diff options
Diffstat (limited to 'devel/qt5')
| -rw-r--r-- | devel/qt5/Makefile.sqldrivers | 2 | ||||
| -rw-r--r-- | devel/qt5/distinfo | 104 | ||||
| -rw-r--r-- | devel/qt5/files/extrapatch-configure | 42 | ||||
| -rw-r--r-- | devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf | 77 | ||||
| -rw-r--r-- | devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf | 6 | ||||
| -rw-r--r-- | devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h | 31 |
6 files changed, 161 insertions, 101 deletions
diff --git a/devel/qt5/Makefile.sqldrivers b/devel/qt5/Makefile.sqldrivers index 6da175cbc77a..ecb1c2b07c78 100644 --- a/devel/qt5/Makefile.sqldrivers +++ b/devel/qt5/Makefile.sqldrivers @@ -16,7 +16,7 @@ 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 \ +PLIST_FILES+= ${QT_CMAKEDIR_REL}/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 diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo index 12d804bd0b41..808700ede7c7 100644 --- a/devel/qt5/distinfo +++ b/devel/qt5/distinfo @@ -1,45 +1,59 @@ -TIMESTAMP = 1476003740 -SHA256 (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941 -SIZE (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = 19763124 -SHA256 (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 -SIZE (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 46825164 -SHA256 (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad -SIZE (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = 10836672 -SHA256 (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 -SIZE (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 2639772 -SHA256 (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da -SIZE (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 18813016 -SHA256 (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e -SIZE (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 14751100 -SHA256 (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 -SIZE (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 1909556 -SHA256 (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a -SIZE (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 3148448 -SHA256 (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf -SIZE (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = 3492628 -SHA256 (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c -SIZE (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5952696 -SHA256 (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 -SIZE (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 882160 -SHA256 (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e -SIZE (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = 2587484 -SHA256 (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 -SIZE (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = 1973888 -SHA256 (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826 -SIZE (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = 234612 -SHA256 (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 -SIZE (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = 256852 -SHA256 (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e -SIZE (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = 1723056 -SHA256 (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 -SIZE (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = 9794512 -SHA256 (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421 -SIZE (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 1204148 -SHA256 (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 -SIZE (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 119792 -SHA256 (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 -SIZE (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 171004 -SHA256 (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced -SIZE (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 33640 -SHA256 (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc -SIZE (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 1323576 +TIMESTAMP = 1484477552 +SHA256 (KDE/Qt/5.7.1/qt3d-opensource-src-5.7.1.tar.xz) = 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea +SIZE (KDE/Qt/5.7.1/qt3d-opensource-src-5.7.1.tar.xz) = 19474848 +SHA256 (KDE/Qt/5.7.1/qtbase-opensource-src-5.7.1.tar.xz) = edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e +SIZE (KDE/Qt/5.7.1/qtbase-opensource-src-5.7.1.tar.xz) = 44992616 +SHA256 (KDE/Qt/5.7.1/qtcanvas3d-opensource-src-5.7.1.tar.xz) = a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4 +SIZE (KDE/Qt/5.7.1/qtcanvas3d-opensource-src-5.7.1.tar.xz) = 10851540 +SHA256 (KDE/Qt/5.7.1/qtcharts-opensource-src-5.7.1.tar.xz) = 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3 +SIZE (KDE/Qt/5.7.1/qtcharts-opensource-src-5.7.1.tar.xz) = 4086256 +SHA256 (KDE/Qt/5.7.1/qtconnectivity-opensource-src-5.7.1.tar.xz) = b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966 +SIZE (KDE/Qt/5.7.1/qtconnectivity-opensource-src-5.7.1.tar.xz) = 2690688 +SHA256 (KDE/Qt/5.7.1/qtdatavis3d-opensource-src-5.7.1.tar.xz) = 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8 +SIZE (KDE/Qt/5.7.1/qtdatavis3d-opensource-src-5.7.1.tar.xz) = 5155740 +SHA256 (KDE/Qt/5.7.1/qtdeclarative-opensource-src-5.7.1.tar.xz) = fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 +SIZE (KDE/Qt/5.7.1/qtdeclarative-opensource-src-5.7.1.tar.xz) = 18976920 +SHA256 (KDE/Qt/5.7.1/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz) = 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f +SIZE (KDE/Qt/5.7.1/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz) = 74340 +SHA256 (KDE/Qt/5.7.1/qtgamepad-opensource-src-5.7.1.tar.xz) = bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182 +SIZE (KDE/Qt/5.7.1/qtgamepad-opensource-src-5.7.1.tar.xz) = 360940 +SHA256 (KDE/Qt/5.7.1/qtgraphicaleffects-opensource-src-5.7.1.tar.xz) = 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8 +SIZE (KDE/Qt/5.7.1/qtgraphicaleffects-opensource-src-5.7.1.tar.xz) = 14486948 +SHA256 (KDE/Qt/5.7.1/qtimageformats-opensource-src-5.7.1.tar.xz) = 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4 +SIZE (KDE/Qt/5.7.1/qtimageformats-opensource-src-5.7.1.tar.xz) = 2004376 +SHA256 (KDE/Qt/5.7.1/qtlocation-opensource-src-5.7.1.tar.xz) = f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f +SIZE (KDE/Qt/5.7.1/qtlocation-opensource-src-5.7.1.tar.xz) = 3194112 +SHA256 (KDE/Qt/5.7.1/qtmultimedia-opensource-src-5.7.1.tar.xz) = a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def +SIZE (KDE/Qt/5.7.1/qtmultimedia-opensource-src-5.7.1.tar.xz) = 3563676 +SHA256 (KDE/Qt/5.7.1/qtquickcontrols-opensource-src-5.7.1.tar.xz) = 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d +SIZE (KDE/Qt/5.7.1/qtquickcontrols-opensource-src-5.7.1.tar.xz) = 5943024 +SHA256 (KDE/Qt/5.7.1/qtquickcontrols2-opensource-src-5.7.1.tar.xz) = f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec +SIZE (KDE/Qt/5.7.1/qtquickcontrols2-opensource-src-5.7.1.tar.xz) = 2212812 +SHA256 (KDE/Qt/5.7.1/qtscript-opensource-src-5.7.1.tar.xz) = 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426 +SIZE (KDE/Qt/5.7.1/qtscript-opensource-src-5.7.1.tar.xz) = 2608180 +SHA256 (KDE/Qt/5.7.1/qtscxml-opensource-src-5.7.1.tar.xz) = 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c +SIZE (KDE/Qt/5.7.1/qtscxml-opensource-src-5.7.1.tar.xz) = 346948 +SHA256 (KDE/Qt/5.7.1/qtsensors-opensource-src-5.7.1.tar.xz) = ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10 +SIZE (KDE/Qt/5.7.1/qtsensors-opensource-src-5.7.1.tar.xz) = 1987144 +SHA256 (KDE/Qt/5.7.1/qtserialbus-opensource-src-5.7.1.tar.xz) = 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157 +SIZE (KDE/Qt/5.7.1/qtserialbus-opensource-src-5.7.1.tar.xz) = 239676 +SHA256 (KDE/Qt/5.7.1/qtserialport-opensource-src-5.7.1.tar.xz) = 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26 +SIZE (KDE/Qt/5.7.1/qtserialport-opensource-src-5.7.1.tar.xz) = 265616 +SHA256 (KDE/Qt/5.7.1/qtsvg-opensource-src-5.7.1.tar.xz) = b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947 +SIZE (KDE/Qt/5.7.1/qtsvg-opensource-src-5.7.1.tar.xz) = 1751536 +SHA256 (KDE/Qt/5.7.1/qttools-opensource-src-5.7.1.tar.xz) = 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac +SIZE (KDE/Qt/5.7.1/qttools-opensource-src-5.7.1.tar.xz) = 10011108 +SHA256 (KDE/Qt/5.7.1/qttranslations-opensource-src-5.7.1.tar.xz) = 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7 +SIZE (KDE/Qt/5.7.1/qttranslations-opensource-src-5.7.1.tar.xz) = 1206116 +SHA256 (KDE/Qt/5.7.1/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz) = b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add +SIZE (KDE/Qt/5.7.1/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz) = 10014088 +SHA256 (KDE/Qt/5.7.1/qtwebchannel-opensource-src-5.7.1.tar.xz) = 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b +SIZE (KDE/Qt/5.7.1/qtwebchannel-opensource-src-5.7.1.tar.xz) = 122436 +SHA256 (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 +SIZE (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = 35298736 +SHA256 (KDE/Qt/5.7.1/qtwebsockets-opensource-src-5.7.1.tar.xz) = 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1 +SIZE (KDE/Qt/5.7.1/qtwebsockets-opensource-src-5.7.1.tar.xz) = 193204 +SHA256 (KDE/Qt/5.7.1/qtx11extras-opensource-src-5.7.1.tar.xz) = 5f5a0c2cc66ec01c2f2f31eff32fea26bd0bc03741a5dfd803b13870aa4ce427 +SIZE (KDE/Qt/5.7.1/qtx11extras-opensource-src-5.7.1.tar.xz) = 59656 +SHA256 (KDE/Qt/5.7.1/qtxmlpatterns-opensource-src-5.7.1.tar.xz) = a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5 +SIZE (KDE/Qt/5.7.1/qtxmlpatterns-opensource-src-5.7.1.tar.xz) = 1352472 diff --git a/devel/qt5/files/extrapatch-configure b/devel/qt5/files/extrapatch-configure index ed22a32567e4..46515d852348 100644 --- a/devel/qt5/files/extrapatch-configure +++ b/devel/qt5/files/extrapatch-configure @@ -16,9 +16,9 @@ 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 @@ +--- configure.orig 2015-03-16 17:16:10.000000000 +0100 ++++ configure 2016-04-18 12:35:38.595937000 +0200 +@@ -3878,7 +3878,7 @@ } # build qmake @@ -27,7 +27,7 @@ echo "Creating qmake..." mkdir -p "$outpath/qmake" || exit -@@ -4777,8 +4777,8 @@ +@@ -5045,8 +5045,8 @@ SQLITE_AUTODETECT_FAILED="no" if [ "$CFG_SQLITE" = "system" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then @@ -38,9 +38,9 @@ else QT_CFLAGS_SQLITE= QT_LFLAGS_SQLITE="-lsqlite3 -lz" -@@ -4881,8 +4881,8 @@ - fi - if [ "$CFG_DBUS" = "linked" ]; then +@@ -5149,8 +5149,8 @@ + # runtime: no detection (cannot fail), load libdbus-1 at runtime + if [ "$CFG_DBUS" = "auto" ] || [ "$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` @@ -49,7 +49,7 @@ else QT_LIBS_DBUS="-ldbus-1" fi -@@ -4928,8 +4928,8 @@ +@@ -5201,8 +5201,8 @@ # auto-detect Glib support if [ "$CFG_GLIB" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -60,20 +60,20 @@ fi if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then CFG_GLIB=yes -@@ -4952,9 +4952,9 @@ +@@ -5225,9 +5225,9 @@ # auto-detect GTK style support - if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then + if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "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_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null` +- QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.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_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null | filterIncludeOptions` ++ QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.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 @@ + if [ -n "$QT_CFLAGS_QGTK3" ] ; then + CFG_GTK=yes +@@ -5272,8 +5272,8 @@ # Auto-detect PulseAudio support if [ "$CFG_PULSEAUDIO" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -84,7 +84,7 @@ fi if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then CFG_PULSEAUDIO=yes -@@ -5165,8 +5165,8 @@ +@@ -5436,8 +5436,8 @@ # auto-detect FontConfig support if [ "$CFG_FONTCONFIG" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then @@ -119,7 +119,7 @@ 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 @@ +@@ -5631,16 +5631,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" @@ -151,7 +151,7 @@ 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 @@ +@@ -5776,8 +5776,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 @@ -162,7 +162,7 @@ QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" -@@ -5524,9 +5524,9 @@ +@@ -5830,9 +5830,9 @@ fi if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then diff --git a/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf b/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf new file mode 100644 index 000000000000..2723284c5083 --- /dev/null +++ b/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf @@ -0,0 +1,77 @@ +As we moved the libraries of Qt5 from /usr/local/lib to /usr/local/lib/qt5 the +cmake files would get installed into /usr/local/lib/qt5/cmake. This however is +not really convenient for use with other applications depending on Qt via cmake. + +For ports we could modify cmake.mk to always append /usr/local/lib/qt5 to the +search path. This would however still break applications outside of the ports +tree that users want to compile via cmake. An other option would be to patch +devel/cmake to add /usr/local/lib/qt5/cmake to the default search paths. + +We chose the third option. To patch qmake's internal cmake generation function +to fix up the paths so that cmake files still land in the the "correct" location +in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. + + + +--- mkspecs/features/create_cmake.prf.orig 2016-05-11 09:21:02.000000000 +0200 ++++ mkspecs/features/create_cmake.prf 2016-06-03 18:21:42.389363000 +0200 +@@ -48,7 +52,7 @@ + } + + CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { ++contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*")|freebsd { + CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ + CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + } +@@ -56,7 +60,7 @@ + !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true + + CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_LIB_DIR,"^\\.\\./.*") { ++contains(CMAKE_LIB_DIR,"^\\.\\./.*")|freebsd { + CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ + CMAKE_LIB_DIR_IS_ABSOLUTE = True + } else { +@@ -67,20 +71,20 @@ + } + + CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_BIN_DIR, "^\\.\\./.*") { ++contains(CMAKE_BIN_DIR, "^\\.\\./.*")|freebsd { + CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ + CMAKE_BIN_DIR_IS_ABSOLUTE = True + } + + CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { ++contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*")|freebsd { + CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ + CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True + } + + win32:!wince:!static:!staticlib { + CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) +- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { ++ contains(CMAKE_DLL_DIR, "^\\.\\./.*")|freebsd { + CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ + CMAKE_DLL_DIR_IS_ABSOLUTE = True + } +@@ -167,7 +171,7 @@ + cmake_target_file + + cmake_qt5_plugin_file.files = $$cmake_target_file.output +- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++ cmake_qt5_plugin_file.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + INSTALLS += cmake_qt5_plugin_file + + return() +@@ -314,7 +318,7 @@ + cmake_qt5_module_files.files += $$cmake_macros_file.output + } + +-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++cmake_qt5_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + + # We are generating cmake files. Most developers of Qt are not aware of cmake, + # so we require automatic tests to be available. The only module which should diff --git a/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf b/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf index 25007cbeb401..ebca55108e98 100644 --- a/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf +++ b/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf @@ -1,7 +1,7 @@ The first hunk fixes the install location of the pkconfig files: FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig - qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR - respectively as absolute path. + qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR. + As this is now '${PREFIX}/lib/qt5' we need to go up two levels. The second hunk stops qmake from generating la files. @@ -12,7 +12,7 @@ The second hunk stops qmake from generating la files. !internal_module:!lib_bundle:if(unix|mingw) { CONFIG += create_pc - QMAKE_PKGCONFIG_DESTDIR = pkgconfig -+ QMAKE_PKGCONFIG_DESTDIR = ../libdata/pkgconfig ++ QMAKE_PKGCONFIG_DESTDIR = ../../libdata/pkgconfig host_build: \ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] else: \ diff --git a/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h b/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h deleted file mode 100644 index fbc864b3058b..000000000000 --- a/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 |