summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-08 19:33:28 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-08 19:33:28 +0000
commita5337eb91fc74301c2614b9faa3ab585349162db (patch)
treea6e2296fc1307bdd6ee9ad624c6951fcbb0841c4 /kde-base
parentensure webm is disabled if not requested (diff)
downloadgentoo-2-a5337eb91fc74301c2614b9faa3ab585349162db.tar.gz
gentoo-2-a5337eb91fc74301c2614b9faa3ab585349162db.tar.bz2
gentoo-2-a5337eb91fc74301c2614b9faa3ab585349162db.zip
Make shutdown work. Fixes bug #362555
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdm/ChangeLog9
-rw-r--r--kde-base/kdm/files/4.6.2_fix_halt_p1.patch27
-rw-r--r--kde-base/kdm/files/4.6.2_fix_halt_p2.patch25
-rw-r--r--kde-base/kdm/kdm-4.6.2-r1.ebuild (renamed from kde-base/kdm/kdm-4.6.2.ebuild)4
4 files changed, 63 insertions, 2 deletions
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 30235893acd1..1834de383b8d 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for kde-base/kdm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.239 2011/04/06 14:19:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.240 2011/04/08 19:33:28 scarabeus Exp $
+
+*kdm-4.6.2-r1 (08 Apr 2011)
+
+ 08 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/4.6.2_fix_halt_p1.patch, +files/4.6.2_fix_halt_p2.patch,
+ -kdm-4.6.2.ebuild, +kdm-4.6.2-r1.ebuild:
+ Make shutdown work. Fixes bug #362555
*kdm-4.6.2 (06 Apr 2011)
diff --git a/kde-base/kdm/files/4.6.2_fix_halt_p1.patch b/kde-base/kdm/files/4.6.2_fix_halt_p1.patch
new file mode 100644
index 000000000000..8441ccda39d1
--- /dev/null
+++ b/kde-base/kdm/files/4.6.2_fix_halt_p1.patch
@@ -0,0 +1,27 @@
+From: Oswald Buddenhagen <ossi@kde.org>
+Date: Fri, 08 Apr 2011 17:02:01 +0000
+Subject: linux shutdown wants -P instead of -p
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=4b7ec7c9966df0c705bc0c9b9bff1010475347b6
+---
+linux shutdown wants -P instead of -p
+
+BUG: 270228
+FIXED-IN: 4.6.3
+---
+
+
+--- a/kdm/config.def
++++ b/kdm/config.def
+@@ -37,7 +37,10 @@
+ #ifdef _AIX
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+-#elif defined(BSD) || defined(__linux__)
++#elif defined(__linux__)
++# define HALT_CMD "/sbin/shutdown -P now"
++# define REBOOT_CMD "/sbin/shutdown -r now"
++#elif defined(BSD)
+ # define HALT_CMD "/sbin/shutdown -p now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+
diff --git a/kde-base/kdm/files/4.6.2_fix_halt_p2.patch b/kde-base/kdm/files/4.6.2_fix_halt_p2.patch
new file mode 100644
index 000000000000..44afbf763631
--- /dev/null
+++ b/kde-base/kdm/files/4.6.2_fix_halt_p2.patch
@@ -0,0 +1,25 @@
+From: Oswald Buddenhagen <ossi@kde.org>
+Date: Fri, 08 Apr 2011 18:58:29 +0000
+Subject: actually, it wants -h -P, because -P is just a modifier
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=28b79d8d04cce4d0a0899cadcc8fe6fd69d38e01
+---
+actually, it wants -h -P, because -P is just a modifier
+
+FAIL ...
+
+BUG: 270228 (take 2)
+---
+
+
+--- a/kdm/config.def
++++ b/kdm/config.def
+@@ -38,7 +38,7 @@
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+ #elif defined(__linux__)
+-# define HALT_CMD "/sbin/shutdown -P now"
++# define HALT_CMD "/sbin/shutdown -h -P now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(BSD)
+ # define HALT_CMD "/sbin/shutdown -p now"
+
diff --git a/kde-base/kdm/kdm-4.6.2.ebuild b/kde-base/kdm/kdm-4.6.2-r1.ebuild
index b9edbb83652e..b960f805481f 100644
--- a/kde-base/kdm/kdm-4.6.2.ebuild
+++ b/kde-base/kdm/kdm-4.6.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.2.ebuild,v 1.1 2011/04/06 14:19:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.2-r1.ebuild,v 1.1 2011/04/08 19:33:28 scarabeus Exp $
EAPI=3
@@ -42,6 +42,8 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+ "${FILESDIR}/${PV}_fix_halt_p1.patch"
+ "${FILESDIR}/${PV}_fix_halt_p2.patch"
)
pkg_setup() {