rpms/xscreensaver/devel xscreensaver-5.08-gcc441-aliasing.patch, NONE, 1.1 xscreensaver-5.08-new-xextproto.patch, NONE, 1.1 xscreensaver.spec, 1.91, 1.92

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7567

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.08-gcc441-aliasing.patch 
	xscreensaver-5.08-new-xextproto.patch 
Log Message:
* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-11
- Build fix for new xextproto (libXext 1.0.99.3)
- Fix for breaking strict aliasing rule
- Again change %default_text


xscreensaver-5.08-gcc441-aliasing.patch:
 timers.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE xscreensaver-5.08-gcc441-aliasing.patch ---
--- xscreensaver-5.08/driver/timers.c.aliasing	2009-07-25 17:00:59.000000000 +0900
+++ xscreensaver-5.08/driver/timers.c	2009-07-25 20:50:30.000000000 +0900
@@ -1020,13 +1020,20 @@
             /* The Resize and Rotate extension sends an event when the
                size, rotation, or refresh rate of any screen has changed.
              */
+#if 0
             XRRScreenChangeNotifyEvent *xrr_event =
               (XRRScreenChangeNotifyEvent *) &event;
+#endif
 
             if (p->verbose_p)
               {
                 /* XRRRootToScreen is in Xrandr.h 1.4, 2001/06/07 */
-                int screen = XRRRootToScreen (si->dpy, xrr_event->window);
+
+                /* Fix for the warning about breaking strict aliasing rule.
+                   Note that the first 5 entries of struct XAnyEvent
+                   and struct XRRScreenChangeNotifyEvent are the same.
+                 */
+                int screen = XRRRootToScreen (si->dpy, event.xany.window);
                 fprintf (stderr, "%s: %d: screen change event received\n",
                          blurb(), screen);
               }

xscreensaver-5.08-new-xextproto.patch:
 dpms.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE xscreensaver-5.08-new-xextproto.patch ---
--- xscreensaver-5.08/driver/dpms.c.newproto	2005-03-22 11:07:21.000000000 +0900
+++ xscreensaver-5.08/driver/dpms.c	2009-07-25 16:53:09.000000000 +0900
@@ -55,7 +55,6 @@
 
 # include <X11/Xproto.h>
 # include <X11/extensions/dpms.h>
-# include <X11/extensions/dpmsstr.h>
 
   /* Why this crap is not in a header file somewhere, I have no idea.  Losers!
    */


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- xscreensaver.spec	24 Jul 2009 20:15:48 -0000	1.91
+++ xscreensaver.spec	25 Jul 2009 13:09:33 -0000	1.92
@@ -9,7 +9,7 @@
 
 %define extrarel      %{nil}
 
-%define default_text  %{_datadir}/doc/HTML/README-Accessibility
+%define default_text  %{_datadir}/doc/HTML/readme/en_US/README-en_US.txt
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
@@ -46,7 +46,15 @@ Patch51:         xscreensaver-5.08-phosp
 # bug 504912, must be reported to upstream
 # ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
 # xscreensaver crashes when randr reportes 0 rroi->ncrtc
-Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch 
+Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
+#
+# Not sent to upstream yet, must do later
+#
+# Fix for Xext 1.0.99.3
+# http://lists.freedesktop.org/archives/xorg/2009-July/046521.html
+Patch53:         xscreensaver-5.08-new-xextproto.patch
+# Fix warnings for breaking strict aliasing rule
+Patch54:         xscreensaver-5.08-gcc441-aliasing.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -202,6 +210,8 @@ This package contains some test programs
 %patch50 -p1 -b .po
 %patch51 -p1 -b .phosphor
 %patch52 -p0 -b .randr_ncrtc
+%patch53 -p1 -b .newxextproto
+%patch54 -p1 -b .aliasing
 
 change_option(){
    set +x
@@ -653,7 +663,9 @@ exit 0
 
 %changelog
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-11
-- F-12: Mass rebuild
+- Build fix for new xextproto (libXext 1.0.99.3)
+- Fix for breaking strict aliasing rule
+- Again change %%default_text
 
 * Thu Jun 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-10
 - Fix crash on startup when randr reports no rroi->ncrtc