[arch-commits] Commit in 0ad/trunk (PKGBUILD miniupnpc-1.9.patch)

[Bartłomiej Piotrowski]

    Date: Tuesday, February 18, 2014 @ 13:42:01
  Author: bpiotrowski
Revision: 105900

upgpkg: 0ad a15-4

re-enable miniupnpc support

Added:
  0ad/trunk/miniupnpc-1.9.patch
Modified:
  0ad/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   18 +++++++++++++-----
 miniupnpc-1.9.patch |   12 ++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-18 12:20:23 UTC (rev 105899)
+++ PKGBUILD	2014-02-18 12:42:01 UTC (rev 105900)
@@ -5,7 +5,7 @@
 pkgname=0ad
 pkgver=a15
 _pkgver=0.0.15-alpha
-pkgrel=3
+pkgrel=4
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
 url="http://play0ad.com/"
@@ -12,11 +12,18 @@
 license=('GPL2' 'CCPL')
 depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
          'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
-         'gloox' 'miniupnpc' 'libsm')
-makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
-source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
-md5sums=('a651d81eb9b31da01e376ddaa597e954')
+         'gloox' 'miniupnpc')
+makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
+        "miniupnpc-1.9.patch")
+md5sums=('a651d81eb9b31da01e376ddaa597e954'
+         'f3d27da4944d42fcf6b4153e54dc4600')
 
+prepare() {
+  cd "$srcdir/$pkgname-$_pkgver"
+  patch -p1 -i ../miniupnpc-1.9.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
 
@@ -25,6 +32,7 @@
   export WX_CONFIG=/usr/bin/wx-config-2.8
   ./update-workspaces.sh \
       --with-system-enet \
+      --with-system-miniupnpc \
       --bindir=/usr/bin \
       --libdir=/usr/lib/0ad \
       --datadir=/usr/share/${pkgname}/data

Added: miniupnpc-1.9.patch
===================================================================
--- miniupnpc-1.9.patch	                        (rev 0)
+++ miniupnpc-1.9.patch	2014-02-18 12:42:01 UTC (rev 105900)
@@ -0,0 +1,12 @@
+diff -rupN a/source/network/NetServer.cpp b/source/network/NetServer.cpp
+--- a/source/network/NetServer.cpp	2013-12-18 16:08:56.000000000 +0000
++++ b/source/network/NetServer.cpp	2014-02-18 10:11:59.955214338 +0000
+@@ -274,7 +274,7 @@ void* CNetServerWorker::SetupUPnP(void*)
+ 	// Check that the port was actually forwarded.
+ 	ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL,
+ 									 data.first.servicetype,
+-									 psPort, protocall,
++									 psPort, protocall, externalIPAddress,
+ 									 intClient, intPort, NULL/*desc*/,
+ 									 NULL/*enabled*/, duration);
+