1 |
ssuominen 09/09/10 11:19:04 |
2 |
|
3 |
Added: xscreensaver-5.10-gentoo.patch |
4 |
xscreensaver-5.10-xfce.patch |
5 |
Log: |
6 |
Version bump. |
7 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 x11-misc/xscreensaver/files/xscreensaver-5.10-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.10-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.10-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: xscreensaver-5.10-gentoo.patch |
16 |
=================================================================== |
17 |
diff -ur xscreensaver-5.10.orig/driver/XScreenSaver.ad.in xscreensaver-5.10/driver/XScreenSaver.ad.in |
18 |
--- xscreensaver-5.10.orig/driver/XScreenSaver.ad.in 2009-09-08 07:53:15.000000000 +0300 |
19 |
+++ xscreensaver-5.10/driver/XScreenSaver.ad.in 2009-09-10 14:08:07.000000000 +0300 |
20 |
@@ -31,26 +31,26 @@ |
21 |
*mode: random |
22 |
*timeout: 0:10:00 |
23 |
*cycle: 0:10:00 |
24 |
-*lockTimeout: 0:00:00 |
25 |
+*lockTimeout: 0:30:00 |
26 |
*passwdTimeout: 0:00:30 |
27 |
-*dpmsEnabled: False |
28 |
+*dpmsEnabled: True |
29 |
*dpmsStandby: 2:00:00 |
30 |
*dpmsSuspend: 2:00:00 |
31 |
*dpmsOff: 4:00:00 |
32 |
-*grabDesktopImages: True |
33 |
+*grabDesktopImages: False |
34 |
*grabVideoFrames: False |
35 |
*chooseRandomImages: @DEFAULT_IMAGES_P@ |
36 |
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ |
37 |
*nice: 10 |
38 |
*memoryLimit: 0 |
39 |
-*lock: False |
40 |
+*lock: True |
41 |
*verbose: False |
42 |
*timestamp: True |
43 |
*fade: True |
44 |
*unfade: False |
45 |
*fadeSeconds: 0:00:03 |
46 |
*fadeTicks: 20 |
47 |
-*splash: True |
48 |
+*splash: False |
49 |
*splashDuration: 0:00:05 |
50 |
*visualID: default |
51 |
*captureStderr: True |
52 |
@@ -60,7 +60,7 @@ |
53 |
*textLiteral: XScreenSaver |
54 |
*textFile: @DEFAULT_TEXT_FILE@ |
55 |
*textProgram: fortune |
56 |
-*textURL: http://www.livejournal.com/stats/latest-rss.bml |
57 |
+*textURL: http://planet.gentoo.org/rss20.xml |
58 |
!*textURL: http://twitter.com/statuses/public_timeline.atom |
59 |
|
60 |
*overlayTextForeground: #FFFF00 |
61 |
@@ -118,7 +118,8 @@ |
62 |
|
63 |
! The format used for printing the date and time in the password dialog box |
64 |
! (see the strftime(3) manual page for details.) |
65 |
-*dateFormat: %d-%b-%y (%a); %I:%M %p |
66 |
+*dateFormat: %x %X |
67 |
+! *dateFormat: %d-%b-%y (%a); %I:%M %p |
68 |
! To show the time only: |
69 |
! *dateFormat: %I:%M %p |
70 |
! For 24 hour time: |
71 |
diff -ur xscreensaver-5.10.orig/hacks/barcode.c xscreensaver-5.10/hacks/barcode.c |
72 |
--- xscreensaver-5.10.orig/hacks/barcode.c 2008-07-31 13:17:32.000000000 +0300 |
73 |
+++ xscreensaver-5.10/hacks/barcode.c 2009-09-10 14:10:21.000000000 +0300 |
74 |
@@ -131,7 +131,6 @@ |
75 |
"children", |
76 |
"chocolate", |
77 |
"CLONE", |
78 |
- "cock", |
79 |
"constriction", |
80 |
"contrition", |
81 |
"cop", |
82 |
@@ -265,7 +264,6 @@ |
83 |
"punishment", |
84 |
"punk rock", |
85 |
"punk", |
86 |
- "pussy", |
87 |
"quagmire", |
88 |
"quarantine", |
89 |
"quartz", |
90 |
@@ -333,8 +331,6 @@ |
91 |
"vegetarian", |
92 |
"venom", |
93 |
"verifiability", |
94 |
- "viagra", |
95 |
- "vibrator", |
96 |
"victim", |
97 |
"vignette", |
98 |
"villainy", |
99 |
diff -ur xscreensaver-5.10.orig/hacks/glx/glsnake.c xscreensaver-5.10/hacks/glx/glsnake.c |
100 |
--- xscreensaver-5.10.orig/hacks/glx/glsnake.c 2008-08-11 01:45:23.000000000 +0300 |
101 |
+++ xscreensaver-5.10/hacks/glx/glsnake.c 2009-09-10 14:11:41.000000000 +0300 |
102 |
@@ -565,17 +565,17 @@ |
103 |
ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, |
104 |
ZERO, PIN, ZERO } |
105 |
}, |
106 |
- { "erect penis", /* thanks benno */ |
107 |
+ { "shuffle board", /* thanks benno */ |
108 |
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
109 |
PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, |
110 |
ZERO, ZERO } |
111 |
}, |
112 |
- { "flaccid penis", |
113 |
+ { "flaccid anchor", |
114 |
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
115 |
PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, |
116 |
ZERO, ZERO } |
117 |
}, |
118 |
- { "vagina", |
119 |
+ { "engagement ring", |
120 |
{ RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, |
121 |
LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, |
122 |
PIN, RIGHT, ZERO } |
123 |
@@ -995,7 +995,7 @@ |
124 |
{ "Parrot", |
125 |
{ ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } |
126 |
}, |
127 |
- { "Penis", |
128 |
+ { "Shuttle", |
129 |
{ PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } |
130 |
}, |
131 |
{ "PictureComingSoon", |
132 |
|
133 |
|
134 |
|
135 |
1.1 x11-misc/xscreensaver/files/xscreensaver-5.10-xfce.patch |
136 |
|
137 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.10-xfce.patch?rev=1.1&view=markup |
138 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.10-xfce.patch?rev=1.1&content-type=text/plain |
139 |
|
140 |
Index: xscreensaver-5.10-xfce.patch |
141 |
=================================================================== |
142 |
diff -ur xscreensaver-5.10.orig/driver/screensaver-properties.desktop.in xscreensaver-5.10/driver/screensaver-properties.desktop.in |
143 |
--- xscreensaver-5.10.orig/driver/screensaver-properties.desktop.in 2008-01-27 01:16:59.000000000 +0200 |
144 |
+++ xscreensaver-5.10/driver/screensaver-properties.desktop.in 2009-09-10 14:18:48.000000000 +0300 |
145 |
@@ -5,4 +5,4 @@ |
146 |
_Name=Screensaver |
147 |
_Comment=Change screensaver properties |
148 |
Type=Application |
149 |
-Categories=Settings;DesktopSettings;Security; |
150 |
+Categories=Settings;DesktopSettings;Security;X-XFCE; |