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]

4 files changed, 0 insertions, 89 deletions

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;