From 7dc7daa0dd4fed20ebd78d4e727a632658a277d1 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 21 Nov 2015 15:43:24 +0200
Subject: [PATCH] generic: make changes required for building against Katie

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 build.sh                                      | 38 ++++---------------
 packaging/archlinux/katana-extraapps/PKGBUILD |  2 +-
 packaging/archlinux/katana-workspace/PKGBUILD |  1 +
 packaging/archlinux/katanalibs/PKGBUILD       |  2 +-
 4 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/build.sh b/build.sh
index 3a2eff9..7bed83c 100755
--- a/build.sh
+++ b/build.sh
@@ -18,22 +18,18 @@ fi
 
 sudo=""
 if [ "$(id -u)" != "0" ];then
-    if which sudo ;then
-        sudo="sudo"
-    elif which su ;then
-        sudo="su -c"
-    else
-        echo "Neither su nor sudo are available"
+    if ! which sudo ;then
+        echo "Sudo is not available"
         exit 1
     fi
+    sudo="sudo"
 fi
 
-packs=("ariya-icons" "kdelibs" "kde-baseapps" "kde-workspace" "kde-extraapps" "kde-l10n")
+packs=("ariya-icons" "kdelibs" "kde-baseapps" "kde-workspace")
 
 source "$(dirname $0)/fetch.sh"
 
-rm -rf icons-build kdelibs-build baseapps-build \
-    workspace-build extraapps-build l10n-build
+rm -rf icons-build kdelibs-build baseapps-build workspace-build
 
 mkdir -p icons-build && cd icons-build
 cmake ../ariya-icons \
@@ -46,7 +42,7 @@ cd ..
 mkdir -p kdelibs-build && cd kdelibs-build
 cmake ../kdelibs \
         -DCMAKE_BUILD_TYPE="$release" \
-        -DKDE4_BUILD_TESTS=OFF \
+        -DENABLE_TESTING=OFF \
         -DCMAKE_SKIP_INSTALL_RPATH=ON \
         -DCMAKE_INSTALL_PREFIX="$prefix" \
         -DSYSCONF_INSTALL_DIR=/etc \
@@ -58,7 +54,7 @@ cd ..
 mkdir -p baseapps-build && cd baseapps-build
 cmake ../kde-baseapps \
         -DCMAKE_BUILD_TYPE="$release" \
-        -DKDE4_BUILD_TESTS=OFF \
+        -DENABLE_TESTING=OFF \
         -DCMAKE_SKIP_INSTALL_RPATH=ON \
         -DCMAKE_INSTALL_PREFIX="$prefix"
 make
@@ -68,7 +64,7 @@ cd ..
 mkdir -p workspace-build && cd workspace-build
 cmake ../kde-workspace \
         -DCMAKE_BUILD_TYPE="$release" \
-        -DKDE4_BUILD_TESTS=OFF \
+        -DENABLE_TESTING=OFF \
         -DCMAKE_SKIP_INSTALL_RPATH=ON \
         -DCMAKE_INSTALL_PREFIX="$prefix" \
         -DSYSCONF_INSTALL_DIR=/etc \
@@ -76,21 +72,3 @@ cmake ../kde-workspace \
 make
 $sudo make install
 cd ..
-
-mkdir -p extraapps-build && cd extraapps-build
-cmake ../kde-extraapps \
-        -DCMAKE_BUILD_TYPE="$release" \
-        -DKDE4_BUILD_TESTS=OFF \
-        -DCMAKE_SKIP_INSTALL_RPATH=ON \
-        -DCMAKE_INSTALL_PREFIX="$prefix"
-make
-$sudo make install
-cd ..
-
-mkdir -p l10n-build && cd l10n-build
-cmake ../kde-l10n \
-        -DCMAKE_BUILD_TYPE="$release" \
-        -DCMAKE_INSTALL_PREFIX="$prefix"
-make
-$sudo make install
-cd ..
diff --git a/packaging/archlinux/katana-extraapps/PKGBUILD b/packaging/archlinux/katana-extraapps/PKGBUILD
index eb81620..c639b10 100644
--- a/packaging/archlinux/katana-extraapps/PKGBUILD
+++ b/packaging/archlinux/katana-extraapps/PKGBUILD
@@ -3,7 +3,7 @@
 # TODO: split into small packages
 
 pkgname=katana-extraapps
-pkgver=4.18.0.7ce4a91
+pkgver=4.18.0.7e3fd7f
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
diff --git a/packaging/archlinux/katana-workspace/PKGBUILD b/packaging/archlinux/katana-workspace/PKGBUILD
index 055fe3d..6dc2d47 100644
--- a/packaging/archlinux/katana-workspace/PKGBUILD
+++ b/packaging/archlinux/katana-workspace/PKGBUILD
@@ -45,6 +45,7 @@ sha1sums=('SKIP'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'aa9d2e5a69986c4c3d47829721ea99edb473be12')
 conflicts=('kdebase-workspace' 'kdebase-runtime')
+provides=('kdebase-workspace')
 
 pkgver() {
     cd kde-workspace
diff --git a/packaging/archlinux/katanalibs/PKGBUILD b/packaging/archlinux/katanalibs/PKGBUILD
index be5ac02..eaf3d21 100644
--- a/packaging/archlinux/katanalibs/PKGBUILD
+++ b/packaging/archlinux/katanalibs/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=katanalibs
-pkgver=4.18.0.865ac9b
+pkgver=4.18.0.e6ad6ca
 pkgrel=1
 pkgdesc="Katana core libraries"
 arch=('i686' 'x86_64')