rpms/xscreensaver/devel xscreensaver-5.11-xjack-with-small-window.patch, 1.2, 1.3 xscreensaver.spec, 1.112, 1.113
Mamoru Tasaka
mtasaka at fedoraproject.org
Sun Jun 27 17:51:24 UTC 2010
- Previous message: rpms/xscreensaver/F-13 xscreensaver-5.11-xjack-with-small-window.patch, 1.2, 1.3 xscreensaver.spec, 1.110, 1.111
- Next message: rpms/gstreamer-plugins-base/devel .cvsignore, 1.42, 1.43 gstreamer-plugins-base.spec, 1.117, 1.118 sources, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19221/devel
Modified Files:
xscreensaver-5.11-xjack-with-small-window.patch
xscreensaver.spec
Log Message:
* Mon Jun 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-6.respin1
- Replace Patch32 (xscreensaver-5.11-xjack-with-small-window.patch) with the one
revised by the upstream
xscreensaver-5.11-xjack-with-small-window.patch:
xjack.c | 4 ++++
1 file changed, 4 insertions(+)
Index: xscreensaver-5.11-xjack-with-small-window.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.11-xjack-with-small-window.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xscreensaver-5.11-xjack-with-small-window.patch 14 Jun 2010 09:10:42 -0000 1.2
+++ xscreensaver-5.11-xjack-with-small-window.patch 27 Jun 2010 17:51:23 -0000 1.3
@@ -1,30 +1,13 @@
---- xscreensaver-5.11/hacks/xjack.c.debug 2008-07-31 18:52:05.000000000 +0900
-+++ xscreensaver-5.11/hacks/xjack.c 2010-06-14 17:54:10.000000000 +0900
-@@ -117,8 +117,25 @@
- xjack_reshape (dpy, window, st, st->xgwa.width, st->xgwa.height);
-
- st->left = 0xFF & (random() % ((st->columns / 2)+1));
-- st->right = st->left + (0xFF & (random() % (st->columns - st->left - 10)
-- + 10));
-+
-+ /* deal with small window */
-+ {
-+ int tmp;
-+ if (st->columns <= 11)
-+ {
-+ fprintf(stderr, "Column width %i is too short for %s, exiting...\n",
-+ st->columns, progname);
-+ exit(1);
-+ }
-+ tmp = st->columns - st->left - 10;
-+ if (tmp < 1)
-+ {
-+ tmp = 1;
-+ st->left = st->columns - 10 - tmp;
-+ }
-+ st->right = st->left + (0xFF & (random() % tmp + 10));
-+ }
+--- xscreensaver-5.11/hacks/xjack.c.small 2008-07-31 18:52:05.000000000 +0900
++++ xscreensaver-5.11/hacks/xjack.c 2010-06-28 02:42:42.000000000 +0900
+@@ -59,6 +59,10 @@
+ XGetWindowAttributes (st->dpy, st->window, &st->xgwa);
+ st->columns = (st->xgwa.width - st->hspace - st->hspace) / st->char_width;
+ st->rows = (st->xgwa.height - st->vspace - st->vspace) / st->line_height;
++ /* If the window is stupidly small, just truncate. */
++ if (st->rows < 4) st->rows = 4;
++ if (st->columns < 12) st->columns = 12;
+
- st->x = 0;
- st->y = 0;
+ st->rows--;
+ st->columns--;
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- xscreensaver.spec 23 Jun 2010 15:45:12 -0000 1.112
+++ xscreensaver.spec 27 Jun 2010 17:51:23 -0000 1.113
@@ -5,7 +5,7 @@
%define modular_conf 1
-%define fedora_rel 5
+%define fedora_rel 6
%define extrarel .respin1
@@ -56,11 +56,13 @@ Patch30: xscreensaver-5.11-conf2
# bug 587537
# hacks crash with no window2 when MappingNotify or so is received
Patch31: xscreensaver-5.11-no-window2-MappingNotify-bz587537.patch
-## Patches to be sent to the upsteam
# bug 603587
# xjack crashes with too small window
+# (Patch32 was revised by the upstream)
Patch32: xscreensaver-5.11-xjack-with-small-window.patch
#
+## Patches to be sent to the upsteam
+#
# Patches end
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -699,7 +701,11 @@ exit 0
%defattr(-,root,root,-)
%changelog
-* Thu Jun 24 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-4.respin1
+* Mon Jun 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-6.respin1
+- Replace Patch32 (xscreensaver-5.11-xjack-with-small-window.patch) with the one
+ revised by the upstream
+
+* Thu Jun 24 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-5.respin1
- Make hacks' names in gss compat desktop files written in full path
(ref: bug 531151)
- Update gss compat desktop creation
- Previous message: rpms/xscreensaver/F-13 xscreensaver-5.11-xjack-with-small-window.patch, 1.2, 1.3 xscreensaver.spec, 1.110, 1.111
- Next message: rpms/gstreamer-plugins-base/devel .cvsignore, 1.42, 1.43 gstreamer-plugins-base.spec, 1.117, 1.118 sources, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list