diff options
49 files changed, 93 insertions, 523 deletions
diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk index f7322b305a3c..c306d4c51394 100644 --- a/Mk/Uses/qmake.mk +++ b/Mk/Uses/qmake.mk @@ -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="" \ diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 33d109891ebc..37f1d92eb889 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -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 diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index bab5d8e839b2..f0bae2786d6e 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -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/ diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile index 0280ead63440..77b02408ab52 100644 --- a/databases/qt4-odbc-plugin/Makefile +++ b/databases/qt4-odbc-plugin/Makefile @@ -3,7 +3,6 @@ PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= databases MAINTAINER= kde@FreeBSD.org diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile index be5ccb12cfe0..b33e73028730 100644 --- a/databases/qt4-sql/Makefile +++ b/databases/qt4-sql/Makefile @@ -3,7 +3,6 @@ PORTNAME= sql DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= qt4- diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile index 7d1d32eab7bb..dfde4a1832ab 100644 --- a/databases/qt4-sqlite-plugin/Makefile +++ b/databases/qt4-sqlite-plugin/Makefile @@ -3,7 +3,6 @@ PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= databases MAINTAINER= kde@FreeBSD.org diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile index 8b61757f6dc5..55affe3bbb50 100644 --- a/databases/qt4-sqlite3-plugin/Makefile +++ b/databases/qt4-sqlite3-plugin/Makefile @@ -3,7 +3,6 @@ PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= databases MAINTAINER= kde@FreeBSD.org diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index 34dfa5755eb5..3f0513c1795e 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -3,7 +3,6 @@ PORTNAME= dbus DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist index ad3b897ddc88..448331c6b542 100644 --- a/devel/qmake4/pkg-plist +++ b/devel/qmake4/pkg-plist @@ -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 diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 9aac27efdb0c..11c78e2adf0d 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -3,7 +3,6 @@ PORTNAME= assistant DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 9ef7e5589418..fd1dcade9161 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -3,7 +3,6 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 5 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index f69c461ad108..df1ebcd20d6d 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -3,7 +3,6 @@ PORTNAME= designer DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index d11f40196c83..656b85e8f174 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -3,7 +3,6 @@ PORTNAME= help DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index 8b56ad01a02e..f73d6b1c3cde 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -3,7 +3,6 @@ PORTNAME= linguist DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qmlviewer/Makefile b/devel/qt4-qmlviewer/Makefile index a33ba5495d8d..51da99a264fe 100644 --- a/devel/qt4-qmlviewer/Makefile +++ b/devel/qt4-qmlviewer/Makefile @@ -3,7 +3,6 @@ PORTNAME= qmlviewer DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index ea02cb76c353..8a1c62109668 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -3,7 +3,6 @@ PORTNAME= qt3support DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel x11-toolkits PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index 88c0837d78f7..b16f08b316d5 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -3,7 +3,6 @@ PORTNAME= qvfb DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index 7cfe6b04c2f7..7b22871d4291 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -3,7 +3,6 @@ PORTNAME= script DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h b/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h deleted file mode 100644 index 77e4e34f68ac..000000000000 --- a/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h +++ /dev/null @@ -1,34 +0,0 @@ ---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig 2014-04-10 20:37:12.000000000 +0200 -+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2014-04-24 15:06:18.000000000 +0200 -@@ -71,18 +71,10 @@ - - #if OS(WINDOWS) && !OS(WINCE) - #include <windows.h> --#elif OS(DARWIN) --#include <libkern/OSAtomic.h> - #elif OS(ANDROID) - #include <cutils/atomic.h> - #elif OS(QNX) - #include <atomic.h> --#elif COMPILER(GCC) && !OS(SYMBIAN) --#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) --#include <ext/atomicity.h> --#else --#include <bits/atomicity.h> --#endif - #endif - - #if USE(PTHREADS) -@@ -230,12 +222,6 @@ - inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); } - #endif - --#elif OS(DARWIN) --#define WTF_USE_LOCKFREE_THREADSAFESHARED 1 -- --inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); } --inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); } -- - #elif OS(ANDROID) - - inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); } diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile index 40db106b71df..693a3338dec5 100644 --- a/devel/qt4-scripttools/Makefile +++ b/devel/qt4-scripttools/Makefile @@ -2,7 +2,6 @@ PORTNAME= scripttools DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-testlib/Makefile b/devel/qt4-testlib/Makefile index 55a27d64cdc3..0bc7758e1f03 100644 --- a/devel/qt4-testlib/Makefile +++ b/devel/qt4-testlib/Makefile @@ -3,7 +3,6 @@ PORTNAME= testlib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index ac73214f5c70..e3f832b79ca2 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -3,7 +3,6 @@ PORTNAME= qt4 DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo index 46ee321148f5..b8aded889200 100644 --- a/devel/qt4/distinfo +++ b/devel/qt4/distinfo @@ -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 diff --git a/devel/qt4/files/extrapatch-configure b/devel/qt4/files/extrapatch-configure index 4b3c09d8b1ef..09fef9a75886 100644 --- a/devel/qt4/files/extrapatch-configure +++ b/devel/qt4/files/extrapatch-configure @@ -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" diff --git a/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h b/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h index d73253165305..492a0993b2fd 100644 --- a/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h +++ b/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h @@ -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 diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile index 14ace010f3fc..8b11f24a06d1 100644 --- a/graphics/qt4-imageformats/Makefile +++ b/graphics/qt4-imageformats/Makefile @@ -3,7 +3,6 @@ PORTNAME= imageformats DISTVERSION= ${QT4_VERSION} -PORTREVISION= 3 CATEGORIES= graphics PKGNAMEPREFIX= qt4- diff --git a/graphics/qt4-imageformats/files/patch-CVE-2014-0190 b/graphics/qt4-imageformats/files/patch-CVE-2014-0190 deleted file mode 100644 index 46e2e0e104c2..000000000000 --- a/graphics/qt4-imageformats/files/patch-CVE-2014-0190 +++ /dev/null @@ -1,38 +0,0 @@ -commit f1b76c126c476c155af8c404b97c42cd1a709333 -Author: Lars Knoll <lars.knoll@digia.com> -Date: Thu Apr 24 15:33:27 2014 +0200 - - Don't crash on broken GIF images - - Broken GIF images could set invalid width and height - values inside the image, leading to Qt creating a null - QImage for it. In that case we need to abort decoding - the image and return an error. - - Initial patch by Rich Moore. - - Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 - - Task-number: QTBUG-38367 - Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a - Security-advisory: CVE-2014-0190 - Reviewed-by: Richard J. Moore <rich@kde.org> - -diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp -index 3324f04..5199dd3 100644 ---- src/gui/image/qgifhandler.cpp -+++ src/gui/image/qgifhandler.cpp -@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, - memset(bits, 0, image->byteCount()); - } - -+ // Check if the previous attempt to create the image failed. If it -+ // did then the image is broken and we should give up. -+ if (image->isNull()) { -+ state = Error; -+ return -1; -+ } -+ - disposePrevious(image); - disposed = false; - diff --git a/graphics/qt4-imageformats/files/patch-CVE-2015-1858 b/graphics/qt4-imageformats/files/patch-CVE-2015-1858 deleted file mode 100644 index 91aed0d19d77..000000000000 --- a/graphics/qt4-imageformats/files/patch-CVE-2015-1858 +++ /dev/null @@ -1,24 +0,0 @@ -commit a1cf194c54be57d6ab55dfd26b9562a60532208e -Author: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> -Date: Wed Mar 11 09:00:41 2015 +0100 - - Fixes crash in gif image decoder - - Fuzzing test revealed that for certain malformed gif files, - qgifhandler would segfault. - - Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1 - (cherry picked from qtbase/ea2c5417fcd374302f5019e67f72af5facbd29f6) - Reviewed-by: Richard J. Moore <rich@kde.org> - ---- src/gui/image/qgifhandler.cpp -+++ src/gui/image/qgifhandler.cpp -@@ -944,6 +944,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co - - void QGIFFormat::nextY(unsigned char *bits, int bpl) - { -+ if (out_of_bounds) -+ return; - int my; - switch (interlace) { - case 0: // Non-interlaced diff --git a/graphics/qt4-imageformats/files/patch-CVE-2015-1859 b/graphics/qt4-imageformats/files/patch-CVE-2015-1859 deleted file mode 100644 index d03c34d59b00..000000000000 --- a/graphics/qt4-imageformats/files/patch-CVE-2015-1859 +++ /dev/null @@ -1,53 +0,0 @@ -commit 3e55cd6dc467303a3c35312e9fcb255c2c048b32 -Author: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> -Date: Wed Mar 11 13:34:01 2015 +0100 - - Fixes crash in bmp and ico image decoding - - Fuzzing test revealed that for certain malformed bmp and ico files, - the handler would segfault. - - Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe - (cherry picked from qtbase/2adbbae5432aa9d8cc41c6fcf55c2e310d2d4078) - Reviewed-by: Richard J. Moore <rich@kde.org> - ---- src/gui/image/qbmphandler.cpp -+++ src/gui/image/qbmphandler.cpp -@@ -478,12 +478,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - p = data + (h-y-1)*bpl; - break; - case 2: // delta (jump) -- // Protection -- if ((uint)x >= (uint)w) -- x = w-1; -- if ((uint)y >= (uint)h) -- y = h-1; -- - { - quint8 tmp; - d->getChar((char *)&tmp); -@@ -491,6 +485,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - d->getChar((char *)&tmp); - y += tmp; - } -+ -+ // Protection -+ if ((uint)x >= (uint)w) -+ x = w-1; -+ if ((uint)y >= (uint)h) -+ y = h-1; -+ - p = data + (h-y-1)*bpl + x; - break; - default: // absolute mode ---- src/plugins/imageformats/ico/qicohandler.cpp -+++ src/plugins/imageformats/ico/qicohandler.cpp -@@ -571,7 +571,7 @@ QImage ICOReader::iconAt(int index) - QImage::Format format = QImage::Format_ARGB32; - if (icoAttrib.nbits == 24) - format = QImage::Format_RGB32; -- else if (icoAttrib.ncolors == 2) -+ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1) - format = QImage::Format_Mono; - else if (icoAttrib.ncolors > 0) - format = QImage::Format_Indexed8; diff --git a/graphics/qt4-opengl/Makefile b/graphics/qt4-opengl/Makefile index bfec6f6e69f6..1f771e890a3a 100644 --- a/graphics/qt4-opengl/Makefile +++ b/graphics/qt4-opengl/Makefile @@ -3,7 +3,6 @@ PORTNAME= opengl DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- diff --git a/graphics/qt4-opengl/pkg-plist b/graphics/qt4-opengl/pkg-plist index 0a32e5498486..36f316940790 100644 --- a/graphics/qt4-opengl/pkg-plist +++ b/graphics/qt4-opengl/pkg-plist @@ -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 diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile index 5c3f4fb65992..ccd5ace5fa81 100644 --- a/graphics/qt4-svg/Makefile +++ b/graphics/qt4-svg/Makefile @@ -3,7 +3,6 @@ PORTNAME= svg DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt4- diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile index 082ee0176845..22bb5eabd570 100644 --- a/misc/qt4-l10n/Makefile +++ b/misc/qt4-l10n/Makefile @@ -2,7 +2,6 @@ PORTNAME= l10n DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= misc PKGNAMEPREFIX= qt4- diff --git a/misc/qt4-l10n/pkg-plist b/misc/qt4-l10n/pkg-plist index 04d7f4fe196a..5dac2bdb1abf 100644 --- a/misc/qt4-l10n/pkg-plist +++ b/misc/qt4-l10n/pkg-plist @@ -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 diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile index ed75701b648f..9341ba0cc61c 100644 --- a/misc/qt4-qtconfig/Makefile +++ b/misc/qt4-qtconfig/Makefile @@ -3,7 +3,6 @@ PORTNAME= qtconfig DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= misc PKGNAMEPREFIX= qt4- diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile index 2d1164582028..a5c03790f5fd 100644 --- a/misc/qt4-qtdemo/Makefile +++ b/misc/qt4-qtdemo/Makefile @@ -3,7 +3,6 @@ PORTNAME= qtdemo DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= misc PKGNAMEPREFIX= qt4- diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile index debc230701ab..68b6274b70d1 100644 --- a/multimedia/qt4-multimedia/Makefile +++ b/multimedia/qt4-multimedia/Makefile @@ -2,7 +2,6 @@ PORTNAME= multimedia DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt4- diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile index 6f298abc2ae1..874544a28d75 100644 --- a/net/qt4-network/Makefile +++ b/net/qt4-network/Makefile @@ -3,7 +3,6 @@ PORTNAME= network DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt4- diff --git a/textproc/clucene-qt4/Makefile b/textproc/clucene-qt4/Makefile index 13b8fe2dd1f2..cff5e5a3f878 100644 --- a/textproc/clucene-qt4/Makefile +++ b/textproc/clucene-qt4/Makefile @@ -3,7 +3,6 @@ PORTNAME= clucene DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index d70e941022ea..9039e335239e 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -3,7 +3,6 @@ PORTNAME= xml DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile index 11012253c4b7..e878a0f1d91e 100644 --- a/textproc/qt4-xmlpatterns/Makefile +++ b/textproc/qt4-xmlpatterns/Makefile @@ -3,7 +3,6 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- diff --git a/www/webkit-qt4/Makefile b/www/webkit-qt4/Makefile index b9d5358ff82a..c49292c309ad 100644 --- a/www/webkit-qt4/Makefile +++ b/www/webkit-qt4/Makefile @@ -3,7 +3,6 @@ PORTNAME= webkit DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt4- diff --git a/x11-toolkits/qt4-declarative/Makefile b/x11-toolkits/qt4-declarative/Makefile index cf001d247274..cabc2068d73c 100644 --- a/x11-toolkits/qt4-declarative/Makefile +++ b/x11-toolkits/qt4-declarative/Makefile @@ -2,7 +2,6 @@ PORTNAME= declarative DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 6d328c0c141f..fd10ed8d0bf4 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -3,7 +3,6 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 5 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- diff --git a/x11-toolkits/qt4-gui/files/patch-CVE-2015-0295 b/x11-toolkits/qt4-gui/files/patch-CVE-2015-0295 deleted file mode 100644 index 46249856032c..000000000000 --- a/x11-toolkits/qt4-gui/files/patch-CVE-2015-0295 +++ /dev/null @@ -1,34 +0,0 @@ -commit e50aa2252cdd5cb53eef7d8c4503c7edff634f68 -Author: Richard J. Moore <rich@kde.org> -Date: Tue Feb 24 19:02:35 2015 +0000 - - Fix a division by zero when processing malformed BMP files. - - This fixes a division by 0 when processing a maliciously crafted BMP - file. No impact beyond DoS. - - Backport of 661f6bfd032dacc62841037732816a583640e187 - - Task-number: QTBUG-44547 - Change-Id: I43f06e752b11cb50669101460902a82b885ae618 - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - ---- src/gui/image/qbmphandler.cpp -+++ src/gui/image/qbmphandler.cpp -@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - } - } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { - red_shift = calc_shift(red_mask); -+ if (((red_mask >> red_shift) + 1) == 0) -+ return false; - red_scale = 256 / ((red_mask >> red_shift) + 1); - green_shift = calc_shift(green_mask); -+ if (((green_mask >> green_shift) + 1) == 0) -+ return false; - green_scale = 256 / ((green_mask >> green_shift) + 1); - blue_shift = calc_shift(blue_mask); -+ if (((blue_mask >> blue_shift) + 1) == 0) -+ return false; - blue_scale = 256 / ((blue_mask >> blue_shift) + 1); - } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { - blue_mask = 0x000000ff; diff --git a/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859 b/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859 deleted file mode 100644 index d03c34d59b00..000000000000 --- a/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859 +++ /dev/null @@ -1,53 +0,0 @@ -commit 3e55cd6dc467303a3c35312e9fcb255c2c048b32 -Author: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> -Date: Wed Mar 11 13:34:01 2015 +0100 - - Fixes crash in bmp and ico image decoding - - Fuzzing test revealed that for certain malformed bmp and ico files, - the handler would segfault. - - Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe - (cherry picked from qtbase/2adbbae5432aa9d8cc41c6fcf55c2e310d2d4078) - Reviewed-by: Richard J. Moore <rich@kde.org> - ---- src/gui/image/qbmphandler.cpp -+++ src/gui/image/qbmphandler.cpp -@@ -478,12 +478,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - p = data + (h-y-1)*bpl; - break; - case 2: // delta (jump) -- // Protection -- if ((uint)x >= (uint)w) -- x = w-1; -- if ((uint)y >= (uint)h) -- y = h-1; -- - { - quint8 tmp; - d->getChar((char *)&tmp); -@@ -491,6 +485,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - d->getChar((char *)&tmp); - y += tmp; - } -+ -+ // Protection -+ if ((uint)x >= (uint)w) -+ x = w-1; -+ if ((uint)y >= (uint)h) -+ y = h-1; -+ - p = data + (h-y-1)*bpl + x; - break; - default: // absolute mode ---- src/plugins/imageformats/ico/qicohandler.cpp -+++ src/plugins/imageformats/ico/qicohandler.cpp -@@ -571,7 +571,7 @@ QImage ICOReader::iconAt(int index) - QImage::Format format = QImage::Format_ARGB32; - if (icoAttrib.nbits == 24) - format = QImage::Format_RGB32; -- else if (icoAttrib.ncolors == 2) -+ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1) - format = QImage::Format_Mono; - else if (icoAttrib.ncolors > 0) - format = QImage::Format_Indexed8; diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 918a69347992..c2d4f914f189 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -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} diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake index 515e221eb028..7213d99f0cf2 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake @@ -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) diff --git a/x11/qt4-graphicssystems-opengl/Makefile b/x11/qt4-graphicssystems-opengl/Makefile index 7220ede874a5..1336317dac85 100644 --- a/x11/qt4-graphicssystems-opengl/Makefile +++ b/x11/qt4-graphicssystems-opengl/Makefile @@ -2,7 +2,6 @@ PORTNAME= graphicssystems DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -opengl |