summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Zamarin2016-05-12 09:06:13 +0300
committerArthur Zamarin2016-05-12 09:06:41 +0300
commitbb434ffa6c95496624d083fd32df87b03e78e8a4 (patch)
treedecd414cd0752e2fad85735ce15c56e57a2429d5
parenta98215a5cd2c2cc30e52036a99903c010b892f0a (diff)
downloadaur-bb434ffa6c95496624d083fd32df87b03e78e8a4.tar.gz
Fix Compilation
big thanks to Martchus <martchus@gmx.net>
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD22
-rw-r--r--return-null.patch11
3 files changed, 28 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25a3766b7ff..0874b884139 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Thu May 12 06:06:13 UTC 2016
pkgbase = warmux
pkgdesc = Clone of turn-based artillery games like Scorched Earth or Worms (formerly known as Wormux)
pkgver = 11.04.1
- pkgrel = 8
+ pkgrel = 9
url = http://gna.org/projects/warmux/
arch = i686
arch = x86_64
@@ -21,9 +23,11 @@ pkgbase = warmux
source = http://download.gna.org/warmux/warmux-11.04.1.tar.bz2
source = include-zlib.patch
source = gcc-fix.patch
+ source = return-null.patch
sha256sums = 789c4f353e4c5ce0a2aba2e82861d3fd0e5218bc76d8da1a332f2c7b1b27e4ee
sha256sums = 665c4a64e54478491284f6cb6251bd58f96ba81671a7c439cffe175b86462852
sha256sums = 3f271dc6249ababe919733268c34464fc3050fc7c2b0329e9017f1b32c7760f5
+ sha256sums = 0e0692fb2acc5697c3083deeff41dcdb055f3330cbac146ebab4aa0f021ad03c
pkgname = warmux
diff --git a/PKGBUILD b/PKGBUILD
index b9f2ae438ae..51ec12acefc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,14 @@
-# Maintainer: 404
+# Maintainer: Zamarin Arthur <arthurzam@gmail.com>
# Contributor: carstene1ns <url/mail: arch carsten-teibes de>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: pukyxd
# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Martchus <martchus@gmx.net>
pkgname=warmux
pkgver=11.04.1
-pkgrel=8
+pkgrel=9
pkgdesc="Clone of turn-based artillery games like Scorched Earth or Worms (formerly known as Wormux)"
arch=('i686' 'x86_64')
url="http://gna.org/projects/warmux/"
@@ -16,32 +17,33 @@ depends=('libxml++' 'sdl_image' 'sdl_gfx' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl'
replaces=('wormux' 'warmux-data')
conflicts=('warmux-data')
source=("http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2"
- "include-zlib.patch"
- "gcc-fix.patch")
+ 'include-zlib.patch'
+ 'gcc-fix.patch'
+ 'return-null.patch')
sha256sums=('789c4f353e4c5ce0a2aba2e82861d3fd0e5218bc76d8da1a332f2c7b1b27e4ee'
'665c4a64e54478491284f6cb6251bd58f96ba81671a7c439cffe175b86462852'
- '3f271dc6249ababe919733268c34464fc3050fc7c2b0329e9017f1b32c7760f5')
-# disable compression, only saves ~15 mb
-PKGEXT='.pkg.tar'
+ '3f271dc6249ababe919733268c34464fc3050fc7c2b0329e9017f1b32c7760f5'
+ '0e0692fb2acc5697c3083deeff41dcdb055f3330cbac146ebab4aa0f021ad03c')
prepare() {
- cd $pkgname-${pkgver/.1/}
+ cd "$pkgname-${pkgver/.1/}"
# libpng fix
patch -Np1 < ../include-zlib.patch
# compilation fixes
patch -Np1 < ../gcc-fix.patch
+ patch -Np0 < ../return-null.patch
}
build() {
- cd $pkgname-${pkgver/.1/}
+ cd "$pkgname-${pkgver/.1/}"
./configure --prefix=/usr
make
}
package() {
- cd $pkgname-${pkgver/.1/}
+ cd "$pkgname-${pkgver/.1/}"
make DESTDIR="$pkgdir" install
}
diff --git a/return-null.patch b/return-null.patch
new file mode 100644
index 00000000000..851dfcbd168
--- /dev/null
+++ b/return-null.patch
@@ -0,0 +1,11 @@
+--- src/interface/weapon_menu.cpp.orig 2016-05-09 15:22:36.895266463 +0200
++++ src/interface/weapon_menu.cpp 2016-05-09 15:21:38.518476191 +0200
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+ if (!show)
+- return false;
++ return NULL;
+ const std::vector<PolygonItem *>& items = poly->GetItem();
+ WeaponMenuItem * tmp;
+ Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);