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

[Sven-Hendrik Haase]

    Date: Monday, November 24, 2014 @ 05:49:24
  Author: svenstaro
Revision: 123030

upgpkg: wesnoth 1.12.0-1

upstream release 1.12.0

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

---------------------+
 PKGBUILD            |   19 ++++++++++++-------
 wesnoth-boost.patch |   12 ++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-24 04:39:15 UTC (rev 123029)
+++ PKGBUILD	2014-11-24 04:49:24 UTC (rev 123030)
@@ -6,25 +6,30 @@
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=wesnoth
-pkgver=1.10.7
-pkgrel=5
+pkgver=1.12.0
+pkgrel=1
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.wesnoth.org/"
 depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' 'wesnoth-data' 'dbus' 'python2')
-makedepends=('boost' 'cmake')
+makedepends=('boost' 'cmake'' git')
 install=wesnoth.install
 options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+source=("git://github.com/wesnoth/wesnoth.git#tag=${pkgver}"
+        "wesnoth-boost.patch"
         wesnothd.tmpfiles.conf
         wesnothd.service)
-md5sums=('3f460a494530d32aa5d5d0f19c95efbd'
+md5sums=('SKIP'
+         '9a4ad99ba66990bfc17cb12966b3823b'
          '2d2fea6b3d86dfd589f5ad35a3be1f97'
          'd1b6bf1d3dc05086ee6a370adff0ae4a')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
+  
+  # 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 .. \
@@ -36,7 +41,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
 
   cd build
   make DESTDIR="$pkgdir" install

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