diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:10:28 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:10:28 +0000 |
| commit | a2f51bc7dca7a94fb99c5be545ffacfacd46000a (patch) | |
| tree | 4eafaa4530b2e5811e7b900a3b54d50ed48fe190 /kde-base | |
| parent | Remove unneeded patches. (diff) | |
| download | gentoo-2-a2f51bc7dca7a94fb99c5be545ffacfacd46000a.tar.gz gentoo-2-a2f51bc7dca7a94fb99c5be545ffacfacd46000a.tar.bz2 gentoo-2-a2f51bc7dca7a94fb99c5be545ffacfacd46000a.zip | |
Remove unneeded patches.
(Portage version: 2.1.2-r7)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/klaptopdaemon/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/klaptopdaemon/files/kdeutils-3.4.3-klaptopdaemon.patch | 49 |
2 files changed, 5 insertions, 50 deletions
diff --git a/kde-base/klaptopdaemon/ChangeLog b/kde-base/klaptopdaemon/ChangeLog index 5c354a7f0b02..e70626a9c7bd 100644 --- a/kde-base/klaptopdaemon/ChangeLog +++ b/kde-base/klaptopdaemon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/klaptopdaemon # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.72 2007/02/04 02:32:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.73 2007/02/05 12:10:28 flameeyes Exp $ + + 05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/kdeutils-3.4.3-klaptopdaemon.patch: + Remove unneeded patches. 04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -klaptopdaemon-3.5.2.ebuild: diff --git a/kde-base/klaptopdaemon/files/kdeutils-3.4.3-klaptopdaemon.patch b/kde-base/klaptopdaemon/files/kdeutils-3.4.3-klaptopdaemon.patch deleted file mode 100644 index 28344217e647..000000000000 --- a/kde-base/klaptopdaemon/files/kdeutils-3.4.3-klaptopdaemon.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp ---- kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp 2005-10-05 15:26:42.000000000 +0200 -+++ kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp 2005-10-18 15:38:21.000000000 +0200 -@@ -919,7 +919,7 @@ - // the lid button turns stuff on when it's down and back off again when it's raised - // (kind of like the fridge door light) - // -- if (lid_state != laptop_portable::get_button(laptop_portable::LidButton)) { -+ if (s.enable_lid_button && (lid_state != laptop_portable::get_button(laptop_portable::LidButton))) { - lid_state = !lid_state; - if (lid_state) { - if (s.button_lid_bright_enabled) { -@@ -982,7 +982,7 @@ - // - // the power button on the other hand is an off/on switch for non-suspend type ops - // -- if (power_state != laptop_portable::get_button(laptop_portable::PowerButton)) { -+ if (s.enable_power_button && (power_state != laptop_portable::get_button(laptop_portable::PowerButton))) { - power_state = !power_state; - if (power_state) { - if (power_button_off) { -diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp kdeutils-3.4.3/klaptopdaemon/portable.cpp ---- kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp 2005-10-05 15:26:42.000000000 +0200 -+++ kdeutils-3.4.3/klaptopdaemon/portable.cpp 2005-10-18 15:38:21.000000000 +0200 -@@ -1937,19 +1937,19 @@ - laptop_portable::get_button(LaptopButton l) // true if a button is pressed - { - if (::has_acpi()) { -- QString *name=0; -+ QString name; - switch (l) { - case LidButton: -- name = &acpi_lid_name; -+ name = acpi_lid_name; - break; - case PowerButton: -- name = &acpi_power_name; -+ name = acpi_power_name; - break; - default: - break; - } -- if (name) { -- QFile f(*name); -+ if (!name.isNull()) { -+ QFile f(name); - if (f.open(IO_ReadOnly)) { - while (!f.atEnd()) { - QString l; |