Update Qt to 5.6.2 [1,2]

Thanks to the upstream work of Marie Loise Nolden, we could get rid of a handful
of patches, as they have been properly upstreamed. The rest of the work is just
some minor plist changes.

I would like to thank Loise <nolden@kde.org> for the upstream work, and Adriaan
<groot@kde.org> for getting the update into shape.

[1] http://blog.qt.io/blog/2016/10/12/qt-5-6-2-released/
[2] http://wiki.qt.io/Qt_5.6.2_Change_Files

PR: 213530
Exp-run by: antoine
Submitted by: Adriaan de Groot <groot@kde.org>
Reviewed by: rakuco, mat, tcberner
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D8228

2 files changed, 24 insertions, 0 deletions

diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index 112100ece8c3..319d20052d5e 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -82,6 +82,10 @@ CFLAGS_powerpc64=	-mminimal-toc
 CXXFLAGS+=	-flax-vector-conversions
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+EXTRA_PATCHES+=  ${FILESDIR}/extrapatch-src_gui_painting_qcolor.cpp
+.endif
+
 post-build:
 .for d in ${MORE_WRKSRCS}
 	@cd ${WRKSRC}/${d} && \
diff --git a/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp b/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp
new file mode 100644
index 000000000000..7760f66a4034
--- /dev/null
+++ b/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp
@@ -0,0 +1,20 @@
+On FreeBSD 9.3 with gcc-4.2 we need to mark the constant as an unsigned long long. 
+Else the compiler will choke on it being too large:
+
+c++ -c -O2 -pipe [...] itemmodels/qstandarditemmodel.cpp
+painting/qcolor.cpp:527: error: integer constant is too large for 'long' type
+*** [.obj/qcolor.o] Error code 1
+1 error
+
+
+--- src/gui/painting/qcolor.cpp.orig	2016-10-10 16:17:59 UTC
++++ src/gui/painting/qcolor.cpp
+@@ -524,7 +524,7 @@ QString QColor::name(NameFormat format) 
+         return QLatin1Char('#') + QString::number(rgba() | 0x1000000, 16).rightRef(6);
+     case HexArgb:
+         // it's called rgba() but it does return AARRGGBB
+-        return QLatin1Char('#') + QString::number(rgba() | 0x100000000, 16).rightRef(8);
++        return QLatin1Char('#') + QString::number(rgba() | 0x100000000ULL, 16).rightRef(8);
+     }
+     return QString();
+ }