[arch-commits] Commit in spring/repos (10 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Thu Jul 2 00:25:50 UTC 2015


    Date: Thursday, July 2, 2015 @ 02:25:49
  Author: svenstaro
Revision: 136221

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

Added:
  spring/repos/community-i686/PKGBUILD
    (from rev 136220, spring/trunk/PKGBUILD)
  spring/repos/community-i686/spring.install
    (from rev 136220, spring/trunk/spring.install)
  spring/repos/community-x86_64/PKGBUILD
    (from rev 136220, spring/trunk/PKGBUILD)
  spring/repos/community-x86_64/spring.install
    (from rev 136220, spring/trunk/spring.install)
Deleted:
  spring/repos/community-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
  spring/repos/community-i686/PKGBUILD
  spring/repos/community-i686/spring.install
  spring/repos/community-x86_64/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
  spring/repos/community-x86_64/PKGBUILD
  spring/repos/community-x86_64/spring.install

----------------------------------------------------------------------------------+
 /PKGBUILD                                                                        |   90 ++++++++++
 /spring.install                                                                  |   24 ++
 community-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch   |   32 ---
 community-i686/PKGBUILD                                                          |   51 -----
 community-i686/spring.install                                                    |   12 -
 community-x86_64/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch |   32 ---
 community-x86_64/PKGBUILD                                                        |   51 -----
 community-x86_64/spring.install                                                  |   12 -
 8 files changed, 114 insertions(+), 190 deletions(-)

Deleted: community-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
===================================================================
--- community-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch	2015-07-02 00:25:44 UTC (rev 136220)
+++ community-i686/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch	2015-07-02 00:25:49 UTC (rev 136221)
@@ -1,32 +0,0 @@
-From 9e0db5f602407de4e7875ca85761b41782c1bb9c Mon Sep 17 00:00:00 2001
-From: Johan Rehnberg <cleanrock at gmail.com>
-Date: Wed, 31 Dec 2014 11:35:19 +0100
-Subject: [PATCH] fix GetListOfSubModules to support GLOB returning both "//"
- and "/"
-
-I needed this when building on archlinux with cmake 3.1.0 where GLOB returns "/"
----
- rts/build/cmake/Util.cmake | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/rts/build/cmake/Util.cmake b/rts/build/cmake/Util.cmake
-index 9f49e54..e23db7b 100644
---- a/rts/build/cmake/Util.cmake
-+++ b/rts/build/cmake/Util.cmake
-@@ -166,10 +166,11 @@ EndFunction (MakeGlobal)
- # Find all CMakeLists.txt files in sub-directories
- Macro    (GetListOfSubModules list_var)
- 	File(GLOB ${list_var} RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" FOLLOW_SYMLINKS "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt")
--
- 	# Strip away the "/CMakeLists.txt" parts, so we end up with just a list of dirs,
- 	# for example: AAI;RAI;KAIK
--	String(REPLACE "//CMakeLists.txt" "" ${list_var} "${${list_var}}")
-+	# GLOB can prefix with "//" or "/" (perhaps changed in cmake 3.1.0), this double replace will support both "//" and "/"
-+	String(REPLACE "/CMakeLists.txt" "" ${list_var} "${${list_var}}")
-+	String(REPLACE "/" "" ${list_var} "${${list_var}}")
- EndMacro (GetListOfSubModules list_var)
- 
- 
--- 
-2.2.1
-

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-07-02 00:25:44 UTC (rev 136220)
+++ community-i686/PKGBUILD	2015-07-02 00:25:49 UTC (rev 136221)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=98.0
-pkgrel=5
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' 'x86_64')
-url="http://springrts.com/"
-license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2'
-         'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
-makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa')
-optdepends=('python2: python-based bots'
-            'java-runtime: java-based bots')
-install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
-        0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch)
-md5sums=('fbe60dff4d39918157869f45738e0a8a'
-         'a8a8e5038439d43baaeac26585f5caf9')
-
-prepare() {
-  bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
-
-  cd spring_${pkgver}
-
-  patch -Np1 -i ../0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
-}
-
-build() {
-  cd spring_${pkgver}
-
-  cmake	. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DDATADIR=share/spring \
-    -DCMAKE_SKIP_RPATH=YES
-  make
-}
-
-package() {
-  cd spring_${pkgver}
-
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/etc/spring"
-  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
-}
-
-# vim sw=2:ts=2 et:

Copied: spring/repos/community-i686/PKGBUILD (from rev 136220, spring/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-07-02 00:25:49 UTC (rev 136221)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=99.0
+pkgrel=1
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('i686' 'x86_64')
+url="http://springrts.com/"
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2' 'libunwind'
+         'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa')
+optdepends=('python2: python-based bots'
+            'java-runtime: java-based bots')
+install=spring.install
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma)
+md5sums=('3c9d8e0f7616060550e6452236d7626f')
+
+prepare() {
+  bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+}
+
+build() {
+  cd spring_${pkgver}
+
+  cmake	. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDATADIR=share/spring \
+    -DCMAKE_SKIP_RPATH=YES
+  make
+}
+
+package() {
+  cd spring_${pkgver}
+
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/etc/spring"
+  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
+}
+
+# vim sw=2:ts=2 et:

Deleted: community-i686/spring.install
===================================================================
--- community-i686/spring.install	2015-07-02 00:25:44 UTC (rev 136220)
+++ community-i686/spring.install	2015-07-02 00:25:49 UTC (rev 136221)
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: spring/repos/community-i686/spring.install (from rev 136220, spring/trunk/spring.install)
===================================================================
--- community-i686/spring.install	                        (rev 0)
+++ community-i686/spring.install	2015-07-02 00:25:49 UTC (rev 136221)
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Deleted: community-x86_64/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
===================================================================
--- community-x86_64/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch	2015-07-02 00:25:44 UTC (rev 136220)
+++ community-x86_64/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch	2015-07-02 00:25:49 UTC (rev 136221)
@@ -1,32 +0,0 @@
-From 9e0db5f602407de4e7875ca85761b41782c1bb9c Mon Sep 17 00:00:00 2001
-From: Johan Rehnberg <cleanrock at gmail.com>
-Date: Wed, 31 Dec 2014 11:35:19 +0100
-Subject: [PATCH] fix GetListOfSubModules to support GLOB returning both "//"
- and "/"
-
-I needed this when building on archlinux with cmake 3.1.0 where GLOB returns "/"
----
- rts/build/cmake/Util.cmake | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/rts/build/cmake/Util.cmake b/rts/build/cmake/Util.cmake
-index 9f49e54..e23db7b 100644
---- a/rts/build/cmake/Util.cmake
-+++ b/rts/build/cmake/Util.cmake
-@@ -166,10 +166,11 @@ EndFunction (MakeGlobal)
- # Find all CMakeLists.txt files in sub-directories
- Macro    (GetListOfSubModules list_var)
- 	File(GLOB ${list_var} RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" FOLLOW_SYMLINKS "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt")
--
- 	# Strip away the "/CMakeLists.txt" parts, so we end up with just a list of dirs,
- 	# for example: AAI;RAI;KAIK
--	String(REPLACE "//CMakeLists.txt" "" ${list_var} "${${list_var}}")
-+	# GLOB can prefix with "//" or "/" (perhaps changed in cmake 3.1.0), this double replace will support both "//" and "/"
-+	String(REPLACE "/CMakeLists.txt" "" ${list_var} "${${list_var}}")
-+	String(REPLACE "/" "" ${list_var} "${${list_var}}")
- EndMacro (GetListOfSubModules list_var)
- 
- 
--- 
-2.2.1
-

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-07-02 00:25:44 UTC (rev 136220)
+++ community-x86_64/PKGBUILD	2015-07-02 00:25:49 UTC (rev 136221)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=98.0
-pkgrel=5
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' 'x86_64')
-url="http://springrts.com/"
-license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2'
-         'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
-makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa')
-optdepends=('python2: python-based bots'
-            'java-runtime: java-based bots')
-install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
-        0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch)
-md5sums=('fbe60dff4d39918157869f45738e0a8a'
-         'a8a8e5038439d43baaeac26585f5caf9')
-
-prepare() {
-  bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
-
-  cd spring_${pkgver}
-
-  patch -Np1 -i ../0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch
-}
-
-build() {
-  cd spring_${pkgver}
-
-  cmake	. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DDATADIR=share/spring \
-    -DCMAKE_SKIP_RPATH=YES
-  make
-}
-
-package() {
-  cd spring_${pkgver}
-
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/etc/spring"
-  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
-}
-
-# vim sw=2:ts=2 et:

Copied: spring/repos/community-x86_64/PKGBUILD (from rev 136220, spring/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-07-02 00:25:49 UTC (rev 136221)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=99.0
+pkgrel=1
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('i686' 'x86_64')
+url="http://springrts.com/"
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2' 'libunwind'
+         'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa')
+optdepends=('python2: python-based bots'
+            'java-runtime: java-based bots')
+install=spring.install
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma)
+md5sums=('3c9d8e0f7616060550e6452236d7626f')
+
+prepare() {
+  bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+}
+
+build() {
+  cd spring_${pkgver}
+
+  cmake	. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDATADIR=share/spring \
+    -DCMAKE_SKIP_RPATH=YES
+  make
+}
+
+package() {
+  cd spring_${pkgver}
+
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/etc/spring"
+  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
+}
+
+# vim sw=2:ts=2 et:

Deleted: community-x86_64/spring.install
===================================================================
--- community-x86_64/spring.install	2015-07-02 00:25:44 UTC (rev 136220)
+++ community-x86_64/spring.install	2015-07-02 00:25:49 UTC (rev 136221)
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: spring/repos/community-x86_64/spring.install (from rev 136220, spring/trunk/spring.install)
===================================================================
--- community-x86_64/spring.install	                        (rev 0)
+++ community-x86_64/spring.install	2015-07-02 00:25:49 UTC (rev 136221)
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}



More information about the arch-commits mailing list