summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus D. Hanwell <cryos@gentoo.org>2007-07-17 19:06:04 +0000
committerMarcus D. Hanwell <cryos@gentoo.org>2007-07-17 19:06:04 +0000
commit8781f74daaff1ab76a7fffb6dede0df1c0e81c1b (patch)
treef9fe0a5d211d6a43382b99264adf22c05c05f9ec /kde-base
parentStable for HPPA (bug #185649). (diff)
downloadgentoo-2-8781f74daaff1ab76a7fffb6dede0df1c0e81c1b.tar.gz
gentoo-2-8781f74daaff1ab76a7fffb6dede0df1c0e81c1b.tar.bz2
gentoo-2-8781f74daaff1ab76a7fffb6dede0df1c0e81c1b.zip
Add XDG path for screensavers, closes bug 168540. Thanks to Brian S. Stephan <bssteph@incorporeal.org> for the patch.
(Portage version: 2.1.3_rc8)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kcontrol/ChangeLog7
-rw-r--r--kde-base/kcontrol/files/kcontrol-3.5.7-screensaver-path.patch14
-rw-r--r--kde-base/kcontrol/kcontrol-3.5.7.ebuild4
3 files changed, 23 insertions, 2 deletions
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index dadd4cfdc193..8e6f4d991ce3 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kcontrol
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.86 2007/05/23 10:31:37 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.87 2007/07/17 19:06:04 cryos Exp $
+
+ 17 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org>
+ +files/kcontrol-3.5.7-screensaver-path.patch, kcontrol-3.5.7.ebuild:
+ Add XDG path for screensavers, closes bug 168540. Thanks to Brian S. Stephan
+ <bssteph@incorporeal.org> for the patch.
23 May 2007; Carsten Lohrke <carlo@gentoo.org> kcontrol-3.5.7.ebuild:
Correct dependencies.
diff --git a/kde-base/kcontrol/files/kcontrol-3.5.7-screensaver-path.patch b/kde-base/kcontrol/files/kcontrol-3.5.7-screensaver-path.patch
new file mode 100644
index 000000000000..9af488fdff76
--- /dev/null
+++ b/kde-base/kcontrol/files/kcontrol-3.5.7-screensaver-path.patch
@@ -0,0 +1,14 @@
+diff -urN kdebase-3.5.6/kcontrol/screensaver/scrnsave.cpp kdebase-3.5.6-patch/kcontrol/screensaver/scrnsave.cpp
+--- kdebase-3.5.6/kcontrol/screensaver/scrnsave.cpp 2006-10-01 12:31:49.000000000 -0500
++++ kdebase-3.5.6-patch/kcontrol/screensaver/scrnsave.cpp 2007-03-15 17:54:16.000000000 -0500
+@@ -86,6 +86,10 @@
+ KGlobal::dirs()->kde_default("apps") +
+ "apps/ScreenSavers/");
+
++ // Add path for Gentoo (bug #168540)
++ KGlobal::dirs()->addResourceType("scrsav",
++ "share/applications/");
++
+ setQuickHelp( i18n("<h1>Screen Saver</h1> This module allows you to enable and"
+ " configure a screen saver. Note that you can enable a screen saver"
+ " even if you have power saving features enabled for your display.<p>"
diff --git a/kde-base/kcontrol/kcontrol-3.5.7.ebuild b/kde-base/kcontrol/kcontrol-3.5.7.ebuild
index adb3980683ec..aa04e3b1af6f 100644
--- a/kde-base/kcontrol/kcontrol-3.5.7.ebuild
+++ b/kde-base/kcontrol/kcontrol-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/kcontrol/kcontrol-3.5.7.ebuild,v 1.2 2007/05/23 10:31:37 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.7.ebuild,v 1.3 2007/07/17 19:06:04 cryos Exp $
KMNAME=kdebase
MAXKDEVER=$PV
@@ -48,6 +48,8 @@ KMCOPYLIB="libkonq libkonq
libtaskbar kicker/taskbar
libtaskmanager kicker/taskmanager"
+PATCHES="${FILESDIR}/${P}-screensaver-path.patch"
+
src_compile() {
myconf="$myconf --with-ssl $(use_with arts) $(use_with opengl gl)
$(use_with ieee1394 libraw1394) $(use_with logitech-mouse libusb)