aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-12-26 00:32:48 -0500
committerMark H Weaver <mhw@netris.org>2014-12-26 00:34:44 -0500
commit9cb3036f0dd82d6b031b65c6656efd40a0c7d612 (patch)
tree995a1cae0d985640fef6679a92489e9bd20be0c0 /gnu/packages/patches
parentcc8b02f4a51f38e2d4a7d430ebb5dafd533e89b7 (diff)
downloadguix-9cb3036f0dd82d6b031b65c6656efd40a0c7d612.tar.gz
guix-9cb3036f0dd82d6b031b65c6656efd40a0c7d612.zip
gnu: sdl: Fix incompatibility with libx11-1.6.
* gnu/packages/patches/sdl-libx11-1.6.patch: New file * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/sdl.scm (sdl): Add patch.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/sdl-libx11-1.6.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/gnu/packages/patches/sdl-libx11-1.6.patch b/gnu/packages/patches/sdl-libx11-1.6.patch
new file mode 100644
index 0000000000..73ba9ac071
--- /dev/null
+++ b/gnu/packages/patches/sdl-libx11-1.6.patch
@@ -0,0 +1,13 @@
+Update _XData32 declaration in SDL_x11sym.h to match that of libx11 1.6.
+
+--- SDL-1.2.15/src/video/x11/SDL_x11sym.h.~1~ 2012-01-19 01:30:06.000000000 -0500
++++ SDL-1.2.15/src/video/x11/SDL_x11sym.h 2014-12-26 00:22:36.445067694 -0500
+@@ -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
+