From d0edeacad75a44bc9718b9ffd8a7bb12820ef75e Mon Sep 17 00:00:00 2001 From: Eric Hameleers 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. --- deps/extra-cmake-modules/extra-cmake-modules.SlackBuild | 2 +- deps/qca-qt5/qca-qt5.SlackBuild | 2 +- kde/KDE.SlackBuild | 5 +---- kde/modules/kdebase | 1 + kde/patch/kdelibs4support.patch | 2 ++ kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff | 11 +++++++++++ kde/patch/plasma-desktop.patch | 2 +- 7 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff diff --git a/deps/extra-cmake-modules/extra-cmake-modules.SlackBuild b/deps/extra-cmake-modules/extra-cmake-modules.SlackBuild index 8edfc93..5e08a2e 100755 --- a/deps/extra-cmake-modules/extra-cmake-modules.SlackBuild +++ b/deps/extra-cmake-modules/extra-cmake-modules.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=extra-cmake-modules -VERSION=${VERSION:-1.6.0} +VERSION=${VERSION:-1.6.1} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/deps/qca-qt5/qca-qt5.SlackBuild b/deps/qca-qt5/qca-qt5.SlackBuild index 6c95f74..5c71948 100755 --- a/deps/qca-qt5/qca-qt5.SlackBuild +++ b/deps/qca-qt5/qca-qt5.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=qca-qt5 -VERSION=2.1.0.1 +VERSION=${VERSION:-2.1.0.2} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} diff --git a/kde/KDE.SlackBuild b/kde/KDE.SlackBuild index 875aa30..4017525 100755 --- a/kde/KDE.SlackBuild +++ b/kde/KDE.SlackBuild @@ -524,9 +524,7 @@ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR SLACK_KDE_BUILD_DIR=$TMP/kde-build mkdir -p $SLACK_KDE_BUILD_DIR -# Yes, we know kde-workspace is built twice. kdebase needs the -# plasma bits from it, and then we build it again for good measure... -# And kde-baseapps is rebuilt after kdewebdev because it can then pickup +# kde-baseapps is rebuilt after kdewebdev because it can then pickup # libtidy and enable the Konqueror validators plugin to validate HTML. KDEMODS=" \ kdelibs \ @@ -534,7 +532,6 @@ KDEMODS=" \ kdepimlibs \ kdebase \ kdebindings - kdebase:kde-workspace \ kdepim \ extragear \ frameworks \ diff --git a/kde/modules/kdebase b/kde/modules/kdebase index 6ae2f32..182e20a 100644 --- a/kde/modules/kdebase +++ b/kde/modules/kdebase @@ -4,3 +4,4 @@ baloo-widgets nepomuk-core nepomuk-widgets kactivities +#kde-workspace 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