From 322e623017947f32cb26db4c80f8eec2c5736401 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Wed, 19 Feb 2014 03:36:23 +0000
Subject: Wed Feb 19 03:33:04 UTC 2014

---
 community/0ad/PKGBUILD            | 20 ++++++++++++++------
 community/0ad/miniupnpc-1.9.patch | 12 ++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 community/0ad/miniupnpc-1.9.patch

(limited to 'community/0ad')

diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index a510a3e0f..406461c25 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 105861 2014-02-16 16:38:12Z bpiotrowski $
+# $Id: PKGBUILD 105901 2014-02-18 12:42:08Z bpiotrowski $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
 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/"
 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 @@ build() {
   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
diff --git a/community/0ad/miniupnpc-1.9.patch b/community/0ad/miniupnpc-1.9.patch
new file mode 100644
index 000000000..d0546cf2e
--- /dev/null
+++ b/community/0ad/miniupnpc-1.9.patch
@@ -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);
+ 
-- 
cgit v1.2.3-54-g00ecf