1 |
drac 07/12/30 20:06:23 |
2 |
|
3 |
Added: xscreensaver-5.04-gentoo.patch |
4 |
Log: |
5 |
Update patch. Sort ebuild. |
6 |
(Portage version: 2.1.4_rc11) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 x11-misc/xscreensaver/files/xscreensaver-5.04-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-gentoo.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-gentoo.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: xscreensaver-5.04-gentoo.patch |
15 |
=================================================================== |
16 |
diff -ur xscreensaver-5.04.orig/configure.in xscreensaver-5.04/configure.in |
17 |
--- xscreensaver-5.04.orig/configure.in 2007-11-11 03:00:31.000000000 +0200 |
18 |
+++ xscreensaver-5.04/configure.in 2007-12-30 21:46:13.000000000 +0200 |
19 |
@@ -4145,41 +4145,7 @@ |
20 |
# Now let's warn if there's a previous RPM version already installed. |
21 |
# But don't bother with this test if we are currently *building* an RPM. |
22 |
|
23 |
-if test -z "$RPM_PACKAGE_VERSION" ; then |
24 |
- |
25 |
- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras" |
26 |
- |
27 |
- # M4 sucks!! |
28 |
- changequote(X,Y) |
29 |
- rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ |
30 |
- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ |
31 |
- head -1` |
32 |
- changequote([,]) |
33 |
- |
34 |
- if test \! -z "$rpmv" ; then |
35 |
- rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` |
36 |
- rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'` |
37 |
- |
38 |
- warning=no |
39 |
- warnL "There is already an installed RPM of xscreensaver $rpmv" |
40 |
- warn2 'on this system. You might want to remove it ("rpm -ve")' |
41 |
- warn2 'before running "make install" in this directory.' |
42 |
- echo "" |
43 |
- warn2 "Alternately, you could build this version of xscreensaver" |
44 |
- warn2 'as an RPM, and then install that. An "xscreensaver.spec"' |
45 |
- warn2 'file is included. Try "rpmbuild -v -ba xscreensaver.spec".' |
46 |
- warn2 "See the RPM documentation for more info." |
47 |
- echo "" |
48 |
- |
49 |
- if test "$rpmbdir" = "$rpmhdir" ; then |
50 |
- warn2 "The RPM version was installed in $rpmbdir/." |
51 |
- do_dir_warning=yes |
52 |
- else |
53 |
- warn2 "The RPM version was installed in $rpmbdir/," |
54 |
- warn2 "with demos in $rpmhdir/." |
55 |
- fi |
56 |
- fi |
57 |
-fi |
58 |
+# Nope - breaks compilation with sandbox violation |
59 |
|
60 |
if test "${bindir}" = "${HACKDIR}" ; then |
61 |
do_dir_warning=yes |
62 |
diff -ur xscreensaver-5.04.orig/driver/XScreenSaver.ad.in xscreensaver-5.04/driver/XScreenSaver.ad.in |
63 |
--- xscreensaver-5.04.orig/driver/XScreenSaver.ad.in 2007-11-13 10:36:00.000000000 +0200 |
64 |
+++ xscreensaver-5.04/driver/XScreenSaver.ad.in 2007-12-30 21:46:13.000000000 +0200 |
65 |
@@ -31,36 +31,36 @@ |
66 |
*mode: random |
67 |
*timeout: 0:10:00 |
68 |
*cycle: 0:10:00 |
69 |
-*lockTimeout: 0:00:00 |
70 |
+*lockTimeout: 0:20:00 |
71 |
*passwdTimeout: 0:00:30 |
72 |
-*dpmsEnabled: False |
73 |
-*dpmsStandby: 2:00:00 |
74 |
-*dpmsSuspend: 2:00:00 |
75 |
-*dpmsOff: 4:00:00 |
76 |
-*grabDesktopImages: True |
77 |
+*dpmsEnabled: True |
78 |
+*dpmsStandby: 1:00:00 |
79 |
+*dpmsSuspend: 1:00:00 |
80 |
+*dpmsOff: 2:00:00 |
81 |
+*grabDesktopImages: False |
82 |
*grabVideoFrames: False |
83 |
*chooseRandomImages: @DEFAULT_IMAGES_P@ |
84 |
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ |
85 |
*nice: 10 |
86 |
*memoryLimit: 0 |
87 |
-*lock: False |
88 |
+*lock: True |
89 |
*verbose: False |
90 |
*timestamp: True |
91 |
*fade: True |
92 |
*unfade: False |
93 |
*fadeSeconds: 0:00:03 |
94 |
*fadeTicks: 20 |
95 |
-*splash: True |
96 |
+*splash: False |
97 |
*splashDuration: 0:00:05 |
98 |
*visualID: default |
99 |
*captureStderr: True |
100 |
*ignoreUninstalledPrograms: False |
101 |
|
102 |
-*textMode: file |
103 |
-*textLiteral: XScreenSaver |
104 |
-*textFile: @DEFAULT_TEXT_FILE@ |
105 |
-*textProgram: fortune |
106 |
-*textURL: http://www.livejournal.com/stats/latest-rss.bml |
107 |
+*textMode: literal |
108 |
+*textLiteral: Gentoo Linux |
109 |
+*textFile: /etc/gentoo-release |
110 |
+*textProgram: /usr/bin/fortune |
111 |
+*textURL: http://planet.gentoo.org/rss20.xml |
112 |
|
113 |
*overlayTextForeground: #FFFF00 |
114 |
*overlayTextBackground: #000000 |
115 |
@@ -117,7 +117,10 @@ |
116 |
|
117 |
! The format used for printing the date and time in the password dialog box |
118 |
! (see the strftime(3) manual page for details.) |
119 |
-*dateFormat: %d-%b-%y (%a); %I:%M %p |
120 |
+! Preferred time representation for the current locale |
121 |
+*dateFormat: %x %X |
122 |
+! Xscreensaver's default |
123 |
+! *dateFormat: %d-%b-%y (%a); %I:%M %p |
124 |
! To show the time only: |
125 |
! *dateFormat: %I:%M %p |
126 |
! For 24 hour time: |
127 |
diff -ur xscreensaver-5.04.orig/driver/xscreensaver.c xscreensaver-5.04/driver/xscreensaver.c |
128 |
--- xscreensaver-5.04.orig/driver/xscreensaver.c 2007-11-11 23:11:59.000000000 +0200 |
129 |
+++ xscreensaver-5.04/driver/xscreensaver.c 2007-12-30 21:46:13.000000000 +0200 |
130 |
@@ -1644,10 +1644,12 @@ |
131 |
if (hint.res_class) XFree (hint.res_class); |
132 |
} |
133 |
|
134 |
+ /* |
135 |
fprintf (stderr, "%s: %d: unrecognised ClientMessage \"%s\" received\n", |
136 |
blurb(), screen, (str ? str : "(null)")); |
137 |
fprintf (stderr, "%s: %d: for window 0x%lx (%s)\n", |
138 |
blurb(), screen, (unsigned long) w, wdesc); |
139 |
+ */ |
140 |
if (str) XFree (str); |
141 |
} |
142 |
|
143 |
diff -ur xscreensaver-5.04.orig/hacks/webcollage xscreensaver-5.04/hacks/webcollage |
144 |
--- xscreensaver-5.04.orig/hacks/webcollage 2007-11-08 05:05:23.000000000 +0200 |
145 |
+++ xscreensaver-5.04/hacks/webcollage 2007-12-30 21:46:13.000000000 +0200 |
146 |
@@ -860,7 +860,8 @@ |
147 |
|
148 |
|
149 |
sub pick_dictionary() { |
150 |
- my @dicts = ("/usr/dict/words", |
151 |
+ my @dicts = ("/usr/share/dict/cracklib-small", |
152 |
+ "/usr/dict/words", |
153 |
"/usr/share/dict/words", |
154 |
"/usr/share/lib/dict/words"); |
155 |
foreach my $f (@dicts) { |
156 |
|
157 |
|
158 |
|
159 |
-- |
160 |
gentoo-commits@g.o mailing list |