summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2008-03-02 14:45:28 +0000
committerSamuli Suominen <drac@gentoo.org>2008-03-02 14:45:28 +0000
commit4f1cd2ed5ae23da8cc4d9316bd2c8029c9c6c676 (patch)
tree5ab02d604a119e38a69b8ad726ed6748a5a50153 /x11-misc/xscreensaver/files
parentMarked stable on amd64 as per bug 196952. (diff)
downloadgentoo-2-4f1cd2ed5ae23da8cc4d9316bd2c8029c9c6c676.tar.gz
gentoo-2-4f1cd2ed5ae23da8cc4d9316bd2c8029c9c6c676.tar.bz2
gentoo-2-4f1cd2ed5ae23da8cc4d9316bd2c8029c9c6c676.zip
Version bump wrt #212060, thanks to Tobias Klausmann for reporting.
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-misc/xscreensaver/files')
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch29
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch12
2 files changed, 41 insertions, 0 deletions
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch
new file mode 100644
index 000000000000..f0e9b90cdd75
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch
@@ -0,0 +1,29 @@
+diff -ur xscreensaver-5.05.orig/driver/Makefile.in xscreensaver-5.05/driver/Makefile.in
+--- xscreensaver-5.05.orig/driver/Makefile.in 2008-03-02 07:34:46.000000000 +0200
++++ xscreensaver-5.05/driver/Makefile.in 2008-03-02 16:07:29.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.05.orig/driver/screensaver-properties.desktop.in xscreensaver-5.05/driver/screensaver-properties.desktop.in
+--- xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in 2008-01-27 01:16:59.000000000 +0200
++++ xscreensaver-5.05/driver/screensaver-properties.desktop.in 2008-03-02 16:08:00.000000000 +0200
+@@ -6,3 +6,4 @@
+ _Comment=Change screensaver properties
+ Type=Application
+ Categories=Settings;DesktopSettings;Security;
++NotShowIn=GNOME;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch
new file mode 100644
index 000000000000..d282e78e2e44
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch
@@ -0,0 +1,12 @@
+diff -ur xscreensaver-5.05.orig/Makefile.in xscreensaver-5.05/Makefile.in
+--- xscreensaver-5.05.orig/Makefile.in 2008-03-01 06:32:52.000000000 +0200
++++ xscreensaver-5.05/Makefile.in 2008-03-02 16:27:25.000000000 +0200
+@@ -326,7 +326,7 @@
+ diff -U0 download.html $$TMP ; \
+ echo '' ; \
+ \
+- OLDEST=`ls xscreensaver*.tar.gz | head -1` ; \
++ OLDEST=`ls xscreensaver*.tar.gz | head -n 1` ; \
+ /bin/echo -n "Delete $$DEST/$$OLDEST? "; \
+ read line; \
+ if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then \