diff options
Diffstat (limited to 'kde-base/kdeutils')
| -rw-r--r-- | kde-base/kdeutils/ChangeLog | 11 | ||||
| -rw-r--r-- | kde-base/kdeutils/Manifest | 25 | ||||
| -rw-r--r-- | kde-base/kdeutils/files/digest-kdeutils-3.5.8-r1 | 6 | ||||
| -rw-r--r-- | kde-base/kdeutils/files/kmilo-3.5.8-198015_XF86Audio.patch | 84 | ||||
| -rw-r--r-- | kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild | 58 |
5 files changed, 176 insertions, 8 deletions
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog index f8f1c6a4514b..b38edabe7b99 100644 --- a/kde-base/kdeutils/ChangeLog +++ b/kde-base/kdeutils/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for kde-base/kdeutils # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.214 2007/10/19 22:47:05 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.215 2007/11/20 13:46:02 philantrop Exp $ + +*kdeutils-3.5.8-r1 (20 Nov 2007) + + 20 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org> + +files/kmilo-3.5.8-198015_XF86Audio.patch, +kdeutils-3.5.8-r1.ebuild: + Added a patch to fix a problem with the XF86Audio* key handlers not working + when there's no master channel (e. g. you have a mute key that stopped + working in KDE). Fixes bug 198015. Thanks to Kelvie Wong for creating and + submitting said patch. *kdeutils-3.5.8 (19 Oct 2007) diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest index 26d83d7c7304..e43a676ddd48 100644 --- a/kde-base/kdeutils/Manifest +++ b/kde-base/kdeutils/Manifest @@ -9,6 +9,10 @@ AUX klaptopdaemon-3.5.7-libXss-linking.patch 629 RMD160 49f69d98b3addf18d264aba8 MD5 98d40e51d61be53e054fcd4d608fb590 files/klaptopdaemon-3.5.7-libXss-linking.patch 629 RMD160 49f69d98b3addf18d264aba8f10f7286e8726a20 files/klaptopdaemon-3.5.7-libXss-linking.patch 629 SHA256 356c94da4a3e4c94c0097d65db4dc6203d582dacf225b87c4181f554031ad80b files/klaptopdaemon-3.5.7-libXss-linking.patch 629 +AUX kmilo-3.5.8-198015_XF86Audio.patch 2781 RMD160 15a54329f39e1e7af316566684d8ca620a9761aa SHA1 00c0147f52f2a387901be7900d0b9641ca0f456d SHA256 0916cbffb011e4589bed8e71e9e76cae5982e0e7d111a9afa3abb061b0667c5e +MD5 a13ed91810cc840494f6a6eb4ea38eed files/kmilo-3.5.8-198015_XF86Audio.patch 2781 +RMD160 15a54329f39e1e7af316566684d8ca620a9761aa files/kmilo-3.5.8-198015_XF86Audio.patch 2781 +SHA256 0916cbffb011e4589bed8e71e9e76cae5982e0e7d111a9afa3abb061b0667c5e files/kmilo-3.5.8-198015_XF86Audio.patch 2781 AUX superkaramba-3.5.7-network_sensor.patch 672 RMD160 42c974138f30873ed654bb072874a03b7e5424a2 SHA1 47359e471f3c88efd45021a219149edf2f9b2b84 SHA256 ceec6d676826ac82eee2e4a1b79ef7bd70f12369abdf3468149c0a5ab31ecd57 MD5 fcff6689188a12e74d0bd2128d438a04 files/superkaramba-3.5.7-network_sensor.patch 672 RMD160 42c974138f30873ed654bb072874a03b7e5424a2 files/superkaramba-3.5.7-network_sensor.patch 672 @@ -39,14 +43,18 @@ EBUILD kdeutils-3.5.7.ebuild 1456 RMD160 31b571f3d9e971c0f7b6d8434b049d7448346c9 MD5 c5919a58518f6bb5fbdcd51b1b21df22 kdeutils-3.5.7.ebuild 1456 RMD160 31b571f3d9e971c0f7b6d8434b049d7448346c91 kdeutils-3.5.7.ebuild 1456 SHA256 faacdb17b467d04c707749b9c980d9af622dd44718cbc602061c5e45aad847d5 kdeutils-3.5.7.ebuild 1456 +EBUILD kdeutils-3.5.8-r1.ebuild 1706 RMD160 98cb2286e3feba5dc05ddb27ae6d1f9ac8b223a9 SHA1 70240c2885af2ef5fbf89876975d60a7b6243c63 SHA256 4c67f34d573ddec7f1ea2f85f41490c3fd2934d59f3e5c52089202a4cfbc9057 +MD5 998cfe61befa6eb9e9aeaa6e5a355937 kdeutils-3.5.8-r1.ebuild 1706 +RMD160 98cb2286e3feba5dc05ddb27ae6d1f9ac8b223a9 kdeutils-3.5.8-r1.ebuild 1706 +SHA256 4c67f34d573ddec7f1ea2f85f41490c3fd2934d59f3e5c52089202a4cfbc9057 kdeutils-3.5.8-r1.ebuild 1706 EBUILD kdeutils-3.5.8.ebuild 1654 RMD160 eadc48ad2ae063fd55e51fade9f782c0013d62c6 SHA1 9a0fc8a85fff2e11a43bfa051b922b94446819e4 SHA256 97791182ca4315f61f9daa9cc5221bc30b553ce4e04cbec3b8261d6722c6ceaa MD5 aba61cb6ece7d9932f7a92a8c975d57f kdeutils-3.5.8.ebuild 1654 RMD160 eadc48ad2ae063fd55e51fade9f782c0013d62c6 kdeutils-3.5.8.ebuild 1654 SHA256 97791182ca4315f61f9daa9cc5221bc30b553ce4e04cbec3b8261d6722c6ceaa kdeutils-3.5.8.ebuild 1654 -MISC ChangeLog 25669 RMD160 25e75ba279bb02c2334b9a35794a1abbd35b41a3 SHA1 fc60d06ce1820bccbbff989f03bbb65d1a9864d8 SHA256 18c06793bb559579a3e2cc52312ffbda633b4ec9dfe2bea2a4c3913b13b03fef -MD5 49364da0c59bb59c2448b6f650cc0fd0 ChangeLog 25669 -RMD160 25e75ba279bb02c2334b9a35794a1abbd35b41a3 ChangeLog 25669 -SHA256 18c06793bb559579a3e2cc52312ffbda633b4ec9dfe2bea2a4c3913b13b03fef ChangeLog 25669 +MISC ChangeLog 26083 RMD160 fa5bfedf6f0bb7bd4a7da3f762f3b036122ba78b SHA1 a70b0d6c7321559b56572acd9225b9eefc553faf SHA256 a27fe4a3f1e07cd0246bf6ddd06c8aa21698149418059bbfc898591a99b4d792 +MD5 ef5065777cd425afd2980527a3b962ce ChangeLog 26083 +RMD160 fa5bfedf6f0bb7bd4a7da3f762f3b036122ba78b ChangeLog 26083 +SHA256 a27fe4a3f1e07cd0246bf6ddd06c8aa21698149418059bbfc898591a99b4d792 ChangeLog 26083 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -69,10 +77,13 @@ SHA256 bbc34c0763584ef1da811fb4b3dee8d9a0bed32b306d649b67dfdb14b83485fa files/di MD5 a771930ed5525bfe68207ad9b6451d08 files/digest-kdeutils-3.5.8 521 RMD160 269e7a9823549adae058c3df50c0a67659a1cf14 files/digest-kdeutils-3.5.8 521 SHA256 876863f3b586ed7dbb1354812325faf565977118b00c2c003733910043e7d32c files/digest-kdeutils-3.5.8 521 +MD5 a771930ed5525bfe68207ad9b6451d08 files/digest-kdeutils-3.5.8-r1 521 +RMD160 269e7a9823549adae058c3df50c0a67659a1cf14 files/digest-kdeutils-3.5.8-r1 521 +SHA256 876863f3b586ed7dbb1354812325faf565977118b00c2c003733910043e7d32c files/digest-kdeutils-3.5.8-r1 521 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHGTP9CkvF58q80IkRAjOwAJ491lHAxWXBVnd9BZmhk2ruUXFD7wCfWlBs -MJTcoxKp4n3PKPAQAiv9Y2g= -=Jq8r +iD8DBQFHQuUhCkvF58q80IkRApB3AJ42tRrfTm1IPRQFmXLoi4Y3qqL1pwCfUl/V +bCEHf6/QcqHEO7RdbPQNsHU= +=EZzj -----END PGP SIGNATURE----- diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.5.8-r1 b/kde-base/kdeutils/files/digest-kdeutils-3.5.8-r1 new file mode 100644 index 000000000000..d5ce5a414504 --- /dev/null +++ b/kde-base/kdeutils/files/digest-kdeutils-3.5.8-r1 @@ -0,0 +1,6 @@ +MD5 4a5500af2f0170c9f74501093d5393ad kdeutils-3.5-patchset-02.tar.bz2 3019 +RMD160 b4598488995ed7dc7a86349cd68da426e2238773 kdeutils-3.5-patchset-02.tar.bz2 3019 +SHA256 54ddfbec990e3bff3139abf42755be24a450a8969eb77d41a5b0da4dc72580d6 kdeutils-3.5-patchset-02.tar.bz2 3019 +MD5 d1a0fcc83f35428a76cf7523a04ba19c kdeutils-3.5.8.tar.bz2 3059172 +RMD160 94267b9c08339c7310d65106110c9b9ef133d6f8 kdeutils-3.5.8.tar.bz2 3059172 +SHA256 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac kdeutils-3.5.8.tar.bz2 3059172 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 new file mode 100644 index 000000000000..22d16983f88f --- /dev/null +++ b/kde-base/kdeutils/files/kmilo-3.5.8-198015_XF86Audio.patch @@ -0,0 +1,84 @@ +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 + diff --git a/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild b/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild new file mode 100644 index 000000000000..43a2fffd87fd --- /dev/null +++ b/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild,v 1.1 2007/11/20 13:46:02 philantrop Exp $ + +inherit kde-dist eutils + +SRC_URI="${SRC_URI} + mirror://gentoo/kdeutils-3.5-patchset-02.tar.bz2" + +DESCRIPTION="KDE utilities." + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="crypt kdehiddenvisibility pbbuttonsd snmp xscreensaver" + +BOTH_DEPEND="~kde-base/kdebase-${PV} + snmp? ( net-analyzer/net-snmp ) + pbbuttonsd? ( app-laptop/pbbuttonsd ) + dev-lang/python + dev-libs/gmp + x11-libs/libXtst" + +RDEPEND="${BOTH_DEPEND} + crypt? ( app-crypt/gnupg )" + +DEPEND="${BOTH_DEPEND} + xscreensaver? ( x11-libs/libXScrnSaver ) + x11-libs/libX11 + x11-proto/xproto + virtual/os-headers" + +PATCHES="${FILESDIR}/superkaramba-3.5.7-network_sensor.patch + ${FILESDIR}/klaptopdaemon-3.5.7-has_acpi_sleep.patch + ${FILESDIR}/kmilo-3.5.8-198015_XF86Audio.patch" +EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff + klaptopdaemon-3.5-lock-and-hibernate.diff" + +src_unpack() { + kde_src_unpack + + # Fix some desktop files + sed -i -e "s:Hidden=true:Hidden=false:" "${S}/ksim/ksim.desktop" \ + || die "sed (ksim) failed" + sed -i -e "s:\(^Type=\)Service:\1Application:" "${S}/kdelirc/irkick/irkick.desktop" \ + || die "sed (irkick) failed" + sed -i -e "s:\(^Init=.*\):X-\1:" "${S}/klaptopdaemon/applnk/laptop.desktop" \ + || die "sed (laptop) failed" +} + +src_compile() { + local myconf="$(use_with snmp) + $(use_with pbbuttonsd powerbook) + $(use_with xscreensaver) + --without-xmms" + + use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg" + + kde_src_compile +} |