[arch-commits] CVS update of extra/kde/kdebase (PKGBUILD fix-nfs.patch)

[Tobias Powalowski]

    Date: Saturday, January 26, 2008 @ 14:18:09
  Author: tpowa
    Path: /home/cvs-extra/extra/kde/kdebase

   Added: fix-nfs.patch (1.1)
Modified: PKGBUILD (1.89 -> 1.90)

'upgpkg: fixed http://bugs.archlinux.org/task/9172'


---------------+
 PKGBUILD      |   11 +++++++----
 fix-nfs.patch |   16 ++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)


Index: extra/kde/kdebase/PKGBUILD
diff -u extra/kde/kdebase/PKGBUILD:1.89 extra/kde/kdebase/PKGBUILD:1.90
--- extra/kde/kdebase/PKGBUILD:1.89	Wed Dec  5 11:05:48 2007
+++ extra/kde/kdebase/PKGBUILD	Sat Jan 26 14:18:09 2008
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD,v 1.89 2007/12/05 16:05:48 tpowa Exp $
+# $Id: PKGBUILD,v 1.90 2008/01/26 19:18:09 tpowa Exp $
 # Contributor: Roman Kreisel <roman.kreisel at epost.de>
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kdebase
 pkgver=3.5.8
 kdever=3.5.8 # if minor 0, then without .0
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Base Programs."
 arch=(i686 x86_64)
 url="http://www.kde.org"
@@ -25,7 +25,7 @@
 # parallel builds break kcontrol and whatnot
 options=(!makeflags)
 source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2
-	tango.diff kdm-grub.patch lmsensors.patch)
+	tango.diff kdm-grub.patch lmsensors.patch fix-nfs.patch)
 
 
 
@@ -41,6 +41,8 @@
   patch -Np0 -i ../tango.diff || return 1
   # fix sensors
   patch -Np0 -i ../lmsensors.patch || return 1
+  # fix nfs http://bugs.archlinux.org/task/9172
+  patch -Np0 -i ../fix-nfs.patch || return 1
   sed -i -e 's/applications-merged/kde-applications-merged/g' applnk/Makefile.{am,in}
   #make -f admin/Makefile.common || return 1
   ./configure --prefix=/opt/kde --with-dpms --build="${CHOST}" --host="${CHOST}" \
@@ -80,4 +82,5 @@
 md5sums=('9990c669229daaaa8fca4c5e354441fd'
          '43232dcb916b1d25e0ad7ef3575763a4'
          'f8645dc5d0044476a01c9c6a95c4853f'
-         '7fec06bac92febdf0a26dfd72faabf50')
+         '7fec06bac92febdf0a26dfd72faabf50'
+         '3652ba1bbc971f0a8dfbb0cf2036db5a')
Index: extra/kde/kdebase/fix-nfs.patch
diff -u /dev/null extra/kde/kdebase/fix-nfs.patch:1.1
--- /dev/null	Sat Jan 26 14:18:09 2008
+++ extra/kde/kdebase/fix-nfs.patch	Sat Jan 26 14:18:09 2008
@@ -0,0 +1,16 @@
+Index: kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp	(revision 724099)
++++ kioslave/media/mediamanager/halbackend.cpp	(revision 724100)
+@@ -74,7 +74,10 @@
+         const QPtrList<Medium> medlist = m_mediaList.list();
+         QPtrListIterator<Medium> it (medlist);
+         for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it)
+-	    unmount(current_medium->id());
++        {
++            if( !current_medium->id().startsWith( "/org/kde" ))
++                unmount(current_medium->id());
++        }
+ 
+ 
+         /* Remove all the registered media first */