[arch-commits] Commit in 0ad/repos (6 files)

Sven-Hendrik Haase svenstaro at nymeria.archlinux.org
Mon May 19 02:56:26 UTC 2014


    Date: Monday, May 19, 2014 @ 04:56:24
  Author: svenstaro
Revision: 111463

archrelease: copy trunk to community-i686, community-x86_64

Added:
  0ad/repos/community-i686/PKGBUILD
    (from rev 111462, 0ad/trunk/PKGBUILD)
  0ad/repos/community-x86_64/PKGBUILD
    (from rev 111462, 0ad/trunk/PKGBUILD)
Deleted:
  0ad/repos/community-i686/PKGBUILD
  0ad/repos/community-i686/miniupnpc-1.9.patch
  0ad/repos/community-x86_64/PKGBUILD
  0ad/repos/community-x86_64/miniupnpc-1.9.patch

--------------------------------------+
 /PKGBUILD                            |  132 +++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD              |   57 --------------
 community-i686/miniupnpc-1.9.patch   |   12 ---
 community-x86_64/PKGBUILD            |   57 --------------
 community-x86_64/miniupnpc-1.9.patch |   12 ---
 5 files changed, 132 insertions(+), 138 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-05-19 02:56:13 UTC (rev 111462)
+++ community-i686/PKGBUILD	2014-05-19 02:56:24 UTC (rev 111463)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# 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
-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')
-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"
-
-  unset CPPFLAGS # for le spidermonkey
-
-  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
-
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
-
-  make CONFIG=Release
-}
-
-package() {
-  install -d "${pkgdir}"/usr/{bin,lib/0ad}
-  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 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 build/resources/${pkgname}.desktop \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 build/resources/${pkgname}.png \
-    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}

Copied: 0ad/repos/community-i686/PKGBUILD (from rev 111462, 0ad/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-05-19 02:56:24 UTC (rev 111463)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
+pkgname=0ad
+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/"
+license=('GPL2' 'CCPL')
+depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
+         'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
+         'gloox' 'miniupnpc' 'icu' 'nspr')
+makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
+        "http://trac.wildfiregames.com/raw-attachment/ticket/2552/miniupnpc_api.patch")
+md5sums=('3836bbcdf4edc57c2354b4fef6023146'
+         '6981595ba4b8eb21f9503304b090c9a9')
+
+prepare() {
+  cd "$srcdir/$pkgname-$_pkgver/"
+  patch -p0 -i "../miniupnpc_api.patch"
+  sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.3/bin/cxxtestgen
+}
+
+build() {
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
+
+  unset CPPFLAGS # for le spidermonkey
+
+  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
+
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
+
+  make
+}
+
+package() {
+  install -d "${pkgdir}"/usr/{bin,lib/0ad,share/"${pkgname}"/data}
+  cd "$srcdir/$pkgname-$_pkgver"
+
+  install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
+  install -Dm755 binaries/system/*.so "${pkgdir}/usr/lib/0ad"
+
+  cp -r binaries/data/l10n/ ${pkgdir}/usr/share/${pkgname}/data/
+
+  install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 build/resources/${pkgname}.desktop \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 build/resources/${pkgname}.png \
+    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
+
+# Fails?
+#check() {
+#  cd "$srcdir/$pkgname-$_pkgver"
+#  LD_LIBRARY_PATH=binaries/system binaries/system/test
+#}

Deleted: community-i686/miniupnpc-1.9.patch
===================================================================
--- community-i686/miniupnpc-1.9.patch	2014-05-19 02:56:13 UTC (rev 111462)
+++ community-i686/miniupnpc-1.9.patch	2014-05-19 02:56:24 UTC (rev 111463)
@@ -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);
- 

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-05-19 02:56:13 UTC (rev 111462)
+++ community-x86_64/PKGBUILD	2014-05-19 02:56:24 UTC (rev 111463)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# 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
-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')
-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"
-
-  unset CPPFLAGS # for le spidermonkey
-
-  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
-
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
-
-  make CONFIG=Release
-}
-
-package() {
-  install -d "${pkgdir}"/usr/{bin,lib/0ad}
-  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 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 build/resources/${pkgname}.desktop \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 build/resources/${pkgname}.png \
-    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}

Copied: 0ad/repos/community-x86_64/PKGBUILD (from rev 111462, 0ad/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-05-19 02:56:24 UTC (rev 111463)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
+pkgname=0ad
+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/"
+license=('GPL2' 'CCPL')
+depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
+         'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
+         'gloox' 'miniupnpc' 'icu' 'nspr')
+makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
+        "http://trac.wildfiregames.com/raw-attachment/ticket/2552/miniupnpc_api.patch")
+md5sums=('3836bbcdf4edc57c2354b4fef6023146'
+         '6981595ba4b8eb21f9503304b090c9a9')
+
+prepare() {
+  cd "$srcdir/$pkgname-$_pkgver/"
+  patch -p0 -i "../miniupnpc_api.patch"
+  sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.3/bin/cxxtestgen
+}
+
+build() {
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
+
+  unset CPPFLAGS # for le spidermonkey
+
+  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
+
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
+
+  make
+}
+
+package() {
+  install -d "${pkgdir}"/usr/{bin,lib/0ad,share/"${pkgname}"/data}
+  cd "$srcdir/$pkgname-$_pkgver"
+
+  install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
+  install -Dm755 binaries/system/*.so "${pkgdir}/usr/lib/0ad"
+
+  cp -r binaries/data/l10n/ ${pkgdir}/usr/share/${pkgname}/data/
+
+  install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 build/resources/${pkgname}.desktop \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 build/resources/${pkgname}.png \
+    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
+
+# Fails?
+#check() {
+#  cd "$srcdir/$pkgname-$_pkgver"
+#  LD_LIBRARY_PATH=binaries/system binaries/system/test
+#}

Deleted: community-x86_64/miniupnpc-1.9.patch
===================================================================
--- community-x86_64/miniupnpc-1.9.patch	2014-05-19 02:56:13 UTC (rev 111462)
+++ community-x86_64/miniupnpc-1.9.patch	2014-05-19 02:56:24 UTC (rev 111463)
@@ -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);
- 




More information about the arch-commits mailing list