+2015-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add freetype2
+ also prepare for qt5.5
+
2015-04-24 Thomas Orgis <sobukus AT sourcemage.org>
* CONFLICTS: added, conflicts with itself during build
diff --git a/x11-toolkits/qt4/CVE-2014-0190.patch
b/x11-toolkits/qt4/CVE-2014-0190.patch
deleted file mode 100644
index e97ee7b..0000000
--- a/x11-toolkits/qt4/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/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index bfba18c..5c2f9de 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,9 +2,8 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.8.6
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692
+ VERSION=4.8.7
+
SOURCE_HASH=sha512:f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
SOURCE=$SPELLX-$VERSION.tar.gz
SECURITY_PATCH=6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index b74071e..16a0851 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,10 @@
+2015-05-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.8.7
+ * PRE_BUILD: remove patch
+ * qt-everywhere-opensource-src-4.8.6-gcc5_fixes-1.patch: deleted
+ * CVE-2014-0190.patch: deleted
+
+
2015-04-29 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: install to /opt/qt4
* DETAILS: PATCHLEVEL++
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 2583940..4c76edd 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,7 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&