rpms/xscreensaver/F-11 xscreensaver-5.11-no-window2-MappingNotify-bz587537.patch, NONE, 1.1 xscreensaver.spec, 1.100, 1.101
Mamoru Tasaka
mtasaka at fedoraproject.org
Fri Apr 30 16:59:02 UTC 2010
- Previous message: rpms/pino/F-13 .cvsignore, 1.8, 1.9 import.log, 1.13, 1.14 pino.spec, 1.11, 1.12 sources, 1.8, 1.9
- Next message: rpms/xscreensaver/F-12 xscreensaver-5.11-no-window2-MappingNotify-bz587537.patch, NONE, 1.1 xscreensaver.spec, 1.106, 1.107
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12790/F-11
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.11-no-window2-MappingNotify-bz587537.patch
Log Message:
* 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-no-window2-MappingNotify-bz587537.patch:
screenhack.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE xscreensaver-5.11-no-window2-MappingNotify-bz587537.patch ---
--- xscreensaver-5.11/hacks/screenhack.c.bz587537 2010-04-12 13:48:58.000000000 +0900
+++ xscreensaver-5.11/hacks/screenhack.c 2010-05-01 01:08:46.000000000 +0900
@@ -453,7 +453,8 @@
(! (event.xany.window == window
? ft->event_cb (dpy, window, closure, &event)
#ifdef DEBUG_PAIR
- : event.xany.window == window2
+ : (window2 && closure2 &&
+ (event.xany.window == window2))
? ft->event_cb (dpy, window2, closure2, &event)
#endif
: 0)))
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/xscreensaver.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- xscreensaver.spec 12 Apr 2010 14:58:35 -0000 1.100
+++ xscreensaver.spec 30 Apr 2010 16:59:02 -0000 1.101
@@ -5,7 +5,7 @@
%define modular_conf 1
-%define fedora_rel 1
+%define fedora_rel 2
%define extrarel %{nil}
@@ -57,7 +57,10 @@ Patch22: xscreensaver-5.11-usepo
## Patches to be 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 end
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -216,6 +219,7 @@ ln -sf xscreensaver-5.10/po po
%patch21 -p1 -b .nonet
%patch22 -p1 -b .po
%patch30 -p1 -b .conf264
+%patch31 -p1 -b .nowin2_sig
change_option(){
set +x
@@ -687,6 +691,10 @@ exit 0
%defattr(-,root,root,-)
%changelog
+* 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)
+
* Mon Apr 12 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-1
- Update to 5.11
- All patches sent to the upstream now applied in the tarball
- Previous message: rpms/pino/F-13 .cvsignore, 1.8, 1.9 import.log, 1.13, 1.14 pino.spec, 1.11, 1.12 sources, 1.8, 1.9
- Next message: rpms/xscreensaver/F-12 xscreensaver-5.11-no-window2-MappingNotify-bz587537.patch, NONE, 1.1 xscreensaver.spec, 1.106, 1.107
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list