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

[Sven-Hendrik Haase]

    Date: Saturday, May 17, 2014 @ 22:15:41
  Author: svenstaro
Revision: 111383

Prepare a16

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

---------------------+
 PKGBUILD            |   24 +++++++++++++-----------
 miniupnpc-1.9.patch |   12 ------------
 2 files changed, 13 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-17 20:14:28 UTC (rev 111382)
+++ PKGBUILD	2014-05-17 20:15:41 UTC (rev 111383)
@@ -3,9 +3,9 @@
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
 pkgname=0ad
-pkgver=a15
-_pkgver=0.0.15-alpha
-pkgrel=5
+pkgver=a16
+_pkgver=0.0.16-alpha
+pkgrel=1
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
 url="http://play0ad.com/"
@@ -12,16 +12,16 @@
 license=('GPL2' 'CCPL')
 depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
          'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
-         'gloox' 'miniupnpc')
+         'gloox' 'miniupnpc' 'icu')
 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')
+        "http://trac.wildfiregames.com/raw-attachment/ticket/2552/miniupnpc_api.patch")
+md5sums=('3836bbcdf4edc57c2354b4fef6023146'
+         '6981595ba4b8eb21f9503304b090c9a9')
 
 prepare() {
-  cd "$srcdir/$pkgname-$_pkgver"
-  patch -p1 -i ../miniupnpc-1.9.patch
+  cd "$srcdir/$pkgname-$_pkgver/"
+  patch -p0 -i "../miniupnpc_api.patch"
 }
 
 build() {
@@ -43,12 +43,14 @@
 }
 
 package() {
-  install -d "${pkgdir}"/usr/{bin,lib/0ad}
+  install -d "${pkgdir}"/usr/{bin,lib/0ad,share/"${pkgname}"/data/l10n}
   cd "$srcdir/$pkgname-$_pkgver"
 
   install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
-  install -Dm755 binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad"
+  install -Dm755 binaries/system/*.so "${pkgdir}/usr/lib/0ad"
 
+  cp -r binaries/data/l10n/ ${pkgdir}/usr/share/${pkgname}/data/l10n
+
   install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 build/resources/${pkgname}.desktop \
     "${pkgdir}/usr/share/applications/${pkgname}.desktop"

Deleted: miniupnpc-1.9.patch
===================================================================
--- miniupnpc-1.9.patch	2014-05-17 20:14:28 UTC (rev 111382)
+++ miniupnpc-1.9.patch	2014-05-17 20:15:41 UTC (rev 111383)
@@ -1,12 +0,0 @@
-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);
-