[Frugalware-git] frugalware-current: kdebase-workspace-4.6.0-4-i686

[Michel Hermier]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=91997a8e84da5f18df9a8bfb2c2535b12c92e648

commit 91997a8e84da5f18df9a8bfb2c2535b12c92e648
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sun Mar 6 10:31:45 2011 +0100

kdebase-workspace-4.6.0-4-i686

* Add patch that really do shutdown with systemd and don't halt.

diff --git a/source/kde/kdebase-workspace/FrugalBuild 
b/source/kde/kdebase-workspace/FrugalBuild
index 68c01eb..c4f5174 100644
--- a/source/kde/kdebase-workspace/FrugalBuild
+++ b/source/kde/kdebase-workspace/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <cr...@frugalware.org>

pkgname=kdebase-workspace
-pkgrel=3
+pkgrel=4
pkgdesc="Programs specific for the KDE4 desktop."
groups=('kde')
archs=('i686' 'x86_64' 'ppc')
@@ -20,6 +20,7 @@ makedepends=("${makedepends[@]}" "ksgmltools2>=$_F_kde_ver" 
"kdelibs>=$_F_kde_ve
## xrdb needed by font part .. from code in fonts.cpp ->:
## " proc << "xrdb" << "-quiet" << "-remove" << "-nocpp"; "
source=("${source[@]}" \
+       a58c0a17217b14e2e47415cfdfb1e8bb0b61a4d3.patch \
kde.desktop \
kde.pamd \
kde-np.pamd \
@@ -29,6 +30,7 @@ source=("${source[@]}" \
#       'kicker-compiz' 'taskbar-compiz' 'mtaskbar' 'ksmoothdock' \
#       'kompose' 'dbus-qt3')
sha1sums=('c192f712d16617e625acc84fcd9e0546df887a70' \
+          '9487b12ca673c90eb4850eee102956dee81844ba' \
'e1f706c984fc81633663c662e674b6f2c64d2f83' \
'9ff7d6cf01f42d513cf16a0d2c302cadde38f857' \
'4632f6e2a199f91f8aa068e0335dbae43813aaed' \
diff --git 
a/source/kde/kdebase-workspace/a58c0a17217b14e2e47415cfdfb1e8bb0b61a4d3.patch 
b/source/kde/kdebase-workspace/a58c0a17217b14e2e47415cfdfb1e8bb0b61a4d3.patch
new file mode 100644
index 0000000..6ffef53
--- /dev/null
+++ 
b/source/kde/kdebase-workspace/a58c0a17217b14e2e47415cfdfb1e8bb0b61a4d3.patch
@@ -0,0 +1,27 @@
+From: Oswald Buddenhagen <o...@kde.org>
+Date: Sat, 05 Mar 2011 18:39:00 +0000
+Subject: default to poweroff for HaltCmd on linux
+X-Git-Url: 
http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a58c0a17217b14e2e47415cfdfb1e8bb0b61a4d3
+---
+default to poweroff for HaltCmd on linux
+
+now that linux can have more bsd-like shutdown implementations (both in
+form of gentoo and of systemd), it makes sense to treat it the same.
+
+BUG: 267490
+FIXED-IN: 4.6.2
+---
+
+
+--- a/kdm/config.def
++++ b/kdm/config.def
+@@ -37,7 +37,7 @@
+ #ifdef _AIX
+ # define HALT_CMD     "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD   "/usr/sbin/shutdown -r now"
+-#elif defined(BSD)
++#elif defined(BSD) || defined(__linux__)
+ # define HALT_CMD     "/sbin/shutdown -p now"
+ # define REBOOT_CMD   "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git