[arch-commits] Commit in wesnoth/repos (14 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Fri Oct 7 20:24:30 UTC 2016


    Date: Friday, October 7, 2016 @ 20:24:29
  Author: bpiotrowski
Revision: 191608

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

Added:
  wesnoth/repos/community-staging-i686/
  wesnoth/repos/community-staging-i686/PKGBUILD
    (from rev 191607, wesnoth/trunk/PKGBUILD)
  wesnoth/repos/community-staging-i686/wesnoth-boost.patch
    (from rev 191607, wesnoth/trunk/wesnoth-boost.patch)
  wesnoth/repos/community-staging-i686/wesnoth.install
    (from rev 191607, wesnoth/trunk/wesnoth.install)
  wesnoth/repos/community-staging-i686/wesnoth.tmpfiles.conf
    (from rev 191607, wesnoth/trunk/wesnoth.tmpfiles.conf)
  wesnoth/repos/community-staging-i686/wesnothd.service
    (from rev 191607, wesnoth/trunk/wesnothd.service)
  wesnoth/repos/community-staging-i686/wesnothd.tmpfiles.conf
    (from rev 191607, wesnoth/trunk/wesnothd.tmpfiles.conf)
  wesnoth/repos/community-staging-x86_64/
  wesnoth/repos/community-staging-x86_64/PKGBUILD
    (from rev 191607, wesnoth/trunk/PKGBUILD)
  wesnoth/repos/community-staging-x86_64/wesnoth-boost.patch
    (from rev 191607, wesnoth/trunk/wesnoth-boost.patch)
  wesnoth/repos/community-staging-x86_64/wesnoth.install
    (from rev 191607, wesnoth/trunk/wesnoth.install)
  wesnoth/repos/community-staging-x86_64/wesnoth.tmpfiles.conf
    (from rev 191607, wesnoth/trunk/wesnoth.tmpfiles.conf)
  wesnoth/repos/community-staging-x86_64/wesnothd.service
    (from rev 191607, wesnoth/trunk/wesnothd.service)
  wesnoth/repos/community-staging-x86_64/wesnothd.tmpfiles.conf
    (from rev 191607, wesnoth/trunk/wesnothd.tmpfiles.conf)

-------------------------------------------------+
 community-staging-i686/PKGBUILD                 |   56 ++++++++++++++++++++++
 community-staging-i686/wesnoth-boost.patch      |   12 ++++
 community-staging-i686/wesnoth.install          |   14 +++++
 community-staging-i686/wesnoth.tmpfiles.conf    |    1 
 community-staging-i686/wesnothd.service         |    9 +++
 community-staging-i686/wesnothd.tmpfiles.conf   |    1 
 community-staging-x86_64/PKGBUILD               |   56 ++++++++++++++++++++++
 community-staging-x86_64/wesnoth-boost.patch    |   12 ++++
 community-staging-x86_64/wesnoth.install        |   14 +++++
 community-staging-x86_64/wesnoth.tmpfiles.conf  |    1 
 community-staging-x86_64/wesnothd.service       |    9 +++
 community-staging-x86_64/wesnothd.tmpfiles.conf |    1 
 12 files changed, 186 insertions(+)

Copied: wesnoth/repos/community-staging-i686/PKGBUILD (from rev 191607, wesnoth/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1,56 @@
+# $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
+pkgver=1.12.6
+pkgrel=3
+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' 'lua52' 'wesnoth-data' 'dbus' 'python2')
+makedepends=('boost' 'cmake' 'git')
+install=wesnoth.install
+options=(!emptydirs)
+source=("git://github.com/wesnoth/wesnoth.git#tag=${pkgver}"
+        "wesnoth-boost.patch"
+        wesnothd.tmpfiles.conf
+        wesnothd.service)
+md5sums=('SKIP'
+         '9a4ad99ba66990bfc17cb12966b3823b'
+         '2d2fea6b3d86dfd589f5ad35a3be1f97'
+         'd1b6bf1d3dc05086ee6a370adff0ae4a')
+
+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
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+
+  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"
+}

Copied: wesnoth/repos/community-staging-i686/wesnoth-boost.patch (from rev 191607, wesnoth/trunk/wesnoth-boost.patch)
===================================================================
--- community-staging-i686/wesnoth-boost.patch	                        (rev 0)
+++ community-staging-i686/wesnoth-boost.patch	2016-10-07 20:24:29 UTC (rev 191608)
@@ -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)

Copied: wesnoth/repos/community-staging-i686/wesnoth.install (from rev 191607, wesnoth/trunk/wesnoth.install)
===================================================================
--- community-staging-i686/wesnoth.install	                        (rev 0)
+++ community-staging-i686/wesnoth.install	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1,14 @@
+# arg 1:  the new package version
+post_install() {
+    systemd-tmpfiles --create wesnothd.conf
+cat << EOF
+Note:
+==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma"
+==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth
+==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output.
+EOF
+}
+
+post_upgrade() {
+    post_install
+}

Copied: wesnoth/repos/community-staging-i686/wesnoth.tmpfiles.conf (from rev 191607, wesnoth/trunk/wesnoth.tmpfiles.conf)
===================================================================
--- community-staging-i686/wesnoth.tmpfiles.conf	                        (rev 0)
+++ community-staging-i686/wesnoth.tmpfiles.conf	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1 @@
+D /run/wesnothd 0700 root root -

Copied: wesnoth/repos/community-staging-i686/wesnothd.service (from rev 191607, wesnoth/trunk/wesnothd.service)
===================================================================
--- community-staging-i686/wesnothd.service	                        (rev 0)
+++ community-staging-i686/wesnothd.service	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Wesnoth Server Daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/wesnothd
+
+[Install]
+WantedBy=multi-user.target

Copied: wesnoth/repos/community-staging-i686/wesnothd.tmpfiles.conf (from rev 191607, wesnoth/trunk/wesnothd.tmpfiles.conf)
===================================================================
--- community-staging-i686/wesnothd.tmpfiles.conf	                        (rev 0)
+++ community-staging-i686/wesnothd.tmpfiles.conf	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1 @@
+d /run/wesnothd 0700 root root -

Copied: wesnoth/repos/community-staging-x86_64/PKGBUILD (from rev 191607, wesnoth/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1,56 @@
+# $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
+pkgver=1.12.6
+pkgrel=3
+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' 'lua52' 'wesnoth-data' 'dbus' 'python2')
+makedepends=('boost' 'cmake' 'git')
+install=wesnoth.install
+options=(!emptydirs)
+source=("git://github.com/wesnoth/wesnoth.git#tag=${pkgver}"
+        "wesnoth-boost.patch"
+        wesnothd.tmpfiles.conf
+        wesnothd.service)
+md5sums=('SKIP'
+         '9a4ad99ba66990bfc17cb12966b3823b'
+         '2d2fea6b3d86dfd589f5ad35a3be1f97'
+         'd1b6bf1d3dc05086ee6a370adff0ae4a')
+
+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
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+
+  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"
+}

Copied: wesnoth/repos/community-staging-x86_64/wesnoth-boost.patch (from rev 191607, wesnoth/trunk/wesnoth-boost.patch)
===================================================================
--- community-staging-x86_64/wesnoth-boost.patch	                        (rev 0)
+++ community-staging-x86_64/wesnoth-boost.patch	2016-10-07 20:24:29 UTC (rev 191608)
@@ -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)

Copied: wesnoth/repos/community-staging-x86_64/wesnoth.install (from rev 191607, wesnoth/trunk/wesnoth.install)
===================================================================
--- community-staging-x86_64/wesnoth.install	                        (rev 0)
+++ community-staging-x86_64/wesnoth.install	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1,14 @@
+# arg 1:  the new package version
+post_install() {
+    systemd-tmpfiles --create wesnothd.conf
+cat << EOF
+Note:
+==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma"
+==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth
+==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output.
+EOF
+}
+
+post_upgrade() {
+    post_install
+}

Copied: wesnoth/repos/community-staging-x86_64/wesnoth.tmpfiles.conf (from rev 191607, wesnoth/trunk/wesnoth.tmpfiles.conf)
===================================================================
--- community-staging-x86_64/wesnoth.tmpfiles.conf	                        (rev 0)
+++ community-staging-x86_64/wesnoth.tmpfiles.conf	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1 @@
+D /run/wesnothd 0700 root root -

Copied: wesnoth/repos/community-staging-x86_64/wesnothd.service (from rev 191607, wesnoth/trunk/wesnothd.service)
===================================================================
--- community-staging-x86_64/wesnothd.service	                        (rev 0)
+++ community-staging-x86_64/wesnothd.service	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Wesnoth Server Daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/wesnothd
+
+[Install]
+WantedBy=multi-user.target

Copied: wesnoth/repos/community-staging-x86_64/wesnothd.tmpfiles.conf (from rev 191607, wesnoth/trunk/wesnothd.tmpfiles.conf)
===================================================================
--- community-staging-x86_64/wesnothd.tmpfiles.conf	                        (rev 0)
+++ community-staging-x86_64/wesnothd.tmpfiles.conf	2016-10-07 20:24:29 UTC (rev 191608)
@@ -0,0 +1 @@
+d /run/wesnothd 0700 root root -



More information about the arch-commits mailing list