rpms/xscreensaver/F-13 xscreensaver-5.11-xjack-with-small-window.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xscreensaver.spec, 1.107, 1.108 xscreensaver-5.11-usepo_again.patch, 1.1, NONE
Mamoru Tasaka
mtasaka at fedoraproject.org
Mon Jun 14 07:39:12 UTC 2010
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6382/F-13
Modified Files:
.cvsignore sources xscreensaver.spec
Added Files:
xscreensaver-5.11-xjack-with-small-window.patch
Removed Files:
xscreensaver-5.11-usepo_again.patch
Log Message:
* Mon Jun 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-4.respin1
- Fix crash of xjack when window is too small (bug 603587)
xscreensaver-5.11-xjack-with-small-window.patch:
xjack.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
--- NEW FILE xscreensaver-5.11-xjack-with-small-window.patch ---
--- xscreensaver-5.11/hacks/xjack.c.debug 2008-07-31 18:52:05.000000000 +0900
+++ xscreensaver-5.11/hacks/xjack.c 2010-06-14 16:24:23.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)
+ {
+ st->left = 0;
+ tmp = 1;
+ }
+ st->right = st->left + (0xFF & (random() % tmp + 10));
+ }
+
st->x = 0;
st->y = 0;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-13/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore 12 Apr 2010 14:58:38 -0000 1.14
+++ .cvsignore 14 Jun 2010 07:39:11 -0000 1.15
@@ -1,2 +1 @@
-xscreensaver-5.10.tar.gz
xscreensaver-5.11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-13/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources 12 Apr 2010 14:58:38 -0000 1.14
+++ sources 14 Jun 2010 07:39:11 -0000 1.15
@@ -1,2 +1 @@
-0d7205f9da8e3f1b83bcda549d73a7c4 xscreensaver-5.10.tar.gz
-86cb9d36fd62bba479d1cf45b35457fe xscreensaver-5.11.tar.gz
+80f981b86734ccb31c5b3b24af3930ae xscreensaver-5.11.tar.gz
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-13/xscreensaver.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- xscreensaver.spec 30 Apr 2010 16:59:02 -0000 1.107
+++ xscreensaver.spec 14 Jun 2010 07:39:12 -0000 1.108
@@ -5,9 +5,9 @@
%define modular_conf 1
-%define fedora_rel 2
+%define fedora_rel 4
-%define extrarel %{nil}
+%define extrarel .respin1
%if 0%{?fedora} >= 12
%define default_text %{_datadir}/doc/HTML/readme/en_US/README-en_US.txt
@@ -33,8 +33,6 @@ License: MIT
Group: Amusements/Graphics
URL: http://www.jwz.org/xscreensaver/
Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz
-# Translation being removed?? Recovering from the previous version
-Source1: http://www.jwz.org/xscreensaver/xscreensaver-5.10.tar.gz
%if %{modular_conf}
Source10: update-xscreensaver-hacks
%endif
@@ -51,15 +49,17 @@ Patch1: xscreensaver-5.00b5-san
# Change webcollage not to access to net
# Also see bug 472061
Patch21: xscreensaver-5.11-webcollage-default-nonet.patch
-# Reuse po again
-Patch22: xscreensaver-5.11-usepo_again.patch
#
-## Patches to be sent to the upsteam
+## Patches already sent to the upsteam
# Remove "AC_PROG_CC' was expanded before it was required" warning
Patch30: xscreensaver-5.11-conf264.patch
# 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: xscreensaver-5.11-xjack-with-small-window.patch
#
# Patches end
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -212,14 +212,13 @@ This package contains some test programs
%prep
-%setup -q -n %{name}-%{mainversion}%{?beta_ver} -a 1
-ln -sf xscreensaver-5.10/po po
+%setup -q -n %{name}-%{mainversion}%{?beta_ver}
%patch1 -p1 -b .sanitize-hacks
%patch21 -p1 -b .nonet
-%patch22 -p1 -b .po
%patch30 -p1 -b .conf264
%patch31 -p1 -b .nowin2_sig
+%patch32 -p1 -b .xjack_smallwin
change_option(){
set +x
@@ -691,6 +690,14 @@ exit 0
%defattr(-,root,root,-)
%changelog
+* Mon Jun 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-4.respin1
+- Fix crash of xjack when window is too small (bug 603587)
+
+* Sat Jun 5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-3.respin1
+- Upstream seems to have released new 5.11 tarball
+ containing po/ directory, use that tarball
+ (detected by Kevin's source audit)
+
* Sat May 1 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-2
- Fix crash when not using "pair" mode and when MappingNotify
or so is received (bug 587537)
--- xscreensaver-5.11-usepo_again.patch DELETED ---
More information about the scm-commits
mailing list