From daabd0d728a0e54705c18cfc91e80732c91aec8f Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Jul 25 2009 13:09:33 +0000 Subject: - Build fix for new xextproto (libXext 1.0.99.3) - Fix for breaking strict aliasing rule - Again change %default_text --- diff --git a/xscreensaver-5.08-gcc441-aliasing.patch b/xscreensaver-5.08-gcc441-aliasing.patch new file mode 100644 index 0000000..eb857c2 --- /dev/null +++ b/xscreensaver-5.08-gcc441-aliasing.patch @@ -0,0 +1,24 @@ +--- 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); + } diff --git a/xscreensaver-5.08-new-xextproto.patch b/xscreensaver-5.08-new-xextproto.patch new file mode 100644 index 0000000..5160273 --- /dev/null +++ b/xscreensaver-5.08-new-xextproto.patch @@ -0,0 +1,10 @@ +--- 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 + # include +-# include + + /* Why this crap is not in a header file somewhere, I have no idea. Losers! + */ diff --git a/xscreensaver.spec b/xscreensaver.spec index 4d7eaa0..49b9d87 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -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-phosphor-segv.patch # 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 to debug XScreenSaver. %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 - 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 - 1:5.08-10 - Fix crash on startup when randr reports no rroi->ncrtc