[ri-li] 04/05: Add link-with-X11.patch.
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Feb 20 01:20:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository ri-li.
commit dfe370b2b0dfce2c10241a1a31240ce386ff0453
Author: Markus Koschany <apo at debian.org>
Date: Mon Feb 20 01:20:24 2017 +0100
Add link-with-X11.patch.
Apparently this resolves the build failures on arm64 (and probably other build
environments)
---
debian/patches/link-with-X11.patch | 25 +++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 26 insertions(+)
diff --git a/debian/patches/link-with-X11.patch b/debian/patches/link-with-X11.patch
new file mode 100644
index 0000000..acb9589
--- /dev/null
+++ b/debian/patches/link-with-X11.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 20 Feb 2017 01:03:25 +0100
+Subject: link with X11
+
+Apparently some build environments require that X11 is manually linked to avoid
+random build failures.
+
+Bug-Debian: https://bugs.debian.org/848063
+---
+ data-src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data-src/Makefile b/data-src/Makefile
+index cdb6043..0b7ca24 100644
+--- a/data-src/Makefile
++++ b/data-src/Makefile
+@@ -26,7 +26,7 @@ LINKER=c++
+ AR=ar
+ DEBUGOPT= -DLINUX
+ COPTS=-O3 -Wall -Wno-switch -Wno-deprecated -ffast-math -I/usr/X11R6/include -I/usr/include $(DEBUGOPT) `sdl-config --cflags`
+-LINKOPTS=-L/usr/lib `sdl-config --libs` -lSDL_image
++LINKOPTS=-L/usr/lib `sdl-config --libs` -lSDL_image -lX11
+
+ TARGET=MakeDat
+
diff --git a/debian/patches/series b/debian/patches/series
index ca64563..db4f98a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
fix-gcc4.3-ftbfs.patch
fix-compiler-warnings.patch
+link-with-X11.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ri-li.git
More information about the Pkg-games-commits
mailing list