1 |
drac 08/08/04 22:00:03 |
2 |
|
3 |
Added: 01_all_default_settings.patch |
4 |
02_all_xinerama_function.patch |
5 |
Log: |
6 |
Version bump. Upstream applied most of our patchset. Fix building with --without-xinerama-ext by renaming misnamed ifdef. |
7 |
(Portage version: 2.2_rc6/cvs/Linux 2.6.24-gentoo-r3 x86_64) |
8 |
(Unsigned Manifest commit) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.06/01_all_default_settings.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: 01_all_default_settings.patch |
17 |
=================================================================== |
18 |
diff -ur xscreensaver-5.06.orig/driver/screensaver-properties.desktop.in xscreensaver-5.06/driver/screensaver-properties.desktop.in |
19 |
--- xscreensaver-5.06.orig/driver/screensaver-properties.desktop.in 2008-01-27 01:16:59.000000000 +0200 |
20 |
+++ xscreensaver-5.06/driver/screensaver-properties.desktop.in 2008-08-05 00:07:25.000000000 +0300 |
21 |
@@ -1,6 +1,6 @@ |
22 |
[Desktop Entry] |
23 |
Exec=xscreensaver-demo |
24 |
-Icon=xscreensaver |
25 |
+Icon=/usr/share/pixmaps/xscreensaver.xpm |
26 |
Terminal=false |
27 |
_Name=Screensaver |
28 |
_Comment=Change screensaver properties |
29 |
diff -ur xscreensaver-5.06.orig/driver/XScreenSaver.ad.in xscreensaver-5.06/driver/XScreenSaver.ad.in |
30 |
--- xscreensaver-5.06.orig/driver/XScreenSaver.ad.in 2008-07-17 00:03:56.000000000 +0300 |
31 |
+++ xscreensaver-5.06/driver/XScreenSaver.ad.in 2008-08-05 00:00:15.000000000 +0300 |
32 |
@@ -31,36 +31,36 @@ |
33 |
*mode: random |
34 |
*timeout: 0:10:00 |
35 |
*cycle: 0:10:00 |
36 |
-*lockTimeout: 0:00:00 |
37 |
+*lockTimeout: 0:20:00 |
38 |
*passwdTimeout: 0:00:30 |
39 |
-*dpmsEnabled: False |
40 |
-*dpmsStandby: 2:00:00 |
41 |
-*dpmsSuspend: 2:00:00 |
42 |
-*dpmsOff: 4:00:00 |
43 |
-*grabDesktopImages: True |
44 |
+*dpmsEnabled: True |
45 |
+*dpmsStandby: 1:00:00 |
46 |
+*dpmsSuspend: 1:00:00 |
47 |
+*dpmsOff: 2:00:00 |
48 |
+*grabDesktopImages: False |
49 |
*grabVideoFrames: False |
50 |
*chooseRandomImages: @DEFAULT_IMAGES_P@ |
51 |
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ |
52 |
*nice: 10 |
53 |
*memoryLimit: 0 |
54 |
-*lock: False |
55 |
+*lock: True |
56 |
*verbose: False |
57 |
*timestamp: True |
58 |
*fade: True |
59 |
*unfade: False |
60 |
*fadeSeconds: 0:00:03 |
61 |
*fadeTicks: 20 |
62 |
-*splash: True |
63 |
+*splash: False |
64 |
*splashDuration: 0:00:05 |
65 |
*visualID: default |
66 |
*captureStderr: True |
67 |
*ignoreUninstalledPrograms: False |
68 |
|
69 |
-*textMode: file |
70 |
-*textLiteral: XScreenSaver |
71 |
-*textFile: @DEFAULT_TEXT_FILE@ |
72 |
-*textProgram: fortune |
73 |
-*textURL: http://www.livejournal.com/stats/latest-rss.bml |
74 |
+*textMode: literal |
75 |
+*textLiteral: Gentoo Linux |
76 |
+*textFile: /etc/gentoo-release |
77 |
+*textProgram: /usr/bin/fortune |
78 |
+*textURL: http://planet.gentoo.org/rss20.xml |
79 |
|
80 |
*overlayTextForeground: #FFFF00 |
81 |
*overlayTextBackground: #000000 |
82 |
@@ -117,7 +117,10 @@ |
83 |
|
84 |
! The format used for printing the date and time in the password dialog box |
85 |
! (see the strftime(3) manual page for details.) |
86 |
-*dateFormat: %d-%b-%y (%a); %I:%M %p |
87 |
+! Preferred time representation for the current locale |
88 |
+*dateFormat: %x %X |
89 |
+! Xscreensaver's default |
90 |
+! *dateFormat: %d-%b-%y (%a); %I:%M %p |
91 |
! To show the time only: |
92 |
! *dateFormat: %I:%M %p |
93 |
! For 24 hour time: |
94 |
diff -ur xscreensaver-5.06.orig/hacks/barcode.c xscreensaver-5.06/hacks/barcode.c |
95 |
--- xscreensaver-5.06.orig/hacks/barcode.c 2006-04-06 09:40:32.000000000 +0300 |
96 |
+++ xscreensaver-5.06/hacks/barcode.c 2008-08-05 00:00:21.000000000 +0300 |
97 |
@@ -131,7 +131,6 @@ |
98 |
"children", |
99 |
"chocolate", |
100 |
"CLONE", |
101 |
- "cock", |
102 |
"constriction", |
103 |
"contrition", |
104 |
"cop", |
105 |
@@ -265,7 +264,6 @@ |
106 |
"punishment", |
107 |
"punk rock", |
108 |
"punk", |
109 |
- "pussy", |
110 |
"quagmire", |
111 |
"quarantine", |
112 |
"quartz", |
113 |
@@ -333,8 +331,6 @@ |
114 |
"vegetarian", |
115 |
"venom", |
116 |
"verifiability", |
117 |
- "viagra", |
118 |
- "vibrator", |
119 |
"victim", |
120 |
"vignette", |
121 |
"villainy", |
122 |
diff -ur xscreensaver-5.06.orig/hacks/glx/glsnake.c xscreensaver-5.06/hacks/glx/glsnake.c |
123 |
--- xscreensaver-5.06.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 |
124 |
+++ xscreensaver-5.06/hacks/glx/glsnake.c 2008-08-05 00:00:21.000000000 +0300 |
125 |
@@ -565,17 +565,17 @@ |
126 |
ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, |
127 |
ZERO, PIN, ZERO } |
128 |
}, |
129 |
- { "erect penis", /* thanks benno */ |
130 |
+ { "shuffle board", /* thanks benno */ |
131 |
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
132 |
PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, |
133 |
ZERO, ZERO } |
134 |
}, |
135 |
- { "flaccid penis", |
136 |
+ { "flaccid anchor", |
137 |
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
138 |
PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, |
139 |
ZERO, ZERO } |
140 |
}, |
141 |
- { "vagina", |
142 |
+ { "engagement ring", |
143 |
{ RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, |
144 |
LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, |
145 |
PIN, RIGHT, ZERO } |
146 |
@@ -995,7 +995,7 @@ |
147 |
{ "Parrot", |
148 |
{ ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } |
149 |
}, |
150 |
- { "Penis", |
151 |
+ { "Shuttle", |
152 |
{ PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } |
153 |
}, |
154 |
{ "PictureComingSoon", |
155 |
|
156 |
|
157 |
|
158 |
1.1 x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch |
159 |
|
160 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch?rev=1.1&view=markup |
161 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.06/02_all_xinerama_function.patch?rev=1.1&content-type=text/plain |
162 |
|
163 |
Index: 02_all_xinerama_function.patch |
164 |
=================================================================== |
165 |
diff -ur xscreensaver-5.06.orig/driver/screens.c xscreensaver-5.06/driver/screens.c |
166 |
--- xscreensaver-5.06.orig/driver/screens.c 2008-07-07 12:03:00.000000000 +0300 |
167 |
+++ xscreensaver-5.06/driver/screens.c 2008-08-05 00:49:54.000000000 +0300 |
168 |
@@ -563,7 +563,7 @@ |
169 |
if (! monitors) monitors = vidmode_scan_monitors (si->dpy); |
170 |
# endif |
171 |
|
172 |
-# ifdef HAVE_XF86VMODE |
173 |
+# ifdef HAVE_XINERAMA |
174 |
if (! monitors) monitors = xinerama_scan_monitors (si->dpy); |
175 |
# endif |