[arch-commits] Commit in kdebase-workspace/trunk (4 files)

[Andrea Scarpino]

    Date: Thursday, April 28, 2011 @ 20:27:40
  Author: andrea
Revision: 121095

KDE 4.6.3

Added:
  kdebase-workspace/trunk/nm-09.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD
Deleted:
  kdebase-workspace/trunk/sensors-fix.patch
  kdebase-workspace/trunk/shutdown-fix.patch

--------------------+
 PKGBUILD           |   18 ++++++------------
 nm-09.patch        |   24 ++++++++++++++++++++++++
 sensors-fix.patch  |   22 ----------------------
 shutdown-fix.patch |   11 -----------
 4 files changed, 30 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-29 00:27:36 UTC (rev 121094)
+++ PKGBUILD	2011-04-29 00:27:40 UTC (rev 121095)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at 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'
@@ -27,10 +27,8 @@
         'etc/pam.d/kscreensaver')
 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'
@@ -38,19 +36,15 @@
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'c18422cb964e51d2cfcca3907904a361d507c8e1'
-          'fd6bb3239705c23d38f51fb39048b05ed6e95703')
+          '46259fe725e505aa8314407120f0aa9013823fa5')
 
 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
+    patch -p0 -i ${srcdir}/nm-09.patch
 
-    # Already fixed upstream
-    patch -Np1 -i ${srcdir}/sensors-fix.patch
-
 	cd ${srcdir}
 	mkdir build
 	cd build

Added: nm-09.patch
===================================================================
--- nm-09.patch	                        (rev 0)
+++ nm-09.patch	2011-04-29 00:27:40 UTC (rev 121095)
@@ -0,0 +1,24 @@
+diff -up kdebase-workspace-4.6.1/solid/networkmanager-0.7/manager.cpp.foo kdebase-workspace-4.6.1/solid/networkmanager-0.7/manager.cpp
+--- kdebase-workspace-4.6.1/solid/networkmanager-0.7/manager.cpp.foo	2011-03-22 20:02:37.298879915 -0500
++++ kdebase-workspace-4.6.1/solid/networkmanager-0.7/manager.cpp	2011-03-22 20:03:40.423090754 -0500
+@@ -118,16 +118,16 @@ QObject *NMNetworkManager::createNetwork
+     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;
+             /*

Deleted: sensors-fix.patch
===================================================================
--- sensors-fix.patch	2011-04-29 00:27:36 UTC (rev 121094)
+++ sensors-fix.patch	2011-04-29 00:27:40 UTC (rev 121095)
@@ -1,22 +0,0 @@
-commit 23863a99399cbb274f6756146b3c08de2efa0c7f
-Author: John Tapsell <johnflux at gmail.com>
-Date:   Thu Apr 7 10:59:20 2011 +0100
-
-    Fix accidental removal of a #include, when adding freebsd support.  This broke the lmsensors at minimum
-    
-    BUG: 270246
-    BUG: 270246
-    CCMAIL: naylor.b.david at gmail.com
-
-diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
-index e780be6..9aae890 100644
---- a/ksysguard/ksysguardd/modules.h
-+++ b/ksysguard/ksysguardd/modules.h
-@@ -23,6 +23,7 @@
- #ifndef KSG_MODULES_H
- #define KSG_MODULES_H
- 
-+#include "config-ksysguardd.h"
- #include "Command.h"
- #include "conf.h"
- #include "ksysguardd.h"

Deleted: shutdown-fix.patch
===================================================================
--- shutdown-fix.patch	2011-04-29 00:27:36 UTC (rev 121094)
+++ shutdown-fix.patch	2011-04-29 00:27:40 UTC (rev 121095)
@@ -1,11 +0,0 @@
---- kdebase-workspace-4.6.2/kdm/config.def~	2011-04-08 00:29:48.291941154 -0700
-+++ kdebase-workspace-4.6.2/kdm/config.def	2011-04-08 00:32:04.738607619 -0700
-@@ -38,7 +38,7 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(BSD) || defined(__linux__)
--# define HALT_CMD	"/sbin/shutdown -p now"
-+# define HALT_CMD	"/sbin/shutdown -h now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"