diff options
4 files changed, 8 insertions, 140 deletions
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog index a0e4ab478c0a..881a19a6de7a 100644 --- a/kde-base/kdeutils/ChangeLog +++ b/kde-base/kdeutils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdeutils -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.235 2008/06/07 15:02:47 keytoaster Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.236 2009/06/14 12:59:11 alexxy Exp $ + + 14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> + -files/klaptopdaemon-3.5.7-has_acpi_sleep.patch, + -files/klaptopdaemon-3.5.7-libXss-linking.patch, + -files/kmilo-3.5.8-198015_XF86Audio.patch: + Clean unneeded patches 07 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org> -kdeutils-3.5.8-r1.ebuild: diff --git a/kde-base/kdeutils/files/klaptopdaemon-3.5.7-has_acpi_sleep.patch b/kde-base/kdeutils/files/klaptopdaemon-3.5.7-has_acpi_sleep.patch deleted file mode 100644 index 33b8a448a14f..000000000000 --- a/kde-base/kdeutils/files/klaptopdaemon-3.5.7-has_acpi_sleep.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- ./klaptopdaemon/portable.cpp.old 2007-05-14 11:40:45.000000000 +0400 -+++ ./klaptopdaemon/portable.cpp 2007-08-14 01:52:30.775790879 +0400 -@@ -690,15 +690,16 @@ has_acpi_sleep(int state) - mask = 0; - - QFile p("/sys/power/state"); -- QFile f("/proc/acpi/sleep"); - - if (p.open(IO_ReadOnly)) { -+ QTextStream stream(&p); - QString l; -- p.readLine(l,500); -+ l = stream.readLine(); -+ - QStringList ll = QStringList::split(' ',l,false); - for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) { - QString s = *i; -- -+ - if (s.compare("standby")==0) - mask |= (1<<1); - else if (s.compare("mem")==0) -@@ -708,20 +709,6 @@ has_acpi_sleep(int state) - } - p.close(); - } -- else if (f.open(IO_ReadOnly)) { -- QString l; -- f.readLine(l, 500); -- QStringList ll = QStringList::split(' ',l,false); -- for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) { -- QString s = *i; -- if (s[0] == 'S') { -- int c = s[1].digitValue(); -- if (c >= 0 && c <= 9) -- mask |= 1<<c; -- } -- } -- f.close(); -- } - } - return((mask&acpi_sleep_enabled&(1<<state)) != 0); - } diff --git a/kde-base/kdeutils/files/klaptopdaemon-3.5.7-libXss-linking.patch b/kde-base/kdeutils/files/klaptopdaemon-3.5.7-libXss-linking.patch deleted file mode 100644 index 190b7f95401e..000000000000 --- a/kde-base/kdeutils/files/klaptopdaemon-3.5.7-libXss-linking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./klaptopdaemon/Makefile.am.orig 2007-05-27 19:35:43.000000000 +0400 -+++ ./klaptopdaemon/Makefile.am 2007-05-27 19:41:26.000000000 +0400 -@@ -10,7 +10,7 @@ - MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c - kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel - kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst --kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) libkcmlaptop.la -+kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) libkcmlaptop.la $(LIB_XSS) - - klaptop_acpi_helper_SOURCES = acpi_helper.cpp - diff --git a/kde-base/kdeutils/files/kmilo-3.5.8-198015_XF86Audio.patch b/kde-base/kdeutils/files/kmilo-3.5.8-198015_XF86Audio.patch deleted file mode 100644 index 22d16983f88f..000000000000 --- a/kde-base/kdeutils/files/kmilo-3.5.8-198015_XF86Audio.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 5ddf8e7f68098ebb86d0023653e540edf119291d Mon Sep 17 00:00:00 2001 -From: Kelvie Wong <kelvie@ieee.org> -Date: Sat, 3 Nov 2007 21:42:27 -0700 -Subject: [PATCH] KMilo: reintroduced support for kmix's user-set master channel - * uses the new masterDeviceIndex dcop call in KMix (from other patch) - ---- - kmilo/generic/generic_monitor.cpp | 18 +++++++++++++----- - kmilo/generic/generic_monitor.h | 1 + - 2 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp -index 51b96b1..fd7a47f 100644 ---- a/kmilo/generic/generic_monitor.cpp -+++ b/kmilo/generic/generic_monitor.cpp -@@ -50,6 +50,7 @@ GenericMonitor::GenericMonitor(QObject *parent, const char *name, const QStringL - m_minVolume = 0; - m_maxVolume = 100; - m_volume = 50; -+ m_deviceIdx = 0; - } - - GenericMonitor::~GenericMonitor() -@@ -92,7 +93,14 @@ bool GenericMonitor::retrieveVolume() - { - bool kmix_error = false; - -- DCOPReply reply = kmixClient->call("absoluteVolume", 0); -+ // Set it to the master, or 0 (from GenericMonitor()) if this dcop -+ // call doesn't exist or various other errors. It used to be -+ // hard-coded to 0 anyways. -+ DCOPReply reply = kmixClient->call("masterDeviceIndex"); -+ if (reply.isValid()) -+ m_deviceIdx = reply; -+ -+ reply = kmixClient->call("absoluteVolume", m_deviceIdx); - if (reply.isValid()) - m_volume = reply; - else -@@ -104,7 +112,7 @@ bool GenericMonitor::retrieveVolume() - if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix - { - // trying again -- reply = kmixClient->call("absoluteVolume", 0); -+ reply = kmixClient->call("absoluteVolume", m_deviceIdx); - if (reply.isValid()) - { - m_volume = reply; -@@ -122,9 +130,9 @@ bool GenericMonitor::retrieveVolume() - - return false; - } else { -- reply = kmixClient->call("absoluteVolumeMax", 0); -+ reply = kmixClient->call("absoluteVolumeMax", m_deviceIdx); - m_maxVolume = reply; -- reply = kmixClient->call("absoluteVolumeMin", 0); -+ reply = kmixClient->call("absoluteVolumeMin", m_deviceIdx); - m_minVolume = reply; - return true; - } -@@ -165,7 +173,7 @@ void GenericMonitor::displayVolume() - - // If we got this far, the DCOP communication with kmix works, - // so we don't have to test the result. -- kmixClient->send("setAbsoluteVolume", 0, m_volume); -+ kmixClient->send("setAbsoluteVolume", m_deviceIdx, m_volume); - - // if mute then unmute - if (m_mute) -diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h -index 7a0ba51..d04274f 100644 ---- a/kmilo/generic/generic_monitor.h -+++ b/kmilo/generic/generic_monitor.h -@@ -74,6 +74,7 @@ private: - - DCOPRef *kmixClient, *kmixWindow; - -+ int m_deviceIdx; - int m_progress; - long m_volume, m_oldVolume; - bool m_mute; --- -1.5.3.4 - |