From 3099659954b53ec4362258745bdca190d54e0a59 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 25 Jun 2017 12:46:41 +0200 Subject: krita needs a patch to compile against Qt 5.9 --- kde/patch/krita.patch | 3 +++ kde/patch/krita/krita_qt59.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 kde/patch/krita.patch create mode 100644 kde/patch/krita/krita_qt59.patch (limited to 'kde') 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 +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 + #include + #include +-#include + + #include + #include -- cgit v1.2.3