diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
commit | 4a133169d99e3d760caad3cbca2781872f4a0805 (patch) | |
tree | 73d442004d2d4f70e0194bd78d6b293337ec2456 /community/warmux | |
parent | a420f5c4c2a4eeb411175d086b339b620dba309d (diff) | |
parent | 58f5e0b164b5f4c9af61b2e42bd10c85f28b9bed (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apcupsd/PKGBUILD
community/freedroidrpg/PKGBUILD
community/lincity-ng/PKGBUILD
community/python2-pymongo/PKGBUILD
core/openssh/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/gnutls/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/mkvtoolnix/PKGBUILD
multilib/chuck/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
social/monkeysphere/PKGBUILD
testing/cups/PKGBUILD
testing/cups/cups-systemd-socket.patch
testing/cups/cups.install
testing/inetutils/PKGBUILD
testing/inetutils/ftpd.service
testing/libreoffice/PKGBUILD
testing/libreoffice/libreoffice-common.csh
testing/libreoffice/libreoffice-common.sh
testing/modemmanager/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.service
testing/openssh/sshd.socket
testing/upower/PKGBUILD
Diffstat (limited to 'community/warmux')
-rw-r--r-- | community/warmux/PKGBUILD | 8 | ||||
-rw-r--r-- | community/warmux/gcc-fix.patch | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD index 45abfc66f..65e5012a8 100644 --- a/community/warmux/PKGBUILD +++ b/community/warmux/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 63773 2012-02-05 12:13:45Z ibiru $ +# $Id: PKGBUILD 75821 2012-09-01 20:39:50Z heftig $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: pukyxd # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=warmux pkgver=11.04.1 -pkgrel=4 +pkgrel=5 pkgdesc="A clone of the worms game" arch=('i686' 'x86_64' 'mips64el') url="http://www.wormux.org/" license=('GPL') -makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') +makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') replaces=('wormux') source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 include-zlib.patch gcc-fix.patch) md5sums=('26ff65c43a9bb61a3f0529c98b943e35' 'c8285955e880f80e3c68312715a3061c' - '693176b72c9568c0c223be76ea7dd0d2') + 'ab50d613d3fa3f71262b1d2fc71641b1') build() { cd "${srcdir}/${pkgname}-${pkgver/.1/}" diff --git a/community/warmux/gcc-fix.patch b/community/warmux/gcc-fix.patch index d4ceb0746..1ac476b92 100644 --- a/community/warmux/gcc-fix.patch +++ b/community/warmux/gcc-fix.patch @@ -23,3 +23,14 @@ diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/wa ~Action(); +Description: Fix FTBFS with gcc 4.7. +Author: Felix Geyer <debfx-pkg@fobos.de> + +--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp ++++ warmux-11.04.1+repack/tools/list_games/main.cpp +@@ -1,4 +1,5 @@ + #include <stdio.h> ++#include <unistd.h> + #include <WARMUX_types.h> + #include <WARMUX_network.h> + #include <WARMUX_index_server.h> |