Attachment 161049 Details for Bug 202808 – Patch v3

[patch] Patch v3

qt-4.8.7-2015.09.15.diff (text/plain), 44.22 KB, created by Raphael Kubo da Costa on 2015-09-15 09:35:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2015-09-15 09:35:27 UTC

Size: 44.22 KB

patch

obsolete

>--- Mk/Uses/qmake.mk	2014-11-05 10:39:21.000000000 +0100
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/Mk/Uses/qmake.mk	2015-08-29 13:01:20.715512000 +0200
>@@ -71,6 +71,7 @@
> 		QMAKE_CFLAGS="${CFLAGS}" \
> 		QMAKE_CXXFLAGS="${CXXFLAGS}" \
> 		QMAKE_LFLAGS="${LDFLAGS}" \
>+		QMAKE_LIBS="${LIBS}" \
> 		QMAKE_CFLAGS_DEBUG="" \
> 		QMAKE_CFLAGS_RELEASE="" \
> 		QMAKE_CXXFLAGS_DEBUG="" \
>--- Mk/bsd.qt.mk	2015-09-15 00:31:29.190205000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/Mk/bsd.qt.mk	2015-09-14 17:50:54.057108000 +0200
>@@ -26,7 +26,7 @@
> 
> # 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 @@
> . 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 -Nru -I '$FreeBSD.*$' /usr/ports/databases/qt4-odbc-plugin/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-odbc-plugin/Makefile
>--- databases/qt4-odbc-plugin/Makefile	2014-07-24 19:35:09.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-odbc-plugin/Makefile	2015-07-03 00:52:57.690535000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	qt4-${DB}-plugin
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	databases
> 
> MAINTAINER=	kde@FreeBSD.org
>diff -Nru -I '$FreeBSD.*$' /usr/ports/databases/qt4-sql/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sql/Makefile
>--- databases/qt4-sql/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sql/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	sql
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	databases
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/databases/qt4-sqlite-plugin/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite-plugin/Makefile
>--- databases/qt4-sqlite-plugin/Makefile	2014-09-11 23:54:45.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite-plugin/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	qt4-${DB}-plugin
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	databases
> 
> MAINTAINER=	kde@FreeBSD.org
>diff -Nru -I '$FreeBSD.*$' /usr/ports/databases/qt4-sqlite3-plugin/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite3-plugin/Makefile
>--- databases/qt4-sqlite3-plugin/Makefile	2014-07-24 19:35:09.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite3-plugin/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	qt4-${DB}-plugin
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	databases
> 
> MAINTAINER=	kde@FreeBSD.org
>diff -Nru -I '$FreeBSD.*$' /usr/ports/devel/dbus-qt4/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/dbus-qt4/Makefile
>--- devel/dbus-qt4/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/dbus-qt4/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	dbus
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/devel/qmake4/pkg-plist /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qmake4/pkg-plist
>--- devel/qmake4/pkg-plist	2014-10-23 23:35:14.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qmake4/pkg-plist	2015-05-31 12:30:03.050073000 +0200
>@@ -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
>--- devel/qt4/Makefile	2015-04-03 21:22:38.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/Makefile	2015-04-03 19:38:18.138325000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	qt4
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	2
> CATEGORIES=	devel
> 
> MAINTAINER=	kde@FreeBSD.org
>diff -Nru -I '$FreeBSD.*$' /usr/ports/devel/qt4/distinfo /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/distinfo
>--- devel/qt4/distinfo	2014-05-05 22:47:22.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/distinfo	2015-05-31 12:30:03.038883000 +0200
>@@ -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 -Nru -I '$FreeBSD.*$' /usr/ports/devel/qt4/files/extrapatch-configure /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/files/extrapatch-configure
>--- devel/qt4/files/extrapatch-configure	2015-03-11 20:46:41.000000000 +0100
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/files/extrapatch-configure	2015-08-10 19:45:20.735686000 +0200
>@@ -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"
>--- devel/qt4/files/extrapatch-src-corelib-global-qglobal.h	2014-07-26 00:24:40.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h	2015-09-15 11:01:33.482578000 +0200
>@@ -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
>--- devel/qt4-assistant/Makefile	2014-09-10 22:50:31.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-assistant/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	assistant
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>--- devel/qt4-corelib/Makefile	2015-04-23 23:26:09.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	corelib
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	5
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>--- devel/qt4-designer/Makefile	2014-09-10 22:50:31.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-designer/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	designer
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>--- devel/qt4-help/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-help/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	help
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>--- devel/qt4-linguist/Makefile	2015-02-24 22:39:19.000000000 +0100
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-linguist/Makefile	2015-02-24 22:09:23.716129000 +0100
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	linguist
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	2
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>--- devel/qt4-qmlviewer/Makefile	2014-09-10 22:50:31.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qmlviewer/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	qmlviewer
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>--- devel/qt4-qt3support/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qt3support/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	qt3support
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel x11-toolkits
> PKGNAMEPREFIX=	qt4-
> 
>--- devel/qt4-qvfb/Makefile	2014-09-10 22:50:31.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qvfb/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	qvfb
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>--- devel/qt4-script/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-script/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	script
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>--- devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h	2014-05-05 22:47:22.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -Nru -I '$FreeBSD.*$' /usr/ports/devel/qt4-scripttools/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-scripttools/Makefile
>--- devel/qt4-scripttools/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-scripttools/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	scripttools
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/devel/qt4-testlib/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-testlib/Makefile
>--- devel/qt4-testlib/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-testlib/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	testlib
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt4-
> 
>--- graphics/qt4-imageformats/Makefile	2015-06-22 20:33:20.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/Makefile	2015-07-03 00:52:39.781493000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	imageformats
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	3
> CATEGORIES=	graphics
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/graphics/qt4-imageformats/files/patch-CVE-2014-0190 /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/files/patch-CVE-2014-0190
>--- graphics/qt4-imageformats/files/patch-CVE-2014-0190	2014-07-19 22:26:10.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/files/patch-CVE-2014-0190	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -Nru -I '$FreeBSD.*$' /usr/ports/graphics/qt4-imageformats/files/patch-CVE-2015-1858 /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/files/patch-CVE-2015-1858
>--- graphics/qt4-imageformats/files/patch-CVE-2015-1858	2015-04-14 10:34:41.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/files/patch-CVE-2015-1858	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -Nru -I '$FreeBSD.*$' /usr/ports/graphics/qt4-imageformats/files/patch-CVE-2015-1859 /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/files/patch-CVE-2015-1859
>--- graphics/qt4-imageformats/files/patch-CVE-2015-1859	2015-04-14 10:34:41.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/files/patch-CVE-2015-1859	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -Nru -I '$FreeBSD.*$' /usr/ports/graphics/qt4-opengl/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-opengl/Makefile
>--- graphics/qt4-opengl/Makefile	2014-09-10 22:50:31.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-opengl/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	opengl
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	2
> CATEGORIES=	graphics
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/graphics/qt4-opengl/pkg-plist /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-opengl/pkg-plist
>--- graphics/qt4-opengl/pkg-plist	2014-10-20 19:04:20.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-opengl/pkg-plist	2015-05-31 12:30:03.430093000 +0200
>@@ -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 -Nru -I '$FreeBSD.*$' /usr/ports/graphics/qt4-svg/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-svg/Makefile
>--- graphics/qt4-svg/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-svg/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	svg
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	graphics
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/misc/qt4-l10n/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-l10n/Makefile
>--- misc/qt4-l10n/Makefile	2015-02-24 22:39:19.000000000 +0100
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-l10n/Makefile	2015-02-24 22:09:23.691221000 +0100
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	l10n
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	misc
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/misc/qt4-l10n/pkg-plist /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-l10n/pkg-plist
>--- misc/qt4-l10n/pkg-plist	2014-10-23 23:35:14.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-l10n/pkg-plist	2015-08-29 13:01:20.685594000 +0200
>@@ -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 -Nru -I '$FreeBSD.*$' /usr/ports/misc/qt4-qtconfig/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-qtconfig/Makefile
>--- misc/qt4-qtconfig/Makefile	2014-09-10 22:50:31.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-qtconfig/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	qtconfig
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	misc
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/misc/qt4-qtdemo/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-qtdemo/Makefile
>--- misc/qt4-qtdemo/Makefile	2014-10-16 23:09:09.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-qtdemo/Makefile	2014-10-18 13:07:31.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	qtdemo
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	2
> CATEGORIES=	misc
> PKGNAMEPREFIX=	qt4-
> 
>--- multimedia/qt4-multimedia/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/multimedia/qt4-multimedia/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	multimedia
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	multimedia
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/net/qt4-network/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/net/qt4-network/Makefile
>--- net/qt4-network/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/net/qt4-network/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	network
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	net ipv6
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/textproc/clucene-qt4/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/clucene-qt4/Makefile
>--- textproc/clucene-qt4/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/clucene-qt4/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	clucene
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	textproc
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/textproc/qt4-xml/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xml/Makefile
>--- textproc/qt4-xml/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xml/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	xml
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	textproc
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/textproc/qt4-xmlpatterns/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xmlpatterns/Makefile
>--- textproc/qt4-xmlpatterns/Makefile	2014-07-19 13:09:00.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xmlpatterns/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	xmlpatterns
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	textproc
> PKGNAMEPREFIX=	qt4-
> 
>--- www/webkit-qt4/Makefile	2014-09-10 22:50:31.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/www/webkit-qt4/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	webkit
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	2
> CATEGORIES=	www
> PKGNAMEPREFIX=	qt4-
> 
>--- x11-toolkits/qt4-declarative/Makefile	2014-09-10 22:50:31.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-declarative/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	declarative
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	2
> CATEGORIES=	x11-toolkits
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/x11-toolkits/qt4-gui/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/Makefile
>--- x11-toolkits/qt4-gui/Makefile	2015-04-14 10:34:41.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/Makefile	2015-07-03 00:52:29.832056000 +0200
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	gui
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	5
> CATEGORIES=	x11-toolkits
> PKGNAMEPREFIX=	qt4-
> 
>diff -Nru -I '$FreeBSD.*$' /usr/ports/x11-toolkits/qt4-gui/files/patch-CVE-2015-0295 /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/files/patch-CVE-2015-0295
>--- x11-toolkits/qt4-gui/files/patch-CVE-2015-0295	2015-03-05 00:06:13.000000000 +0100
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/files/patch-CVE-2015-0295	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -Nru -I '$FreeBSD.*$' /usr/ports/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859 /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859
>--- x11-toolkits/qt4-gui/files/patch-CVE-2015-1859	2015-04-14 10:34:41.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859	1970-01-01 01:00:00.000000000 +0100
>@@ -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;
>--- x11/qt4-graphicssystems-opengl/Makefile	2014-09-10 22:50:31.000000000 +0200
>+++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-graphicssystems-opengl/Makefile	2014-09-30 22:27:14.000000000 +0200
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	graphicssystems
> DISTVERSION=	${QT4_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	x11
> PKGNAMEPREFIX=	qt4-
> PKGNAMESUFFIX=	-opengl
>--- cad/qcad/Makefile	(revision 395961)
>+++ cad/qcad/Makefile	(working copy)
>@@ -52,12 +52,12 @@
> 	${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/
>--- x11/kdelibs4/Makefile	(revision 396940)
>+++ x11/kdelibs4/Makefile	(working copy)
>@@ -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}
>--- x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake	2014-01-22 18:40:44.000000000 +0100
>+++ x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake	2015-09-15 11:00:27.015655000 +0200
>@@ -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)

Actions: View | Diff

Attachments on bug 202808: 160579 | 160961 | 161049