cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Reorder #include's to unbreak the build against Qt versions 5.14+

Browse Source 
- Do not include <X11/Xcm/Xcm.h> twice (included from "qcmsevents.h")
This commit is contained in:
Alexey Dokuchaev 2020-08-28 06:09:24 +00:00
parent 054311d725
commit fdf265074b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=546707
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/oyranos/Makefile
View File

@ -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

28
graphics/oyranos/files/patch-src_tools_qcmsevents_qcmsevents.cpp Normal file
View File

@ -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;