kdelibs, diverses corrections 4.6.0-4

3 files changed, 31 insertions, 5 deletions

diff --git a/kde/kdelibs/.md5sum b/kde/kdelibs/.md5sum
index 9f783bdba..6edae5de5 100644
--- a/kde/kdelibs/.md5sum
+++ b/kde/kdelibs/.md5sum
@@ -1,2 +1,3 @@
 2b30cc3e382e99333e7ff388943473e9  kde-applications-menu.patch
+b21f9b2c0f9af0f658ceaf2f8dcc334d  kdelibs-4.6.0-fix-crash-in-plasma.patch
 9ee32f375809a42a4a8d512bd06a612b  kdelibs-4.6.0.tar.bz2
diff --git a/kde/kdelibs/Pkgfile b/kde/kdelibs/Pkgfile
index 6dad89fc4..74696d4ae 100755
--- a/kde/kdelibs/Pkgfile
+++ b/kde/kdelibs/Pkgfile
@@ -2,19 +2,23 @@
 # URL: http://www.kde.org
 # Maintainer: NuTyX packager Team
 # Packager: lesibel at free dot fr
-# Depends on: cmake, qt, polkit-qt, libdbusmenu-qt, gamin, automoc4, xz-utils, qt, strigi, soprano, qca, eigen2, gmm, dbus, jasper, openexr, giflib, avahi, enchant, pcre, shared-mime-info, kerberos, acl, attica, shared-desktop-ontologies, libcups, phonon, docbook-xsl, grantlee, udisks 
+# Depends on: automoc4, cmake, qt, xorg-libxscrnsaver, polkit-qt, libdbusmenu-qt, xz-utils, strigi, attica, soprano, qca, gmm, jasper, openexr, giflib, avahi, enchant, shared-mime-info, kerberos, shared-desktop-ontologies, phonon, docbook-xsl, grantlee, udisks, upower
 
-# Run on: polkit-qt,libdbusmenu-qt,gamin,xz-utils,qt,strigi,soprano,qca,eigen2,gmm,dbus,jasper,openexr,giflib,avahi,enchant,pcre,shared-mime-info,kerberos,acl,attica,shared-desktop-ontologies,libcups,phonon,grantlee,udisks
+# Run on: polkit-qt,libdbusmenu-qt,xz-utils,qt,strigi,soprano,qca,gmm,dbus,jasper,openexr,giflib,avahi,enchant,shared-mime-info,kerberos,attica,shared-desktop-ontologies,phonon,grantlee,udisks,upower
 
 name=kdelibs
 version=4.6.0
-release=2
+release=4
 source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 \
-	http://nutyx.meticul.eu/files/patchs/$name/kde-applications-menu.patch)
+	http://nutyx.meticul.eu/files/patchs/$name/kde-applications-menu.patch
+	kdelibs-4.6.0-fix-crash-in-plasma.patch)
 
 build() {
 	cd $name-*
+
 	patch -p1 -i $SRC/kde-applications-menu.patch
+	patch -p1 -i $SRC/kdelibs-4.6.0-fix-crash-in-plasma.patch
+
 	sed -i "s/Ethais/Attapu/" plasma/theme.cpp
 	mkdir build
 	cd build
@@ -29,7 +33,6 @@ build() {
                -DKAUTH_BACKEND=PolkitQt-1
 	make
 	make DESTDIR=$PKG install
-#	rm -r $PKG/usr/share/doc
 	rm -f $PKG/usr/share/apps/kssl/ca-bundle.crt
        	ln -sf /etc/ssl/certs/ca-certificates.crt $PKG/usr/share/apps/kssl/ca-bundle.crt
 }
diff --git a/kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch b/kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch
new file mode 100644
index 000000000..5fd8d0a5c
--- /dev/null
+++ b/kde/kdelibs/kdelibs-4.6.0-fix-crash-in-plasma.patch
@@ -0,0 +1,22 @@
+commit 709f75ac353cd735ccac31f87363ea90dde345d3
+Author: Marco Martin <notmart@gmail.com>
+Date:   Tue Feb 1 21:15:49 2011 +0100
+
+    don't collapse when it's destroying
+    try to not crash upon deletion of the extender
+
+diff --git a/plasma/extenders/extenderitem.cpp b/plasma/extenders/extenderitem.cpp
+index bdbc886..3e5809f 100644
+--- a/plasma/extenders/extenderitem.cpp
++++ b/plasma/extenders/extenderitem.cpp
+@@ -596,6 +596,10 @@ void ExtenderItem::destroy()
+ 
+ void ExtenderItem::setCollapsed(bool collapsed)
+ {
++    if (extender()->d->destroying) {
++        return;
++    }
++
+     config().writeEntry("isCollapsed", collapsed);
+     d->collapsed = collapsed;
+     d->collapseIcon->setToolTip(collapsed ? i18n("Expand this widget") : i18n("Collapse this widget"));