[arch-commits] Commit in wesnoth-data/repos/community-any (4 files)

[Sven-Hendrik Haase]

    Date: Saturday, April 11, 2015 @ 22:49:37
  Author: svenstaro
Revision: 131187

archrelease: copy trunk to community-any

Added:
  wesnoth-data/repos/community-any/PKGBUILD
    (from rev 131186, wesnoth-data/trunk/PKGBUILD)
  wesnoth-data/repos/community-any/wesnoth-boost.patch
    (from rev 131186, wesnoth-data/trunk/wesnoth-boost.patch)
Deleted:
  wesnoth-data/repos/community-any/PKGBUILD
  wesnoth-data/repos/community-any/wesnoth-boost.patch

---------------------+
 PKGBUILD            |  100 +++++++++++++++++++++++++-------------------------
 wesnoth-boost.patch |   24 ++++++------
 2 files changed, 62 insertions(+), 62 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-11 20:49:30 UTC (rev 131186)
+++ PKGBUILD	2015-04-11 20:49:37 UTC (rev 131187)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Jacobo Arvelo <unix4all at ya.com>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-
-pkgname=wesnoth-data
-pkgver=1.12.1
-pkgrel=1
-pkgdesc="A turn-based strategy game on a fantasy world (data files)"
-arch=('any')
-license=('GPL')
-url="http://www.wesnoth.org/"
-makedepends=('boost' 'cmake' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'lua' 'pango' 'git')
-options=(!emptydirs)
-source=("git://github.com/wesnoth/wesnoth.git#tag=${pkgver}"
-        "wesnoth-boost.patch")
-md5sums=('SKIP'
-         '9a4ad99ba66990bfc17cb12966b3823b')
-
-build() {
-  cd "${srcdir}/wesnoth"
-
-  # Try this again in a new version when they fix their linking to boost
-  patch -Np1 < ${srcdir}/wesnoth-boost.patch
-
-  mkdir build && cd build
-  cmake .. \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DENABLE_OMP=ON \
-      -DENABLE_TOOLS=ON \
-      -DMANDIR=share/man \
-      -DFIFO_DIR=/var/run/wesnothd
-  make
-}
-
-package() {
-  cd "${srcdir}/wesnoth"
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  rm -r $pkgdir/usr/bin
-  rm -r $pkgdir/usr/share/man
-
-  for file in $(grep -l "python" $pkgdir/usr/share/wesnoth/data/tools/*); do
-    sed -i "s|#!/usr/bi#n/env python|#!/usr/bin/env python2|" $file;
-  done
-}

Copied: wesnoth-data/repos/community-any/PKGBUILD (from rev 131186, wesnoth-data/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-04-11 20:49:37 UTC (rev 131187)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Jacobo Arvelo <unix4all at ya.com>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+
+pkgname=wesnoth-data
+pkgver=1.12.2
+pkgrel=1
+pkgdesc="A turn-based strategy game on a fantasy world (data files)"
+arch=('any')
+license=('GPL')
+url="http://www.wesnoth.org/"
+makedepends=('boost' 'cmake' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'lua' 'pango' 'git')
+options=(!emptydirs)
+source=("git://github.com/wesnoth/wesnoth.git#tag=${pkgver}"
+        "wesnoth-boost.patch")
+md5sums=('SKIP'
+         '9a4ad99ba66990bfc17cb12966b3823b')
+
+build() {
+  cd "${srcdir}/wesnoth"
+
+  # Try this again in a new version when they fix their linking to boost
+  patch -Np1 < ${srcdir}/wesnoth-boost.patch
+
+  mkdir build && cd build
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DENABLE_OMP=ON \
+      -DENABLE_TOOLS=ON \
+      -DMANDIR=share/man \
+      -DFIFO_DIR=/var/run/wesnothd
+  make
+}
+
+package() {
+  cd "${srcdir}/wesnoth"
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  rm -r $pkgdir/usr/bin
+  rm -r $pkgdir/usr/share/man
+
+  for file in $(grep -l "python" $pkgdir/usr/share/wesnoth/data/tools/*); do
+    sed -i "s|#!/usr/bi#n/env python|#!/usr/bin/env python2|" $file;
+  done
+}

Deleted: wesnoth-boost.patch
===================================================================
--- wesnoth-boost.patch	2015-04-11 20:49:30 UTC (rev 131186)
+++ wesnoth-boost.patch	2015-04-11 20:49:37 UTC (rev 131187)
@@ -1,12 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 43a20d7..61f36e0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -79,6 +79,7 @@ else(MSVC)
- 		${Boost_IOSTREAMS_LIBRARY}
- 		${Boost_REGEX_LIBRARY}
- 		${Boost_PROGRAM_OPTIONS_LIBRARY}
-+        ${Boost_SYSTEM_LIBRARIES}
- 		${LIBINTL_LIBRARIES}
- 	)
- endif(MSVC)

Copied: wesnoth-data/repos/community-any/wesnoth-boost.patch (from rev 131186, wesnoth-data/trunk/wesnoth-boost.patch)
===================================================================
--- wesnoth-boost.patch	                        (rev 0)
+++ wesnoth-boost.patch	2015-04-11 20:49:37 UTC (rev 131187)
@@ -0,0 +1,12 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 43a20d7..61f36e0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -79,6 +79,7 @@ else(MSVC)
+ 		${Boost_IOSTREAMS_LIBRARY}
+ 		${Boost_REGEX_LIBRARY}
+ 		${Boost_PROGRAM_OPTIONS_LIBRARY}
++        ${Boost_SYSTEM_LIBRARIES}
+ 		${LIBINTL_LIBRARIES}
+ 	)
+ endif(MSVC)