summaryrefslogtreecommitdiffstats
path: root/kde/patch
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-06-25 12:46:41 +0200
committer Eric Hameleers <alien@slackware.com>2017-06-25 12:46:41 +0200
commit3099659954b53ec4362258745bdca190d54e0a59 (patch)
treee4ef251b6ac979a738f5da6825cf89cf75a5269d /kde/patch
parent2e70c8e4eec359b7f06aaf60a2f6048fe526671f (diff)
downloadktown-3099659954b53ec4362258745bdca190d54e0a59.tar.gz
ktown-3099659954b53ec4362258745bdca190d54e0a59.tar.xz
krita needs a patch to compile against Qt 5.9
Diffstat (limited to 'kde/patch')
-rw-r--r--kde/patch/krita.patch3
-rw-r--r--kde/patch/krita/krita_qt59.patch26
2 files changed, 29 insertions, 0 deletions
diff --git a/kde/patch/krita.patch b/kde/patch/krita.patch
new file mode 100644
index 0000000..3f1486b
--- /dev/null
+++ b/kde/patch/krita.patch
@@ -0,0 +1,3 @@
+# Fix compilation of Krita against Qt 5.9:
+cat $CWD/patch/krita/krita_qt59.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/krita/krita_qt59.patch b/kde/patch/krita/krita_qt59.patch
new file mode 100644
index 0000000..f517995
--- /dev/null
+++ b/kde/patch/krita/krita_qt59.patch
@@ -0,0 +1,26 @@
+Source: https://github.com/KDE/krita/commit/2f59d0d1.patch
+
+From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sat, 6 May 2017 16:00:21 +0200
+Subject: [PATCH] Drop QForeachContainer include and fix Qt 5.9 build
+
+It's not used anywhere.
+
+Acked by boud.
+---
+ libs/ui/KisResourceBundleManifest.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libs/ui/KisResourceBundleManifest.cpp b/libs/ui/KisResourceBundleManifest.cpp
+index e4f94ca788..83761657d8 100644
+--- a/libs/ui/KisResourceBundleManifest.cpp
++++ b/libs/ui/KisResourceBundleManifest.cpp
+@@ -22,7 +22,6 @@
+ #include <QDomElement>
+ #include <QDomNode>
+ #include <QDomNodeList>
+-#include <QForeachContainer>
+
+ #include <KoXmlNS.h>
+ #include <KoXmlReader.h>