[SDL/f18] Adapt to libX11-1.5.99.901

[Petr Pisar]

commit ef1edf0c9db876303d76a8dc515355d6aef774ca
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Mar 27 16:11:16 2013 +0100

    Adapt to libX11-1.5.99.901

 SDL-1.2.15-const_XData32.patch |   16 ++++++++++++++++
 SDL.spec                       |    4 ++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/SDL-1.2.15-const_XData32.patch b/SDL-1.2.15-const_XData32.patch
new file mode 100644
index 0000000..0f1c07c
--- /dev/null
+++ b/SDL-1.2.15-const_XData32.patch
@@ -0,0 +1,16 @@
+libX11-1.5.99.901 has changed prototype of _XData32
+
+<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
+
+diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h	Wed Feb 27 15:20:31 2013 -0800
++++ b/src/video/x11/SDL_x11sym.h	Wed Mar 27 16:07:23 2013 +0100
+@@ -165,7 +165,7 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+ 
diff --git a/SDL.spec b/SDL.spec
index bb9af1f..036d83b 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -20,6 +20,8 @@ Patch1:     SDL-1.2.10-GrabNotViewable.patch
 Patch2:     SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch
 # Upstream fix for sdl1486, rh990677
 Patch3:     SDL-1.2.15-ignore_insane_joystick_axis.patch
+# Proposded to upstream as sdl1769
+Patch4:     SDL-1.2.15-const_XData32.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  arts-devel
@@ -79,6 +81,7 @@ applications.
 %patch1 -p0 -b .grabnotviewable
 %patch2 -p1 -b .gamma
 %patch3 -p1 -b .insane_axis
+%patch4 -p1 -b .XData32
 for F in CREDITS; do 
     iconv -f iso8859-1 -t utf-8 < "$F" > "${F}.utf"
     touch --reference "$F" "${F}.utf"
@@ -136,6 +139,7 @@ rm -f %{buildroot}%{_libdir}/*.la
 %changelog
 * Thu Dec 05 2013 Petr Pisar <ppisar at redhat.com> - 1.2.15-4
 - Ignore joystick axis events if they aren't in a sane range (bug #990677)
+- Adapt to libX11-1.5.99.901
 
 * Wed Jan 23 2013 Petr Pisar <ppisar at redhat.com> - 1.2.15-3
 - Work around bug in Xorg to allow changing gamma on X11 (bug #891973)