[SCM] Debian packaging of wesnoth branch, devel, updated. debian/1.9.8-1-3-g9f65c77

Gerfried Fuchs rhonda at debian.org
Mon Sep 5 12:43:35 UTC 2011


The following commit has been merged in the devel branch:
commit 9f65c77260fa9d51ebea534a2e0c0df4658ecbdc
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Mon Sep 5 14:42:56 2011 +0200

    Add patch to make it compile on all archs

diff --git a/debian/changelog b/debian/changelog
index 5a33b9e..8024177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ wesnoth-1.9 (1:1.9.9-1) unstable; urgency=low
   * New upstream devel release.
   * Switch to source format 3.0 (quilt).  Adjust debian/README.source,
     debian/rules and debian/control* for that change.
+  * Add patch from Mark de Wever to make it compile on all archs again
+    (closes: #636193)
 
  -- 
 
diff --git a/debian/patches/04sdl-compile-fix b/debian/patches/04sdl-compile-fix
new file mode 100644
index 0000000..933a975
--- /dev/null
+++ b/debian/patches/04sdl-compile-fix
@@ -0,0 +1,13 @@
+Author: Mark de Wever <koraq at xs4all.nl>	vim:ft=diff:
+Description: remove the undef SDLNet_Read32 to make it compile on all archs
+
+--- a/src/network_worker.cpp
++++ b/src/network_worker.cpp
+@@ -599,7 +599,6 @@
+ 		return SOCKET_ERRORED;
+ 	}
+ 
+-	#undef SDLNet_Read32
+ 	const int len = SDLNet_Read32(reinterpret_cast<void*>(num_buf));
+ 
+ 	if(len < 1 || len > 100000000) {
diff --git a/debian/patches/series b/debian/patches/series
index 57b6465..a85c9b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02wesnoth-nolog-desktop-file
 03wesnothd-name
+04sdl-compile-fix

-- 
Debian packaging of wesnoth



More information about the Pkg-games-commits mailing list