diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2008-02-21 18:29:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2008-02-21 18:29:49 +0000 |
| commit | e16b4b1974112dfe55d0034241c7a7308c6c022a (patch) | |
| tree | 07ed6a1a5223e0d16c5869f68e468f9df50f7795 /x11-misc | |
| parent | Cleaning up random foo to make repoman fully happy (diff) | |
| download | gentoo-2-e16b4b1974112dfe55d0034241c7a7308c6c022a.tar.gz gentoo-2-e16b4b1974112dfe55d0034241c7a7308c6c022a.tar.bz2 gentoo-2-e16b4b1974112dfe55d0034241c7a7308c6c022a.zip | |
Make the desktop entry invisible in Gnome so it doesn't duplicate with gnome-screensaver due to translations and rename the desktop file to xscreensaver-properties.desktop
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch | 26 |
2 files changed, 30 insertions, 3 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 0796c11b0c1a..7fa65f5c195b 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.219 2008/02/21 17:04:12 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.220 2008/02/21 18:29:48 drac Exp $ + + 21 Feb 2008; Samuli Suominen <drac@gentoo.org> + files/xscreensaver-5.04-desktop-entry.patch: + Rename desktop file to xscreensaver-properties.desktop and add NotShowIn + GNOME to avoid duplicate entry with gnome-screensaver in Gnome environment. 21 Feb 2008; nixnut <nixnut@gentoo.org> xscreensaver-5.04-r1.ebuild: Stable on ppc wrt bug 210913 diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch index aff293d6e999..fd6ef5eb81bb 100644 --- a/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch +++ b/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch @@ -1,7 +1,28 @@ +diff -ur xscreensaver-5.04.orig/driver/Makefile.in xscreensaver-5.04/driver/Makefile.in +--- xscreensaver-5.04.orig/driver/Makefile.in 2007-11-13 10:39:35.000000000 +0200 ++++ xscreensaver-5.04/driver/Makefile.in 2008-02-21 20:20:55.000000000 +0200 +@@ -498,7 +498,7 @@ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ + fi ;\ +- name2=gnome-screensaver-properties.desktop ;\ ++ name2=xscreensaver-properties.desktop ;\ + echo $(INSTALL_DATA) screensaver-properties.desktop \ + $(install_prefix)$(GTK_APPDIR)/$$name2 ;\ + $(INSTALL_DATA) screensaver-properties.desktop \ +@@ -571,7 +571,7 @@ + # into /usr/share/applications/ + uninstall-gnome:: + @if [ "$(GTK_DATADIR)" != "" ]; then \ +- f=gnome-screensaver-properties.desktop ;\ ++ f=xscreensaver-properties.desktop ;\ + echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ + rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ + fi diff -ur xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in xscreensaver-5.04/driver/screensaver-properties.desktop.in --- xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in 2003-12-15 13:16:12.000000000 +0200 -+++ xscreensaver-5.04/driver/screensaver-properties.desktop.in 2007-12-30 21:00:15.000000000 +0200 -@@ -1,8 +1,8 @@ ++++ xscreensaver-5.04/driver/screensaver-properties.desktop.in 2008-02-21 20:21:19.000000000 +0200 +@@ -1,8 +1,9 @@ [Desktop Entry] Exec=xscreensaver-demo -Icon=xscreensaver.xpm @@ -12,3 +33,4 @@ diff -ur xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in xscreen Type=Application -Categories=Application;Settings;Appearance;AdvancedSettings; +Categories=Settings;DesktopSettings;Security; ++NotShowIn=GNOME; |