From: Fabio Erculiani Date: Sat, 29 May 2010 06:25:59 +0000 (+0000) Subject: apply patch in upstream bug #205453 that fixes s2ram/hibernation support X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=195833589b8059da95b7c42f3e9a6d6979a680a4;p=gentoo.git apply patch in upstream bug #205453 that fixes s2ram/hibernation support Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog index 0565a5e535ab..8886b6c9c328 100644 --- a/kde-base/powerdevil/ChangeLog +++ b/kde-base/powerdevil/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/powerdevil # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.47 2010/05/04 05:52:22 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.48 2010/05/29 06:25:59 lxnay Exp $ + +*powerdevil-4.4.3-r1 (29 May 2010) + + 29 May 2010; Fabio Erculiani + +powerdevil-4.4.3-r1.ebuild, + +files/powerdevil-4.4.3-fix-sleep-205453.patch: + apply patch in upstream bug #205453 that fixes s2ram/hibernation support 04 May 2010; Alexey Shvetsov -powerdevil-4.4.1.ebuild: Drop KDE SC 4.4.1 diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest index 5681c964047f..c4c08bf2b323 100644 --- a/kde-base/powerdevil/Manifest +++ b/kde-base/powerdevil/Manifest @@ -1,6 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX powerdevil-4.4.3-fix-sleep-205453.patch 431 RMD160 21dc46c060f7804f10413cbee49ae6fc8d990cf5 SHA1 2041e88c60fc950d835e683984a0e7990cf7bf5a SHA256 85bf67a7c60ff7406b681752762d408d1ba20a3ca3178b2874ca44b76102291b DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b DIST kdebase-workspace-4.3.5.tar.bz2 62525359 RMD160 dcf04a40412ba236365423afc877ea0c2066f972 SHA1 703582cb8a3471c5821986dbdfc3c6deedac0ff3 SHA256 7985634ed1f87889bcd6613ef41127196df442017bf895be6fb2afb196ce149b DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69ccb90f656266c SHA1 5fd38e48c6ddcf551bb49cf8841ba23b7682ee5b SHA256 8c32bda86e9ec67244ea2996a7e710ed04f0bb532c691af7d366c278f9b519bd @@ -8,13 +6,7 @@ DIST kdebase-workspace-4.4.3.tar.bz2 77035367 RMD160 df3d9ceaab33d08ea27cd1206c3 EBUILD powerdevil-4.3.3.ebuild 837 RMD160 8ffc68da52e9fbba9872cc8f9c041f574aa7105f SHA1 4b858c641d40bb5f77faef83a295ebec82080383 SHA256 6e096084022d4818bdc9d2f56ef8465376414922b42741977a6102ef5e9a4125 EBUILD powerdevil-4.3.5.ebuild 893 RMD160 64677ff681ea0fa6e35dfc514853238750d6718f SHA1 b304eb8d2b99837cc19de7cfc907901635cb5585 SHA256 1d27d8ffb2bbbb9d7fed6db3d2bf41543dc81edb383c9c91375027a2b3d6b1e0 EBUILD powerdevil-4.4.2.ebuild 895 RMD160 83add22f69d6122cf853692819e5126b414e6a2c SHA1 ebef8c03bf97d22f91f15aa7c8ca517f737dd061 SHA256 1030a831748a5efa0320d7d1a4c9fca8d73b4411c50dc6762bc54e6091966f31 +EBUILD powerdevil-4.4.3-r1.ebuild 953 RMD160 7f3b3501569bbb4a10efe34573b91840682e24e7 SHA1 afbbe3e68ed2b29723630cca48ff4a63a9da739a SHA256 7a2d31d3f4521a8310f95d179bbc3ec4741dfd24e55e35a7d4d15ade9aa7535b EBUILD powerdevil-4.4.3.ebuild 896 RMD160 dc1a4c8474d26d277e8585c8871e49132c213f4e SHA1 daa31fcc95ffbb86a94fdcbd26e357663672e025 SHA256 0bfe5b85814e4af65a1fcb7971b81bbe1bc98a1bd48f27b2ce10390cd4bd2a9e -MISC ChangeLog 5973 RMD160 7a2fcc30832fbfb3ada318e6964ceb376aaf5775 SHA1 6783db37ec0693760c29d5aafe8fdb0535499120 SHA256 dd360377143f2e18a47be4276508da6a50e54829d969d77d60d6044d8dc2a913 +MISC ChangeLog 6215 RMD160 411ed9f1787f65c99a9d342587d62115da238962 SHA1 9c2a76156e56e3056ebabf843e35c50e05d3a4fa SHA256 825756992af95d44bd0b4ad32de248d537857ceb046c94b8e639a4ed48a60d0a MISC metadata.xml 281 RMD160 81ae5951c6f8387eb7c87bf07d7c136d4c3f7589 SHA1 e1e397b43276333f8c5a5f1300977fca84c39920 SHA256 f42f84b6cbe3862afd6839a2da268b563bbac43ed8d39f127db2bd1ad5b53c88 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkvftqEACgkQ5BmOA85PVLgtmwCfbMH2x+vnQOfwuTiKltz2zSG0 -lcoAn0jIMh7p5xEH1LasxniT7H13WVjE -=IpmZ ------END PGP SIGNATURE----- diff --git a/kde-base/powerdevil/files/powerdevil-4.4.3-fix-sleep-205453.patch b/kde-base/powerdevil/files/powerdevil-4.4.3-fix-sleep-205453.patch new file mode 100644 index 000000000000..b34add249724 --- /dev/null +++ b/kde-base/powerdevil/files/powerdevil-4.4.3-fix-sleep-205453.patch @@ -0,0 +1,11 @@ +--- kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp.orig 2010-04-29 21:54:40.000000000 +0200 ++++ kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp 2010-05-09 17:06:54.000000000 +0200 +@@ -571,7 +571,7 @@ + + void PowerDevilDaemon::buttonPressed(int but) + { +- if (!checkIfCurrentSessionActive() || d->screenSaverIface->GetActive()) { ++ if (!checkIfCurrentSessionActive()) { + return; + } + diff --git a/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild b/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild new file mode 100644 index 000000000000..c6fc3bc624c5 --- /dev/null +++ b/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild,v 1.1 2010/05/29 06:25:59 lxnay Exp $ + +EAPI="3" + +KMNAME="kdebase-workspace" +inherit kde4-meta + +DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement." +HOMEPAGE="http://www.kde-apps.org/content/show.php/PowerDevil?content=85078" +LICENSE="GPL-2" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug +pm-utils" + +COMMONDEPEND=" + $(add_kdebase_dep libkworkspace) + $(add_kdebase_dep solid) + !aqua? ( x11-libs/libXScrnSaver ) +" +DEPEND="${COMMONDEPEND} + !aqua? ( x11-proto/scrnsaverproto ) +" +RDEPEND="${COMMONDEPEND} + !sys-power/powerdevil + pm-utils? ( sys-power/pm-utils ) +" + +PATCHES=( "${FILESDIR}/${P}-fix-sleep-205453.patch" ) + +KMEXTRACTONLY=" + krunner/ + ksmserver/org.kde.KSMServerInterface.xml +"