From d0edeacad75a44bc9718b9ffd8a7bb12820ef75e Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 13 Jan 2015 11:05:23 +0100
Subject: Fixed kdelibs4support compilation. Modified KDE.SlackBuild build
 order.

Additionally, bumped the versions of
qca-qt5 to 2.1.0.2, and
extra-cmake-modules to 1.6.1,
in order to fix bugs in both programs which affect the KDE 5 build.
---
 kde/patch/kdelibs4support.patch                      |  2 ++
 kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff | 11 +++++++++++
 kde/patch/plasma-desktop.patch                       |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff

(limited to 'kde/patch')

diff --git a/kde/patch/kdelibs4support.patch b/kde/patch/kdelibs4support.patch
index ada5f0a..8e9fe7b 100644
--- a/kde/patch/kdelibs4support.patch
+++ b/kde/patch/kdelibs4support.patch
@@ -2,3 +2,5 @@
 # Fixed in 5.1.0.
 #cat $CWD/patch/kdelibs4support/update-FindGettext.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
+# Allow cmake to find our doctools:
+cat $CWD/patch/kdelibs4support/FindDocBookXML4.cmake.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff b/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
new file mode 100644
index 0000000..1b39328
--- /dev/null
+++ b/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
@@ -0,0 +1,11 @@
+--- kdelibs4support-5.6.0/cmake/FindDocBookXML4.cmake.orig	2015-01-03 13:04:40.000000000 +0100
++++ kdelibs4support-5.6.0/cmake/FindDocBookXML4.cmake	2015-01-13 09:52:37.998230784 +0100
+@@ -16,7 +16,7 @@
+ 
+ 
+ if (NOT DocBookXML_FIND_VERSION)
+-     set(DocBookXML_FIND_VERSION "4.2")
++     set(DocBookXML_FIND_VERSION "4.5")
+ endif ()
+ 
+ set (DocBookXML4_DTD_VERSION ${DocBookXML_FIND_VERSION}
diff --git a/kde/patch/plasma-desktop.patch b/kde/patch/plasma-desktop.patch
index 0439348..a407570 100644
--- a/kde/patch/plasma-desktop.patch
+++ b/kde/patch/plasma-desktop.patch
@@ -2,4 +2,4 @@
 #cat $CWD/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
 # Forgotten includes:
-cat $CWD/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+#cat $CWD/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-- 
cgit v1.2.3