[arch-commits] Commit in wesnoth-data/trunk (PKGBUILD wesnoth-boost.patch)

[Sven-Hendrik Haase]

    Date: Monday, November 24, 2014 @ 05:10:10
  Author: svenstaro
Revision: 123026

upgpkg: wesnoth-data 1.12.0-1

upstream release 1.12.0

Added:
  wesnoth-data/trunk/wesnoth-boost.patch
Modified:
  wesnoth-data/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   17 +++++++++++------
 wesnoth-boost.patch |   12 ++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-24 03:46:53 UTC (rev 123025)
+++ PKGBUILD	2014-11-24 04:10:10 UTC (rev 123026)
@@ -6,20 +6,25 @@
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=wesnoth-data
-pkgver=1.10.7
+pkgver=1.12.0
 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')
+makedepends=('boost' 'cmake' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'lua' 'pango' 'git')
 options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/wesnoth/wesnoth-${pkgver}.tar.bz2)
-md5sums=('3f460a494530d32aa5d5d0f19c95efbd')
+source=("git://github.com/wesnoth/wesnoth.git#tag=${pkgver}"
+        "wesnoth-boost.patch")
+md5sums=('SKIP'
+         '9a4ad99ba66990bfc17cb12966b3823b')
 
 build() {
-  cd "${srcdir}/wesnoth-${pkgver}"
+  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 \
@@ -31,7 +36,7 @@
 }
 
 package() {
-  cd "${srcdir}/wesnoth-${pkgver}"
+  cd "${srcdir}/wesnoth"
 
   cd build
   make DESTDIR="$pkgdir" install

Added: wesnoth-boost.patch
===================================================================
--- wesnoth-boost.patch	                        (rev 0)
+++ wesnoth-boost.patch	2014-11-24 04:10:10 UTC (rev 123026)
@@ -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)