[Midnightbsd-cvs] mports [21612] trunk/devel/qt5: first pass at metaport
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 13 16:34:33 EDT 2016
Revision: 21612
http://svnweb.midnightbsd.org/mports/?rev=21612
Author: laffer1
Date: 2016-08-13 16:34:33 -0400 (Sat, 13 Aug 2016)
Log Message:
-----------
first pass at metaport
Added Paths:
-----------
trunk/devel/qt5/
trunk/devel/qt5/Makefile
trunk/devel/qt5/Makefile.sqldrivers
trunk/devel/qt5/distinfo
trunk/devel/qt5/files/
trunk/devel/qt5/files/extrapatch-config.tests-unix-compile.test
trunk/devel/qt5/files/extrapatch-configure
trunk/devel/qt5/files/extrapatch-libtool
trunk/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h
trunk/devel/qt5/files/patch-mkspecs__qt_functions.prf
trunk/devel/qt5/files/pkg-deinstall.in
trunk/devel/qt5/pkg-descr
Added: trunk/devel/qt5/Makefile
===================================================================
--- trunk/devel/qt5/Makefile (rev 0)
+++ trunk/devel/qt5/Makefile 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,17 @@
+# $MidnightBSD$
+# $FreeBSD: head/devel/qt5/Makefile 416257 2016-06-01 19:10:05Z pi $
+
+PORTNAME= qt5
+DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
+CATEGORIES= devel
+
+MAINTAINER= ports at MidnightBSD.org
+COMMENT= Cross-platform application and UI framework (metaport)
+
+LICENSE= gpl3
+
+USE_QT5= ${_USE_QT_ALL:Nphonon4:S/$/_run/} # phonon4 is not part of Qt itself.
+USES= metaport
+
+.include <bsd.port.mk>
Property changes on: trunk/devel/qt5/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt5/Makefile.sqldrivers
===================================================================
--- trunk/devel/qt5/Makefile.sqldrivers (rev 0)
+++ trunk/devel/qt5/Makefile.sqldrivers 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,26 @@
+# $MidnightBSD$
+# $FreeBSD: head/devel/qt5/Makefile.sqldrivers 406778 2016-01-20 16:18:03Z pawel $
+
+PORTNAME?= ${DB:tl}
+DISTVERSION?= ${QT5_VERSION}
+CATEGORIES?= databases
+PKGNAMEPREFIX?= qt5-sqldrivers-
+
+MAINTAINER?= ports at MidnightBSD.org
+COMMENT?= Qt ${DB_DESC} database plugin
+
+LICENSE= gpl3
+
+USE_QT5+= core sql qmake_build buildtools_build
+QT_DIST?= base
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS+=-no-gui -no-xcb
+
+BUILD_WRKSRC?= ${WRKSRC}/src/plugins/sqldrivers/${DB:tl}
+INSTALL_WRKSRC?=${BUILD_WRKSRC}
+
+PLIST_FILES+= ${QT_LIBDIR_REL}/cmake/Qt5Sql/Qt5Sql_Q${DB}DriverPlugin.cmake \
+ ${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so \
+ %%DEBUG%%${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so.debug
+
+.include <bsd.port.mk>
Property changes on: trunk/devel/qt5/Makefile.sqldrivers
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt5/distinfo
===================================================================
--- trunk/devel/qt5/distinfo (rev 0)
+++ trunk/devel/qt5/distinfo 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,50 @@
+SHA256 (KDE/Qt/5.5.1/qt3d-opensource-src-5.5.1.tar.xz) = e380906e2bcbd825dab45043bf063dd88b793c0d5fb050ee915bf4e2b58b1bf7
+SIZE (KDE/Qt/5.5.1/qt3d-opensource-src-5.5.1.tar.xz) = 18061948
+SHA256 (KDE/Qt/5.5.1/qtbase-opensource-src-5.5.1.tar.xz) = dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916
+SIZE (KDE/Qt/5.5.1/qtbase-opensource-src-5.5.1.tar.xz) = 46389212
+SHA256 (KDE/Qt/5.5.1/qtcanvas3d-opensource-src-5.5.1.tar.xz) = 759b171030d7110751943643885c1484c7900fed7737424d202e36bdeba0b080
+SIZE (KDE/Qt/5.5.1/qtcanvas3d-opensource-src-5.5.1.tar.xz) = 10409580
+SHA256 (KDE/Qt/5.5.1/qtconnectivity-opensource-src-5.5.1.tar.xz) = 3637e6def8582fc0fb3684179b93650720ba2da1311a560d358296153f245023
+SIZE (KDE/Qt/5.5.1/qtconnectivity-opensource-src-5.5.1.tar.xz) = 2660592
+SHA256 (KDE/Qt/5.5.1/qtdeclarative-opensource-src-5.5.1.tar.xz) = 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791
+SIZE (KDE/Qt/5.5.1/qtdeclarative-opensource-src-5.5.1.tar.xz) = 18627840
+SHA256 (KDE/Qt/5.5.1/qtdoc-opensource-src-5.5.1.tar.xz) = 9f0daf55a1765f637b5d8096a195842281a49adc5a82e7ddc75e541c62e00f86
+SIZE (KDE/Qt/5.5.1/qtdoc-opensource-src-5.5.1.tar.xz) = 2669772
+SHA256 (KDE/Qt/5.5.1/qtenginio-opensource-src-5.5.1.tar.xz) = a79936bd5b6a35aba28dd282291b28c8fa869b8d86652c62efe5e268d94defe2
+SIZE (KDE/Qt/5.5.1/qtenginio-opensource-src-5.5.1.tar.xz) = 523788
+SHA256 (KDE/Qt/5.5.1/qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47
+SIZE (KDE/Qt/5.5.1/qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 14329444
+SHA256 (KDE/Qt/5.5.1/qtimageformats-opensource-src-5.5.1.tar.xz) = c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5
+SIZE (KDE/Qt/5.5.1/qtimageformats-opensource-src-5.5.1.tar.xz) = 1892820
+SHA256 (KDE/Qt/5.5.1/qtlocation-opensource-src-5.5.1.tar.xz) = 1fe948cb87649f4450be921cf3cdefc311595a80ef6a7a7b7484901baa0d6316
+SIZE (KDE/Qt/5.5.1/qtlocation-opensource-src-5.5.1.tar.xz) = 3108096
+SHA256 (KDE/Qt/5.5.1/qtmultimedia-opensource-src-5.5.1.tar.xz) = 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f
+SIZE (KDE/Qt/5.5.1/qtmultimedia-opensource-src-5.5.1.tar.xz) = 3464340
+SHA256 (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c
+SIZE (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = 16028732
+SHA256 (KDE/Qt/5.5.1/qtquickcontrols-opensource-src-5.5.1.tar.xz) = 1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0
+SIZE (KDE/Qt/5.5.1/qtquickcontrols-opensource-src-5.5.1.tar.xz) = 5976316
+SHA256 (KDE/Qt/5.5.1/qtscript-opensource-src-5.5.1.tar.xz) = cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd
+SIZE (KDE/Qt/5.5.1/qtscript-opensource-src-5.5.1.tar.xz) = 2604884
+SHA256 (KDE/Qt/5.5.1/qtsensors-opensource-src-5.5.1.tar.xz) = 5d264fc0729a5d7679bd4eb8d7a0a9b142ed38d09fa68fc7dfe57f64afc8eeea
+SIZE (KDE/Qt/5.5.1/qtsensors-opensource-src-5.5.1.tar.xz) = 1989556
+SHA256 (KDE/Qt/5.5.1/qtserialport-opensource-src-5.5.1.tar.xz) = a034dbfb023db1b9b9de54390f7e76a48c1d1eb12533b0ffd574505c99968f7a
+SIZE (KDE/Qt/5.5.1/qtserialport-opensource-src-5.5.1.tar.xz) = 260984
+SHA256 (KDE/Qt/5.5.1/qtsvg-opensource-src-5.5.1.tar.xz) = f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7
+SIZE (KDE/Qt/5.5.1/qtsvg-opensource-src-5.5.1.tar.xz) = 1802880
+SHA256 (KDE/Qt/5.5.1/qttools-opensource-src-5.5.1.tar.xz) = 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd
+SIZE (KDE/Qt/5.5.1/qttools-opensource-src-5.5.1.tar.xz) = 9327100
+SHA256 (KDE/Qt/5.5.1/qttranslations-opensource-src-5.5.1.tar.xz) = 41f800710f0bc6ca263f1e54f1fa22be7043962999304e73ce9887ebefc7a4c6
+SIZE (KDE/Qt/5.5.1/qttranslations-opensource-src-5.5.1.tar.xz) = 1153132
+SHA256 (KDE/Qt/5.5.1/qtwebchannel-opensource-src-5.5.1.tar.xz) = 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0
+SIZE (KDE/Qt/5.5.1/qtwebchannel-opensource-src-5.5.1.tar.xz) = 96684
+SHA256 (KDE/Qt/5.5.1/qtwebkit-opensource-src-5.5.1.tar.xz) = 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69
+SIZE (KDE/Qt/5.5.1/qtwebkit-opensource-src-5.5.1.tar.xz) = 33489924
+SHA256 (KDE/Qt/5.5.1/qtwebkit-examples-opensource-src-5.5.1.tar.xz) = 098935b42d6d249027d1a635e4e70edc3d2969dd860f825b36aec06fc72e46c6
+SIZE (KDE/Qt/5.5.1/qtwebkit-examples-opensource-src-5.5.1.tar.xz) = 3428204
+SHA256 (KDE/Qt/5.5.1/qtwebsockets-opensource-src-5.5.1.tar.xz) = cf4e834a867b90337188be504ef20184c52666370f721e704952988f8cb12deb
+SIZE (KDE/Qt/5.5.1/qtwebsockets-opensource-src-5.5.1.tar.xz) = 170440
+SHA256 (KDE/Qt/5.5.1/qtx11extras-opensource-src-5.5.1.tar.xz) = 6387a01d972b62e1ad39e5a25e07d0492200f62fc87cf4366122085aeeebeb65
+SIZE (KDE/Qt/5.5.1/qtx11extras-opensource-src-5.5.1.tar.xz) = 33416
+SHA256 (KDE/Qt/5.5.1/qtxmlpatterns-opensource-src-5.5.1.tar.xz) = b537eb0252988e3805a32a16c65038973371d647baf246fdf703bde725d0e8ec
+SIZE (KDE/Qt/5.5.1/qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 1323560
Property changes on: trunk/devel/qt5/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt5/files/extrapatch-config.tests-unix-compile.test
===================================================================
--- trunk/devel/qt5/files/extrapatch-config.tests-unix-compile.test (rev 0)
+++ trunk/devel/qt5/files/extrapatch-config.tests-unix-compile.test 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,11 @@
+--- config.tests/unix/compile.test.orig
++++ config.tests/unix/compile.test
+@@ -13,7 +13,7 @@
+ shift 7
+ LFLAGS="$SYSROOT_FLAG"
+ INCLUDEPATH=""
+-CXXFLAGS="$SYSROOT_FLAG"
++CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
+ MAC_ARCH_CXXFLAGS=""
+ MAC_ARCH_LFLAGS=""
+ while [ "$#" -gt 0 ]; do
Property changes on: trunk/devel/qt5/files/extrapatch-config.tests-unix-compile.test
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt5/files/extrapatch-configure
===================================================================
--- trunk/devel/qt5/files/extrapatch-configure (rev 0)
+++ trunk/devel/qt5/files/extrapatch-configure 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,177 @@
+* The "build qmake" chunk is required for qtbase ports other than devel/qmake5
+ to use the already built qmake instead of always building their own copy.
+
+* All the other chunks are part of the changes required to avoid ports/194088.
+
+ We want to avoid passing -I${LOCALBASE}/include and -L${LOCALBASE}/lib to the
+ compiler since in Qt5 at least for the Qt ports themselves those parameters
+ will be passed before the build directories, and consequently an older
+ installed version will be used when building a new Qt port and cause
+ problems. See QTBUG-40825 for a discussion we have started upstream.
+
+ This part of the solution comprises both filtering the output of the
+ pkg-config calls so it does not contain those parameters as well as
+ changing the default value of DEFAULT_LIBDIRS in bsd.qt.mk (in the
+ qtbase-post-patch target). It is used in the pkg-config filtering as well
+ as the value of QMAKE_DEFAULT_LIBDIRS in mkspecs/qconfig.pri (which qmake
+ uses to filter out those same paths when processing .pro files).
+
+--- configure.orig 2015-03-16 17:16:10.000000000 +0100
++++ configure 2015-05-01 09:35:38.595937000 +0200
+@@ -3853,7 +3853,7 @@
+ }
+
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if [ '!' -e "$outpath/bin/qmake" ]; then
+ echo "Creating qmake..."
+
+ mkdir -p "$outpath/qmake" || exit
+@@ -4777,8 +4777,8 @@
+ SQLITE_AUTODETECT_FAILED="no"
+ if [ "$CFG_SQLITE" = "system" ]; then
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then
+- QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
+- QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
++ QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null | filterIncludeOptions`
++ QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null | filterLibraryOptions`
+ else
+ QT_CFLAGS_SQLITE=
+ QT_LFLAGS_SQLITE="-lsqlite3 -lz"
+@@ -4881,8 +4881,8 @@
+ fi
+ if [ "$CFG_DBUS" = "linked" ]; then
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then
+- QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null`
+- QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null`
++ QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null | filterIncludeOptions`
++ QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null | filterLibraryOptions`
+ else
+ QT_LIBS_DBUS="-ldbus-1"
+ fi
+@@ -4928,8 +4928,8 @@
+ # auto-detect Glib support
+ if [ "$CFG_GLIB" != "no" ]; then
+ if [ -n "$PKG_CONFIG" ]; then
+- QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null`
+- QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null`
++ QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null | filterIncludeOptions`
++ QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null | filterLibraryOptions`
+ fi
+ if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then
+ CFG_GLIB=yes
+@@ -4952,9 +4952,9 @@
+ # auto-detect GTK style support
+ if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then
+ if [ -n "$PKG_CONFIG" ]; then
+- QT_CFLAGS_QGTK2=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.18 atk 2>/dev/null`
+- QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null`
+- QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null`
++ QT_CFLAGS_QGTK2=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.18 atk 2>/dev/null | filterIncludeOptions`
++ QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null | filterLibraryOptions`
++ QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null | filterLibraryOptions`
+ fi
+ if [ -n "$QT_CFLAGS_QGTK2" ] ; then
+ CFG_QGTKSTYLE=yes
+@@ -5001,8 +5001,8 @@
+ # Auto-detect PulseAudio support
+ if [ "$CFG_PULSEAUDIO" != "no" ]; then
+ if [ -n "$PKG_CONFIG" ]; then
+- QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null`
+- QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null`
++ QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterIncludeOptions`
++ QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterLibraryOptions`
+ fi
+ if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then
+ CFG_PULSEAUDIO=yes
+@@ -5165,8 +5165,8 @@
+ # auto-detect FontConfig support
+ if [ "$CFG_FONTCONFIG" != "no" ]; then
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then
+- QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null`
+- QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null`
++ QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null | filterIncludeOptions`
++ QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null | filterLibraryOptions`
+ else
+ QT_CFLAGS_FONTCONFIG=
+ QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"
+@@ -5192,9 +5192,9 @@
+
+ if [ "$CFG_LIBUDEV" != "no" ]; then
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists libudev 2>/dev/null; then
+- QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
+- QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null`
+- QMAKE_CFLAGS_LIBUDEV=`$PKG_CONFIG --cflags libudev 2>/dev/null`
++ QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'`
++ QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null | filterLibraryOptions`
++ QMAKE_CFLAGS_LIBUDEV=`$PKG_CONFIG --cflags libudev 2>/dev/null | filterIncludeOptions`
+ QMakeVar set QMAKE_INCDIR_LIBUDEV "$QMAKE_INCDIR_LIBUDEV"
+ QMakeVar set QMAKE_LIBS_LIBUDEV "$QMAKE_LIBS_LIBUDEV"
+ fi
+@@ -5333,8 +5333,8 @@
+
+ if [ "$CFG_XCB" != "no" ]; then
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
+- QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`"
+- QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`"
++ QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null | filterIncludeOptions`"
++ QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null | filterLibraryOptions`"
+ fi
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then
+ QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
+@@ -5353,16 +5353,16 @@
+ CFG_XCB="system"
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
+ XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape"
+- QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`"
+- QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`"
++ QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null | filterIncludeOptions`"
++ QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null | filterLibraryOptions`"
+ fi
+
+ # libxcb version 1.10 was the first version that enables xcb-xkb by default,
+ # therefore the minimal xcb-xkb version we support is 1.10
+ CFG_XKB=no
+ if $PKG_CONFIG --exists "xcb-xkb >= 1.10" 2>/dev/null; then
+- QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null`"
+- QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null`"
++ QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null | filterIncludeOptions`"
++ QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null | filterLibraryOptions`"
+ if compileTest qpa/xcb-xkb "xcb-xkb" $QMAKE_CFLAGS_XKB $QMAKE_LIBS_XKB; then
+ CFG_XKB=yes
+ fi
+@@ -5416,8 +5416,8 @@
+
+ if [ "$CFG_DIRECTFB" != "no" ]; then
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then
+- QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null`
+- QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null`
++ QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null | filterIncludeOptions`
++ QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null | filterLibraryOptions`
+ if compileTest qpa/directfb "DirectFB" $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then
+ CFG_DIRECTFB=yes
+ elif [ "$CFG_DIRECTFB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+@@ -5470,8 +5470,8 @@
+ if [ "$CFG_XKBCOMMON" != "no" ] && [ "$CFG_XKBCOMMON" != "qt" ]; then
+ # Check if there is a suitable system-wide xkbcommon
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then
+- QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null`"
+- QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null`"
++ QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null | filterIncludeOptions`"
++ QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null | filterLibraryOptions`"
+
+ QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON"
+ QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON"
+@@ -5524,9 +5524,9 @@
+ fi
+
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then
+- QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
+- QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null`
+- QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null`
++ QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'`
++ QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null | filterLibraryOptions`
++ QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null | filterIncludeOptions`
+ QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
+ QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
+ QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`"
Property changes on: trunk/devel/qt5/files/extrapatch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt5/files/extrapatch-libtool
===================================================================
--- trunk/devel/qt5/files/extrapatch-libtool (rev 0)
+++ trunk/devel/qt5/files/extrapatch-libtool 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,11 @@
+--- mkspecs/features/qt_module.prf.orig 2015-03-16 17:16:43.000000000 +0100
++++ mkspecs/features/qt_module.prf 2015-05-01 09:47:31.767105000 +0200
+@@ -200,7 +200,7 @@
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
+
+ unix {
+- CONFIG += create_libtool explicitlib
++ CONFIG += explicitlib
+ host_build: \
+ QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
+ else: \
Property changes on: trunk/devel/qt5/files/extrapatch-libtool
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h
===================================================================
--- trunk/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h (rev 0)
+++ trunk/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,31 @@
+--- src/corelib/global/qcompilerdetection.h.orig 2015-10-13 04:35:31 UTC
++++ src/corelib/global/qcompilerdetection.h
+@@ -941,13 +941,26 @@
+ # undef Q_COMPILER_CONSTEXPR
+ # endif
+ # endif // Q_OS_QNX
+-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
+- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
++# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && !defined(_LIBCPP_VERSION)
+ // Apple has not updated libstdc++ since 2007, which means it does not have
+ // <initializer_list> or std::move. Let's disable these features
++// The same applies to FreeBSD's base libstdc++ version used in FreeBSD 9.x.
+ # undef Q_COMPILER_INITIALIZER_LISTS
+ # undef Q_COMPILER_RVALUE_REFS
+ # undef Q_COMPILER_REF_QUALIFIERS
++// FreeBSD's base libstdc++ does not support std::u{16,32}string.
++# undef Q_COMPILER_UNICODE_STRINGS
++// FreeBSD's base libstdc++ does not support std::declval, which is used in
++// together with noexcept in some headers such as qpair.h (as of Qt 5.5).
++// Since there is no macro checking for std::declval, just disable noexcept
++// altogether.
++# undef Q_COMPILER_NOEXCEPT
++// FreeBSD's base libstdc++ is missing constexpr keywords on important
++// functions like std::numeric_limits<>::min(). Disable constexpr even if clang
++// advertises support for it.
++# undef Q_COMPILER_CONSTEXPR
++// FreeBSD's base libstdc++ does not support std::nullptr_t.
++# undef Q_COMPILER_NULLPTR
+ // Also disable <atomic>, since it's clearly not there
+ # undef Q_COMPILER_ATOMICS
+ # endif
Property changes on: trunk/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt5/files/patch-mkspecs__qt_functions.prf
===================================================================
--- trunk/devel/qt5/files/patch-mkspecs__qt_functions.prf (rev 0)
+++ trunk/devel/qt5/files/patch-mkspecs__qt_functions.prf 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,11 @@
+--- mkspecs/features/qt_functions.prf.orig 2016-08-13 13:26:41.680600797 -0400
++++ mkspecs/features/qt_functions.prf 2016-08-13 13:27:15.734600909 -0400
+@@ -271,7 +271,7 @@
+ }
+ equals(QMAKE_HOST.os, Windows) {
+ deppath.name = PATH
+- } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
++ } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|MidnightBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
+ deppath.name = LD_LIBRARY_PATH
+ } else:contains(QMAKE_HOST.os, Haiku) {
+ deppath.name = LIBRARY_PATH
Property changes on: trunk/devel/qt5/files/patch-mkspecs__qt_functions.prf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt5/files/pkg-deinstall.in
===================================================================
--- trunk/devel/qt5/files/pkg-deinstall.in (rev 0)
+++ trunk/devel/qt5/files/pkg-deinstall.in 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $FreeBSD: head/devel/qt5/files/pkg-deinstall.in 346930 2014-03-03 16:50:32Z makc $
+
+case $2 in
+POST-DEINSTALL)
+ sed -i "" '/qconfig-%%QT_MODNAME%%\.h/ d' \
+ %%QT_INCDIR%%/QtCore/qconfig-modules.h 2>/dev/null || true
+ [ \! -e %%QT_INCDIR%%/QtCore/qconfig.h ] &&
+ [ \! -s %%QT_INCDIR%%/QtCore/qconfig-modules.h ] &&
+ ( rm -f %%QT_INCDIR%%/QtCore/qconfig-modules.h 2>/dev/null
+ rmdir %%QT_INCDIR%%/QtCore 2>/dev/null
+ rmdir %%QT_INCDIR%% 2>/dev/null ) || true
+ ;;
+esac
Property changes on: trunk/devel/qt5/files/pkg-deinstall.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt5/pkg-descr
===================================================================
--- trunk/devel/qt5/pkg-descr (rev 0)
+++ trunk/devel/qt5/pkg-descr 2016-08-13 20:34:33 UTC (rev 21612)
@@ -0,0 +1,9 @@
+Qt is a cross-platform application and UI framework for developers
+using C++ or QML, a CSS/JavaScript-like language.
+
+With Qt, code can be reused efficiently to target multiple platforms
+with one code base. The modular C++ class library and developer tools
+easily enables developers to create applications for one platform and
+easily build and run to deploy on another platform.
+
+WWW: http://qt-project.org
Property changes on: trunk/devel/qt5/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list