svn commit: r404856 - in head: devel/qmake5 devel/qmake5/files x11-toolkits/qt5-gui
Raphael Kubo da Costa
rakuco at FreeBSD.org
Wed Dec 30 14:03:43 UTC 2015
Author: rakuco
Date: Wed Dec 30 14:03:42 2015
New Revision: 404856
URL: https://svnweb.freebsd.org/changeset/ports/404856
Log:
qmake5: Set QMAKE_{INC,LIB}DIR_OPENGL.
Follow-up to r404694. When we stopped setting CPATH and LIBRARY_PATH, some
Qt5-based ports (astro/stellarium, audio/musescore, audio/cantata,
irc/quassel, deskutils/owncloudclient) broke because the QtGui headers end
up bringing in GL/gl.h, but -I/usr/local/include was no longer being passed
to the compiler.
This is generally caused by QMAKE_{INC,LIB}DIR_OPENGL being empty, which
leads to some parts of Qt5ConfigExtras.cmake.in being left out when being
processed into Qt5ConfigExtras.cmake. Specifically, the bits of code that
make the directories containing GL/gl.h and libGL.so a dependency of the
Qt5::Gui CMake target were not present.
Fix it by setting those two variables again like we also do in devel/qmake4.
Most ports broken by r404694 are fixed by this change, but not all:
* audio/cantata: Accidentally fixed by this change. Upstream includes the
TagLib headers wrongly. `taglib-config --cflags' returns
-I${LOCALBASE}/include/taglib, but the code references headers as
<taglib/foo.h> instead of <foo.h>.
* multimedia/obs-studio, textproc/sigil, x11/antimicro: Those remain broken,
linker calls pass -lfoo instead of /path/to/libfoo.so, and they were only
working because we were passing LIBRARY_PATH to the linker before. They
need to be fixed separately.
Thanks to antoine@ for the fallout heads-up.
PR: 194088
PR: 195105
PR: 198720
MFH: 2015Q4
Modified:
head/devel/qmake5/Makefile
head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf
head/x11-toolkits/qt5-gui/Makefile
Modified: head/devel/qmake5/Makefile
==============================================================================
--- head/devel/qmake5/Makefile Wed Dec 30 12:52:24 2015 (r404855)
+++ head/devel/qmake5/Makefile Wed Dec 30 14:03:42 2015 (r404856)
@@ -2,7 +2,7 @@
PORTNAME= qmake
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
Modified: head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf
==============================================================================
--- head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf Wed Dec 30 12:52:24 2015 (r404855)
+++ head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf Wed Dec 30 14:03:42 2015 (r404856)
@@ -1,6 +1,6 @@
--- ./mkspecs/common/freebsd.conf.orig 2013-12-05 17:36:29.064198097 +0000
+++ ./mkspecs/common/freebsd.conf 2013-12-05 17:38:34.413200492 +0000
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,40 @@
+#
+# qmake configuration for FreeBSD
+#
@@ -16,6 +16,10 @@
+QMAKE_INCDIR = /usr/local/include
+QMAKE_LIBDIR = /usr/local/lib
+
++# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h.
++QMAKE_INCDIR_OPENGL = /usr/local/include
++QMAKE_LIBDIR_OPENGL = /usr/local/lib
++
+QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined
+QMAKE_LFLAGS_THREAD = -pthread
+
Modified: head/x11-toolkits/qt5-gui/Makefile
==============================================================================
--- head/x11-toolkits/qt5-gui/Makefile Wed Dec 30 12:52:24 2015 (r404855)
+++ head/x11-toolkits/qt5-gui/Makefile Wed Dec 30 14:03:42 2015 (r404856)
@@ -2,7 +2,7 @@
PORTNAME= gui
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits graphics
PKGNAMEPREFIX= qt5-
More information about the svn-ports-all
mailing list