summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2007-05-28 20:07:33 +0000
committerWulf Krueger <philantrop@gentoo.org>2007-05-28 20:07:33 +0000
commit29f9643b1c390dc5f4f3b71390c6b92079f7bb25 (patch)
tree13d400822287165ca02f49bb6aa55331e529fa5f /kde-base
parentAdded kde-base/klaptopdaemon:xscreensaver. (diff)
downloadgentoo-2-29f9643b1c390dc5f4f3b71390c6b92079f7bb25.tar.gz
gentoo-2-29f9643b1c390dc5f4f3b71390c6b92079f7bb25.tar.bz2
gentoo-2-29f9643b1c390dc5f4f3b71390c6b92079f7bb25.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')
-rw-r--r--kde-base/klaptopdaemon/ChangeLog8
-rw-r--r--kde-base/klaptopdaemon/files/klaptopdaemon-3.5.7-libXss-linking.patch11
-rw-r--r--kde-base/klaptopdaemon/klaptopdaemon-3.5.7.ebuild12
3 files changed, 28 insertions, 3 deletions
diff --git a/kde-base/klaptopdaemon/ChangeLog b/kde-base/klaptopdaemon/ChangeLog
index a74bf6a74a4a..82262cd5c995 100644
--- a/kde-base/klaptopdaemon/ChangeLog
+++ b/kde-base/klaptopdaemon/ChangeLog
@@ -1,6 +1,12 @@
# 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.78 2007/05/25 13:48:14 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.79 2007/05/28 20:07:33 philantrop Exp $
+
+ 28 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
+ +files/klaptopdaemon-3.5.7-libXss-linking.patch,
+ klaptopdaemon-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>
klaptopdaemon-3.5.7.ebuild:
diff --git a/kde-base/klaptopdaemon/files/klaptopdaemon-3.5.7-libXss-linking.patch b/kde-base/klaptopdaemon/files/klaptopdaemon-3.5.7-libXss-linking.patch
new file mode 100644
index 000000000000..190b7f95401e
--- /dev/null
+++ b/kde-base/klaptopdaemon/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/klaptopdaemon/klaptopdaemon-3.5.7.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.7.ebuild
index 66a006b7279c..7e54ee122921 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5.7.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-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/klaptopdaemon/klaptopdaemon-3.5.7.ebuild,v 1.2 2007/05/25 13:48:14 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.7.ebuild,v 1.3 2007/05/28 20:07:33 philantrop Exp $
KMNAME=kdeutils
MAXKDEVER=$PV
@@ -12,13 +12,21 @@ SRC_URI="${SRC_URI}
DESCRIPTION="KLaptopdaemon - KDE battery monitoring and management for laptops."
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
+IUSE="kdehiddenvisibility xscreensaver"
RDEPEND="x11-libs/libXtst"
DEPEND="${RDEPEND}
+ xscreensaver? ( x11-libs/libXScrnSaver )
x11-libs/libX11
x11-proto/xproto
virtual/os-headers"
+PATCHES="${FILESDIR}/${P}-libXss-linking.patch"
EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff"
+
+src_compile() {
+ myconf="${myconf} $(use_with xscreensaver)"
+
+ kde_src_compile
+}