diff options
| author |   Wulf Krueger <philantrop@gentoo.org> | 2007-05-28 22:23:26 +0000 |
|---|---|---|
| committer | Wulf Krueger <philantrop@gentoo.org> | 2007-05-28 22:23:26 +0000 |
| commit | 9d66f9259313d65965b415f20fd2ed89d5dfb646 (patch) | |
| tree | 80813b43a4f1e3e7aa04d021b4da734dfb9c1672 /kde-base/kdeutils | |
| parent | Added kde-base/kdeutils:xscreensaver. (diff) | |
| download | gentoo-2-9d66f9259313d65965b415f20fd2ed89d5dfb646.tar.gz gentoo-2-9d66f9259313d65965b415f20fd2ed89d5dfb646.tar.bz2 gentoo-2-9d66f9259313d65965b415f20fd2ed89d5dfb646.zip | |
Added patches from bug 179905 to allow for building with libXScrnSaver. Thanks, pva and jmbsvicetto, for the patches.
(Portage version: 2.1.2.7)
Diffstat (limited to 'kde-base/kdeutils')
| -rw-r--r-- | kde-base/kdeutils/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdeutils/files/klaptopdaemon-3.5.7-libXss-linking.patch | 11 | ||||
| -rw-r--r-- | kde-base/kdeutils/kdeutils-3.5.7.ebuild | 9 |
3 files changed, 23 insertions, 4 deletions
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog index 76599e60b13d..68aa93aa4a3c 100644 --- a/kde-base/kdeutils/ChangeLog +++ b/kde-base/kdeutils/ChangeLog @@ -1,6 +1,11 @@ # 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.201 2007/05/25 13:53:18 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.202 2007/05/28 22:23:26 philantrop Exp $ + + 28 May 2007; Wulf C. Krueger <philantrop@gentoo.org> + +files/klaptopdaemon-3.5.7-libXss-linking.patch, kdeutils-3.5.7.ebuild: + Added patches from bug 179905 to allow for building with libXScrnSaver. + Thanks, pva and jmbsvicetto, for the patches. 25 May 2007; Marcus D. Hanwell <cryos@gentoo.org> kdeutils-3.5.7.ebuild: Exclude obsolete patch that no longer applies cleanly. Closes bug 179553. 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 new file mode 100644 index 000000000000..190b7f95401e --- /dev/null +++ b/kde-base/kdeutils/files/klaptopdaemon-3.5.7-libXss-linking.patch @@ -0,0 +1,11 @@ +--- ./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/kdeutils-3.5.7.ebuild b/kde-base/kdeutils/kdeutils-3.5.7.ebuild index 843c6c374e3e..2e2285a94635 100644 --- a/kde-base/kdeutils/kdeutils-3.5.7.ebuild +++ b/kde-base/kdeutils/kdeutils-3.5.7.ebuild @@ -1,6 +1,6 @@ # 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.7.ebuild,v 1.2 2007/05/25 13:53:18 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7.ebuild,v 1.3 2007/05/28 22:23:26 philantrop Exp $ inherit kde-dist eutils @@ -10,7 +10,7 @@ SRC_URI="${SRC_URI} DESCRIPTION="KDE utilities." KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="crypt kdehiddenvisibility pbbuttonsd snmp" +IUSE="crypt kdehiddenvisibility pbbuttonsd snmp xscreensaver" BOTH_DEPEND="~kde-base/kdebase-${PV} snmp? ( net-analyzer/net-snmp ) @@ -24,10 +24,12 @@ RDEPEND="${BOTH_DEPEND} !x11-misc/superkaramba" DEPEND="${BOTH_DEPEND} + xscreensaver? ( x11-libs/libXScrnSaver ) x11-libs/libX11 x11-proto/xproto virtual/os-headers" +PATCHES="${FILESDIR}/klaptopdaemon-3.5.7-libXss-linking.patch" EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff" src_unpack() { @@ -37,7 +39,8 @@ src_unpack() { src_compile() { local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook) - --without-xmms" + --without-xmms" + myconf="${myconf} $(use_with xscreensaver)" use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg" |