Date: Wed, 16 Sep 2015 08:55:05 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397043 - in head: Mk Mk/Uses cad/qcad databases/qt4-odbc-plugin databases/qt4-sql databases/qt4-sqlite-plugin databases/qt4-sqlite3-plugin devel/dbus-qt4 devel/qmake4 devel/qt4 devel/q... Message-ID: <201509160855.t8G8t5Sj089416@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Sep 16 08:55:04 2015 New Revision: 397043 URL: https://svnweb.freebsd.org/changeset/ports/397043 Log: Update the Qt4 ports to 4.8.7. According to upstream, this is the last planned Qt4 release. A list of changes since 4.8.6 can be found here: <http://download.qt.io/official_releases/qt/4.8/4.8.7/changes-4.8.7>; Porting notes and changes: - Remove several patches that have been upstreamed. - Make Uses/qmake.mk pass the contents of LIBS to the qmake environment. [1] - Repurpose devel/qt4/files/extrapatch-src-corelib-global-qglobal.h now the original patch is part of the release (curiously enough, the original patch was never actually used, as the ?= assignment in r362837 after r362770 was never possible). This works around the way compiler support for C++11 features is detected in Qt 4.8.7: while it originally only uses the compiler to determine if something is supported or not, the initializer lists feature also depends on the C++ standard library being used. It's a problem in FreeBSD 9.x, where USES=compiler:c++0x or USES=compiler:c++11-lang means we will use clang to build a port but use libstdc++ from base (GCC 4.2). The latter obviously does not support initializer lists, and the build fails because Qt tries to include headers that do not exist (<initializer_list>). Since detecting libstdc++'s version is not trivial (we need to include a non-lightweight header like cstdio and then check for __GLIBCXX__), we just enable Q_COMPILER_INITIALIZER_LISTS support only when libc++ is used (there should be no reason for someone to be using clang with GCC 4.8's libstdc++, for example). x11/kdelibs4's FindQt4.cmake had to include a backported change from the upstream FindQt4.cmake in CMake itself to use a C++ compiler to detect flags like Q_WS_X11, otherwise the inclusion of <ciso646> in qglobal.h makes the build fail. This patch contains changes by me, makc@ and alonso@. PR: 202552 [1] PR: 202808 [exp-run] Submitted by: pawel@ [1] Deleted: head/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h head/graphics/qt4-imageformats/files/ head/x11-toolkits/qt4-gui/files/ Modified: head/Mk/Uses/qmake.mk head/Mk/bsd.qt.mk head/cad/qcad/Makefile head/databases/qt4-odbc-plugin/Makefile head/databases/qt4-sql/Makefile head/databases/qt4-sqlite-plugin/Makefile head/databases/qt4-sqlite3-plugin/Makefile head/devel/dbus-qt4/Makefile head/devel/qmake4/pkg-plist head/devel/qt4-assistant/Makefile head/devel/qt4-corelib/Makefile head/devel/qt4-designer/Makefile head/devel/qt4-help/Makefile head/devel/qt4-linguist/Makefile head/devel/qt4-qmlviewer/Makefile head/devel/qt4-qt3support/Makefile head/devel/qt4-qvfb/Makefile head/devel/qt4-script/Makefile head/devel/qt4-scripttools/Makefile head/devel/qt4-testlib/Makefile head/devel/qt4/Makefile head/devel/qt4/distinfo head/devel/qt4/files/extrapatch-configure head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h head/graphics/qt4-imageformats/Makefile head/graphics/qt4-opengl/Makefile head/graphics/qt4-opengl/pkg-plist head/graphics/qt4-svg/Makefile head/misc/qt4-l10n/Makefile head/misc/qt4-l10n/pkg-plist head/misc/qt4-qtconfig/Makefile head/misc/qt4-qtdemo/Makefile head/multimedia/qt4-multimedia/Makefile head/net/qt4-network/Makefile head/textproc/clucene-qt4/Makefile head/textproc/qt4-xml/Makefile head/textproc/qt4-xmlpatterns/Makefile head/www/webkit-qt4/Makefile head/x11-toolkits/qt4-declarative/Makefile head/x11-toolkits/qt4-gui/Makefile head/x11/kdelibs4/Makefile head/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake head/x11/qt4-graphicssystems-opengl/Makefile Modified: head/Mk/Uses/qmake.mk ============================================================================== --- head/Mk/Uses/qmake.mk Wed Sep 16 08:12:05 2015 (r397042) +++ head/Mk/Uses/qmake.mk Wed Sep 16 08:55:04 2015 (r397043) @@ -71,6 +71,7 @@ QMAKE_ARGS+= -spec ${QMAKESPEC} \ QMAKE_CFLAGS="${CFLAGS}" \ QMAKE_CXXFLAGS="${CXXFLAGS}" \ QMAKE_LFLAGS="${LDFLAGS}" \ + QMAKE_LIBS="${LIBS}" \ QMAKE_CFLAGS_DEBUG="" \ QMAKE_CFLAGS_RELEASE="" \ QMAKE_CXXFLAGS_DEBUG="" \ Modified: head/Mk/bsd.qt.mk ============================================================================== --- head/Mk/bsd.qt.mk Wed Sep 16 08:12:05 2015 (r397042) +++ head/Mk/bsd.qt.mk Wed Sep 16 08:55:04 2015 (r397043) @@ -26,7 +26,7 @@ Qt_Pre_Include= bsd.qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 4 5 -QT4_VERSION?= 4.8.6 +QT4_VERSION?= 4.8.7 QT5_VERSION?= 5.4.1 QT_PREFIX?= ${LOCALBASE} @@ -171,13 +171,13 @@ CONFIGURE_ARGS+=-verbose . endif . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} -EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool . if ${_QT_VERSION:M4*} -EXTRA_PATCHES?= ${EXTRA_PATCHES} \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h +_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h . endif +EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \ + ${_EXTRA_PATCHES_QT4} . endif # Override settings installed in qconfig.h and *.pri files. The flags will be Modified: head/cad/qcad/Makefile ============================================================================== --- head/cad/qcad/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/cad/qcad/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -52,12 +52,12 @@ pre-configure: ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ ${WRKSRC}/src/core/RSettings.cpp -# Temporary hack for Qt 4.8.6 support while upstream does not add proper +# Temporary hack for Qt 4.8.7 support while upstream does not add proper # bindings. (cd ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-4.8.5 && \ - ${COPYTREE_SHARE} . ../qt-labs-qtscriptgenerator-4.8.6) - (cd ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-4.8.6 && \ - mv qt-labs-qtscriptgenerator-4.8.5.pro qt-labs-qtscriptgenerator-4.8.6.pro) + ${COPYTREE_SHARE} . ../qt-labs-qtscriptgenerator-4.8.7) + (cd ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-4.8.7 && \ + mv qt-labs-qtscriptgenerator-4.8.5.pro qt-labs-qtscriptgenerator-4.8.7.pro) do-install: ${INSTALL_PROGRAM} ${RESDIR}/qcad-bin ${STAGEDIR}${PREFIX}/bin/ Modified: head/databases/qt4-odbc-plugin/Makefile ============================================================================== --- head/databases/qt4-odbc-plugin/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/databases/qt4-odbc-plugin/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= databases MAINTAINER= kde@FreeBSD.org Modified: head/databases/qt4-sql/Makefile ============================================================================== --- head/databases/qt4-sql/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/databases/qt4-sql/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= sql DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= qt4- Modified: head/databases/qt4-sqlite-plugin/Makefile ============================================================================== --- head/databases/qt4-sqlite-plugin/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/databases/qt4-sqlite-plugin/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= databases MAINTAINER= kde@FreeBSD.org Modified: head/databases/qt4-sqlite3-plugin/Makefile ============================================================================== --- head/databases/qt4-sqlite3-plugin/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/databases/qt4-sqlite3-plugin/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= databases MAINTAINER= kde@FreeBSD.org Modified: head/devel/dbus-qt4/Makefile ============================================================================== --- head/devel/dbus-qt4/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/dbus-qt4/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= dbus DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qmake4/pkg-plist ============================================================================== --- head/devel/qmake4/pkg-plist Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qmake4/pkg-plist Wed Sep 16 08:55:04 2015 (r397043) @@ -487,6 +487,8 @@ %%QT_MKSPECDIR%%/win32-msvc2012/qplatformdefs.h %%QT_MKSPECDIR%%/win32-msvc2013/qmake.conf %%QT_MKSPECDIR%%/win32-msvc2013/qplatformdefs.h +%%QT_MKSPECDIR%%/win32-msvc2015/qmake.conf +%%QT_MKSPECDIR%%/win32-msvc2015/qplatformdefs.h %%QT_MKSPECDIR%%/wince50standard-armv4i-msvc2005/default_post.prf %%QT_MKSPECDIR%%/wince50standard-armv4i-msvc2005/qmake.conf %%QT_MKSPECDIR%%/wince50standard-armv4i-msvc2005/qplatformdefs.h Modified: head/devel/qt4-assistant/Makefile ============================================================================== --- head/devel/qt4-assistant/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-assistant/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= assistant DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-corelib/Makefile ============================================================================== --- head/devel/qt4-corelib/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-corelib/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 5 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-designer/Makefile ============================================================================== --- head/devel/qt4-designer/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-designer/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= designer DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-help/Makefile ============================================================================== --- head/devel/qt4-help/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-help/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= help DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-linguist/Makefile ============================================================================== --- head/devel/qt4-linguist/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-linguist/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= linguist DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-qmlviewer/Makefile ============================================================================== --- head/devel/qt4-qmlviewer/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-qmlviewer/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= qmlviewer DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-qt3support/Makefile ============================================================================== --- head/devel/qt4-qt3support/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-qt3support/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= qt3support DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel x11-toolkits PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-qvfb/Makefile ============================================================================== --- head/devel/qt4-qvfb/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-qvfb/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= qvfb DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-script/Makefile ============================================================================== --- head/devel/qt4-script/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-script/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= script DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-scripttools/Makefile ============================================================================== --- head/devel/qt4-scripttools/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-scripttools/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -2,7 +2,6 @@ PORTNAME= scripttools DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4-testlib/Makefile ============================================================================== --- head/devel/qt4-testlib/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4-testlib/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= testlib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4/Makefile ============================================================================== --- head/devel/qt4/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= qt4 DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org Modified: head/devel/qt4/distinfo ============================================================================== --- head/devel/qt4/distinfo Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4/distinfo Wed Sep 16 08:55:04 2015 (r397043) @@ -1,2 +1,2 @@ -SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c -SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667 +SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 +SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567 Modified: head/devel/qt4/files/extrapatch-configure ============================================================================== --- head/devel/qt4/files/extrapatch-configure Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4/files/extrapatch-configure Wed Sep 16 08:55:04 2015 (r397043) @@ -53,12 +53,3 @@ fi # X11/MINGW/SYMBIAN OpenGL -@@ -7729,7 +7717,7 @@ case "$XPLATFORM" in - *-g++*) - # Check gcc's version - case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in -- 4*|3.4*) -+ 5*|4*|3.4*) - ;; - 3.3*) - canBuildWebKit="no" Modified: head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h ============================================================================== --- head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h Wed Sep 16 08:12:05 2015 (r397042) +++ head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h Wed Sep 16 08:55:04 2015 (r397043) @@ -1,239 +1,34 @@ -commit bc620055c82a8ccae49144ad99bf9226d659f852 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Sun Jul 13 23:15:00 2014 +0300 +clang: Only enable Q_COMPILER_INITIALIZER_LISTS with libc++. - Move the C++11 support macros to a central place. - - The main objective of this commit is to make C++11 support work with - clang: so far, the Q_COMPILER_* definitions related to C++11 were - enabled based on __GNUC__ and __GNUC_MINOR__; while clang does define - those two, __GNUC_MINOR__ is hardcoded at "2" and thus none of the - macros end up being defined. - - We now make qglobal.h more similar to how qtbase's qcompilerdetection.h - works by separating the detection of the C++11 features supported by a - compiler from the detection of the compilers themselves. - - It is important to note the list of macros has not changed, the macros - have only been moved. - - This commit either follows the spirit of or is a cherry-pick of the - following qtbase ones: - - 4131c323a36ee8680a3b4d66a2a03a00544751c2 (Update the C++11 support - macros) - - 8dd66f42e834320c4ba0a6f2e45855d591b3b6e7 (Avoid undefined macro - warning for __GXX_EXPERIMENTAL_CXX0X__) - - fe5d5fdaf1d9b7d108727d290e24a6b0f00139c6 (clang: Use __has_feature() - to detect C++11 features) - - 0ec953c93688ec0de74cda43b91f66f4cf879e5f (Remove extra Q_COMPILER_xxx - defines from the MSVC section) - - 163dcf2b71f34a12137f200e4af5640e42e5f5e2 (Fix build with older Clang - versions without __has_extension) - - 53262b9b5b9cb536916f6d6e086a944cb17bb8d8 (Only define the MSVC C++11 - feature macros in C++) - - Change-Id: I2ca35af1a23260a9373943f97a8a72db3fc670e4 - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +This is a workaround for the FreeBSD 9.x series: in Qt 4.8.7, C++11 features +are detected by checking if the compiler supports them. However, initializer +lists support also depends on the C++ standard library. 9.x's libstdc++ from +base (GCC 4.2) does not, so ports with e.g. USES=compiler:c++0x or +compiler:c++11-lang would break: they build with clang and base's libstdc++, so +Qt considers the support is there (including the C++ header) while this is not +the case. -diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h -index 158ef78..4f1384b 100644 +Work around the problem by only enabling Q_COMPILER_INITIALIZER_LISTS if libc++ +is being used. Detecting libstdc++'s version is too cumbersome (we would at +least need to include a non-lightweight header such as cstdio to have access to +__GLIBCXX__) and not worth the effort. --- src/corelib/global/qglobal.h +++ src/corelib/global/qglobal.h -@@ -463,17 +463,6 @@ namespace QT_NAMESPACE {} - # undef QT_HAVE_3DNOW - # endif - --#if defined(Q_CC_MSVC) && _MSC_VER >= 1600 --# define Q_COMPILER_RVALUE_REFS --# define Q_COMPILER_AUTO_FUNCTION --# define Q_COMPILER_AUTO_TYPE --# define Q_COMPILER_LAMBDA --# define Q_COMPILER_DECLTYPE --// MSCV has std::initilizer_list, but do not support the braces initialization --//# define Q_COMPILER_INITIALIZER_LISTS --# endif -- -- - #elif defined(__BORLANDC__) || defined(__TURBOC__) - # define Q_CC_BOR - # define Q_INLINE_TEMPLATE -@@ -505,6 +494,7 @@ namespace QT_NAMESPACE {} - /* work-around for missing compiler intrinsics */ - # define __is_empty(X) false - # define __is_pod(X) false -+ - #elif defined(__GNUC__) - # define Q_CC_GNU - # define Q_C_CALLBACKS -@@ -518,6 +508,10 @@ namespace QT_NAMESPACE {} - # if defined(__clang__) - /* Clang also masquerades as GCC 4.2.1 */ - # define Q_CC_CLANG -+# if !defined(__has_extension) -+ /* Compatibility with older Clang versions */ -+# define __has_extension __has_feature -+# endif - # endif - # ifdef __APPLE__ - # define Q_NO_DEPRECATED_CONSTRUCTORS -@@ -558,33 +552,6 @@ namespace QT_NAMESPACE {} - # define QT_NO_ARM_EABI +@@ -854,7 +855,16 @@ namespace QT_NAMESPACE {} + # define Q_COMPILER_DEFAULT_DELETE_MEMBERS # endif - # endif --# if defined(__GXX_EXPERIMENTAL_CXX0X__) --# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 403 -- /* C++0x features supported in GCC 4.3: */ --# define Q_COMPILER_RVALUE_REFS --# define Q_COMPILER_DECLTYPE --# endif --# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404 -- /* C++0x features supported in GCC 4.4: */ --# define Q_COMPILER_VARIADIC_TEMPLATES --# define Q_COMPILER_AUTO_FUNCTION --# define Q_COMPILER_AUTO_TYPE --# define Q_COMPILER_EXTERN_TEMPLATES --# define Q_COMPILER_DEFAULT_DELETE_MEMBERS --# define Q_COMPILER_CLASS_ENUM + # if __has_feature(cxx_generalized_initializers) -# define Q_COMPILER_INITIALIZER_LISTS --# endif --# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405 -- /* C++0x features supported in GCC 4.5: */ --# define Q_COMPILER_LAMBDA --# define Q_COMPILER_UNICODE_STRINGS --# endif --# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406 -- /* C++0x features supported in GCC 4.6: */ --# define Q_COMPILER_CONSTEXPR --# endif -- --# endif - - /* IBM compiler versions are a bit messy. There are actually two products: - the C product, and the C++ product. The C++ compiler is always packaged -@@ -829,12 +796,33 @@ namespace QT_NAMESPACE {} - # error "Qt has not been tested with this compiler - talk to qt-bugs@trolltech.com" - #endif - +/* -+ * C++11 support -+ * -+ * Paper Macro SD-6 macro -+ * N2541 Q_COMPILER_AUTO_FUNCTION -+ * N1984 N2546 Q_COMPILER_AUTO_TYPE -+ * N2437 Q_COMPILER_CLASS_ENUM -+ * N2235 Q_COMPILER_CONSTEXPR __cpp_constexpr = 200704 -+ * N2343 N3276 Q_COMPILER_DECLTYPE __cpp_decltype = 200707 -+ * N2346 Q_COMPILER_DEFAULT_DELETE_MEMBERS -+ * N1987 Q_COMPILER_EXTERN_TEMPLATES -+ * N2672 Q_COMPILER_INITIALIZER_LISTS -+ * N2658 N2927 Q_COMPILER_LAMBDA __cpp_lambdas = 200907 -+ * N2118 N2844 N3053 Q_COMPILER_RVALUE_REFS __cpp_rvalue_references = 200610 -+ * N2442 Q_COMPILER_UNICODE_STRINGS __cpp_unicode_literals = 200710 -+ * N2242 N2555 Q_COMPILER_VARIADIC_TEMPLATES __cpp_variadic_templates = 200704 -+ * -+ * For any future version of the C++ standard, we use only the SD-6 macro. -+ * For full listing, see -+ * http://isocpp.org/std/standing-documents/sd-6-sg10-feature-test-recommendations ++ * Workaround for FreeBSD 9.x, where we can end up building a port with clang ++ * and base's libstdc++ from GCC 4.2 (which does not support initializer ++ * lists). Since detecting libstdc++'s version is not trivial, only enable the ++ * macro with libc++. + */ - - #ifdef Q_CC_INTEL - # if __INTEL_COMPILER < 1200 - # define Q_NO_TEMPLATE_FRIENDS - # endif --# if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__) -+# if __cplusplus >= 201103L - # if __INTEL_COMPILER >= 1100 - # define Q_COMPILER_RVALUE_REFS - # define Q_COMPILER_EXTERN_TEMPLATES -@@ -849,6 +837,91 @@ namespace QT_NAMESPACE {} - # endif - #endif - -+#if defined(Q_CC_CLANG) && !defined(Q_CC_INTEL) -+# if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) -+ /* Detect C++ features using __has_feature(), see http://clang.llvm.org/docs/LanguageExtensions.html#cxx11 */ -+# if __has_feature(cxx_auto_type) -+# define Q_COMPILER_AUTO_FUNCTION -+# define Q_COMPILER_AUTO_TYPE -+# endif -+# if __has_feature(cxx_constexpr) -+# define Q_COMPILER_CONSTEXPR -+# endif -+# if __has_feature(cxx_decltype) /* && __has_feature(cxx_decltype_incomplete_return_types) */ -+# define Q_COMPILER_DECLTYPE -+# endif -+# if __has_feature(cxx_defaulted_functions) && __has_feature(cxx_deleted_functions) -+# define Q_COMPILER_DEFAULT_DELETE_MEMBERS -+# endif -+# if __has_feature(cxx_generalized_initializers) -+# define Q_COMPILER_INITIALIZER_LISTS -+# endif -+# if __has_feature(cxx_lambdas) -+# define Q_COMPILER_LAMBDA -+# endif -+# if __has_feature(cxx_rvalue_references) -+# define Q_COMPILER_RVALUE_REFS -+# endif -+# if __has_feature(cxx_strong_enums) -+# define Q_COMPILER_CLASS_ENUM -+# endif -+# if __has_feature(cxx_unicode_literals) -+# define Q_COMPILER_UNICODE_STRINGS -+# endif -+# if __has_feature(cxx_variadic_templates) -+# define Q_COMPILER_VARIADIC_TEMPLATES -+# endif -+ /* Features that have no __has_feature() check */ -+# if ((__clang_major__ * 100) + __clang_minor__) >= 209 /* since clang 2.9 */ -+# define Q_COMPILER_EXTERN_TEMPLATES -+# endif -+# endif -+#endif -+ -+#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) -+# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L -+# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 403 -+ /* C++0x features supported in GCC 4.3: */ -+# define Q_COMPILER_RVALUE_REFS -+# define Q_COMPILER_DECLTYPE -+# endif -+# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404 -+ /* C++0x features supported in GCC 4.4: */ -+# define Q_COMPILER_VARIADIC_TEMPLATES -+# define Q_COMPILER_AUTO_FUNCTION -+# define Q_COMPILER_AUTO_TYPE -+# define Q_COMPILER_EXTERN_TEMPLATES -+# define Q_COMPILER_DEFAULT_DELETE_MEMBERS -+# define Q_COMPILER_CLASS_ENUM -+# define Q_COMPILER_INITIALIZER_LISTS -+# endif -+# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405 -+ /* C++0x features supported in GCC 4.5: */ -+# define Q_COMPILER_LAMBDA -+# define Q_COMPILER_UNICODE_STRINGS -+# endif -+# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406 -+ /* C++0x features supported in GCC 4.6: */ -+# define Q_COMPILER_CONSTEXPR -+# endif -+# endif -+#endif -+ -+#if defined(Q_CC_MSVC) && !defined(Q_CC_INTEL) -+# if defined(__cplusplus) -+# if _MSC_VER >= 1600 -+ /* C++11 features supported in VC10 = VC2010: */ -+# define Q_COMPILER_AUTO_FUNCTION -+# define Q_COMPILER_AUTO_TYPE -+# define Q_COMPILER_DECLTYPE -+# define Q_COMPILER_LAMBDA -+# define Q_COMPILER_RVALUE_REFS -+// MSVC's library has std::initializer_list, but the compiler does not support the braces initialization -+//# define Q_COMPILER_INITIALIZER_LISTS -+# endif -+# endif -+#endif -+ - #ifndef Q_PACKED - # define Q_PACKED - # undef Q_NO_PACKED_REFERENCE ++# include <ciso646> ++# if defined(_LIBCPP_VER) ++# define Q_COMPILER_INITIALIZER_LISTS ++# endif + # endif + # if __has_feature(cxx_lambdas) + # define Q_COMPILER_LAMBDA Modified: head/graphics/qt4-imageformats/Makefile ============================================================================== --- head/graphics/qt4-imageformats/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/graphics/qt4-imageformats/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= imageformats DISTVERSION= ${QT4_VERSION} -PORTREVISION= 3 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Modified: head/graphics/qt4-opengl/Makefile ============================================================================== --- head/graphics/qt4-opengl/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/graphics/qt4-opengl/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= opengl DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Modified: head/graphics/qt4-opengl/pkg-plist ============================================================================== --- head/graphics/qt4-opengl/pkg-plist Wed Sep 16 08:12:05 2015 (r397042) +++ head/graphics/qt4-opengl/pkg-plist Wed Sep 16 08:55:04 2015 (r397043) @@ -7,6 +7,7 @@ %%QT_INCDIR%%/Qt/qglpixelbuffer.h %%QT_INCDIR%%/Qt/qglscreen_qws.h %%QT_INCDIR%%/Qt/qglshaderprogram.h +%%QT_INCDIR%%/QtOpenGL/QGL %%QT_INCDIR%%/QtOpenGL/QGLBuffer %%QT_INCDIR%%/QtOpenGL/QGLColormap %%QT_INCDIR%%/QtOpenGL/QGLContext Modified: head/graphics/qt4-svg/Makefile ============================================================================== --- head/graphics/qt4-svg/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/graphics/qt4-svg/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= svg DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Modified: head/misc/qt4-l10n/Makefile ============================================================================== --- head/misc/qt4-l10n/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/misc/qt4-l10n/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -2,7 +2,6 @@ PORTNAME= l10n DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= misc PKGNAMEPREFIX= qt4- Modified: head/misc/qt4-l10n/pkg-plist ============================================================================== --- head/misc/qt4-l10n/pkg-plist Wed Sep 16 08:12:05 2015 (r397042) +++ head/misc/qt4-l10n/pkg-plist Wed Sep 16 08:55:04 2015 (r397043) @@ -28,6 +28,7 @@ %%QT_L10NDIR%%/linguist_de.qm %%QT_L10NDIR%%/linguist_eu.qm %%QT_L10NDIR%%/linguist_fr.qm +%%QT_L10NDIR%%/linguist_he.qm %%QT_L10NDIR%%/linguist_hu.qm %%QT_L10NDIR%%/linguist_ja.qm %%QT_L10NDIR%%/linguist_ko.qm Modified: head/misc/qt4-qtconfig/Makefile ============================================================================== --- head/misc/qt4-qtconfig/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/misc/qt4-qtconfig/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= qtconfig DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= misc PKGNAMEPREFIX= qt4- Modified: head/misc/qt4-qtdemo/Makefile ============================================================================== --- head/misc/qt4-qtdemo/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/misc/qt4-qtdemo/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= qtdemo DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= misc PKGNAMEPREFIX= qt4- Modified: head/multimedia/qt4-multimedia/Makefile ============================================================================== --- head/multimedia/qt4-multimedia/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/multimedia/qt4-multimedia/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -2,7 +2,6 @@ PORTNAME= multimedia DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt4- Modified: head/net/qt4-network/Makefile ============================================================================== --- head/net/qt4-network/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/net/qt4-network/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= network DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt4- Modified: head/textproc/clucene-qt4/Makefile ============================================================================== --- head/textproc/clucene-qt4/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/textproc/clucene-qt4/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= clucene DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Modified: head/textproc/qt4-xml/Makefile ============================================================================== --- head/textproc/qt4-xml/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/textproc/qt4-xml/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= xml DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Modified: head/textproc/qt4-xmlpatterns/Makefile ============================================================================== --- head/textproc/qt4-xmlpatterns/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/textproc/qt4-xmlpatterns/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Modified: head/www/webkit-qt4/Makefile ============================================================================== --- head/www/webkit-qt4/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/www/webkit-qt4/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= webkit DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt4- Modified: head/x11-toolkits/qt4-declarative/Makefile ============================================================================== --- head/x11-toolkits/qt4-declarative/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/x11-toolkits/qt4-declarative/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -2,7 +2,6 @@ PORTNAME= declarative DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- Modified: head/x11-toolkits/qt4-gui/Makefile ============================================================================== --- head/x11-toolkits/qt4-gui/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/x11-toolkits/qt4-gui/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,7 +3,6 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 5 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- Modified: head/x11/kdelibs4/Makefile ============================================================================== --- head/x11/kdelibs4/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/x11/kdelibs4/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -3,6 +3,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Modified: head/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake ============================================================================== --- head/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake Wed Sep 16 08:12:05 2015 (r397042) +++ head/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake Wed Sep 16 08:55:04 2015 (r397043) @@ -1,6 +1,26 @@ ---- ./cmake/modules/FindQt4.cmake.orig 2011-07-28 05:34:31.000000000 +1100 -+++ ./cmake/modules/FindQt4.cmake 2012-05-18 00:28:12.000000000 +1100 -@@ -627,23 +627,12 @@ +Hunks 1 and 3: + Backport upstream CMake change de30173d ("Remove C compiler requirement from + FindQt4.cmake") so that it uses a C++ compiler to look for Q_WS_X11, + otherwise the build fails because <ciso646> from qglobal.h is not present + when using a C compiler. + +Hunk 2: + Do the same thing we do in devel/cmake's FindQt4.cmake patch. The idea behind + the change is that the directories FindQt4.cmake looks for might not be + present at the time CMake looks for them since the ports that actually create + them may not be required by the port calling CMake. +--- cmake/modules/FindQt4.cmake.orig 2014-11-06 22:33:50 UTC ++++ cmake/modules/FindQt4.cmake +@@ -405,7 +405,7 @@ QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE + QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL "release minsize") + + INCLUDE(MacroPushRequiredVars) +-INCLUDE(CheckSymbolExists) ++INCLUDE(CheckCXXSymbolExists) + INCLUDE(MacroAddFileDependencies) + + SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake) +@@ -638,23 +638,12 @@ IF (QT4_QMAKE_FOUND) # ask qmake for the imports directory IF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir) @@ -26,3 +46,29 @@ ############################################# +@@ -671,19 +660,19 @@ IF (QT4_QMAKE_FOUND) + SET(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ") + ENDIF( QT_USE_FRAMEWORKS ) + # Check for Window system symbols (note: only one should end up being set) +- CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11) +- CHECK_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN) +- CHECK_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS) +- CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC) ++ CHECK_CXX_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11) ++ CHECK_CXX_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN) ++ CHECK_CXX_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS) ++ CHECK_CXX_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC) + IF(Q_WS_MAC) + IF(QT_QMAKE_CHANGED) + UNSET(QT_MAC_USE_COCOA CACHE) + ENDIF(QT_QMAKE_CHANGED) +- CHECK_SYMBOL_EXISTS(QT_MAC_USE_COCOA "QtCore/qconfig.h" QT_MAC_USE_COCOA) ++ CHECK_CXX_SYMBOL_EXISTS(QT_MAC_USE_COCOA "QtCore/qconfig.h" QT_MAC_USE_COCOA) + ENDIF(Q_WS_MAC) + + IF (QT_QTCOPY_REQUIRED) +- CHECK_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY) ++ CHECK_CXX_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY) + IF (NOT QT_IS_QTCOPY) + MESSAGE(FATAL_ERROR "qt-copy is required, but hasn't been found") + ENDIF (NOT QT_IS_QTCOPY) Modified: head/x11/qt4-graphicssystems-opengl/Makefile ============================================================================== --- head/x11/qt4-graphicssystems-opengl/Makefile Wed Sep 16 08:12:05 2015 (r397042) +++ head/x11/qt4-graphicssystems-opengl/Makefile Wed Sep 16 08:55:04 2015 (r397043) @@ -2,7 +2,6 @@ PORTNAME= graphicssystems DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -opengl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509160855.t8G8t5Sj089416>