r15126 - in packages/trunk/0ad/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2014-06-12 02:48:45 +0000 (Thu, 12 Jun 2014)
New Revision: 15126

Added:
   packages/trunk/0ad/debian/patches/support_miniupnpc_1.9.patch
Modified:
   packages/trunk/0ad/debian/changelog
   packages/trunk/0ad/debian/patches/series
Log:
Add patch to fix FTBFS against miniupnpc 1.9


Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2014-06-11 04:36:51 UTC (rev 15125)
+++ packages/trunk/0ad/debian/changelog	2014-06-12 02:48:45 UTC (rev 15126)
@@ -1,8 +1,10 @@
-0ad (0.0.16-3) UNRELEASED; urgency=medium
+0ad (0.0.16-3) unstable; urgency=medium
 
+  * Add debian/patches/support_miniupnpc_1.9.patch to fix FTBFS when built
+    with miniupnpc >= 1.9. (Closes: #751224)
   * Tighten build-dep on libminiupnpc-dev (>= 1.6).
 
- -- Vincent Cheng <vcheng at debian.org>  Tue, 10 Jun 2014 21:33:38 -0700
+ -- Vincent Cheng <vcheng at debian.org>  Wed, 11 Jun 2014 19:46:46 -0700
 
 0ad (0.0.16-2) unstable; urgency=medium
 

Modified: packages/trunk/0ad/debian/patches/series
===================================================================
--- packages/trunk/0ad/debian/patches/series	2014-06-11 04:36:51 UTC (rev 15125)
+++ packages/trunk/0ad/debian/patches/series	2014-06-12 02:48:45 UTC (rev 15126)
@@ -1 +1,2 @@
 enable-hardening-relro.patch
+support_miniupnpc_1.9.patch

Added: packages/trunk/0ad/debian/patches/support_miniupnpc_1.9.patch
===================================================================
--- packages/trunk/0ad/debian/patches/support_miniupnpc_1.9.patch	                        (rev 0)
+++ packages/trunk/0ad/debian/patches/support_miniupnpc_1.9.patch	2014-06-12 02:48:45 UTC (rev 15126)
@@ -0,0 +1,17 @@
+Description: Fix FTBFS with miniupnpc >= 1.9
+Origin: upstream, http://trac.wildfiregames.com/ticket/2552
+Bug-Debian: https://bugs.debian.org/751224
+Last-Update: 2014-06-11
+
+--- a/source/network/NetServer.cpp
++++ b/source/network/NetServer.cpp
+@@ -275,6 +275,9 @@
+ 	ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL,
+ 									 data.first.servicetype,
+ 									 psPort, protocall,
++#if MINIUPNPC_API_VERSION >= 10
++									 NULL/*remoteHost*/,
++#endif
+ 									 intClient, intPort, NULL/*desc*/,
+ 									 NULL/*enabled*/, duration);
+