diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2008-08-04 22:00:02 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2008-08-04 22:00:02 +0000 |
commit | fdd2523a972426eec3cc0e799ef2c010de6d93e3 (patch) | |
tree | 174e807a364ff5c311d3519f3b170e81bb80ae28 /x11-misc | |
parent | Version bump. Upstream applied most of our patchset. Fix building with --with... (diff) | |
download | historical-fdd2523a972426eec3cc0e799ef2c010de6d93e3.tar.gz historical-fdd2523a972426eec3cc0e799ef2c010de6d93e3.tar.bz2 historical-fdd2523a972426eec3cc0e799ef2c010de6d93e3.zip |
Version bump. Upstream applied most of our patchset. Fix building with --without-xinerama-ext by renaming misnamed ifdef.
Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.24-gentoo-r3 x86_64
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/xscreensaver/Manifest | 6 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch | 137 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch | 12 |
3 files changed, 154 insertions, 1 deletions
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index ed1ec98e72bc..d33811cb1f90 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -5,8 +5,12 @@ AUX 5.05/04_all_posix_head.patch 583 RMD160 f96101fa4608321d3a87d74fc121eb4ed89d AUX 5.05/05_all_offensive.patch 2068 RMD160 90653b5f867214283de204ab63dafbaba8319b35 SHA1 e76e5150e59f3efd463478891fa8f5740935d6cd SHA256 f85c587e6bfef0d9a6fe88846de22730d420f578f201b95d2e2e69b643890893 AUX 5.05/06_all_rpm.patch 1772 RMD160 e5b862ce1e4c91c866ec584bd0732740dba8e09d SHA1 091c942a18cf36ac7b77ac05c5a3f0abf6f937ec SHA256 499b1a422abb09618bfecf5b9c885b168b8bac0da58f00c7e4e9b1456f750613 AUX 5.05/07_all_xinerama.patch 645 RMD160 2d9080fe392442e1a967c58c4a0f8c5a465277ee SHA1 4cc93c5fcfe5b7a708df3f62a8667b5592d28908 SHA256 faedfe926ad014ae21ddeefe21d138cab49f3f9319676b65d47fafe61f31e1b1 +AUX 5.06/01_all_default_settings.patch 4478 RMD160 07abe8dddfb615b302db1d1e693e3fe08f93ed45 SHA1 380989245e9008c5ebe1ea02992dc82ceaf81f64 SHA256 5514cde38e59cdafd4be55213dc5cc7d22885ca417276b39ae2860ed9e8ef276 +AUX 5.06/02_all_xinerama_function.patch 455 RMD160 561a05512cd97921410f7dfa80b65f40347da2e9 SHA1 17b9664c6e8c8efa725b200f8fe7b3d572d00161 SHA256 60cd6227010490af64323cb3cfc2e7df0d546183ab0a772c54dc7f54b11e35fd DIST xscreensaver-5.05.tar.gz 5468293 RMD160 8f174d544ae68f54454d946c854cf81749427afb SHA1 6f23422b17dd8a06cdaf419fd16d398eee50601b SHA256 3c64366f1990ebe173db422660dce5d9d80b1c758f3a9ad6e55fb72657dc821a +DIST xscreensaver-5.06.tar.gz 5486779 RMD160 de164ee7f68094f77b28dcfaa3279953f98cba83 SHA1 3310789ecf1ed8ff790d94512fe536857e793e4c SHA256 e7fb2f228caca0fed3181b0c88970f7bf501c385f8cdb4e152b34a0f43df38f6 EBUILD xscreensaver-5.05-r1.ebuild 2660 RMD160 c5f251a4492edc5e279f05bb320c1851e1505467 SHA1 75ae90259f46f930f64eef23bb20a54b5e737283 SHA256 f761a210a36e73e73815ec930451849fbb7fcde4b55259ad318ef926841a1b30 EBUILD xscreensaver-5.05.ebuild 2583 RMD160 44751191628b6963d3814632ffab22da6ff1d546 SHA1 355414c5386d718067eac10ec50592c8fb14a231 SHA256 e53ec07db00db2e85272ca355096481ee2f843946a61fd07cda01e3408dd3d6e -MISC ChangeLog 38096 RMD160 a004b70bafc80e8dce35ac6ee517c1599332ea14 SHA1 23ceb9b789754c00ce326c7365e4a58cf0b8a669 SHA256 92c82ad0983705d8c1b1a72f825df7f43998b4150939e151ff4ce338567e178b +EBUILD xscreensaver-5.06.ebuild 2675 RMD160 c4c5efc3144dbdd97892dad2cbe88b756097d341 SHA1 e68b145bd809f90fd0d8abfbef9e1fc952b858be SHA256 538ee3db23f513c4d4350a1db769c63badd012749f40ceeff7800ab3c11df041 +MISC ChangeLog 38424 RMD160 9fc0ddf79eea0cf9b1ecf8903fb6a5a4343eff2f SHA1 f1e72cd11abb3d5002f29b037ffc17880048feb3 SHA256 2152943edf0f3ac15a4c5edc938d31e8f0468143c0550d5b18f472d454043afa MISC metadata.xml 387 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 SHA1 debca11d5df5829ba86249140fdb4f4a42d3103c SHA256 5ae2b87a5da10d0ec7099d2f48602c4d9c09e0247c0ff85856cf4b944d761360 diff --git a/x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch b/x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch new file mode 100644 index 000000000000..6c41cc8bd26b --- /dev/null +++ b/x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch @@ -0,0 +1,137 @@ +diff -ur xscreensaver-5.06.orig/driver/screensaver-properties.desktop.in xscreensaver-5.06/driver/screensaver-properties.desktop.in +--- xscreensaver-5.06.orig/driver/screensaver-properties.desktop.in 2008-01-27 01:16:59.000000000 +0200 ++++ xscreensaver-5.06/driver/screensaver-properties.desktop.in 2008-08-05 00:07:25.000000000 +0300 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Exec=xscreensaver-demo +-Icon=xscreensaver ++Icon=/usr/share/pixmaps/xscreensaver.xpm + Terminal=false + _Name=Screensaver + _Comment=Change screensaver properties +diff -ur xscreensaver-5.06.orig/driver/XScreenSaver.ad.in xscreensaver-5.06/driver/XScreenSaver.ad.in +--- xscreensaver-5.06.orig/driver/XScreenSaver.ad.in 2008-07-17 00:03:56.000000000 +0300 ++++ xscreensaver-5.06/driver/XScreenSaver.ad.in 2008-08-05 00:00:15.000000000 +0300 +@@ -31,36 +31,36 @@ + *mode: random + *timeout: 0:10:00 + *cycle: 0:10:00 +-*lockTimeout: 0:00:00 ++*lockTimeout: 0:20:00 + *passwdTimeout: 0:00:30 +-*dpmsEnabled: False +-*dpmsStandby: 2:00:00 +-*dpmsSuspend: 2:00:00 +-*dpmsOff: 4:00:00 +-*grabDesktopImages: True ++*dpmsEnabled: True ++*dpmsStandby: 1:00:00 ++*dpmsSuspend: 1:00:00 ++*dpmsOff: 2:00:00 ++*grabDesktopImages: False + *grabVideoFrames: False + *chooseRandomImages: @DEFAULT_IMAGES_P@ + *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ + *nice: 10 + *memoryLimit: 0 +-*lock: False ++*lock: True + *verbose: False + *timestamp: True + *fade: True + *unfade: False + *fadeSeconds: 0:00:03 + *fadeTicks: 20 +-*splash: True ++*splash: False + *splashDuration: 0:00:05 + *visualID: default + *captureStderr: True + *ignoreUninstalledPrograms: False + +-*textMode: file +-*textLiteral: XScreenSaver +-*textFile: @DEFAULT_TEXT_FILE@ +-*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 +@@ -117,7 +117,10 @@ + + ! The format used for printing the date and time in the password dialog box + ! (see the strftime(3) manual page for details.) +-*dateFormat: %d-%b-%y (%a); %I:%M %p ++! Preferred time representation for the current locale ++*dateFormat: %x %X ++! Xscreensaver's default ++! *dateFormat: %d-%b-%y (%a); %I:%M %p + ! To show the time only: + ! *dateFormat: %I:%M %p + ! For 24 hour time: +diff -ur xscreensaver-5.06.orig/hacks/barcode.c xscreensaver-5.06/hacks/barcode.c +--- xscreensaver-5.06.orig/hacks/barcode.c 2006-04-06 09:40:32.000000000 +0300 ++++ xscreensaver-5.06/hacks/barcode.c 2008-08-05 00:00:21.000000000 +0300 +@@ -131,7 +131,6 @@ + "children", + "chocolate", + "CLONE", +- "cock", + "constriction", + "contrition", + "cop", +@@ -265,7 +264,6 @@ + "punishment", + "punk rock", + "punk", +- "pussy", + "quagmire", + "quarantine", + "quartz", +@@ -333,8 +331,6 @@ + "vegetarian", + "venom", + "verifiability", +- "viagra", +- "vibrator", + "victim", + "vignette", + "villainy", +diff -ur xscreensaver-5.06.orig/hacks/glx/glsnake.c xscreensaver-5.06/hacks/glx/glsnake.c +--- xscreensaver-5.06.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 ++++ xscreensaver-5.06/hacks/glx/glsnake.c 2008-08-05 00:00:21.000000000 +0300 +@@ -565,17 +565,17 @@ + ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, + ZERO, PIN, ZERO } + }, +- { "erect penis", /* thanks benno */ ++ { "shuffle board", /* thanks benno */ + { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, + PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, + ZERO, ZERO } + }, +- { "flaccid penis", ++ { "flaccid anchor", + { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, + PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, + ZERO, ZERO } + }, +- { "vagina", ++ { "engagement ring", + { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, + LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, + PIN, RIGHT, ZERO } +@@ -995,7 +995,7 @@ + { "Parrot", + { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } + }, +- { "Penis", ++ { "Shuttle", + { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } + }, + { "PictureComingSoon", diff --git a/x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch b/x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch new file mode 100644 index 000000000000..fdb13ae0399c --- /dev/null +++ b/x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch @@ -0,0 +1,12 @@ +diff -ur xscreensaver-5.06.orig/driver/screens.c xscreensaver-5.06/driver/screens.c +--- xscreensaver-5.06.orig/driver/screens.c 2008-07-07 12:03:00.000000000 +0300 ++++ xscreensaver-5.06/driver/screens.c 2008-08-05 00:49:54.000000000 +0300 +@@ -563,7 +563,7 @@ + if (! monitors) monitors = vidmode_scan_monitors (si->dpy); + # endif + +-# ifdef HAVE_XF86VMODE ++# ifdef HAVE_XINERAMA + if (! monitors) monitors = xinerama_scan_monitors (si->dpy); + # endif + |