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

[Andrea Scarpino]

    Date: Friday, April 8, 2011 @ 03:49:14
  Author: andrea
Revision: 118827

Fix invalid shutdown command (FS#23640); Fix broken sensors support (FS#23627); Removed useless cmake option

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

--------------------+
 PKGBUILD           |   17 ++++++++++++-----
 sensors-fix.patch  |   22 ++++++++++++++++++++++
 shutdown-fix.patch |   11 +++++++++++
 3 files changed, 45 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-08 06:10:00 UTC (rev 118826)
+++ PKGBUILD	2011-04-08 07:49:14 UTC (rev 118827)
@@ -4,7 +4,7 @@
 
 pkgname=kdebase-workspace
 pkgver=4.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -26,7 +26,9 @@
         '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')
+        'fixpath.patch' 'terminate-server.patch'
+        'shutdown-fix.patch'
+        'sensors-fix.patch')
 sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -34,14 +36,20 @@
           '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+          'c18422cb964e51d2cfcca3907904a361d507c8e1'
+          'fd6bb3239705c23d38f51fb39048b05ed6e95703')
 
 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
+
 	cd ${srcdir}
 	mkdir build
 	cd build
@@ -50,8 +58,7 @@
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DWITH_Xmms=OFF \
-		-DWITH_Googlegadgets=OFF \
-		-DWITH_PolkitQt=OFF
+		-DWITH_Googlegadgets=OFF
 	make
 }
 

Added: sensors-fix.patch
===================================================================
--- sensors-fix.patch	                        (rev 0)
+++ sensors-fix.patch	2011-04-08 07:49:14 UTC (rev 118827)
@@ -0,0 +1,22 @@
+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"

Added: shutdown-fix.patch
===================================================================
--- shutdown-fix.patch	                        (rev 0)
+++ shutdown-fix.patch	2011-04-08 07:49:14 UTC (rev 118827)
@@ -0,0 +1,11 @@
+--- 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"