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

[Sven-Hendrik Haase]

    Date: Friday, April 27, 2018 @ 08:47:44
  Author: svenstaro
Revision: 318276

upgpkg: wesnoth 1.14.0-1

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

---------------------+
 PKGBUILD            |   25 ++++++++-----------------
 wesnoth-boost.patch |   12 ------------
 2 files changed, 8 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-27 08:25:41 UTC (rev 318275)
+++ PKGBUILD	2018-04-27 08:47:44 UTC (rev 318276)
@@ -6,36 +6,32 @@
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=wesnoth
-pkgver=1.12.6
-pkgrel=8
+pkgver=1.14.0
+pkgrel=1
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('x86_64')
 license=('GPL')
 url="http://www.wesnoth.org/"
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua52' 'wesnoth-data' 'dbus' 'python2')
+depends=('sdl2_ttf' 'sdl2_net' 'sdl2_mixer' 'sdl2_image' 'fribidi' 'boost-libs' 'pango' 'lua52' 'dbus' 'python2')
 makedepends=('boost' 'cmake' 'git')
 options=(!emptydirs)
 source=("git://github.com/wesnoth/wesnoth.git#tag=${pkgver}"
-        "wesnoth-boost.patch"
         wesnothd.tmpfiles.conf
         wesnothd.service)
-md5sums=('SKIP'
-         '9a4ad99ba66990bfc17cb12966b3823b'
-         '2d2fea6b3d86dfd589f5ad35a3be1f97'
-         'd1b6bf1d3dc05086ee6a370adff0ae4a')
+sha512sums=('SKIP'
+            '6e776bf9d4e6f289b1dddbea03b0cc6972af9e926c8305fac823613b101d7f3bc40f30ab73708e9df355b28cc6459b138f3d8015528796ad94d3571d20dd54ed'
+            '9d648c8bd13a574364b4dede4b1084a2fe1bf50a38ad04aa1a9f72f168915fc67d29b3c048f881a32f38a785fd4256d48c864346db08326e279237b28d5ca884')
 
 build() {
   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 .. \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DENABLE_OMP=ON \
       -DENABLE_TOOLS=ON \
-      -DMANDIR=share/man
+      -DMANDIR=share/man \
+      -DFIFO_DIR=/var/run/wesnothd
   make
 }
 
@@ -45,11 +41,6 @@
   cd build
   make DESTDIR="$pkgdir" install
 
-  rm -r $pkgdir/usr/share/applications
-  rm -r $pkgdir/usr/share/doc
-  rm -r $pkgdir/usr/share/pixmaps
-  rm -r $pkgdir/usr/share/wesnoth
-
   install -Dm644 "$srcdir/wesnothd.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnothd.conf"
   install -Dm644 "$srcdir/wesnothd.service" "$pkgdir/usr/lib/systemd/system/wesnothd.service"
 }

Deleted: wesnoth-boost.patch
===================================================================
--- wesnoth-boost.patch	2018-04-27 08:25:41 UTC (rev 318275)
+++ wesnoth-boost.patch	2018-04-27 08:47:44 UTC (rev 318276)
@@ -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)