aboutsummaryrefslogtreecommitdiff
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
parentcc8b02f4a51f38e2d4a7d430ebb5dafd533e89b7 (diff)
downloadguix-9cb3036f0dd82d6b031b65c6656efd40a0c7d612.tar
guix-9cb3036f0dd82d6b031b65c6656efd40a0c7d612.tar.gz
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.
-rw-r--r--gnu-system.am1
-rw-r--r--gnu/packages/patches/sdl-libx11-1.6.patch13
-rw-r--r--gnu/packages/sdl.scm4
3 files changed, 17 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 2af87af18d..2bc688b435 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -442,6 +442,7 @@ dist_patch_DATA = \
gnu/packages/patches/ripperx-libm.patch \
gnu/packages/patches/scheme48-tests.patch \
gnu/packages/patches/scotch-test-threading.patch \
+ gnu/packages/patches/sdl-libx11-1.6.patch \
gnu/packages/patches/slim-session.patch \
gnu/packages/patches/slim-config.patch \
gnu/packages/patches/slim-sigusr1.patch \
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
+
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 069ea6b5f4..b686bd87cb 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 David Thompson <dthompson2@worcester.edu>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -53,7 +54,8 @@
version ".tar.gz"))
(sha256
(base32
- "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"))))
+ "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"))
+ (patches (list (search-patch "sdl-libx11-1.6.patch")))))
(build-system gnu-build-system)
(arguments
'(;; Explicitly link against Xext because SDL tries to dlopen it and