diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-11 12:04:22 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-11 12:04:22 +0100 |
commit | 020644b613452cc7ab48474b463e4a9d1088d8a3 (patch) | |
tree | b1e2ae353ab1f58e0513bf5cef15ea87eacba1ff /community | |
parent | 9268c5eeb9d68cd786f5a7beaed3b5672adb5287 (diff) | |
parent | 9d1489b877a1fa7c2674cf1f744804db42d93bfc (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/librep/PKGBUILD
extra/pixman/PKGBUILD
Diffstat (limited to 'community')
-rw-r--r-- | community/arptables/PKGBUILD | 12 | ||||
-rw-r--r-- | community/ccrypt/PKGBUILD | 23 | ||||
-rwxr-xr-x | community/confuse/PKGBUILD | 15 | ||||
-rw-r--r-- | community/e3/PKGBUILD | 6 | ||||
-rw-r--r-- | community/etherape/PKGBUILD | 4 | ||||
-rw-r--r-- | community/fswebcam/PKGBUILD | 4 | ||||
-rw-r--r-- | community/ldc/PKGBUILD | 8 | ||||
-rw-r--r-- | community/libdbi-drivers/PKGBUILD | 3 | ||||
-rw-r--r-- | community/librep/PKGBUILD | 29 | ||||
-rw-r--r-- | community/megaglest/PKGBUILD | 6 | ||||
-rw-r--r-- | community/paraview/PKGBUILD | 17 | ||||
-rw-r--r-- | community/paraview/fix-build-with-zlib-1.2.6.diff | 36 | ||||
-rw-r--r-- | community/percona-server/PKGBUILD | 4 | ||||
-rw-r--r-- | community/quagga/PKGBUILD | 4 | ||||
-rw-r--r-- | community/tinyproxy/PKGBUILD | 6 | ||||
-rw-r--r-- | community/wesnoth/PKGBUILD | 52 | ||||
-rw-r--r-- | community/wesnoth/wesnoth-1.8.6-boost-foreach.patch | 70 | ||||
-rw-r--r-- | community/wesnoth/wesnoth-libpng-1.4.0.patch | 24 | ||||
-rw-r--r-- | community/wesnoth/wesnoth.install | 9 | ||||
-rw-r--r-- | community/wesnoth/wesnoth.tmpfiles.conf | 1 | ||||
-rwxr-xr-x | community/wesnoth/wesnothd.rc.d | 40 |
21 files changed, 314 insertions, 59 deletions
diff --git a/community/arptables/PKGBUILD b/community/arptables/PKGBUILD index 172baf2bd..ac6942bcb 100644 --- a/community/arptables/PKGBUILD +++ b/community/arptables/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59644 2011-11-29 01:04:59Z seblu $ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net +# $Id: PKGBUILD 64145 2012-02-09 09:48:15Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=arptables pkgver=0.0.3_4 -pkgrel=1 +pkgrel=2 pkgdesc='ARP filtering utility' arch=('i686' 'x86_64') url='http://ebtables.sourceforge.net/' @@ -20,9 +20,6 @@ build() { } package() { - # install rc script - install -D -m 0755 arptables.rc "$pkgdir/etc/rc.d/arptables" - # setup arptables cd $pkgname-v${pkgver//_/-} make install \ @@ -33,6 +30,9 @@ package() { MANDIR=/usr/share/man \ INITDIR=/etc/rc.d \ SYSCONFIGDIR=/etc/arptables + + # install rc script + install -D -m 0755 ../arptables.rc "$pkgdir/etc/rc.d/arptables" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ccrypt/PKGBUILD b/community/ccrypt/PKGBUILD index eda5acd9e..f765d7f77 100644 --- a/community/ccrypt/PKGBUILD +++ b/community/ccrypt/PKGBUILD @@ -1,21 +1,28 @@ -# $Id: PKGBUILD 6074 2009-11-29 08:39:09Z giovanni $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 64159 2012-02-09 16:27:49Z ttopper $ +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=ccrypt pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="A command-line utility for encrypting and decrypting files and streams" arch=('i686' 'x86_64' 'mips64el') url="http://ccrypt.sourceforge.net" license=('GPL2') depends=('glibc') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('c3f78019d7a166dd66f1d4b1390c62c2') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$pkgdir install + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install } diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD index ddfb63ec2..14cc92378 100755 --- a/community/confuse/PKGBUILD +++ b/community/confuse/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 64161 2012-02-09 16:35:50Z ttopper $ +# Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=confuse pkgver=2.7 -pkgrel=1 +pkgrel=2 pkgdesc="C-library for parsing configuration files" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/confuse" license=('LGPL') depends=('glibc') -source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz") options=('!libtool' '!emptydirs') md5sums=('45932fdeeccbb9ef4228f1c1a25e9c8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-shared - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/community/e3/PKGBUILD b/community/e3/PKGBUILD index b23534ff6..542a0c649 100644 --- a/community/e3/PKGBUILD +++ b/community/e3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63897 2012-02-06 16:46:33Z arodseth $ +# $Id: PKGBUILD 64154 2012-02-09 14:16:08Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=e3 pkgver=2.8 -pkgrel=2 -pkgdesc="Tiny text editor written in assembly, that doesn't depend on any libraries" +pkgrel=3 +pkgdesc="Editor written in assembly. Tiny, with no library dependencies." arch=('x86_64' 'i686') url="http://sites.google.com/site/e3editor/" license=('GPL2') diff --git a/community/etherape/PKGBUILD b/community/etherape/PKGBUILD index 2e3713e94..a0901da0d 100644 --- a/community/etherape/PKGBUILD +++ b/community/etherape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48609 2011-06-03 09:54:50Z ttopper $ +# $Id: PKGBUILD 64163 2012-02-09 16:45:19Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: kevin <kevin@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=etherape pkgver=0.9.12 -pkgrel=1 +pkgrel=2 pkgdesc="A graphical network monitor for various OSI layers and protocols" arch=('i686' 'x86_64' 'mips64el') url="http://etherape.sourceforge.net/" diff --git a/community/fswebcam/PKGBUILD b/community/fswebcam/PKGBUILD index 3f8fa34ba..7953a8536 100644 --- a/community/fswebcam/PKGBUILD +++ b/community/fswebcam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54317 2011-08-16 18:16:02Z ttopper $ +# $Id: PKGBUILD 64170 2012-02-09 17:15:43Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Philipp Robbel <robbel@gmail.com> pkgname=fswebcam pkgver=20110717 -pkgrel=1 +pkgrel=2 pkgdesc="Tiny and flexible webcam app." arch=('i686' 'x86_64' 'mips64el') url="http://www.firestorm.cx/fswebcam" diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 09fe68ab1..78129a3a3 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20120204 -pkgrel=2 +pkgver=20120209 +pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') url="http://www.dsource.org/projects/ldc" license=('BSD') -makedepends=('git' 'cmake' 'libconfig') -depends=('llvm') +depends=('llvm' 'libconfig') +makedepends=('git' 'cmake') source=() md5sums=() diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD index 2e8348def..142ee9da8 100644 --- a/community/libdbi-drivers/PKGBUILD +++ b/community/libdbi-drivers/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 64177 2012-02-09 17:50:10Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Olivier Médoc <o_medoc@yahoo.fr> # Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com> @@ -5,7 +6,7 @@ pkgname=libdbi-drivers pkgver=0.8.3_1 _pkgver=0.8.3-1 -pkgrel=2 +pkgrel=3 pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)" url="http://libdbi-drivers.sourceforge.net/" license=('GPL') diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD index ef36053ad..b28daec9a 100644 --- a/community/librep/PKGBUILD +++ b/community/librep/PKGBUILD @@ -1,33 +1,34 @@ -# $Id: PKGBUILD 59710 2011-11-29 13:35:00Z stephane $ -# Maintainer: stefan-husmann@t-online.de +# $Id: PKGBUILD 64157 2012-02-09 14:54:32Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel <juergen@archlinux.org> - pkgname=librep pkgver=0.92.1b -pkgrel=2 -pkgdesc="A Lisp system for UNIX" +pkgrel=3 +pkgdesc="Lisp system for Sawfish" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url="http://sawfish.wikia.com/wiki/Librep" depends=('gmp' 'gdbm' 'libffi') -install=${pkgname}.install +install=$pkgname.install options=('!emptydirs' '!libtool') -source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('f75e1197646bbf1594fc4765802aab0bffe1bb02') +source=("http://download.tuxfamily.org/$pkgname/$pkgname-$pkgver.tar.xz") +sha256sums=('aedca2716252a1ff2256aca321cce35646b795840b65a3c481708c04a6fd7e3e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + ./configure --disable-static \ --prefix=/usr \ - --libexecdir=/usr/lib/$pkgname \ + --libexecdir="/usr/lib/$pkgname" \ --with-readline make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - # create some directories or make install fails -# install -d $pkgdir/usr/{share/aclocal,lib/pkgconfig} - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index c3559f21e..27ae318b8 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63660 2012-02-05 12:04:09Z ibiru $ +# $Id: PKGBUILD 64173 2012-02-09 17:40:27Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.6.0.2 +pkgver=3.6.0.3 pkgrel=2 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' ' 'libircclient' 'miniupnpc' 'wxgtk') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('9d840a04b41aef2cba503de7bf433b8d') +md5sums=('5a4a2429435031d9f9cc5d9535a9de9d') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index 99861df82..2265fff68 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -4,23 +4,28 @@ pkgname=paraview pkgver=3.12.0 -pkgrel=3 +pkgrel=5 pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64' 'mips64el') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff' 'libtheora') +depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2' + # The following is a list of libraries we explicitly tell cmake to use the system library of + 'hdf5' 'freetype2' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'expat' 'libxml2' 'libtheora' + ) makedepends=('cmake' 'desktop-file-utils' 'boost') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" 'paraview.png' 'paraview.desktop' 'fix-boost-graph-api-changes.diff' - '12859-VisItBrige-external-tiff-support.diff') + '12859-VisItBrige-external-tiff-support.diff' + 'fix-build-with-zlib-1.2.6.diff') md5sums=('8feabc6261e2060648eaac593d85b1de' 'db623002bc71a257ddfdd0c9c7b14c3f' '4e4b7172ed18171c37446fd7c4f1e8f5' '2aa5b98288cadd201ffbd057f18929b0' - '9321279c8fc6f289a7cf228648edcb5f') + '9321279c8fc6f289a7cf228648edcb5f' + 'e4506b4ed0d2ae60072388f098be6c33') build() { cd ParaView-${pkgver}/VTK @@ -32,6 +37,10 @@ build() { # fix http://paraview.org/Bug/view.php?id=12849 remove on next pkgver bump patch -Np1 -i ${srcdir}/12859-VisItBrige-external-tiff-support.diff + cd ${srcdir}/ParaView-${pkgver} + # fix http://paraview.org/Bug/view.php?id=12924 + patch -Np0 -i ${srcdir}/fix-build-with-zlib-1.2.6.diff + mkdir ${srcdir}/build cd ${srcdir}/build diff --git a/community/paraview/fix-build-with-zlib-1.2.6.diff b/community/paraview/fix-build-with-zlib-1.2.6.diff new file mode 100644 index 000000000..6540de045 --- /dev/null +++ b/community/paraview/fix-build-with-zlib-1.2.6.diff @@ -0,0 +1,36 @@ +--- Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C.original 2012-02-09 16:22:56.420371795 +0000 ++++ Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C 2012-02-09 16:25:59.652228526 +0000 +@@ -703,10 +703,10 @@ + { + // Read past the specified offset. + if(byteOffset > 0) +- gzseek(gz_handle, byteOffset, SEEK_SET); ++ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET); + + // Read the whole dataset +- gzread(gz_handle, whole_buff, whole_nelem * unit_size); ++ gzread((gzFile)gz_handle, whole_buff, whole_nelem * unit_size); + } + else + { +@@ -1046,9 +1046,9 @@ + { + // Read past the specified offset. + if(byteOffset > 0) +- gzseek(gz_handle, byteOffset, SEEK_SET); ++ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET); + +- gzread(gz_handle, rv->GetVoidPointer(0), ++ gzread((gzFile)gz_handle, rv->GetVoidPointer(0), + nvals * dataNumComponents * unit_size); + } + else +@@ -1192,7 +1192,7 @@ + // Close the file descriptors. + // + if (gzipped) +- gzclose(gz_handle); ++ gzclose((gzFile)gz_handle); + else + fclose(file_handle); + diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 3eea37da6..1523e8653 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.19_rel24.0 +pkgver=5.5.20_rel24.1 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') @@ -98,6 +98,6 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -md5sums=('eb8c21bbb8179e0a4709d51c037e682c' +md5sums=('0f61fde172ed1168a3ca9b7b003a6698' '243864805611764a7e5883c1dba7afd8' '1c949c0dbea5206af0db14942d9927b6') diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index fdd3acd26..b6d8915ba 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -3,12 +3,12 @@ pkgname=quagga pkgver=0.99.20 -pkgrel=2 +pkgrel=3 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' license=('GPL2') -depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses') +depends=('libcap' 'net-snmp' 'readline' 'ncurses') options=('!libtool' '!buildflags') backup=() install=quagga.install diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index 230ccbc55..981881aa0 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62660 2012-01-23 13:31:10Z lfleischer $ +# $Id: PKGBUILD 64182 2012-02-09 20:42:45Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=tinyproxy pkgver=1.8.3 -pkgrel=3 +pkgrel=4 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64' 'mips64el') url='https://banu.com/tinyproxy/' @@ -22,7 +22,7 @@ md5sums=('292ac51da8ad6ae883d4ebf56908400d' build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --localstatedir=/var --enable-transparent make } diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD new file mode 100644 index 000000000..19e8c83f5 --- /dev/null +++ b/community/wesnoth/PKGBUILD @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Jacobo Arvelo <unix4all@ya.com> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=wesnoth +pkgver=1.10 +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-core' 'python2') +makedepends=('boost' 'cmake') +install=wesnoth.install +options=(!emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + wesnoth.tmpfiles.conf + wesnothd.rc.d) +md5sums=('707daa13e2f5b3976d9b169aab62dc29' + 'b8122f5054e3895c9c054e87460869dc' + '85659b47d22dfdf4e4d046556973fc3e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + 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/$pkgname-$pkgver" + + 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/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" + install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd" +} diff --git a/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch new file mode 100644 index 000000000..5aee3118c --- /dev/null +++ b/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch @@ -0,0 +1,70 @@ +--- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200 ++++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200 +@@ -238,6 +238,17 @@ void ttree_view_node::clear() + + struct ttree_view_node_implementation + { ++ template<class W, class It> ++ static W* find_at_aux(It begin, It end, ++ const tpoint& coordinate, const bool must_be_active) { ++ for (It it = begin; it != end; ++it) { ++ if(W* widget = it->find_at(coordinate, must_be_active)) { ++ return widget; ++ } ++ } ++ return NULL; ++ } ++ + template<class W> + static W* find_at( + typename tconst_duplicator<W, ttree_view_node>::type& +@@ -255,13 +266,9 @@ struct ttree_view_node_implementation + } + + typedef typename tconst_duplicator<W, ttree_view_node>::type thack; +- foreach(thack& node, tree_view_node.children_) { +- if(W* widget = node.find_at(coordinate, must_be_active)) { +- return widget; +- } +- } +- +- return NULL; ++ return find_at_aux<W>(tree_view_node.children_.begin(), ++ tree_view_node.children_.end(), ++ coordinate, must_be_active); + } + }; + +@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size + return size; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz + size.x += (get_indention_level() - 1) * tree_view().indention_step_size_; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s + + DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n"; + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; diff --git a/community/wesnoth/wesnoth-libpng-1.4.0.patch b/community/wesnoth/wesnoth-libpng-1.4.0.patch new file mode 100644 index 000000000..338f467af --- /dev/null +++ b/community/wesnoth/wesnoth-libpng-1.4.0.patch @@ -0,0 +1,24 @@ +diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 +@@ -174,8 +174,8 @@ + //TODO: review whether providing NULL error handlers is something + //sensible + png_struct* png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), ++ NULL, NULL); + if(!png_ptr) + throw exploder_failure("Unable to initialize the png write structure"); + +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600 +@@ -15,6 +15,7 @@ + #include "exploder_utils.hpp" + #include "game_config.hpp" + #include "serialization/string_utils.hpp" ++#include <zlib.h> + #include <png.h> + + exploder_point::exploder_point(const std::string &s) diff --git a/community/wesnoth/wesnoth.install b/community/wesnoth/wesnoth.install new file mode 100644 index 000000000..4f1e419ae --- /dev/null +++ b/community/wesnoth/wesnoth.install @@ -0,0 +1,9 @@ +# arg 1: the new package version +post_install() { +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 +} diff --git a/community/wesnoth/wesnoth.tmpfiles.conf b/community/wesnoth/wesnoth.tmpfiles.conf new file mode 100644 index 000000000..3ec0f6013 --- /dev/null +++ b/community/wesnoth/wesnoth.tmpfiles.conf @@ -0,0 +1 @@ +D /run/wesnothd 0700 root root - diff --git a/community/wesnoth/wesnothd.rc.d b/community/wesnoth/wesnothd.rc.d new file mode 100755 index 000000000..95e312b7b --- /dev/null +++ b/community/wesnoth/wesnothd.rc.d @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/wesnothd) + +case "$1" in + start) + stat_busy "Starting Wesnoth Server Daemon" + [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd + [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + PID=$(pidof -o %PPID /usr/bin/wesnothd) + echo $PID > /var/run/wesnotd/pid + add_daemon wesnothd + stat_done + fi + ;; + stop) + stat_busy "Stopping Wesnoth Server Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon wesnothd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 |