Date: Fri, 28 Aug 2020 06:09:24 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546707 - in head/graphics/oyranos: . files Message-ID: <202008280609.07S69OwJ069768@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <X11/Xcm/Xcm.h> 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 <cstdio> + ++#include <QAction> ++#include <QActionGroup> ++#include <QVBoxLayout> ++#include <QMenu> ++ + #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 <X11/Xcm/Xcm.h> +- +-#include <QAction> +-#include <QActionGroup> +-#include <QVBoxLayout> +-#include <QMenu> + + QcmseDialog * dialog = NULL; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008280609.07S69OwJ069768>