From cc596d16be3c9a7109ded5644bc132f13a6a2188 Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Mon, 25 Jul 2011 18:46:44 +0000
Subject: [PATCH] kde-runtime: add repack-hotfixes

---
 kde-runtime/PKGBUILD | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/kde-runtime/PKGBUILD b/kde-runtime/PKGBUILD
index 7b3a24d14..2098f49aa 100644
--- a/kde-runtime/PKGBUILD
+++ b/kde-runtime/PKGBUILD
@@ -16,12 +16,12 @@ pkgname=('kde-runtime'
         
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="split package"
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
 options=('docs' '!splithdr' 'splitdbg' 'log')
-makedepends=('pkgconfig' 'cmake' 'automoc4' "kdepimlibs>=${_kdever}" 'openslp'
+makedepends=('pkgconfig' 'cmake' 'automoc4' "kdepimlibs>=${_kdever}" 'openslp' 'docbook-xml' 'docbook-xsl'
              'xine-lib' 'libpulse' 'libssh' 'ntrack' 'libcanberra' 'libcanberra-pulse' 'samba' 'soprano')
 groups=('kde')
 
@@ -32,14 +32,19 @@ source=($_mirror/${pkgbase}-$_kdever.tar.bz2
 #	01_knetattach_use_sftp.patch
 #	02_oxygenify_knetattach_icon.patch
 	03_disable_logout_sound.patch
-	04_disable_nepomuk_popups.patch)
+	04_disable_nepomuk_popups.patch
+	http://chakra-project.org/sources/kde-runtime/kde-runtime-95f65b882149d398553e8934318658301c84dd29.diff
+	http://chakra-project.org/sources/kde-runtime/kde-runtime-ebaf3b457b94a8be7a894b8eed81940cb7bb818f.diff)
 
 md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
         '68cd8eb57db22c2f2ed554b721253bc2'  #  branding.svgz
 #       '45fa12b8baf21c4fc845147afcea2bc1'  #  01_knetattach_use_sftp.patch
 #       '1f0225f31d5f44e753e966fd3a032f00'  #  02_oxygenify_knetattach_icon.patch
         'a434bf282ee391b2f857184be59a3b6f'  #  03_disable_logout_sound.patch
-        'a3c844d7bbd9a31f39b1b877ae521340') #  04_disable_nepomuk_popups.patch
+        'a3c844d7bbd9a31f39b1b877ae521340'  #  04_disable_nepomuk_popups.patch
+        '286b55c6f8d11ee960739443993bc292'  # kde-runtime-95f65b882149d398553e8934318658301c84dd29.diff
+        '23e58fefbe59872f346b2470e3c9973b'  # kde-runtime-ebaf3b457b94a8be7a894b8eed81940cb7bb818f.diff
+)
 
 
 
@@ -51,10 +56,15 @@ build()
 	cd ${pkgbase}-${pkgver}
 
 	msg "applying main patchset ..."
-	# patch -Np1 -i ${srcdir}/01_knetattach_use_sftp.patch || return 1
-	# patch -Np1 -i ${srcdir}/02_oxygenify_knetattach_icon.patch || return 1
-	patch -Np1 -i ${srcdir}/03_disable_logout_sound.patch || return 1
-	patch -Np1 -i ${srcdir}/04_disable_nepomuk_popups.patch || return 1
+	# patch -Np1 -i ${srcdir}/01_knetattach_use_sftp.patch
+	# patch -Np1 -i ${srcdir}/02_oxygenify_knetattach_icon.patch
+	patch -Np1 -i ${srcdir}/03_disable_logout_sound.patch
+	patch -Np1 -i ${srcdir}/04_disable_nepomuk_popups.patch
+
+	msg "add hotfixes ..."
+	# see: http://mail.kde.org/pipermail/release-team/2011-July/005149.html
+	patch -Np1 -i ${srcdir}/kde-runtime-ebaf3b457b94a8be7a894b8eed81940cb7bb818f.diff
+	patch -Np1 -i ${srcdir}/kde-runtime-95f65b882149d398553e8934318658301c84dd29.diff
 
 	# copy our branding stuff
 	cp -f ${srcdir}/branding.svgz ${srcdir}/${pkgbase}-${pkgver}/desktoptheme/oxygen/widgets/
@@ -67,7 +77,7 @@ build()
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
 
-	make || return 1
+	make
 }
 
 
@@ -88,7 +98,7 @@ package_kde-runtime()
 	install=kde-runtime.install
 
 	cd ${srcdir}/${pkgbase}-${pkgver}/
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install
 
 	# also in kde-runtime-doc
 	rm -rf ${pkgdir}/usr/share/man
@@ -129,7 +139,7 @@ package_kde-runtime-doc()
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
 			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
+			make DESTDIR=${pkgdir} install
 		done
 }