Sat May 7 22:35:21 UTC 2011

3 files changed, 47 insertions, 15 deletions

diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 44593c57b..8211dd1d7 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 118827 2011-04-08 07:49:14Z andrea $
+# $Id: PKGBUILD 122250 2011-05-03 10:29:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
-pkgver=4.6.2
-pkgrel=2
+pkgver=4.6.3
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -14,9 +14,10 @@ groups=('kde')
 # 	not detected by namcap because libgl depends on it
 #	but nvidia providing libgl does not depend on libxdamage
 depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
-        'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx')
+         'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx'
+         'xorg-xsetroot' 'libxcomposite' 'libxinerama')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez'
-        'docbook-xsl' 'python2' 'kdebindings-python')
+             'python2' 'kdebindings-python')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 install="${pkgname}.install"
@@ -24,12 +25,11 @@ backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kde'
         'etc/pam.d/kde-np'
         'etc/pam.d/kscreensaver')
+options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch'
-        'shutdown-fix.patch'
-        'sensors-fix.patch')
-sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7'
+        'fixpath.patch' 'terminate-server.patch' 'nm-09.patch')
+sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
@@ -37,18 +37,14 @@ sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'c18422cb964e51d2cfcca3907904a361d507c8e1'
-          'fd6bb3239705c23d38f51fb39048b05ed6e95703')
+          '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
-    patch -Np1 -i ${srcdir}/shutdown-fix.patch
-
-    # Already fixed upstream
-    patch -Np1 -i ${srcdir}/sensors-fix.patch
+    patch -p1 -i ${srcdir}/nm-09.patch
 
 	cd ${srcdir}
 	mkdir build
diff --git a/extra/kdebase-workspace/kdebase-workspace.install b/extra/kdebase-workspace/kdebase-workspace.install
index 3a1b2404a..f7d6d305b 100644
--- a/extra/kdebase-workspace/kdebase-workspace.install
+++ b/extra/kdebase-workspace/kdebase-workspace.install
@@ -3,6 +3,7 @@ post_install() {
 	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
 	chown -R 135:135 var/lib/kdm &>/dev/null
 	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+    update-desktop-database -q
 }
 
 post_upgrade() {
@@ -10,6 +11,7 @@ post_upgrade() {
 	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
 	chown -R 135:135 var/lib/kdm &>/dev/null
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
 }
 
 post_remove() {
diff --git a/extra/kdebase-workspace/nm-09.patch b/extra/kdebase-workspace/nm-09.patch
new file mode 100644
index 000000000..20ccd4d7d
--- /dev/null
+++ b/extra/kdebase-workspace/nm-09.patch
@@ -0,0 +1,34 @@
+--- kdebase-workspace-4.6.3/solid/CMakeLists.txt~	2011-04-29 03:43:20.321994578 -0700
++++ kdebase-workspace-4.6.3/solid/CMakeLists.txt	2011-04-29 03:43:33.271995023 -0700
+@@ -17,7 +17,7 @@
+     add_subdirectory(networkmanager-0.6)
+   endif (NM_0_6)
+ 
+-  macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7)
++  macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
+   if (NM_0_7)
+     message(STATUS "Will build networkmanager-0.7")
+     set(HAVE_NETWORKMANAGER TRUE)
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp~	2011-04-29 03:32:33.838644845 -0700
++++ kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp	2011-04-29 03:40:52.308657544 -0700
+@@ -118,16 +118,16 @@
+     uint deviceType = devIface.deviceType();
+     NMNetworkInterface * createdInterface = 0;
+     switch ( deviceType ) {
+-        case DEVICE_TYPE_802_3_ETHERNET:
++        case NM_DEVICE_TYPE_ETHERNET:
+             createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager
+             break;
+-        case DEVICE_TYPE_802_11_WIRELESS:
++        case NM_DEVICE_TYPE_WIFI:
+             createdInterface = new NMWirelessNetworkInterface(uni, this, 0);
+             break;
+-        case DEVICE_TYPE_GSM:
++        case 3:
+             createdInterface = new NMGsmNetworkInterface(uni, this, 0);
+             break;
+-        case DEVICE_TYPE_CDMA:
++        case 4:
+             createdInterface = new NMCdmaNetworkInterface(uni, this, 0);
+             break;
+             /*