Merge

2025-02-03 19:17:15 +08:00 · 2011-09-11 22:14:11 +02:00 · 2011-09-11 22:14:11 +02:00 · bc478f4373
commit bc478f4373
parent 000fec4d9e aeb4987463
39 changed files with 569 additions and 331 deletions
--- a/kde-baseapps/PKGBUILD
+++ b/kde-baseapps/PKGBUILD
@ -67,7 +67,7 @@ package_kde-baseapps()
 	groups=("${pkgbase}" "kde" "kde-minimal" "kde-uninstall")
 	install=kde-baseapps.install

-	splitdirs="kdepasswd kdialog keditbookmarks kfind lib nsplugins plasma"
+	splitdirs="kdepasswd kdialog keditbookmarks kfind lib nsplugins plasma konqueror"
 		for i in ${splitdirs} ; do
 			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
@ -82,6 +82,33 @@ package_kde-baseapps()
 	make
 	make DESTDIR=${pkgdir} install || return 1
 	
+	# prepare konqueror
+	msg "splitting konqueror ..."
+	rm -vR ${pkgdir}/usr/include/konqsidebarplugin.h 
+	rm -vR ${pkgdir}/usr/lib/libkonqsidebarplugin.so*
+	rm -vR ${pkgdir}/usr/lib/libkdeinit4_konqueror.so*
+	rm -vR ${pkgdir}/usr/lib/libkonquerorprivate.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/konq_aboutpage.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_web.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/konq_sidebartree_bookmarks.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/konq_sidebartree_dirtree.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/konq_sidebar.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_history.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/kded_konqy_preloader.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_places.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_tree.so*
+	rm -vR ${pkgdir}/usr/share/config/konqsidebartngrc
+	rm -vR ${pkgdir}/usr/share/config.kcfg/konqueror.kcfg
+	rm -vR ${pkgdir}/usr/share/autostart/konqy_preload.desktop
+	rm -vR ${pkgdir}/usr/share/applications/kde4/konquerorsu.desktop
+	rm -vR ${pkgdir}/usr/share/applications/kde4/konqbrowser.desktop
+	rm -vR ${pkgdir}/usr/share/apps/konqsidebartng
+	rm -vR ${pkgdir}/usr/share/apps/konqueror
+	rm -vR ${pkgdir}/usr/share/icons/
+	rm -vR ${pkgdir}/usr/share/dbus-1/interfaces/org.kde.Konq*
+	rm -vR ${pkgdir}/usr/share/dbus-1/interfaces/org.kde.konq*
+	rm -vR ${pkgdir}/usr/bin/konqueror
+	
 	# we dont want the cdemu manager app. the service menu + devicenotifier is perfect already
 	rm -rfv ${pkgdir}/usr/share/applications/kde4/kde_cdemu.desktop

@ -145,6 +172,22 @@ package_kde-baseapps-konqueror()
 			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
+
+	msg "remove conflicting files ..."
+	rm -vR ${pkgdir}/usr/bin/kfmclient
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_history.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_kio.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_konq.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_konqhtml.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_kurifilt.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_performance.so*
+	rm -vR ${pkgdir}/usr/lib/libkdeinit4_kfmclient.so*
+	rm -vR ${pkgdir}/usr/share/applications/kde4/Home.desktop
+	rm -vR ${pkgdir}/usr/share/applications/kde4/kfmclient*
+	rm -vR ${pkgdir}/usr/share/apps/kcmcss
+	rm -vR ${pkgdir}/usr/share/apps/kconf_update
+	rm -vR ${pkgdir}/usr/share/apps/kcontrol
+	rm -vR ${pkgdir}/usr/share/kde4/service*
 }

 package_kde-baseapps-konq-plugins()
--- a/kde-common/kde-common.install
+++ b/kde-common/kde-common.install
@ -3,7 +3,7 @@
 #
 post_install() {
 		echo " "
-		echo " > KDE Software Compilation 4.7.0"
+		echo " > KDE Software Compilation 4.7.1"
 		echo " > packaged by the Chakra Project"
 		echo " "
 		echo "   Installation Prefix : /usr"
--- a/kde-l10n/PKGBUILD
+++ b/kde-l10n/PKGBUILD
@ -398,7 +398,7 @@ package_kde-l10n-bs()
 	pkgdesc="KDE language support: Bosnian"
 	groups=("kde-uninstall" "kde-l10n")

-	pushd ${srcdir}/kde-l10n-bn-${pkgver}
+	pushd ${srcdir}/kde-l10n-bs-${pkgver}
 		make DESTDIR=${pkgdir} install || return 1
 	popd
 }
--- a/kde-plasma-themes/PKGBUILD
+++ b/kde-plasma-themes/PKGBUILD
@ -14,13 +14,13 @@ pkgver=1.0
 pkgrel=1
 arch=('any')

-source=('http://chakra-project.org/sources/neda/Neda-1.6.5-1.tar.gz'
+source=('http://chakra-project.org/sources/neda/Neda-1.7.3.tar.gz'
        'http://chakra-project.org/sources/kneda/Kneda-0.6.4.tar.gz')
-md5sums=('b42e53b244b30a5ba15172d366d79066'
+md5sums=('d134e4ffa0298dfc95104457e27b071a'
         '149b1ace8fa3d2d7f981bc6841749f83')

 package_kde-plasma-themes-neda() {
-pkgver=1.6.5
+pkgver=1.7.3
 pkgrel=1
 pkgdesc="Chakra NEDA Plasma theme"
 url="http://www.chakra-project.org"
--- a/kde-runtime/PKGBUILD
+++ b/kde-runtime/PKGBUILD
@ -16,7 +16,7 @@ pkgname=('kde-runtime'
        
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=5
 pkgdesc="split package"
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
@ -32,19 +32,22 @@ 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
-	http://chakra-project.org/sources/kde-runtime/kde-runtime-95f65b882149d398553e8934318658301c84dd29.diff
-	http://chakra-project.org/sources/kde-runtime/kde-runtime-ebaf3b457b94a8be7a894b8eed81940cb7bb818f.diff)
+#	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
+        fix-empty-jobs.patch)

 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
-        '286b55c6f8d11ee960739443993bc292'  # kde-runtime-95f65b882149d398553e8934318658301c84dd29.diff
-        '23e58fefbe59872f346b2470e3c9973b'  # kde-runtime-ebaf3b457b94a8be7a894b8eed81940cb7bb818f.diff
-)
+#       'a3c844d7bbd9a31f39b1b877ae521340'  #  04_disable_nepomuk_popups.patch
+#        '286b55c6f8d11ee960739443993bc292'  # kde-runtime-95f65b882149d398553e8934318658301c84dd29.diff
+#        '23e58fefbe59872f346b2470e3c9973b'  # kde-runtime-ebaf3b457b94a8be7a894b8eed81940cb7bb818f.diff
+         'bf39497d3a8ba27751d10c2d4b913a5d') # fix-empty-jobs.patch
+
+     



@ -59,13 +62,18 @@ build()
 	# 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
+	#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

+        # FIXME: remove this?
+	# 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
+
+        # see: http://www.afiestas.org/two-annoying-bugs-fixed-in-kdirwatch-and-kuiserver/
+	patch -Np1 -i ${srcdir}/fix-empty-jobs.patch
+        
 	# copy our branding stuff
 	cp -f ${srcdir}/branding.svgz ${srcdir}/${pkgbase}-${pkgver}/desktoptheme/oxygen/widgets/
 	cp -f ${srcdir}/branding.svgz ${srcdir}/${pkgbase}-${pkgver}/desktoptheme/air/widgets/
--- a/kde-runtime/fix-empty-jobs.patch
+++ b/kde-runtime/fix-empty-jobs.patch
@ -0,0 +1,99 @@
+--- a/kuiserver/jobview.cpp
+++ b/kuiserver/jobview.cpp
+@@ -32,6 +32,10 @@
+ 
+ JobView::JobView(uint jobId, QObject *parent)
+     : QObject(parent),
+    m_capabilities(-1),
+    m_percent(-1),
+    m_totalAmount(0),
+    m_processAmount(0),
+     m_jobId(jobId),
+     m_state(Running),
+     m_isTerminated(false),
+@@ -110,6 +114,9 @@ void JobView::setTotalAmount(qulonglong
+         pair.second->asyncCall(QLatin1String("setTotalAmount"), amount, unit);
+     }
+ 
+    m_totalAmount = amount;
+    m_totalUnit = unit;
+
+     if (unit == "bytes") {
+         m_sizeTotal = amount ? KGlobal::locale()->formatByteSize(amount) : QString();
+ 
+@@ -135,6 +142,9 @@ void JobView::setProcessedAmount(qulongl
+         pair.second->asyncCall(QLatin1String("setProcessedAmount"), amount, unit);
+     }
+ 
+    m_processAmount = amount;
+    m_processUnit = unit;
+
+     if (unit == "bytes") {
+         m_sizeProcessed = amount ? KGlobal::locale()->formatByteSize(amount) : QString();
+ 
+@@ -316,6 +326,47 @@ void JobView::addJobContact(const QStrin
+     connect(client, SIGNAL(cancelRequested()), this, SIGNAL(cancelRequested()));
+     Q_ASSERT(!m_objectPaths.contains(address));
+     m_objectPaths.insert(address, pair);
+
+    //If the job already has any information, send it to the contact
+    if (m_capabilities > -1) {
+        client->asyncCall(QLatin1String("setCapabilities"), m_capabilities);
+    }
+
+    if (!m_applicationName.isEmpty()) {
+        client->asyncCall(QLatin1String("setAppName"), m_applicationName);
+    }
+
+    if (!m_appIconName.isEmpty()) {
+        client->asyncCall(QLatin1String("setAppIconName"), m_appIconName);
+    }
+
+    if (m_percent > -1) {
+        client->asyncCall(QLatin1String("setPercent"), m_percent);
+    }
+
+    if (!m_infoMessage.isEmpty()) {
+        client->asyncCall(QLatin1String("setInfoMessage"), m_infoMessage);
+    }
+
+    if (!m_descFields.isEmpty()) {
+        QHashIterator<uint, QPair <QString, QString > > i(m_descFields);
+        while (i.hasNext()) {
+            i.next();
+            client->asyncCall(QLatin1String("setDescriptionField"), i.key(), i.value().first, i.value().second);
+        }
+    }
+
+    if (m_state == Suspended) {
+        client->asyncCall(QLatin1String("setSuspended"), true);
+    }
+
+    if (m_processAmount > 0) {
+        client->asyncCall(QLatin1String("setProcessedAmount"), m_processAmount, m_processUnit);
+    }
+
+    if (m_totalAmount > 0) {
+        client->asyncCall(QLatin1String("setTotalAmount"), m_totalAmount, m_totalUnit);
+    }
+ }
+ 
+ QStringList JobView::jobContacts()
+
+--- a/kuiserver/jobview.h
+++ b/kuiserver/jobview.h
+@@ -200,6 +200,14 @@ private:
+ 
+     QString m_error;           ///< The error message of the job, set when it's terminated
+ 
+    QString m_totalUnit;       ///< The unit used in setTotalAmount
+
+    qulonglong m_totalAmount;  ///< The amount used in setTotalAmount
+
+    QString m_processUnit;     ///< The unit used in setProcessedAmount
+
+    qulonglong m_processAmount; ///< The processed amount (setProcessedAmount)
+
+     QHash<uint, QPair<QString, QString> > m_descFields;
+ 
+     QVariant m_destUrl;
--- a/kde-sc.md5
+++ b/kde-sc.md5
@ -1,123 +1,123 @@
-54b20e46c875c544bde5a6adff53af99  blinken-4.7.0.tar.bz2
-c1a9da755c1ec4ff8a9a736e3c0ff304  cantor-4.7.0.tar.bz2
-a90285ba6e7a84125ba4191e1027730b  gwenview-4.7.0.tar.bz2
-c9ed66f8727afa1945767fd8800c6495  kalgebra-4.7.0.tar.bz2
-3d147f78bb90b22d28ade81e7aabe56d  kalzium-4.7.0.tar.bz2
-f102af88e51fbf489dc1e70cf57d5645  kamera-4.7.0.tar.bz2
-4cfd9b4d28bfb884ef37faee58fe34d7  kanagram-4.7.0.tar.bz2
-844ac138c6391f0266a9140cfd86d0b3  kate-4.7.0.tar.bz2
-40b2d1d5b5e2dd7db37019688c994d22  kbruch-4.7.0.tar.bz2
-95a77f2d4a07d99d2a34bee6963d3d0d  kcolorchooser-4.7.0.tar.bz2
-0dfcfd5acf5ceea87ff2f21e859447b6  kde-baseapps-4.7.0.tar.bz2
-5d11be25fafc962cc1b5637e21e73591  kde-l10n-ar-4.7.0.tar.bz2
-e8c45bffd2436d96b71641f771483bef  kde-l10n-bg-4.7.0.tar.bz2
-60d2fb933f2b71e0e55c953dfaa3b30f  kde-l10n-bs-4.7.0.tar.bz2
-b8a6a28ad3d7d07c50737da4154c5ca5  kde-l10n-ca-4.7.0.tar.bz2
-97dd9f31e3911d61d9f56ed8f90c7e08  kde-l10n-ca@valencia-4.7.0.tar.bz2
-95d2aa38fe5bcd6f16b5155fe6f0c6b5  kde-l10n-cs-4.7.0.tar.bz2
-6ca6531c67dc1af887d29a62785846f7  kde-l10n-da-4.7.0.tar.bz2
-2548922260be2800eeffc13eace8c07c  kde-l10n-de-4.7.0.tar.bz2
-aa1d76e31c0ec495d42f55e4102d75a8  kde-l10n-el-4.7.0.tar.bz2
-f898337d47e4e1e11d56ad28d62ea555  kde-l10n-en_GB-4.7.0.tar.bz2
-fecbbbd061a5f8e858d3db9b84416806  kde-l10n-es-4.7.0.tar.bz2
-db52a47215b4ddd5e902e56db08d5e4e  kde-l10n-et-4.7.0.tar.bz2
-3ecef018acfb33013f9eea442178fe6a  kde-l10n-eu-4.7.0.tar.bz2
-65f86cb562aaad9d43b6109e6c2aecf0  kde-l10n-fi-4.7.0.tar.bz2
-4701d223a9b8d9502ba024b87d27a8d0  kde-l10n-fr-4.7.0.tar.bz2
-0c1c253be187c9119d4a4cea5fb85d35  kde-l10n-ga-4.7.0.tar.bz2
-3133cad9284bab5543e42f76c0b40773  kde-l10n-gl-4.7.0.tar.bz2
-51f3126033654f7331cc1c167e807796  kde-l10n-he-4.7.0.tar.bz2
-39ce4be4147c8dd2c611c687165f6c40  kde-l10n-hr-4.7.0.tar.bz2
-3a4eba6ff50b3dea4f2faa0cdb8e04d1  kde-l10n-hu-4.7.0.tar.bz2
-bf6c393e4b6c8e1e577656d85d958ede  kde-l10n-ia-4.7.0.tar.bz2
-5fbb74b9c7fb8801761b5554d822b610  kde-l10n-id-4.7.0.tar.bz2
-48b6368fc8c0c45867c611414433ef81  kde-l10n-is-4.7.0.tar.bz2
-db3954f0c0ad83fca82021b2efd78271  kde-l10n-it-4.7.0.tar.bz2
-35c6efc2d6d9d4ac165050efa129ef23  kde-l10n-ja-4.7.0.tar.bz2
-1a7fe52295c5292ac7f29be7ab16ec8b  kde-l10n-kk-4.7.0.tar.bz2
-eb08ad140a4498118c04e79403a4341b  kde-l10n-km-4.7.0.tar.bz2
-2cc494440d77f691c9aee1055ab30622  kde-l10n-kn-4.7.0.tar.bz2
-8d0e45d8a2bf4c649a160fbea5f88370  kde-l10n-ko-4.7.0.tar.bz2
-0e1fccb8e6a6eeb95146b7ee5568f3a8  kde-l10n-lt-4.7.0.tar.bz2
-903fd50bf31f649e9af99d4fa59ac2f7  kde-l10n-lv-4.7.0.tar.bz2
-c22e1073a93a79256c4aa4ec12a2095f  kde-l10n-nb-4.7.0.tar.bz2
-33a7d73eedf1293b0d369b6f758bd03f  kde-l10n-nds-4.7.0.tar.bz2
-4d8b8fc5ec6bfec9782417ba42ec630c  kde-l10n-nl-4.7.0.tar.bz2
-caccfbbf31e340af10829e680d339f75  kde-l10n-nn-4.7.0.tar.bz2
-f3b14f8af198f7ceb3634ca0f8ec45ac  kde-l10n-pa-4.7.0.tar.bz2
-1ab0754a74a97910654f90da0a3c6168  kde-l10n-pl-4.7.0.tar.bz2
-e60f173e0a4b37d17077ac5da0943f66  kde-l10n-pt-4.7.0.tar.bz2
-93ae26d356108c8c9b4a8f09aea5f09f  kde-l10n-pt_BR-4.7.0.tar.bz2
-1b4ba726032971a500d96683cda88ce2  kde-l10n-ro-4.7.0.tar.bz2
-eedd99875b84d6675186211becab7517  kde-l10n-ru-4.7.0.tar.bz2
-a384ab0ec013a94cafbb9e2380864622  kde-l10n-sk-4.7.0.tar.bz2
-7497209389c33aa4afa3a7d3d546d7a9  kde-l10n-sl-4.7.0.tar.bz2
-e00bb87fd8789007a4515a0eb15c4a33  kde-l10n-sr-4.7.0.tar.bz2
-d7b34ae68fa64918583acd0e466a4cc7  kde-l10n-sv-4.7.0.tar.bz2
-78dd8637b7a7369527d006b52695987a  kde-l10n-th-4.7.0.tar.bz2
-7dfa62c2aa820d76145a878587909826  kde-l10n-tr-4.7.0.tar.bz2
-3a8932dd13284a14badc0523774f32ed  kde-l10n-ug-4.7.0.tar.bz2
-d28de1ab3034fa3fa54a4e4c8200fc87  kde-l10n-uk-4.7.0.tar.bz2
-9dc0472eed0643213e27203f75e0a41a  kde-l10n-wa-4.7.0.tar.bz2
-f4a4a4162295b35057fdd9a720c63cd2  kde-l10n-zh_CN-4.7.0.tar.bz2
-ef37aefdcc8a0ed5ef89a298fbd5c087  kde-l10n-zh_TW-4.7.0.tar.bz2
-13eaafb4699dad98d1da9b213ec1e69b  kde-runtime-4.7.0.tar.bz2
-3b7f4b71a09431cddc7bb930f81bd479  kde-wallpapers-4.7.0.tar.bz2
-92d2623901816f9b12681a34bd2cea22  kde-workspace-4.7.0.tar.bz2
-86bd48f3b775291df1551ddf784ec993  kdeaccessibility-4.7.0.tar.bz2
-b400dc0759875e49e8e77cd326dd3bae  kdeadmin-4.7.0.tar.bz2
-530cacf9ecd914aaddc25a9e86064806  kdeartwork-4.7.0.tar.bz2
-fe27857410e79b3bd207c4dc4abc5709  kdegames-4.7.0.tar.bz2
-2024d6eca242fa810a4b71336ed451df  kdegraphics-strigi-analyzer-4.7.0.tar.bz2
-df74a5653a8bdcc61c40c42a02482c85  kdegraphics-thumbnailers-4.7.0.tar.bz2
-1d12b9c32da28b38f64718cf10527e80  kdelibs-4.7.0.tar.bz2
-99ffa5e4f7b62cb67f53c97dbe21265d  kdemultimedia-4.7.0.tar.bz2
-bbda7b39ebb41794205299b77a4897a4  kdenetwork-4.7.0.tar.bz2
-24021acc383ff69d8210ecde4d848b6e  kdepim-4.7.0.tar.bz2
-328932493ca7a3bc2dc9c942620b5879  kdepim-runtime-4.7.0.tar.bz2
-b97c45aae52945224094b20b4ab356d9  kdepimlibs-4.7.0.tar.bz2
-f7152ffd214d96b01fab0b112ce4def6  kdeplasma-addons-4.7.0.tar.bz2
-3b9fb9f1e5cf0001ee870b4f469f6cc0  kdesdk-4.7.0.tar.bz2
-78cc4a6faff9c3404b8d09a60e9918f1  kdetoys-4.7.0.tar.bz2
-bf08773fbc60fef38edeeece4074bb9e  kdeutils-4.7.0.tar.bz2
-123315aaff0866b33e38efe9f67de2ac  kdewebdev-4.7.0.tar.bz2
-ab78ac7a39c75bdb5dea665d6754493f  kgamma-4.7.0.tar.bz2
-08a1c495299c5091103bb09e413eb335  kgeography-4.7.0.tar.bz2
-f59008929fcb83f537a036e3b2a195d4  khangman-4.7.0.tar.bz2
-c7587832922c79485f75dcea097a8aa9  kig-4.7.0.tar.bz2
-b48d2b94f0e02666afdac187480493d8  kimono-4.7.0.tar.bz2
-3cf842719c3869356fdc54b7c067984a  kiten-4.7.0.tar.bz2
-e61a8c1f42422f62c36aa0c68e4c54e0  klettres-4.7.0.tar.bz2
-18467d4d039bf34a4c07dcd630932030  kmplot-4.7.0.tar.bz2
-56257bda4942c8e56a4a5209831b97c6  kolourpaint-4.7.0.tar.bz2
-3682298aa6af6d9ca880f0bc6f79cfa0  konsole-4.7.0.tar.bz2
-6756d0f9f5540cc2d758d8a5ddf07001  korundum-4.7.0.tar.bz2
-220ff76efe9164c3b86a7433f1b17a2a  kross-interpreters-4.7.0.tar.bz2
-882e82f9d5a934663401d8f3349da8cd  kruler-4.7.0.tar.bz2
-9eb243fe864030d0c47b80680b6319e5  ksaneplugin-4.7.0.tar.bz2
-fb58cb99c18a04de36ff2be9a50ca55a  ksnapshot-4.7.0.tar.bz2
-f64cc34f81f6497c9f5fe6fd5d011af6  kstars-4.7.0.tar.bz2
-6f13019c3d49aec7477b40c2ac3a3c36  ktouch-4.7.0.tar.bz2
-c9b5146078deeafe83281a653349df4d  kturtle-4.7.0.tar.bz2
-3f5aa2098df14218ad5b2ad391340c9b  kwordquiz-4.7.0.tar.bz2
-8e5ea3fa1c714251e75dd227ad0d01b8  libkdcraw-4.7.0.tar.bz2
-10e59e1b68ffa940637a16369fef88da  libkdeedu-4.7.0.tar.bz2
-a43d210bdfe3de3589b4ba7bfccc4855  libkexiv2-4.7.0.tar.bz2
-7c512e305dac78bbaadff24d8d3f4742  libkipi-4.7.0.tar.bz2
-24586dff3b070dca1c0594958d1df107  libksane-4.7.0.tar.bz2
-d9dc301b31b6f18531e65a2b6bbec520  marble-4.7.0.tar.bz2
-d3e8bb84535cbeb7f6cbcb0f8a8514c6  mobipocket-4.7.0.tar.bz2
-bcca90d264cc7ff040787da3cf29fb07  okular-4.7.0.tar.bz2
-24df624a48bfa7769a7f58bcc4cc7210  oxygen-icons-4.7.0.tar.bz2
-4a2d1d8e584bf9f78361f3e1d7c30654  parley-4.7.0.tar.bz2
-513395540c12845bead009f22d06a267  perlkde-4.7.0.tar.bz2
-c8751e3b99592c9861c1d10270639737  perlqt-4.7.0.tar.bz2
-e36925795355fc153be0d7b79f215667  pykde4-4.7.0.tar.bz2
-d17198b985f954cedd92ab669623de59  qtruby-4.7.0.tar.bz2
-15871e07d366305e69113056bcb894a1  qyoto-4.7.0.tar.bz2
-4ce49c58de674b585e9265a3279f1091  rocs-4.7.0.tar.bz2
-d11844429748dea49e313dbc825ad0a1  smokegen-4.7.0.tar.bz2
-95f53edd3e2995457b04a18b69952f59  smokekde-4.7.0.tar.bz2
-504dd92fc50f7ccb9cc21ecf31e92da6  smokeqt-4.7.0.tar.bz2
-d02eb6adee68ce154b6c1b72afe6a138  step-4.7.0.tar.bz2
-64e10ccf126668a4fb3af337bd547a13  svgpart-4.7.0.tar.bz2
+188ff5ff5ca53a4383c919eec9299fbe  blinken-4.7.1.tar.bz2
+b2f1a3ae4fdc0f04f0cd250a8dbd6d76  cantor-4.7.1.tar.bz2
+54a419ec211ac09f9cc1a70d5556f2cd  gwenview-4.7.1.tar.bz2
+5ed2c0a4ba7e2792f33c36d4d82dbbdf  kalgebra-4.7.1.tar.bz2
+929ba3e612cbb998aa0b8410d89dcd7e  kalzium-4.7.1.tar.bz2
+4f5669536561f1125f9fc3f12c501fd8  kamera-4.7.1.tar.bz2
+a0643cbf4b8bb6a992f73e85263a8b45  kanagram-4.7.1.tar.bz2
+68edb488a616cc4bb41475ee129a22c3  kate-4.7.1.tar.bz2
+95a186add683373cdae592e259a250ae  kbruch-4.7.1.tar.bz2
+9b8074f7362a6ad4a35fbebb0156a0f1  kcolorchooser-4.7.1.tar.bz2
+0713f18f7d9ccbfb7d8e045ac9e195cc  kdeaccessibility-4.7.1.tar.bz2
+b50211eb643bb32159e2321ba6b44416  kdeadmin-4.7.1.tar.bz2
+ba3037537e8a2184a80e9d384ecc3302  kdeartwork-4.7.1.tar.bz2
+f477884f2c25ea23a69b74a2f675c8f6  kde-baseapps-4.7.1.tar.bz2
+ca9d63f2034a674e771ca4f9036308ec  kdegames-4.7.1.tar.bz2
+d58ea5426f38262543c5b38af0057172  kdegraphics-strigi-analyzer-4.7.1.tar.bz2
+9d72b5d9179c7eb981dc7dd9b81ed841  kdegraphics-thumbnailers-4.7.1.tar.bz2
+1e556741290d273f9b84272965fd49d7  kde-l10n-ar-4.7.1.tar.bz2
+5fc99c767ea3a82f247c2b00438068bb  kde-l10n-bg-4.7.1.tar.bz2
+6cc917e0e12a7512b8dc28c285e616b8  kde-l10n-bs-4.7.1.tar.bz2
+8895748164d4ac41340a105839ea36d8  kde-l10n-ca-4.7.1.tar.bz2
+a1aced26157d74af0dc18278d7a87bae  kde-l10n-ca@valencia-4.7.1.tar.bz2
+40f06d829e921b50935cffa88993c5c2  kde-l10n-cs-4.7.1.tar.bz2
+f1639adb05b2ccb5827ba3a3100a1d2f  kde-l10n-da-4.7.1.tar.bz2
+6b7a4d709535a1f2f9a4101d7828486d  kde-l10n-de-4.7.1.tar.bz2
+e485781767e331d24d5a6748cf0deb07  kde-l10n-el-4.7.1.tar.bz2
+e50a4f5667cdb4d7c2933c69ed32c46f  kde-l10n-en_GB-4.7.1.tar.bz2
+5802b54b948a98d2dad9d83496115a0b  kde-l10n-es-4.7.1.tar.bz2
+99590fd262f5dd50748570848b45ab2c  kde-l10n-et-4.7.1.tar.bz2
+ca6721a1271c9391541bc91f8f96c59c  kde-l10n-eu-4.7.1.tar.bz2
+0fd9630e88cfbccda11f5afbf717cbea  kde-l10n-fi-4.7.1.tar.bz2
+88cb733ca323e249c3b34ccb53bff9f2  kde-l10n-fr-4.7.1.tar.bz2
+8ea6275a54ed0a08ca915e5edde0e7c7  kde-l10n-ga-4.7.1.tar.bz2
+7270814fbf30533bc0c33a17e1fe94e5  kde-l10n-gl-4.7.1.tar.bz2
+31bcf07e789a4b69264af0f5a7857f3c  kde-l10n-he-4.7.1.tar.bz2
+4c9ce97ca3ee55eb3855e89a7f70ab80  kde-l10n-hr-4.7.1.tar.bz2
+4d869523e9b68dee00e9d7887ad53407  kde-l10n-hu-4.7.1.tar.bz2
+24fb09f0a9139ec1fa59c518ac20051a  kde-l10n-ia-4.7.1.tar.bz2
+27b473acdc014ecbf1419c78dc68b5b5  kde-l10n-id-4.7.1.tar.bz2
+910715c07bb4dcdf0d932fe35d8c04e8  kde-l10n-is-4.7.1.tar.bz2
+2dad86f3f664b0b4e70620be16e92e9a  kde-l10n-it-4.7.1.tar.bz2
+f964a12a83156500fa9deca862c33c5a  kde-l10n-ja-4.7.1.tar.bz2
+3c2ec10fd3a43833ec0ee07a097ee902  kde-l10n-kk-4.7.1.tar.bz2
+6bcc864466676669ff4d0f630cc95f52  kde-l10n-km-4.7.1.tar.bz2
+c7b1ed17376dcca8df1355a7f237a18c  kde-l10n-kn-4.7.1.tar.bz2
+3785f6c99a1a5f8921f1bf0e1f95ebd4  kde-l10n-ko-4.7.1.tar.bz2
+8024639bcfa6b8518aabba5441c2da94  kde-l10n-lt-4.7.1.tar.bz2
+34567ac2be7db047ab14617a59fb7ba6  kde-l10n-lv-4.7.1.tar.bz2
+ebd2d7cda4028ea63947fe8423eaa7ca  kde-l10n-nb-4.7.1.tar.bz2
+b9ba68900b0b1b87a388aefac769b77f  kde-l10n-nds-4.7.1.tar.bz2
+bfd62b4b1d4d943b989c5daf73412b2e  kde-l10n-nl-4.7.1.tar.bz2
+4bf2aab74f59a69b6651462022294d46  kde-l10n-nn-4.7.1.tar.bz2
+07c83920095b8eb2cc7efe7b0d1e983a  kde-l10n-pa-4.7.1.tar.bz2
+bd7604f6da9234b853d80570d5180ecb  kde-l10n-pl-4.7.1.tar.bz2
+0ac92f7e05710d9506d104b33251fd0e  kde-l10n-pt-4.7.1.tar.bz2
+787a321c5f3d6fc1436419976dd8b7d3  kde-l10n-pt_BR-4.7.1.tar.bz2
+e7df86710cb0606b2c3a85387d5ffeb0  kde-l10n-ro-4.7.1.tar.bz2
+25e8ae00b670bf21458bca80db8b72cd  kde-l10n-ru-4.7.1.tar.bz2
+fb8c8f710b0eb209318252accf5cf84b  kde-l10n-sk-4.7.1.tar.bz2
+85183b944d22b07a02d221c81f2df30a  kde-l10n-sl-4.7.1.tar.bz2
+53bbca44ec05ed24a0f352b05cd08ff3  kde-l10n-sr-4.7.1.tar.bz2
+f410e40782d072b760184c6f9ba29c22  kde-l10n-sv-4.7.1.tar.bz2
+a03ecde05b081c495c225cb9fb733d14  kde-l10n-th-4.7.1.tar.bz2
+32b980da8f31a736770bfdf2b4ecc61c  kde-l10n-tr-4.7.1.tar.bz2
+e470c05f788c412a68edf61e3bd41d22  kde-l10n-ug-4.7.1.tar.bz2
+b529656cc1b28cf1beec47ecab4799ff  kde-l10n-uk-4.7.1.tar.bz2
+883bf31279b2a406c54f99f6c681f67f  kde-l10n-wa-4.7.1.tar.bz2
+3958339f7f8eb7f9ed888dfe8fafa0a6  kde-l10n-zh_CN-4.7.1.tar.bz2
+5d57f811033176f76cab815c50461838  kde-l10n-zh_TW-4.7.1.tar.bz2
+eaeacc3c94501f343eb7c4ef74c7475b  kdelibs-4.7.1.tar.bz2
+730aabab1869e23715fd56ef6dbaa6be  kdemultimedia-4.7.1.tar.bz2
+9f6e2d00955a9fcbdf0afa71a91e3aa2  kdenetwork-4.7.1.tar.bz2
+89b1f72b764bc3df4cf27b9afd36b324  kdepim-4.7.1.tar.bz2
+14432a983e5e280470d04f7922a43bb1  kdepimlibs-4.7.1.tar.bz2
+c244c997c50ab5239ce2f6f0439cad6e  kdepim-runtime-4.7.1.tar.bz2
+42e63b0e539dd1a4255b81d1cda770f6  kdeplasma-addons-4.7.1.tar.bz2
+927c47f79000f7af66b845600a21e9f5  kde-runtime-4.7.1.tar.bz2
+9f7ddb6b219e095103cbe2848cc31d79  kdesdk-4.7.1.tar.bz2
+b6d5b199536080c20ab7fa26fdfdb9e7  kdetoys-4.7.1.tar.bz2
+5deb07003fc0a44605e82f8e2df00a29  kdeutils-4.7.1.tar.bz2
+643eade621034d84803db793089a9c24  kde-wallpapers-4.7.1.tar.bz2
+150bb976a06777c2bfe87beac6109956  kdewebdev-4.7.1.tar.bz2
+128738157adc30030aa590f90109dbb9  kde-workspace-4.7.1.tar.bz2
+524adb1b3c6c4bb9b3e50e1034983216  kgamma-4.7.1.tar.bz2
+9600b1a5d788475fa38ebfdeee6536fc  kgeography-4.7.1.tar.bz2
+a7e0223ccb4f9d827e70627f5505588e  khangman-4.7.1.tar.bz2
+bf912d2f54e66406e2029b2eb5a45f7a  kig-4.7.1.tar.bz2
+673e41be49c6277f832450fa2ba5c698  kimono-4.7.1.tar.bz2
+fe1ce1363da8b9aa754a31b843a5f906  kiten-4.7.1.tar.bz2
+e3176f534baf92ba91100499966e17a8  klettres-4.7.1.tar.bz2
+8052a7295021485fb0a1ca2c7e657e80  kmplot-4.7.1.tar.bz2
+adfe49a6bf61a4996a2abb589888f380  kolourpaint-4.7.1.tar.bz2
+009bd5f40ca86e48ef2cec795dd87262  konsole-4.7.1.tar.bz2
+3e175c5dc5f4ab803c111dfd55cebc2d  korundum-4.7.1.tar.bz2
+6d0cbe5f268fc65e5050833822e8a55c  kross-interpreters-4.7.1.tar.bz2
+392304d7e1b2e5fefd2f9fbd8e721767  kruler-4.7.1.tar.bz2
+2dc4a2fdb1e340b139d84b6d45bac38f  ksaneplugin-4.7.1.tar.bz2
+2f080edabaef56718121fe2f9abaa3ea  ksnapshot-4.7.1.tar.bz2
+fe243613d628e28371ea4986f2312d70  kstars-4.7.1.tar.bz2
+f6b657df0b46190122148e9c418ae060  ktouch-4.7.1.tar.bz2
+1918f53d284bfe12da45c5dad9651445  kturtle-4.7.1.tar.bz2
+399949f9e32ba74512b7af47243a30ad  kwordquiz-4.7.1.tar.bz2
+9501a948515d024a12f7ba6cf551bea2  libkdcraw-4.7.1.tar.bz2
+d4ae1f0d640c9f8fb8db6b0f4a3def10  libkdeedu-4.7.1.tar.bz2
+78940384d4d194cc82f26f73187234d1  libkexiv2-4.7.1.tar.bz2
+08ed8a97c28abc766aed1a337bd8087b  libkipi-4.7.1.tar.bz2
+cd85b7423e90ed2e9a9d53c1d3cad94c  libksane-4.7.1.tar.bz2
+c51019621e91c53b1ded13eb2cfc76c0  marble-4.7.1.tar.bz2
+01aff9d17d452379d471bc22ed6a9902  mobipocket-4.7.1.tar.bz2
+da745b0d3ee2e796894fbb56caae7461  okular-4.7.1.tar.bz2
+76472c5e3f92840fcf19ab0223a21b66  oxygen-icons-4.7.1.tar.bz2
+e707e690bdf4b766914391a517f6c698  parley-4.7.1.tar.bz2
+ba81c4a305cf86aa3eea4117f6633c04  perlkde-4.7.1.tar.bz2
+2f21df2a106d33c4ec626568e9c1d506  perlqt-4.7.1.tar.bz2
+53fc1c1e1bacb1600a82c94352348fdd  pykde4-4.7.1.tar.bz2
+c498021117270962db9b9afae0d24adb  qtruby-4.7.1.tar.bz2
+7c81786e0f80353d8fd7e11ce4471272  qyoto-4.7.1.tar.bz2
+35e2f6d4cf74884a74afdaab3a80a276  rocs-4.7.1.tar.bz2
+b346f945d559e47dd6fcef8c7e8dcc71  smokegen-4.7.1.tar.bz2
+959ecaf7d268072a93477f309d763ff5  smokekde-4.7.1.tar.bz2
+147d73b6f05105ebacd4d8c2f316254c  smokeqt-4.7.1.tar.bz2
+070fac7e16f5c5d3f471f0204dfb3052  step-4.7.1.tar.bz2
+1bffaac4d9c6c9f1d04377621dff224d  svgpart-4.7.1.tar.bz2
--- a/kde-workspace/PKGBUILD
+++ b/kde-workspace/PKGBUILD
@ -16,7 +16,7 @@ pkgname=('kde-workspace'

 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="split package"
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
@ -27,7 +27,7 @@ _default_wp="Horos"

 # NOTE keep in sync with kde-workspace-depends
 depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}" 'qimageblitz'
-         'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' "xkit"
+         'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' "xkit" # 'libgles' 'libegl'
         'libxdamage' 'xorg-utils' 'libxrandr' 'libxres' 'libdmtx' 'libqalculate' 'prison' 'qrencode' "kdepim-runtime>=${_kdever}")

 makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-pykde4>=${_kdever}"
@ -37,8 +37,10 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebinding
 source=($_mirror/${pkgbase}-$_kdever.tar.bz2
 	$_mirror/kde-wallpapers-$_kdever.tar.bz2
 	mishaaq-kcm_touchpad-00370b5.tar.gz
-	http://www.kde-apps.org/CONTENT/content-files/114856-kcm_tablet-1.1.3.tar.gz
-	http://www.kde-apps.org/CONTENT/content-files/117639-favorites-0.1.tar.bz2
+	#http://www.kde-apps.org/CONTENT/content-files/114856-kcm_tablet-1.1.3.tar.gz
+	#http://www.kde-apps.org/CONTENT/content-files/117639-favorites-0.1.tar.bz2
+        http://chakra-project.org/sources/kde-workspace/114856-kcm_tablet-1.1.3.tar.gz
+        http://chakra-project.org/sources/kde-workspace/117639-favorites-0.1.tar.bz2
        kde.pam
        kde-np.pam
        kscreensaver.pam
@ -64,6 +66,8 @@ source=($_mirror/${pkgbase}-$_kdever.tar.bz2
 	fix_root-only-kcms.patch
        # shutdown-fix.patch
 	sensors-fix.patch
+	# fix some issues with the desktop effects and overall performace of Kwin
+	fix-kwin-effects.patch
 	)

 md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
@ -90,7 +94,8 @@ md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 	'97a5eb51e6f9d460f0d61bb322a1db5e' #  fix_kdm_configdef.patch
 	'5f963f80a026f0600edae1b1c70411e5' #  fix_root-only-kcms.patch
        'ecf3a9d6af9bdd3db0189e06ddf21034' #  sensors-fix.patch
-         )
+        '1c85190d0b8371470d903475e9220630') # fix-kwin-effects.patch
+

 #        '13c3203589143e9e2fc757c17375227a' #  feature_plasma-transparent-panel-v4-rb#472.patch
 #        '7361012da217f9aeeca61f0e9956e1d0' #  feature_brightness-osd.patch
@ -119,6 +124,8 @@ build()
 	patch -Np0 -i ${srcdir}/fix_terminate-server.patch
 	patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
        patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch
+        patch -Np1 -i ${srcdir}/fix-kwin-effects.patch 
+


 # FIXME: update feature patches
@ -136,11 +143,13 @@ build()
 		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
 		-DWITH_Xmms=OFF \
 		-DCMAKE_SKIP_RPATH=ON \
-                -DWITH_PolkitQt=OFF \
 		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
-
 	make

+        # Option for OpenGLES - PLEASE DON'T SHIP THIS YET (ask manutortosa)
+        # -DWITH_OpenGLES=ON \
+        # -DKWIN_BUILD_WITH_OPENGLES=ON \
+
 	msg "starting kcm_touchpad build ..."
 	cd ${srcdir}/mishaaq-kcm_touchpad-00370b5
        # Fix desktop to the new layout
@ -148,8 +157,6 @@ build()

 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
 		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
-		-DWITH_Xmms=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'

 	msg "starting kcm_tablet build ..."
@ -159,16 +166,12 @@ build()

 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
 		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
-		-DWITH_Xmms=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'

 	msg "starting favorites launcher build ..."
 	cd ${srcdir}/favorites-0.1
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
 		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
-		-DWITH_Xmms=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'

 	make
@ -186,7 +189,7 @@ package_kde-workspace()
 # FIXME don't find google-gadgets
 # NOTE keep in sync with depends
 	depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}" 'qimageblitz'
-	         'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' "xkit"
+	         'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' "xkit" #'libgles' 'libegl'
 	         'libxdamage' 'xorg-utils' 'libxrandr' 'libxres' 'libdmtx' 'libqalculate' 'prison' 'qrencode' "kdepim-runtime>=${_kdever}")

 	optdepends=("kdebindings-pykde4 : Python Support for Plasma"
--- a/kde-workspace/fix-kwin-effects.patch
+++ b/kde-workspace/fix-kwin-effects.patch
@ -0,0 +1,84 @@
+--- a/kwin/effects.cpp
+++ b/kwin/effects.cpp
+@@ -200,7 +200,7 @@ void EffectsHandlerImpl::reconfigure()
+ void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time)
+ {
+     if (current_paint_screen < loaded_effects.size()) {
+-        loaded_effects[current_paint_screen++].second->prePaintScreen(data, time);
+        loaded_effects.at(current_paint_screen++).second->prePaintScreen(data, time);
+         --current_paint_screen;
+     }
+     // no special final code
+@@ -209,7 +209,7 @@ void EffectsHandlerImpl::prePaintScreen(
+ void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& data)
+ {
+     if (current_paint_screen < loaded_effects.size()) {
+-        loaded_effects[current_paint_screen++].second->paintScreen(mask, region, data);
+        loaded_effects.at(current_paint_screen++).second->paintScreen(mask, region, data);
+         --current_paint_screen;
+     } else
+         scene->finalPaintScreen(mask, region, data);
+@@ -218,7 +218,7 @@ void EffectsHandlerImpl::paintScreen(int
+ void EffectsHandlerImpl::postPaintScreen()
+ {
+     if (current_paint_screen < loaded_effects.size()) {
+-        loaded_effects[current_paint_screen++].second->postPaintScreen();
+        loaded_effects.at(current_paint_screen++).second->postPaintScreen();
+         --current_paint_screen;
+     }
+     // no special final code
+@@ -227,7 +227,7 @@ void EffectsHandlerImpl::postPaintScreen
+ void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time)
+ {
+     if (current_paint_window < loaded_effects.size()) {
+-        loaded_effects[current_paint_window++].second->prePaintWindow(w, data, time);
+        loaded_effects.at(current_paint_window++).second->prePaintWindow(w, data, time);
+         --current_paint_window;
+     }
+     // no special final code
+@@ -236,7 +236,7 @@ void EffectsHandlerImpl::prePaintWindow(
+ void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data)
+ {
+     if (current_paint_window < loaded_effects.size()) {
+-        loaded_effects[current_paint_window++].second->paintWindow(w, mask, region, data);
+        loaded_effects.at(current_paint_window++).second->paintWindow(w, mask, region, data);
+         --current_paint_window;
+     } else
+         scene->finalPaintWindow(static_cast<EffectWindowImpl*>(w), mask, region, data);
+@@ -245,7 +245,7 @@ void EffectsHandlerImpl::paintWindow(Eff
+ void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, double opacity, double frameOpacity)
+ {
+     if (current_paint_effectframe < loaded_effects.size()) {
+-        loaded_effects[current_paint_effectframe++].second->paintEffectFrame(frame, region, opacity, frameOpacity);
+        loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame(frame, region, opacity, frameOpacity);
+         --current_paint_effectframe;
+     } else {
+         const EffectFrameImpl* frameImpl = static_cast<const EffectFrameImpl*>(frame);
+@@ -256,7 +256,7 @@ void EffectsHandlerImpl::paintEffectFram
+ void EffectsHandlerImpl::postPaintWindow(EffectWindow* w)
+ {
+     if (current_paint_window < loaded_effects.size()) {
+-        loaded_effects[current_paint_window++].second->postPaintWindow(w);
+        loaded_effects.at(current_paint_window++).second->postPaintWindow(w);
+         --current_paint_window;
+     }
+     // no special final code
+@@ -273,7 +273,7 @@ bool EffectsHandlerImpl::provides(Effect
+ void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data)
+ {
+     if (current_draw_window < loaded_effects.size()) {
+-        loaded_effects[current_draw_window++].second->drawWindow(w, mask, region, data);
+        loaded_effects.at(current_draw_window++).second->drawWindow(w, mask, region, data);
+         --current_draw_window;
+     } else
+         scene->finalDrawWindow(static_cast<EffectWindowImpl*>(w), mask, region, data);
+@@ -282,7 +282,7 @@ void EffectsHandlerImpl::drawWindow(Effe
+ void EffectsHandlerImpl::buildQuads(EffectWindow* w, WindowQuadList& quadList)
+ {
+     if (current_build_quads < loaded_effects.size()) {
+-        loaded_effects[current_build_quads++].second->buildQuads(w, quadList);
+        loaded_effects.at(current_build_quads++).second->buildQuads(w, quadList);
+         --current_build_quads;
+     }
+ }
+
--- a/kdeaccessibility/PKGBUILD
+++ b/kdeaccessibility/PKGBUILD
@ -28,7 +28,7 @@ license=('GPL' 'LGPL' 'FDL')
 install=${pkgbase}.install
 options=('!splithdr' 'splitdbg' 'log')

-makedepends=('pkgconfig' 'cmake' 'automoc4' "kde-runtime>=${_kdever}" "kdelibs>=${_kdever}" "speech-dispatcher>=0.6.7" 'opentts')
+makedepends=('pkgconfig' 'cmake' 'automoc4' "kde-runtime>=${_kdever}" "kdelibs>=${_kdever}" "speech-dispatcher>=0.6.7" 'docbook-xsl')

 source=($_mirror/${pkgbase}-$_kdever.tar.bz2)
 md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
@ -121,7 +121,7 @@ package_kdeaccessibility-kmouth()
 package_kdeaccessibility-jovie()
 {
 	pkgdesc="Text-to-speech system"
-	depends=("kde-runtime>=${_kdever}" "kdelibs>=${_kdever}" "speech-dispatcher>=0.6.7" 'opentts')
+	depends=("kde-runtime>=${_kdever}" "kdelibs>=${_kdever}" "speech-dispatcher>=0.6.7")
 	conflicts=("kdeaccessibility-doc")
 	replaces=("${pkgbase}-kttsd" "${pkgbase}-ksayit")
 	groups=("${pkgbase}" "kde" "kde-uninstall")
--- a/kdebindings-kimono/PKGBUILD
+++ b/kdebindings-kimono/PKGBUILD
@ -32,7 +32,8 @@ build()
 {
 	cd ${srcdir}/${_pkgname}-${pkgver}
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
-                -DCMAKE_INSTALL_PREFIX=${_installprefix} 
+                -DCMAKE_INSTALL_PREFIX=${_installprefix} \
+		-DWITH_Soprano=OFF       # FIXME: the soprano/nepomuk bindings for mono are not compiling atm
        make
 }

--- a/kdebindings-kross-interpreters/PKGBUILD
+++ b/kdebindings-kross-interpreters/PKGBUILD
@ -13,12 +13,12 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 pkgname=kdebindings-kross-interpreters
 _pkgname=kross-interpreters
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE interpreters for Kross"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-depends=("kdebindings-pykde4>=${_kdever}" "kdebindings-korundum>=${_kdever}")
+depends=("kdebindings-pykde4>=${_kdever}" "kdebindings-korundum>=${_kdever}" "java-runtime")
 makedepends=('cmake' 'automoc4' 'ruby' 'python2' 'openjdk6')
 source=("$_mirror/${_pkgname}-$_kdever.tar.bz2")
 md5sums=(`grep ${_pkgname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
@ -30,9 +30,11 @@ build()
 {
 	cd ${srcdir}/${_pkgname}-${pkgver}

-	# FIXME; ruby and java are not compiling atm
+	# FIXME; ruby is not compiling atm
 	sed -i -e "s~macro_optional_add_subdirectory(ruby)~~g" CMakeLists.txt
-	sed -i -e "s~macro_optional_add_subdirectory(java)~~g" CMakeLists.txt
+
+	# Enable this to disable Java:
+	# sed -i -e "s~macro_optional_add_subdirectory(java)~~g" CMakeLists.txt
  
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
                -DCMAKE_INSTALL_PREFIX=${_installprefix} 
--- a/kdebindings-perlqt/PKGBUILD
+++ b/kdebindings-perlqt/PKGBUILD
@ -13,12 +13,12 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 pkgname=kdebindings-perlqt
 _pkgname=perlqt
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="Perl bindings for the Qt libraries"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-depends=("kdebindings-smokeqt>=${_kdever}")
+depends=("kdebindings-smokeqt>=${_kdever}" 'qwt')
 makedepends=('cmake' 'automoc4' "kdebindings-smokegen>=${_kdever}" 'qwt' "kdesdk-kate>=$Â{_kdever}")
 source=("$_mirror/${_pkgname}-$_kdever.tar.bz2")
 md5sums=(`grep ${_pkgname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
--- a/kdebindings-qtruby/PKGBUILD
+++ b/kdebindings-qtruby/PKGBUILD
@ -13,13 +13,13 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 pkgname=kdebindings-qtruby
 _pkgname=qtruby
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt bindings for ruby"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 depends=("kdebindings-smokeqt>=${_kdever}" "ruby")
-makedepends=('cmake' 'automoc4' "kdebindings-smokegen>=${_kdever}")
+makedepends=('cmake' 'automoc4' "kdebindings-smokegen>=${_kdever}" "qwt")
 source=("$_mirror/${_pkgname}-$_kdever.tar.bz2")
 md5sums=(`grep ${_pkgname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 conflicts=('kdebindings-common')
@ -31,7 +31,7 @@ build()
 {
 	cd ${srcdir}/${_pkgname}-${pkgver}
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
-                -DCMAKE_INSTALL_PREFIX=${_installprefix} 
+                -DCMAKE_INSTALL_PREFIX=${_installprefix}
        make
 }

--- a/kdebindings-smokeqt/PKGBUILD
+++ b/kdebindings-smokeqt/PKGBUILD
@ -13,13 +13,13 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 pkgname=kdebindings-smokeqt
 _pkgname=smokeqt
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-depends=("kde-runtime>=${_kdever}" 'qimageblitz' 'qscintilla' 'qwt')
-makedepends=('cmake' 'automoc4' "kdebindings-smokegen>=${_kdever}")
+depends=("kde-runtime>=${_kdever}" 'qimageblitz' 'qscintilla')
+makedepends=('cmake' 'automoc4' "kdebindings-smokegen>=${_kdever}" "qwt")
 source=("$_mirror/${_pkgname}-$_kdever.tar.bz2")
 md5sums=(`grep ${_pkgname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 groups=("kde" "kdebindings" "kde-uninstall")
@ -30,13 +30,13 @@ build()
 {
 	cd ${srcdir}/${_pkgname}-${pkgver}
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
-                -DCMAKE_INSTALL_PREFIX=${_installprefix} 
+                -DCMAKE_INSTALL_PREFIX=${_installprefix}
        make
 }

 package()
 {
 	cd ${srcdir}/${_pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install 

 }
--- a/kdeedu-step/PKGBUILD
+++ b/kdeedu-step/PKGBUILD
@ -20,7 +20,7 @@ arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 depends=("kde-runtime>=${_kdever}" 'libqalculate' 'gsl' 'eigen')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'docbook-xsl')
 provides=('step')
 groups=("kde" "kdeedu" "kde-uninstall")
 options=('!splithdr' 'splitdbg' 'log')
--- a/kdegraphics-gwenview/PKGBUILD
+++ b/kdegraphics-gwenview/PKGBUILD
@ -20,6 +20,7 @@ url="http://kde.org/applications/graphics/gwenview/"
 license=('GPL' 'LGPL' 'FDL')
 depends=("kde-runtime>=${_kdever}" "kdegraphics-libkipi>=${_kdever}")
 makedepends=('cmake' 'automoc4' "kde-baseapps-konqueror>=${_kdever}")
+opdepends=('kdegraphics-kamera: to work directly with cameras')
 source=("$_mirror/${_pkgname}-$_kdever.tar.bz2")
 md5sums=(`grep ${_pkgname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 install=${pkgname}.install
--- a/kdelibs/PKGBUILD
+++ b/kdelibs/PKGBUILD
@ -17,7 +17,7 @@ pkgname=('kdelibs' 'kdelibs-doc')

 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2

 pkgdesc="split package"
 url="http://www.kde.org"
@ -29,7 +29,7 @@ makedepends=("${_qtpkg}>=${_qtver}" "kde-common>=${_kdever}" "oxygen-icons>=${_k
 	'pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'aspell' 'hspell' 'libxslt'
 	'shared-mime-info' 'upower' 'udisks' 'hal' 'xz>=5.0.0' 'enchant' 'jasper' 'openexr' 'giflib'
 	'strigi>=0.7.5' 'libxtst' 'soprano' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt>=0.98.1'
-	'libxss' 'phonon' 'shared-desktop-ontologies>=0.7' 'attica>=0.2.0' 'heimdal' 'libxcursor'
+	'libxss' 'phonon' 'shared-desktop-ontologies>=0.7' 'attica>=0.2.0' 'krb5' 'libxcursor'
 	'hicolor-icon-theme' 'docbook-xsl' 'docbook-xml' 'dbusmenu-qt-git' 'grantlee-git' 'bzip2>=1.0.6' 'libzip')

 replaces=('arts' 'kdelibs-experimental')
@ -37,12 +37,14 @@ replaces=('arts' 'kdelibs-experimental')
 source=($_mirror/${_origname}-$_kdever.tar.bz2
 	01_chakra_tag.patch
 	02_kde_applications_menu.patch
-	03_chakra_menu.patch)
+	03_chakra_menu.patch
+        fix-kdirwatch.patch)

 md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
         '40ba51f0c50ced94dfffe667ec856950'  # 01_chakra_tag.patch
         'e94450ba5430ea9c1e33bad9ae38ca2d'  # 02_kde_applications_menu.patch
-         '53b85403e4dd8f9146933c52ca23243e') # 03_chakra_menu.patch
+         '53b85403e4dd8f9146933c52ca23243e'  # 03_chakra_menu.patch
+         'd8219059f24fa060d975dd008a3a5b05') # fix-kdirwatch.patch
        
 #
 # build function
@ -58,7 +60,8 @@ build()
 	patch -Np1 -i ${srcdir}/03_chakra_menu.patch || return 1

 	# fixes
-	# msg "applying fixes ..."
+	msg "applying fixes ..."
+        patch -Np1 -i ${srcdir}/fix-kdirwatch.patch || return 1

        cd ..

@ -87,7 +90,7 @@ package_kdelibs()
 	depends=("${_qtpkg}>=${_qtver}" "kde-common>=${_kdever}" "oxygen-icons>=${_kdever}"
 		 'shared-mime-info' 'upower' 'udisks' 'xz>=5.0.0' 'enchant' 'jasper' 'openexr' 'giflib'
 		 'strigi' 'libxtst' 'soprano' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt>=0.98.1'
-		 'libxss' 'phonon' 'shared-desktop-ontologies>=0.5' 'attica>=0.2.0' 'heimdal' 'libxcursor'
+		 'libxss' 'phonon' 'shared-desktop-ontologies>=0.5' 'attica>=0.2.0' 'krb5' 'libxcursor'
 		 'hicolor-icon-theme' 'dbusmenu-qt-git' 'grantlee-git')

 	optdepends=('phonon-gstreamer : GStreamer Phonon backend (default)'
@ -96,7 +99,8 @@ package_kdelibs()
 		    'phonon-vlc       : VLC Phonon backend'
 		    'avahi            : Service discovery on your local network'
 		    'aspell           : Spell checking'
-		    'hspell           : Hebrew spell checking')
+		    'hspell           : Hebrew spell checking'
+		    'hal              : Optional hardware abstraction layer for Solid')

 	provides=("${_origname}=${_kdever}")
 	replaces=('kdelibs-experimental')
--- a/kdelibs/fix-kdirwatch.patch
+++ b/kdelibs/fix-kdirwatch.patch
@ -0,0 +1,33 @@
+--- a/kdecore/io/kdirwatch.cpp
+++ b/kdecore/io/kdirwatch.cpp
+@@ -210,16 +210,24 @@ KDirWatchPrivate::KDirWatchPrivate()
+   {
+     struct utsname uts;
+     int major, minor, patch;
+-    if (uname(&uts) < 0)
+-      supports_inotify = false; // *shrug*
+-    else if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3)
+-      supports_inotify = false; // *shrug*
+-    else if( major * 1000000 + minor * 1000 + patch < 2006014 ) { // <2.6.14
+-      kDebug(7001) << "Can't use INotify, Linux kernel too old";
+    if (uname(&uts) < 0) {
+       supports_inotify = false;
+      kDebug(7001) << "Unable to get uname";
+    } else if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) {
+      supports_inotify = false;
+      kDebug(7001) << "The version is malformed: " << uts.release;
+    } else if(major == 2 && minor == 6) { // If it is 2.6 check further...
+      if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) {
+        supports_inotify = false;
+        kDebug() << "Detected 2.6 kernel but can't know more: " << uts.release;
+      } else if (major * 1000000 + minor * 1000 + patch < 2006014 ){
+        supports_inotify = false;
+        kDebug(7001) << "Can't use INotify, Linux kernel too old " << uts.release;
+      }
+     }
+   }
+ 
+  kDebug() << "INotify available: " << supports_inotify;
+   if ( supports_inotify ) {
+     availableMethods << "INotify";
+     fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC)
--- a/kdenetwork/PKGBUILD
+++ b/kdenetwork/PKGBUILD
@ -30,7 +30,7 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qca-ossl' 
 	     "kde-workspace>=${_kdever}" "kde-baseapps>=${_kdever}" 'libvncserver' 'libmsn' 'libmms'
 	     'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'libgadu' 
-	     'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5' 'msilbc')
+	     'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5' 'msilbc' 'docbook-xsl')

 source=("$_mirror/${pkgbase}-$_kdever.tar.bz2"
        'lisa.daemon')
--- a/kdepimlibs/PKGBUILD
+++ b/kdepimlibs/PKGBUILD
@ -25,7 +25,7 @@ license=('GPL' 'LGPL' 'FDL')
 install=${_origname}.install
 options=('docs' '!splithdr' 'splitdbg' 'log')
 depends=("kdelibs>=${_kdever}" 'akonadi>=1.5.80' 'libical' 'gpgme' 'prison')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap' 'prison')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap' 'prison' 'docbook-xsl')

 groups=("kde" "kde-uninstall" "kde-minimal")

--- a/kdeplasma-addons/PKGBUILD
+++ b/kdeplasma-addons/PKGBUILD
@ -82,7 +82,7 @@ pkgname=('kdeplasma-addons-applets-bball'
         'kdeplasma-addons-wallpapers-weather')
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1

 pkgdesc="KDE Plasma Addons"
 url="http://www.kde.org/"
@ -92,19 +92,19 @@ depends=("kde-workspace>=${_kdever}" 'libqalculate' "kdeedu-marble>=${_kdever}"
 makedepends=('pkgconfig' 'cmake' 'automoc4' "kde-workspace>=${_kdever}" 'libqalculate'
             "kdegraphics-libkexiv2>=${_kdever}" "kdeedu-marble>=${_kdever}" 'eigen' 'scim' 'qwt')

-source=($_mirror/${pkgbase}-$_kdever.tar.bz2
-        http://chakra-project.org/sources/kdeplasma-addons/kdeplasma-addons-4127af9b305485be34fd9ae7d6be7fab29b73a55.diff)
-md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
-         4d34c126e683289b248ebfa7afa67e06)
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2)
+        #http://chakra-project.org/sources/kdeplasma-addons/kdeplasma-addons-4127af9b305485be34fd9ae7d6be7fab29b73a55.diff)
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+         #4d34c126e683289b248ebfa7afa67e06)


 build() {
 	cd $srcdir

 	# fixed in 4.7.1
-	cd ${pkgbase}-${pkgver}
-	patch -Np1 -i $srcdir/kdeplasma-addons-4127af9b305485be34fd9ae7d6be7fab29b73a55.diff
-	cd ..
+	#cd ${pkgbase}-${pkgver}
+	#patch -Np1 -i $srcdir/kdeplasma-addons-4127af9b305485be34fd9ae7d6be7fab29b73a55.diff
+	#cd ..

 	mkdir -p build
 	cd build
--- a/kdesdk/PKGBUILD
+++ b/kdesdk/PKGBUILD
@ -52,7 +52,9 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kde-runtime>=${_kdever}" 'a
             "kdepimlibs>=${_kdever}" 'subversion' "kdebindings-pykde4>=${_kdever}" "kde-baseapps-konqueror>=${_kdever}" 'java-runtime')

 source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
+        #"fix-lokalize-project-view.patch")
 md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+         #'80b25fe3f0f43115c93ee758bb8d00fd')

 #
 # build function
@ -61,11 +63,12 @@ build()
 {
 	cd ${srcdir}/${pkgbase}-${pkgver}

+	#patch -Np0 -i ${srcdir}/fix-lokalize-project-view.patch
+
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
 		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
+		-DCMAKE_SKIP_RPATH=ON 
 	make || return 1
 }

--- a/kdeutils/PKGBUILD
+++ b/kdeutils/PKGBUILD
@ -11,8 +11,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 # package info
 #
 pkgbase=('kdeutils')
-pkgname=('kdeutils-doc'
-         'kdeutils-ark'
+pkgname=('kdeutils-ark'
         'kdeutils-kcalc'
         'kdeutils-kcharselect'
         'kdeutils-kdf'
@ -38,10 +37,11 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}"
             'system-config-printer-common' 'libarchive' 'qimageblitz'
             'p7zip' 'zip' 'unzip' 'unrar' "kdepim-runtime>=${_kdever}")

-source=($_mirror/${pkgbase}-$_kdever.tar.bz2)
+source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
 md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)


+
 #
 # build function
 #
@ -65,25 +65,12 @@ build()
 # split-install functions
 #

-package_kdeutils-doc()
-{
-	pkgdesc="KDE Utilities - Documentation"
-	depends=()
-	groups=("kde" "kdeutils" "kde-doc" "kde-uninstall")
-
-	splitdirs="doc"
-		for i in ${splitdirs} ; do
-			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
-		done
-}
-
 package_kdeutils-ark()
 {
 	pkgdesc="Archiver for various compression formats"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}" 'libarchive')
 	optdepends=('p7zip' 'zip' 'unzip' 'unrar')
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -98,7 +85,7 @@ package_kdeutils-kcalc()
 {
 	pkgdesc="Scientific calculator"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -113,7 +100,7 @@ package_kdeutils-kcharselect()
 {
 	pkgdesc="Character selector"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -128,7 +115,7 @@ package_kdeutils-kdelirc()
 {
 	pkgdesc="KDE Linux infrared remote control server."
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -147,7 +134,7 @@ package_kdeutils-kdessh()
 {
 	pkgdesc="A KDE frontend to SSH"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -162,7 +149,7 @@ package_kdeutils-kdf()
 {
 	pkgdesc="KDE diskfree"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -177,7 +164,7 @@ package_kdeutils-kfloppy()
 {
 	pkgdesc="Floppy formatter"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -192,7 +179,7 @@ package_kdeutils-kgpg()
 {
 	pkgdesc="GPG encryption and key management"
 	depends=("kde-runtime>=${_kdever}" "kdelibs>=${_kdever}" "kdepimlibs>=${_kdever}" 'kde-agent') # "kdepim-runtime>=${_kdever}"
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -207,7 +194,7 @@ package_kdeutils-ktimer()
 {
 	pkgdesc="Timer application"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -222,7 +209,7 @@ package_kdeutils-kwallet()
 {
 	pkgdesc="The KDE wallet system"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -237,7 +224,7 @@ package_kdeutils-printer-applet()
 {
 	pkgdesc="A system tray utility that shows current print jobs, printer warnings and errors"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}" "kdebindings-pykde4>=${_kdever}" 'system-config-printer-common')
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -252,7 +239,7 @@ package_kdeutils-superkaramba()
 {
 	pkgdesc="Desktop widgets"
 	depends=('qimageblitz')
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

@ -267,7 +254,7 @@ package_kdeutils-sweeper()
 {
 	pkgdesc="Clean unwanted traces the user leaves on the system"
 	depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
-	conflicts=("kdeutils-common")
+	conflicts=("kdeutils-common" "kdeutils-doc")
 	groups=("kde" "kdeutils" "kde-uninstall")
 	install=${pkgbase}.install

--- a/support-pkg-akonadi/PKGBUILD
+++ b/support-pkg-akonadi/PKGBUILD
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=akonadi
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://www.akonadi-project.org'
@ -20,22 +20,18 @@ install=$pkgname.install
 source=("ftp://ftp.gtlib.cc.gatech.edu/pub/kde/stable/akonadi/src//${pkgname}-${pkgver}.tar.bz2")
 md5sums=('16bc40e022d06f287f18c71faaeb2e42')

-build() 
-{
- 	cd ${srcdir}/${pkgname}-${pkgver}
-	
-	cd ${srcdir}
-	mkdir -p build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
-	make || return 1
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
+  make
 }

-package() 
-{
-  	cd ${srcdir}/build
-	make DESTDIR=${pkgdir} install
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
--- a/support-pkg-libdmtx/PKGBUILD
+++ b/support-pkg-libdmtx/PKGBUILD
@ -6,7 +6,7 @@
 
 pkgname=libdmtx
 pkgver=0.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="software for reading and writing Data Matrix 2D barcodes"
 url=('http://www.libdmtx.org/')
 arch=('i686' 'x86_64')
@ -16,8 +16,8 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver
 md5sums=('e23705cd9bd40b9d7cf1e7c750c67ca5')

 build() {
-cd $srcdir/${pkgname}-${pkgver}
-./configure --prefix=/usr
-make
-make DESTDIR="$pkgdir/" install || return 1
-}
+	cd $srcdir/${pkgname}-${pkgver}
+	./configure --prefix=/usr
+	make
+	make DESTDIR="$pkgdir/" install || return 1
+}
--- a/support-pkg-libktorrent/PKGBUILD
+++ b/support-pkg-libktorrent/PKGBUILD
@ -5,9 +5,9 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=libktorrent
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
-ktorver=4.1.1
+ktorver=4.1.2
 pkgdesc="A BitTorrent program for KDE"
 arch=('i686' 'x86_64')
 url="http://ktorrent.org"
@ -16,7 +16,7 @@ depends=('kdelibs')
 makedepends=('autoconf' 'perl' 'automoc4' 'cmake' 'kdepimlibs' 'kdebase-workspace')
 source=(http://ktorrent.org/downloads/${ktorver}/libktorrent-${pkgver}.tar.bz2)
 options=('libtool')
-md5sums=('96de8dd6d6cea4255ce946bb4cd69836')
+md5sums=('471b25afc48e195723ac1e264c8a0fc5')

 build() {
  cd ${srcdir}
--- a/support-pkg-musicbrainz/PKGBUILD
+++ b/support-pkg-musicbrainz/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=musicbrainz
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Library That Provides Access to the MusicBrainz Server  "
 url="http://musicbrainz.org/"
 arch=('i686' 'x86_64')
--- a/support-pkg-soprano/PKGBUILD
+++ b/support-pkg-soprano/PKGBUILD
@ -8,19 +8,19 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=soprano
-pkgver=2.6.51
+pkgver=2.7.0
 pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64')
 url='http://soprano.sourceforge.net/'
 license=('GPL' 'LGPL')
-depends=('qt' 'clucene' 'redland' 'libiodbc' 'virtuoso>=6.1.3')
-makedepends=('cmake' 'openjdk6')
+depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso>=6.1.3')
+makedepends=('cmake' 'openjdk6' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('574e006a15e61bc2d4d07d2b4a36e2b6')
+md5sums=('52f216c82e731499bb25bf3b4cf0eecb')

 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
  mkdir build
  cd build
  . /etc/profile.d/openjdk6.sh
@ -28,11 +28,12 @@ build() {
  cmake ../${pkgname}-${pkgver} \
    -DCMAKE_BUILD_TYPE=Release \
    -DCMAKE_SKIP_RPATH=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSOPRANO_DISABLE_CLUCENE_INDEX=ON
  make
 }

 package() {
-  cd ${srcdir}/build
+  cd "${srcdir}"/build
  make DESTDIR="${pkgdir}" install
 }
--- a/tools-pkg-appset-qt/PKGBUILD
+++ b/tools-pkg-appset-qt/PKGBUILD
@ -3,8 +3,8 @@
 # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626

 pkgname=appset-qt
-pkgver=0.6.0
-pkgrel=1
+pkgver=0.6.4
+pkgrel=2
 pkgdesc="An advanced and feature rich Package Manager Frontend"
 arch=('i686' 'x86_64')
 url="http://appset.sourceforge.net/"
@ -12,46 +12,22 @@ license=('GPL2')
 depends=('qt>=4.7')
 optdepends=('ccr: For Community Repository support')
 install=${pkgname}.install
-source=(http://sourceforge.net/projects/appset/files/appset-qt/0.6/0.6.0/appset-qt-0.6.0-sources.tar.gz
+source=(http://sourceforge.net/projects/appset/files/appset-qt/0.6/$pkgver/appset-qt-$pkgver-sources.tar.gz
        http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz
-        http://chakra-project.org/sources/$pkgname/$pkgname-0.6.0-chakra.patch
-        #http://chakra-project.org/sources/$pkgname/add-chinese-taiwan.patch
-        #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.5.0.tar.gz
-        #http://chakra-project.org/sources/$pkgname/appset-qt_de-0.6.0.tar.gz
-        #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz
-        #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.5.0.tar.gz
-        #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.5.0.tar.gz
-        #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz
-        #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz
-        #http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.5.0.tar.gz       
+        http://chakra-project.org/sources/$pkgname/$pkgname-0.6.4-chakra.patch
        )
-md5sums=(8c1792d2c0d94504aacef8eacbf7f088
+md5sums=(f2203af08a370ff5b8e60820833cc313
         87f5f278e3fe67ed2cd6165c2835d81b
-         152d4461282a4d39d12f15041d1c34d3
-         #7de9e3d87fb4258174af214b291b5444 # add-chinese-taiwan.patch
-         #c2fbac4cab7443f60ee00e48a4d537e3 # appset-qt_ca.0.5.0.tar.gz
-         #ee8905fa99ff80485be3d69d2ce7c4f0 # appset-qt_de-0.6.0.tar.gz
-         #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz
-         #f04f8aa20631feca91bbde3519bfcf48 # appset-qt_es.0.5.0.tar.gz
-         #fa69077be4ac7c409df87ab256c97919 # appset-qt_fr.0.5.0.tar.gz
-         #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz
-         #53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz
-         #f75199ceb618cb580efcd57b89301f6b # appset-qt_zh-tw-0.5.0.tar.gz
+         06a6d41e1c959a7861c8d0a76dd13b4e
         )

 build() {
-  cd $srcdir/$pkgname-0.6.0-sources
+  cd $srcdir/$pkgname-$pkgver-sources
  # copy oxygen icons
  cp -v ../*png Qt/AppSet-Qt

  # patch it for Chakra GNU/Linux
-  patch -Np1 -i ${startdir}/src/$pkgname-0.6.0-chakra.patch
-
-  # add chakra translations (check upstream)
-  #patch -Np1 -i ${startdir}/src/add-chinese-taiwan.patch
-  #cp -v ../appsetrepoeditor-qt*.ts Qt/AppSetRepoEditor-Qt
-  #cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt
-  #cp -v ../appset-qt*.ts Qt/AppSet-Qt
+  patch -Np1 -i ${startdir}/src/$pkgname-0.6.4-chakra.patch

  # check for updated strings
  cd Qt/AppSet-Qt
@ -73,12 +49,12 @@ build() {
 }

 package() {
-    cd $srcdir/$pkgname-0.6.0-sources
+    cd $srcdir/$pkgname-$pkgver-sources

    make INSTALL_ROOT="$pkgdir/" install

    #helper daemon
    install -m 755 -d "$pkgdir/etc/rc.d" || return 1
-    install -m 755 "$srcdir/$pkgname-0.6.0-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
+    install -m 755 "$srcdir/$pkgname-$pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
 }

--- a/tools-pkg-bluedevil/PKGBUILD
+++ b/tools-pkg-bluedevil/PKGBUILD
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=bluedevil
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc='The new bluetooth stack for KDE, it is composed of: KCM, KDED, KIO, Library and some other small applications'
 arch=('i686' 'x86_64')
 url="http://gitorious.org/bluedevil"
--- a/tools-pkg-cbundle/PKGBUILD
+++ b/tools-pkg-cbundle/PKGBUILD
@ -5,7 +5,7 @@
 # (c) 2010 Drake Justice

 pkgname=cbundle
-pkgver=0.4.6.4
+pkgver=0.4.6.7
 pkgrel=1
 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse' 'sh')
 makedepends=('qt' 'automoc4' 'kde-workspace')
@ -15,7 +15,7 @@ license=('GPL')
 url="http://chakra-project.org/"

 source=("http://chakra-project.org/sources/cinstall/cbundle-$pkgver.tar.xz")
-md5sums=('b85e3ed5eb96ef5adbc88879f6c68787')
+md5sums=('0efc24f78a0925f7e98e1f444ac7a416')

 # create tarball: source PKGBUILD && mksource

--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@ -6,10 +6,10 @@
 # (c) 2010 Drake Justice

 pkgname=cinstall
-pkgver=0.4.6.8
+pkgver=0.4.6.10
 pkgrel=1
-depends=('rsync' 'cbundle')
-makedepends=('kdelibs' 'qt' 'automoc4' 'libcroco')
+depends=('rsync' 'cbundle' 'kdelibs')
+makedepends=('qt' 'automoc4' 'libcroco')
 pkgdesc="Chakra's Bundle manager"
 arch=("i686" "x86_64")
 license=('GPL')
@ -17,7 +17,7 @@ install=$pkgname.install
 url="http://chakra-project.org/"

 source=("http://chakra-project.org/sources/cinstall/cinstall-$pkgver.tar.xz")
-md5sums=('add89294347b296a4c2a39b222b6f7ec')
+md5sums=('616552f67655684e852a24433bd350fa')

 # create tarball: source PKGBUILD && mksource

--- a/tools-pkg-cinstall/cinstall.install
+++ b/tools-pkg-cinstall/cinstall.install
@ -46,7 +46,7 @@ post_install() {
 			echo "sudoers file already modded"
 		fi

-		chmod -v 0440 /etc/sudoers
+		chmod -v 0440 /etc/sudoers &>/dev/null

 		mkdir -p /etc/cb.conf.d &>/dev/null
 		chmod 775 /etc/cb.conf.d &>/dev/null
@ -104,12 +104,12 @@ post_upgrade() {
 			echo "sudoers file already modded"
 		fi

-		chmod -v 0440 /etc/sudoers
+		chmod -v 0440 /etc/sudoers &>/dev/null

 		mkdir -p /etc/cb.conf.d &>/dev/null
 		chmod 775 /etc/cb.conf.d &>/dev/null
 		chown -R root:bundle /etc/cb.conf.d &>/dev/null
-		rm /etc/cb.conf.d/* -rv
+		rm /etc/cb.conf.d/* -r &>/dev/null

 		echo "update mime-database"      
 		update-mime-database /usr/share/mime &>/dev/null
@ -135,7 +135,7 @@ post_remove() {
 			echo " "
 		fi

-                rm /etc/cb.conf.d -r
+                rm /etc/cb.conf.d -r &>/dev/null

 }

--- a/tools-pkg-colibri/PKGBUILD
+++ b/tools-pkg-colibri/PKGBUILD
@ -9,12 +9,12 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=colibri
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Colibri provides an alternative to KDE4 Plasma notifications."
 arch=('i686' 'x86_64')
 url="http://kde-apps.org/content/show.php/Colibri?content=117147"
 license=('GPL')
-depends=('kdebase-workspace>=4.4')
+depends=('kde-workspace')
 makedepends=('gcc' 'cmake' 'automoc4')
 install=colibri.install
 source=(http://kde-apps.org/CONTENT/content-files/117147-${pkgname}-${pkgver}.tar.bz2)
--- a/tools-pkg-colibri/colibri.install
+++ b/tools-pkg-colibri/colibri.install
@ -1,6 +1,6 @@
 post_install() {
    echo ""
-    echo "Colibri notifications works ONLY with 4.4"
+    echo "Colibri notifications works with 4.4 and higher"
    echo ""
    echo "Enabling Colibri notifications can be a bit tricky:
 - Right-click on the systemtray applet
--- a/tools-pkg-libbluedevil/PKGBUILD
+++ b/tools-pkg-libbluedevil/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=libbluedevil
 pkgver=1.9
-pkgrel=1
+pkgrel=2
 pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack'
 arch=('i686' 'x86_64')
 url="https://projects.kde.org/projects/playground/libs/libbluedevil"
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@ -8,9 +8,8 @@
 # package info
 #
 pkgname=tribe
-pkgver=2011.09.ms3
-#pkgver=2011.07.04.KT
-pkgrel=3
+pkgver=2011.09
+pkgrel=1
 _codename=Edn
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
@ -23,11 +22,11 @@ provides=('tribe')
 replaces=('kdemod-tribe-svn' 'kdemod-tribe')
 conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
 options=('!splithdr' '!splitdbg' 'sign')
-source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
-        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110807.html")
+source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}.tar.xz"
+        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110828.html")
  
-md5sums=('5937264b4d4bddc458812eeceebe7c0e'
-         'e6669ae65a9de5de62dc243270e9c8fb')
+md5sums=('c3d4d239890cc1089d7a639fd7cdf01d'
+         'd8c103e2cfaf97500319387e236afede')
         
 groups=('kde-uninstall')
 install=tools-tribe.install
@ -35,16 +34,13 @@ install=tools-tribe.install
 # create tarball: source PKGBUILD && mksource

 mksource() {
-	  rm -vRf tribe
-	  git clone git://gitorious.org/chakra/tribe.git
-	  #cd ${pkgname}
-	  #git checkout 2011.03
-	  #cd ..
-	  rm -vRf tribe/.git
-	  pushd ${pkgname}
+	  rm -vRf ${pkgname}-${_pkgver}
+	  git clone git://gitorious.org/chakra/${pkgname}.git ${pkgname}-${pkgver}
+	  rm -vRf ${pkgname}-${pkgver}/.git
+	  pushd ${pkgname}-${pkgver}
 	  popd
-	  tar -cvJf ${pkgname}-${pkgver}-${pkgrel}.tar.xz ${pkgname}/*
-	  md5sum ${pkgname}-${pkgver}-${pkgrel}.tar.xz
+	  tar -cvJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
+	  md5sum ${pkgname}-${pkgver}.tar.xz
 }

 #
@ -52,7 +48,7 @@ mksource() {
 #
 build()
 {
-        cd "${srcdir}/$pkgname"
+        cd "${srcdir}/${pkgname}-${pkgver}"

 	# workaround for bug https://bugzilla.novell.com/show_bug.cgi?id=656144
 	#sed -i -e "s~sudo~kdesu~g" "${srcdir}/$pkgname/tribe.desktop"
@ -66,8 +62,8 @@ build()

 	# add pkgver to tribe
 	sed -i -e "s~source build/from git~Build: ${pkgver} ($_codename)~g" config-tribe.h.cmake
-	sed -i -e "s~code-name~$_codename~g" "${srcdir}/$pkgname/scripts/postinstall-functions/job-initialize-target"
-	sed -i -e "s~chakra-version~${pkgver}~g" "${srcdir}/$pkgname/scripts/postinstall-functions/job-initialize-target"
+	sed -i -e "s~code-name~$_codename~g" "${srcdir}/${pkgname}-${pkgver}/scripts/postinstall-functions/job-initialize-target"
+	sed -i -e "s~chakra-version~${pkgver}~g" "${srcdir}/${pkgname}-${pkgver}/scripts/postinstall-functions/job-initialize-target"
 	cmake . -DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
@ -79,10 +75,10 @@ build()

 package()
 {
-        cd "${srcdir}/$pkgname"
+        cd "${srcdir}/${pkgname}-${pkgver}"
 	msg "Make successful, installing..."
 	make DESTDIR=$startdir/pkg install || return 1
-	cp -vf ${srcdir}/RELEASE_NOTES_20110807.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
+	cp -vf ${srcdir}/RELEASE_NOTES_20110828.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html

 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +
--- a/tools-pkg-wicd-client-kde/PKGBUILD
+++ b/tools-pkg-wicd-client-kde/PKGBUILD
@ -5,8 +5,9 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=wicd-client-kde
-pkgver=0.2.1
-pkgrel=3
+_pkgname=wicd-kde
+pkgver=0.2.2
+pkgrel=1
 pkgdesc="Wicd client build on the KDE Development Platform"
 arch=("i686" "x86_64")
 url="http://kde-apps.org/content/show.php/Wicd+Client+KDE?content=132366"
@ -14,13 +15,13 @@ license=('GPL')
 depends=('kdelibs' 'qt' 'wicd')
 conflicts=('networkmanagement')
 makedepends=('cmake' 'automoc4')
-source=("http://kde-apps.org/CONTENT/content-files/132366-wicd-client-kde-0.2.1.tar.gz")
-md5sums=('162ad45b86ea30668316095574efcf81')
+source=("http://kde-apps.org/CONTENT/content-files/132366-${_pkgname}-${pkgver}.tar.gz")
+md5sums=('b335154f13db95d1667db297e0c3da44')

 build() 

 {
-  cd ${srcdir}/${pkgname} || return 1
+  cd ${srcdir}/${_pkgname} || return 1
  

  cmake . -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` || return 1
@ -30,6 +31,6 @@ build()

 package()
 {
-  cd ${srcdir}/${pkgname} || return 1
+  cd ${srcdir}/${_pkgname} || return 1
  make DESTDIR=${pkgdir} install || return 1
 }