From 6cc300623b7331cc090f88237cde42e197b7e6d7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sun, 31 May 2015 10:53:18 +0200
Subject: [PATCH] qt: update to 4.8.7 (last 4.x version).

---
 srcpkgs/qt/patches/CVE-2014-0190.patch        | 32 -------------------
 srcpkgs/qt/patches/kde4-settings.patch        | 11 +++++++
 srcpkgs/qt/patches/moc-boost-workaround.patch | 12 +++++++
 srcpkgs/qt/template                           |  8 ++---
 4 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/qt/patches/CVE-2014-0190.patch
 create mode 100644 srcpkgs/qt/patches/kde4-settings.patch
 create mode 100644 srcpkgs/qt/patches/moc-boost-workaround.patch

diff --git a/srcpkgs/qt/patches/CVE-2014-0190.patch b/srcpkgs/qt/patches/CVE-2014-0190.patch
deleted file mode 100644
index e97ee7bf01e..00000000000
--- a/srcpkgs/qt/patches/CVE-2014-0190.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-
-diff -up qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367 qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
---- qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367	2014-04-10 13:37:12.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp	2014-04-24 15:58:54.515862458 -0500
-@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, co
-                     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/srcpkgs/qt/patches/kde4-settings.patch b/srcpkgs/qt/patches/kde4-settings.patch
new file mode 100644
index 00000000000..747ca4cfd64
--- /dev/null
+++ b/srcpkgs/qt/patches/kde4-settings.patch
@@ -0,0 +1,11 @@
+--- a/src/gui/kernel/qkde.cpp.orig	2015-05-27 11:42:02.507129332 +0200
++++ b/src/gui/kernel/qkde.cpp	2015-05-27 11:43:26.182875729 +0200
+@@ -63,7 +63,7 @@
+         kdeHomePath = QString::fromLocal8Bit(qgetenv("KDEHOME"));
+         if (kdeHomePath.isEmpty()) {
+             QDir homeDir(QDir::homePath());
+-            QString kdeConfDir(QLatin1String("/.kde"));
++            QString kdeConfDir(QLatin1String("/.kde4"));
+             if (4 == X11->desktopVersion && homeDir.exists(QLatin1String(".kde4")))
+             kdeConfDir = QLatin1String("/.kde4");
+             kdeHomePath = QDir::homePath() + kdeConfDir;
diff --git a/srcpkgs/qt/patches/moc-boost-workaround.patch b/srcpkgs/qt/patches/moc-boost-workaround.patch
new file mode 100644
index 00000000000..027f8064dcf
--- /dev/null
+++ b/srcpkgs/qt/patches/moc-boost-workaround.patch
@@ -0,0 +1,12 @@
+diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp	2014-04-10 21:37:12.000000000 +0300
++++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp	2014-11-06 02:24:44.287305916 +0200
+@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
+ 
+     // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
+     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
+ 
+     QByteArray filename;
+     QByteArray output;
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index 03113384db4..ebd35b3ec5d 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -1,7 +1,7 @@
 # Template file for 'qt'
 pkgname=qt
-version=4.8.6
-revision=15
+version=4.8.7
+revision=1
 _distname=qt-everywhere-opensource-src
 patch_args="-Np1"
 wrksrc=${_distname}-${version}
@@ -9,8 +9,8 @@ homepage="http://qt.io/"
 short_desc="A cross-platform application and UI framework"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3, LGPL-2.1"
-distfiles="http://download.qt.io/official_releases/qt/4.8/${version}/${_distname}-${version}.tar.gz"
-checksum=8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/${_distname}-${version}.tar.gz"
+checksum=e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
 
 nocross=yes
 hostmakedepends="sqlite pkg-config"