diff options
| author |   Don Seiler <rizzo@gentoo.org> | 2005-05-27 21:26:07 +0000 |
|---|---|---|
| committer | Don Seiler <rizzo@gentoo.org> | 2005-05-27 21:26:07 +0000 |
| commit | d981bd1d0187fec8efeaef3e07f6eda9f69a5902 (patch) | |
| tree | ad5ba526991a4aa73258d7bd128d5fde3dbd16af /x11-misc/xscreensaver/files | |
| parent | install the README (diff) | |
| download | gentoo-2-d981bd1d0187fec8efeaef3e07f6eda9f69a5902.tar.gz gentoo-2-d981bd1d0187fec8efeaef3e07f6eda9f69a5902.tar.bz2 gentoo-2-d981bd1d0187fec8efeaef3e07f6eda9f69a5902.zip | |
Version bump, closes bug #86102. Thanks to Ryan Finnie and Octavio Ruiz
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'x11-misc/xscreensaver/files')
3 files changed, 81 insertions, 0 deletions
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.21 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.21 new file mode 100644 index 000000000000..8be5d1ac30fa --- /dev/null +++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.21 @@ -0,0 +1 @@ +MD5 3ea7d0bc9b7159523855296e175d7ac7 xscreensaver-4.21.tar.gz 4519828 diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.21-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.21-norpm.patch new file mode 100644 index 000000000000..084c83a77056 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-4.21-norpm.patch @@ -0,0 +1,37 @@ +--- configure.orig 2005-05-27 13:09:59.000000000 -0500 ++++ configure 2005-05-27 13:10:56.000000000 -0500 +@@ -21257,34 +21257,6 @@ + + # M4 sucks!! + +- rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ +- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ +- head -1` +- +- +- if test \! -z "$rpmv" ; then +- rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` +- rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'` +- +- warning=no +- warnL "There is already an installed RPM of xscreensaver $rpmv" +- warn2 'on this system. You might want to remove it ("rpm -ve")' +- warn2 'before running "make install" in this directory.' +- echo "" +- warn2 "Alternately, you could build this version of xscreensaver" +- warn2 'as an RPM, and then install that. An "xscreensaver.spec"' +- warn2 'file is included. Try "rpmbuild -v -ba xscreensaver.spec".' +- warn2 "See the RPM documentation for more info." +- echo "" +- +- if test "$rpmbdir" = "$rpmhdir" ; then +- warn2 "The RPM version was installed in $rpmbdir/." +- do_dir_warning=yes +- else +- warn2 "The RPM version was installed in $rpmbdir/," +- warn2 "with demos in $rpmhdir/." +- fi +- fi + fi + + if test "${bindir}" = "${HACKDIR}" ; then diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.21-settings.patch b/x11-misc/xscreensaver/files/xscreensaver-4.21-settings.patch new file mode 100644 index 000000000000..f300c1b83871 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-4.21-settings.patch @@ -0,0 +1,43 @@ +--- driver/XScreenSaver.ad.in.orig 2005-05-27 14:10:59.000000000 -0500 ++++ driver/XScreenSaver.ad.in 2005-05-27 14:10:46.000000000 -0500 +@@ -31,19 +31,19 @@ + *mode: random + *timeout: 0:10:00 + *cycle: 0:10:00 +-*lockTimeout: 0:00:00 ++*lockTimeout: 0:15:00 + *passwdTimeout: 0:00:30 +-*dpmsEnabled: False ++*dpmsEnabled: True + *dpmsStandby: 2:00:00 + *dpmsSuspend: 2:00:00 + *dpmsOff: 4:00:00 +-*grabDesktopImages: True ++*grabDesktopImages: False + *grabVideoFrames: False + *chooseRandomImages: @DEFAULT_IMAGES_P@ + *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ + *nice: 10 + *memoryLimit: 0 +-*lock: False ++*lock: True + *lockVTs: True + *verbose: False + *timestamp: True +@@ -57,11 +57,11 @@ + *captureStderr: True + *ignoreUninstalledPrograms: False + +-*textMode: file +-*textLiteral: XScreenSaver +-*textFile: /usr/X11R6/lib/X11/doc/README +-*textProgram: fortune +-*textURL: http://www.livejournal.com/stats/latest-rss.bml ++*textMode: literal ++*textLiteral: Gentoo Linux ++*textFile: /etc/gentoo-release ++*textProgram: /usr/bin/fortune ++*textURL: http://planet.gentoo.org/rss20.xml + + *overlayTextForeground: #FFFF00 + *overlayTextBackground: #000000 |