| 1 |
drac 08/05/07 19:03:34 |
| 2 |
|
| 3 |
Added: 02_all_cracklib_words.patch 04_all_posix_head.patch |
| 4 |
06_all_rpm.patch 03_all_desktop_entry.patch |
| 5 |
01_all_default_settings.patch 07_all_xinerama.patch |
| 6 |
05_all_offensive.patch |
| 7 |
Log: |
| 8 |
Remove NotShowIn=GNOME; and use xscreensaver.xpm for unique appearance in desktop entry. Split -5.04-gentoo.patch into separate patches. Add directory for cracklib-words. Fix bug with Xinerama wrt bug #219172. |
| 9 |
(Portage version: 2.1.5_rc6) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 x11-misc/xscreensaver/files/5.05/02_all_cracklib_words.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/02_all_cracklib_words.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/02_all_cracklib_words.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: 02_all_cracklib_words.patch |
| 18 |
=================================================================== |
| 19 |
diff -ur xscreensaver-5.05.orig/hacks/webcollage xscreensaver-5.05/hacks/webcollage |
| 20 |
--- xscreensaver-5.05.orig/hacks/webcollage 2007-11-08 05:05:23.000000000 +0200 |
| 21 |
+++ xscreensaver-5.05/hacks/webcollage 2008-05-07 20:52:08.000000000 +0300 |
| 22 |
@@ -860,7 +860,9 @@ |
| 23 |
|
| 24 |
|
| 25 |
sub pick_dictionary() { |
| 26 |
- my @dicts = ("/usr/dict/words", |
| 27 |
+ my @dicts = ("/usr/share/dict/cracklib-small", |
| 28 |
+ "/usr/share/dict/cracklib-words", |
| 29 |
+ "/usr/dict/words", |
| 30 |
"/usr/share/dict/words", |
| 31 |
"/usr/share/lib/dict/words"); |
| 32 |
foreach my $f (@dicts) { |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.1 x11-misc/xscreensaver/files/5.05/04_all_posix_head.patch |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/04_all_posix_head.patch?rev=1.1&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/04_all_posix_head.patch?rev=1.1&content-type=text/plain |
| 40 |
|
| 41 |
Index: 04_all_posix_head.patch |
| 42 |
=================================================================== |
| 43 |
diff -ur xscreensaver-5.05.orig/Makefile.in xscreensaver-5.05/Makefile.in |
| 44 |
--- xscreensaver-5.05.orig/Makefile.in 2008-03-01 06:32:52.000000000 +0200 |
| 45 |
+++ xscreensaver-5.05/Makefile.in 2008-03-02 16:27:25.000000000 +0200 |
| 46 |
@@ -326,7 +326,7 @@ |
| 47 |
diff -U0 download.html $$TMP ; \ |
| 48 |
echo '' ; \ |
| 49 |
\ |
| 50 |
- OLDEST=`ls xscreensaver*.tar.gz | head -1` ; \ |
| 51 |
+ OLDEST=`ls xscreensaver*.tar.gz | head -n 1` ; \ |
| 52 |
/bin/echo -n "Delete $$DEST/$$OLDEST? "; \ |
| 53 |
read line; \ |
| 54 |
if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then \ |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 x11-misc/xscreensaver/files/5.05/06_all_rpm.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/06_all_rpm.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/06_all_rpm.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: 06_all_rpm.patch |
| 64 |
=================================================================== |
| 65 |
diff -ur xscreensaver-5.05.orig/configure.in xscreensaver-5.05/configure.in |
| 66 |
--- xscreensaver-5.05.orig/configure.in 2008-03-02 00:14:30.000000000 +0200 |
| 67 |
+++ xscreensaver-5.05/configure.in 2008-05-07 20:53:26.000000000 +0300 |
| 68 |
@@ -4169,41 +4169,7 @@ |
| 69 |
# Now let's warn if there's a previous RPM version already installed. |
| 70 |
# But don't bother with this test if we are currently *building* an RPM. |
| 71 |
|
| 72 |
-if test -z "$RPM_PACKAGE_VERSION" ; then |
| 73 |
- |
| 74 |
- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras" |
| 75 |
- |
| 76 |
- # M4 sucks!! |
| 77 |
- changequote(X,Y) |
| 78 |
- rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ |
| 79 |
- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ |
| 80 |
- head -1` |
| 81 |
- changequote([,]) |
| 82 |
- |
| 83 |
- if test \! -z "$rpmv" ; then |
| 84 |
- rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` |
| 85 |
- rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'` |
| 86 |
- |
| 87 |
- warning=no |
| 88 |
- warnL "There is already an installed RPM of xscreensaver $rpmv" |
| 89 |
- warn2 'on this system. You might want to remove it ("rpm -ve")' |
| 90 |
- warn2 'before running "make install" in this directory.' |
| 91 |
- echo "" |
| 92 |
- warn2 "Alternately, you could build this version of xscreensaver" |
| 93 |
- warn2 'as an RPM, and then install that. An "xscreensaver.spec"' |
| 94 |
- warn2 'file is included. Try "rpmbuild -v -ba xscreensaver.spec".' |
| 95 |
- warn2 "See the RPM documentation for more info." |
| 96 |
- echo "" |
| 97 |
- |
| 98 |
- if test "$rpmbdir" = "$rpmhdir" ; then |
| 99 |
- warn2 "The RPM version was installed in $rpmbdir/." |
| 100 |
- do_dir_warning=yes |
| 101 |
- else |
| 102 |
- warn2 "The RPM version was installed in $rpmbdir/," |
| 103 |
- warn2 "with demos in $rpmhdir/." |
| 104 |
- fi |
| 105 |
- fi |
| 106 |
-fi |
| 107 |
+# Nope - breaks compilation with sandbox violation |
| 108 |
|
| 109 |
if test "${bindir}" = "${HACKDIR}" ; then |
| 110 |
do_dir_warning=yes |
| 111 |
|
| 112 |
|
| 113 |
|
| 114 |
1.1 x11-misc/xscreensaver/files/5.05/03_all_desktop_entry.patch |
| 115 |
|
| 116 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/03_all_desktop_entry.patch?rev=1.1&view=markup |
| 117 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/03_all_desktop_entry.patch?rev=1.1&content-type=text/plain |
| 118 |
|
| 119 |
Index: 03_all_desktop_entry.patch |
| 120 |
=================================================================== |
| 121 |
diff -ur xscreensaver-5.05.orig/driver/Makefile.in xscreensaver-5.05/driver/Makefile.in |
| 122 |
--- xscreensaver-5.05.orig/driver/Makefile.in 2008-03-02 07:34:46.000000000 +0200 |
| 123 |
+++ xscreensaver-5.05/driver/Makefile.in 2008-05-07 20:31:30.000000000 +0300 |
| 124 |
@@ -498,7 +498,7 @@ |
| 125 |
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ |
| 126 |
$(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ |
| 127 |
fi ;\ |
| 128 |
- name2=gnome-screensaver-properties.desktop ;\ |
| 129 |
+ name2=xscreensaver-properties.desktop ;\ |
| 130 |
echo $(INSTALL_DATA) screensaver-properties.desktop \ |
| 131 |
$(install_prefix)$(GTK_APPDIR)/$$name2 ;\ |
| 132 |
$(INSTALL_DATA) screensaver-properties.desktop \ |
| 133 |
@@ -571,7 +571,7 @@ |
| 134 |
# into /usr/share/applications/ |
| 135 |
uninstall-gnome:: |
| 136 |
@if [ "$(GTK_DATADIR)" != "" ]; then \ |
| 137 |
- f=gnome-screensaver-properties.desktop ;\ |
| 138 |
+ f=xscreensaver-properties.desktop ;\ |
| 139 |
echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ |
| 140 |
rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ |
| 141 |
fi |
| 142 |
diff -ur xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in xscreensaver-5.05/driver/screensaver-properties.desktop.in |
| 143 |
--- xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in 2008-01-27 01:16:59.000000000 +0200 |
| 144 |
+++ xscreensaver-5.05/driver/screensaver-properties.desktop.in 2008-05-07 20:31:51.000000000 +0300 |
| 145 |
@@ -1,6 +1,6 @@ |
| 146 |
[Desktop Entry] |
| 147 |
Exec=xscreensaver-demo |
| 148 |
-Icon=xscreensaver |
| 149 |
+Icon=/usr/share/pixmaps/xscreensaver.xpm |
| 150 |
Terminal=false |
| 151 |
_Name=Screensaver |
| 152 |
_Comment=Change screensaver properties |
| 153 |
|
| 154 |
|
| 155 |
|
| 156 |
1.1 x11-misc/xscreensaver/files/5.05/01_all_default_settings.patch |
| 157 |
|
| 158 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/01_all_default_settings.patch?rev=1.1&view=markup |
| 159 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/01_all_default_settings.patch?rev=1.1&content-type=text/plain |
| 160 |
|
| 161 |
Index: 01_all_default_settings.patch |
| 162 |
=================================================================== |
| 163 |
diff -ur xscreensaver-5.05.orig/driver/XScreenSaver.ad.in xscreensaver-5.05/driver/XScreenSaver.ad.in |
| 164 |
--- xscreensaver-5.05.orig/driver/XScreenSaver.ad.in 2008-03-01 23:33:47.000000000 +0200 |
| 165 |
+++ xscreensaver-5.05/driver/XScreenSaver.ad.in 2008-05-07 20:47:16.000000000 +0300 |
| 166 |
@@ -31,36 +31,36 @@ |
| 167 |
*mode: random |
| 168 |
*timeout: 0:10:00 |
| 169 |
*cycle: 0:10:00 |
| 170 |
-*lockTimeout: 0:00:00 |
| 171 |
+*lockTimeout: 0:20:00 |
| 172 |
*passwdTimeout: 0:00:30 |
| 173 |
-*dpmsEnabled: False |
| 174 |
-*dpmsStandby: 2:00:00 |
| 175 |
-*dpmsSuspend: 2:00:00 |
| 176 |
-*dpmsOff: 4:00:00 |
| 177 |
-*grabDesktopImages: True |
| 178 |
+*dpmsEnabled: True |
| 179 |
+*dpmsStandby: 1:00:00 |
| 180 |
+*dpmsSuspend: 1:00:00 |
| 181 |
+*dpmsOff: 2:00:00 |
| 182 |
+*grabDesktopImages: False |
| 183 |
*grabVideoFrames: False |
| 184 |
*chooseRandomImages: @DEFAULT_IMAGES_P@ |
| 185 |
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ |
| 186 |
*nice: 10 |
| 187 |
*memoryLimit: 0 |
| 188 |
-*lock: False |
| 189 |
+*lock: True |
| 190 |
*verbose: False |
| 191 |
*timestamp: True |
| 192 |
*fade: True |
| 193 |
*unfade: False |
| 194 |
*fadeSeconds: 0:00:03 |
| 195 |
*fadeTicks: 20 |
| 196 |
-*splash: True |
| 197 |
+*splash: False |
| 198 |
*splashDuration: 0:00:05 |
| 199 |
*visualID: default |
| 200 |
*captureStderr: True |
| 201 |
*ignoreUninstalledPrograms: False |
| 202 |
|
| 203 |
-*textMode: file |
| 204 |
-*textLiteral: XScreenSaver |
| 205 |
-*textFile: @DEFAULT_TEXT_FILE@ |
| 206 |
-*textProgram: fortune |
| 207 |
-*textURL: http://www.livejournal.com/stats/latest-rss.bml |
| 208 |
+*textMode: literal |
| 209 |
+*textLiteral: Gentoo Linux |
| 210 |
+*textFile: /etc/gentoo-release |
| 211 |
+*textProgram: /usr/bin/fortune |
| 212 |
+*textURL: http://planet.gentoo.org/rss20.xml |
| 213 |
|
| 214 |
*overlayTextForeground: #FFFF00 |
| 215 |
*overlayTextBackground: #000000 |
| 216 |
@@ -117,7 +117,10 @@ |
| 217 |
|
| 218 |
! The format used for printing the date and time in the password dialog box |
| 219 |
! (see the strftime(3) manual page for details.) |
| 220 |
-*dateFormat: %d-%b-%y (%a); %I:%M %p |
| 221 |
+! Preferred time representation for the current locale |
| 222 |
+*dateFormat: %x %X |
| 223 |
+! Xscreensaver's default |
| 224 |
+! *dateFormat: %d-%b-%y (%a); %I:%M %p |
| 225 |
! To show the time only: |
| 226 |
! *dateFormat: %I:%M %p |
| 227 |
! For 24 hour time: |
| 228 |
|
| 229 |
|
| 230 |
|
| 231 |
1.1 x11-misc/xscreensaver/files/5.05/07_all_xinerama.patch |
| 232 |
|
| 233 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/07_all_xinerama.patch?rev=1.1&view=markup |
| 234 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/07_all_xinerama.patch?rev=1.1&content-type=text/plain |
| 235 |
|
| 236 |
Index: 07_all_xinerama.patch |
| 237 |
=================================================================== |
| 238 |
diff -ur xscreensaver-5.05.orig/driver/xscreensaver.c xscreensaver-5.05/driver/xscreensaver.c |
| 239 |
--- xscreensaver-5.05.orig/driver/xscreensaver.c 2008-03-01 06:05:12.000000000 +0200 |
| 240 |
+++ xscreensaver-5.05/driver/xscreensaver.c 2008-05-07 21:03:52.000000000 +0300 |
| 241 |
@@ -816,7 +816,7 @@ |
| 242 |
if (i != j && |
| 243 |
xsi[i].screen_number >= 0 && |
| 244 |
xsi[j].screen_number >= 0 && |
| 245 |
- X1 >= X2 && Y1 >= Y2 && (X1+W1) <= (X2+W2) && (X1+H1) <= (X2+H2)) |
| 246 |
+ X1 >= X2 && Y1 >= Y2 && (X1+W1) <= (X2+W2) && (Y1+H1) <= (Y2+H2)) |
| 247 |
{ |
| 248 |
sprintf (err, "%dx%d+%d+%d enclosed by %dx%d+%d+%d", |
| 249 |
W1, H1, X1, Y1, |
| 250 |
|
| 251 |
|
| 252 |
|
| 253 |
1.1 x11-misc/xscreensaver/files/5.05/05_all_offensive.patch |
| 254 |
|
| 255 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/05_all_offensive.patch?rev=1.1&view=markup |
| 256 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.05/05_all_offensive.patch?rev=1.1&content-type=text/plain |
| 257 |
|
| 258 |
Index: 05_all_offensive.patch |
| 259 |
=================================================================== |
| 260 |
diff -ur xscreensaver-5.05.orig/hacks/barcode.c xscreensaver-5.05/hacks/barcode.c |
| 261 |
--- xscreensaver-5.05.orig/hacks/barcode.c 2006-04-06 09:40:32.000000000 +0300 |
| 262 |
+++ xscreensaver-5.05/hacks/barcode.c 2008-05-07 20:49:16.000000000 +0300 |
| 263 |
@@ -131,7 +131,6 @@ |
| 264 |
"children", |
| 265 |
"chocolate", |
| 266 |
"CLONE", |
| 267 |
- "cock", |
| 268 |
"constriction", |
| 269 |
"contrition", |
| 270 |
"cop", |
| 271 |
@@ -265,7 +264,6 @@ |
| 272 |
"punishment", |
| 273 |
"punk rock", |
| 274 |
"punk", |
| 275 |
- "pussy", |
| 276 |
"quagmire", |
| 277 |
"quarantine", |
| 278 |
"quartz", |
| 279 |
@@ -333,8 +331,6 @@ |
| 280 |
"vegetarian", |
| 281 |
"venom", |
| 282 |
"verifiability", |
| 283 |
- "viagra", |
| 284 |
- "vibrator", |
| 285 |
"victim", |
| 286 |
"vignette", |
| 287 |
"villainy", |
| 288 |
diff -ur xscreensaver-5.05.orig/hacks/glx/glsnake.c xscreensaver-5.05/hacks/glx/glsnake.c |
| 289 |
--- xscreensaver-5.05.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 |
| 290 |
+++ xscreensaver-5.05/hacks/glx/glsnake.c 2008-05-07 20:49:16.000000000 +0300 |
| 291 |
@@ -565,17 +565,17 @@ |
| 292 |
ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, |
| 293 |
ZERO, PIN, ZERO } |
| 294 |
}, |
| 295 |
- { "erect penis", /* thanks benno */ |
| 296 |
+ { "shuffle board", /* thanks benno */ |
| 297 |
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
| 298 |
PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, |
| 299 |
ZERO, ZERO } |
| 300 |
}, |
| 301 |
- { "flaccid penis", |
| 302 |
+ { "flaccid anchor", |
| 303 |
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
| 304 |
PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, |
| 305 |
ZERO, ZERO } |
| 306 |
}, |
| 307 |
- { "vagina", |
| 308 |
+ { "engagement ring", |
| 309 |
{ RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, |
| 310 |
LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, |
| 311 |
PIN, RIGHT, ZERO } |
| 312 |
@@ -995,7 +995,7 @@ |
| 313 |
{ "Parrot", |
| 314 |
{ ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } |
| 315 |
}, |
| 316 |
- { "Penis", |
| 317 |
+ { "Shuttle", |
| 318 |
{ PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } |
| 319 |
}, |
| 320 |
{ "PictureComingSoon", |
| 321 |
|
| 322 |
|
| 323 |
|
| 324 |
-- |
| 325 |
gentoo-commits@l.g.o mailing list |
Archives