From owner-svn-ports-head@freebsd.org Fri Aug 28 06:09:25 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9F3183CF2BB; Fri, 28 Aug 2020 06:09:25 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bd8Ls33Pkz44P7; Fri, 28 Aug 2020 06:09:25 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C88310556; Fri, 28 Aug 2020 06:09:25 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07S69PwW069770; Fri, 28 Aug 2020 06:09:25 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07S69OwJ069768; Fri, 28 Aug 2020 06:09:24 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202008280609.07S69OwJ069768@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 28 Aug 2020 06:09:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546707 - in head/graphics/oyranos: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/graphics/oyranos: . files X-SVN-Commit-Revision: 546707 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 06:09:25 -0000 Author: danfe Date: Fri Aug 28 06:09:24 2020 New Revision: 546707 URL: https://svnweb.freebsd.org/changeset/ports/546707 Log: - Reorder #include's to unbreak the build against Qt versions 5.14+ - Do not include twice (included from "qcmsevents.h") Added: head/graphics/oyranos/files/patch-src_tools_qcmsevents_qcmsevents.cpp (contents, props changed) Modified: head/graphics/oyranos/Makefile Modified: head/graphics/oyranos/Makefile ============================================================================== --- head/graphics/oyranos/Makefile Fri Aug 28 05:47:31 2020 (r546706) +++ head/graphics/oyranos/Makefile Fri Aug 28 06:09:24 2020 (r546707) @@ -10,8 +10,6 @@ COMMENT= Colour Management System (CMS) LICENSE= BSD3CLAUSE -BROKEN= Does not build with Qt5-5.14 - RUN_DEPENDS= ${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:graphics/icc-profiles-openicc \ ${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor \ xcalib:x11/xcalib Added: head/graphics/oyranos/files/patch-src_tools_qcmsevents_qcmsevents.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/oyranos/files/patch-src_tools_qcmsevents_qcmsevents.cpp Fri Aug 28 06:09:24 2020 (r546707) @@ -0,0 +1,28 @@ +--- src/tools/qcmsevents/qcmsevents.cpp.orig 2016-12-09 10:36:53 UTC ++++ src/tools/qcmsevents/qcmsevents.cpp +@@ -9,6 +9,11 @@ + + #include + ++#include ++#include ++#include ++#include ++ + #define TARGET "X Color Management Events" + #include "qcmsevents.h" + #include "oyranos.h" +@@ -17,13 +22,6 @@ + #include "oyranos_io.h" + #include "oyProfile_s.h" + #include "oyObject_s.h" +- +-#include +- +-#include +-#include +-#include +-#include + + QcmseDialog * dialog = NULL; +