summaryrefslogtreecommitdiff
path: root/extra/glhack
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-02-06 23:14:50 +0000
committerroot <root@rshg054.dnsready.net>2012-02-06 23:14:50 +0000
commit1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (patch)
tree8d7ccc2dc9d08a4c3cde26aa01c887e9a0fc2fa1 /extra/glhack
parentbdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff)
Mon Feb 6 23:14:50 UTC 2012
Diffstat (limited to 'extra/glhack')
-rw-r--r--extra/glhack/PKGBUILD12
-rw-r--r--extra/glhack/glhack-libpng15.patch11
2 files changed, 17 insertions, 6 deletions
diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD
index 5c073c3b0..dbf68735b 100644
--- a/extra/glhack/PKGBUILD
+++ b/extra/glhack/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137858 2011-09-12 05:04:42Z eric $
+# $Id: PKGBUILD 148744 2012-02-05 11:48:58Z ibiru $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
pkgname=glhack
pkgver=1.2
-pkgrel=5
+pkgrel=6
pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D"
arch=('i686' 'x86_64')
url="http://glhack.sourceforge.net/"
@@ -12,13 +12,13 @@ depends=('sdl' 'libpng' 'libgl')
makedepends=('mesa')
options=('!makeflags')
install=glhack.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b4c68e3ab689610ca638b7660c1b05bd')
-sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz glhack-libpng15.patch)
+sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae'
+ '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d')
build(){
cd "${srcdir}/${pkgname}-${pkgver}"
-
+ patch -p0 -i ../glhack-libpng15.patch
sed -i 's|/usr/lib/games|/usr/share|' include/config.h
sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h
sed -i -e 's|PREFIX = /usr|PREFIX = $(DESTDIR)/usr|' Makefile
diff --git a/extra/glhack/glhack-libpng15.patch b/extra/glhack/glhack-libpng15.patch
new file mode 100644
index 000000000..d8e644d1c
--- /dev/null
+++ b/extra/glhack/glhack-libpng15.patch
@@ -0,0 +1,11 @@
+--- win/gl/gl_image.c.old 2012-01-19 04:01:26.000000000 -0500
++++ win/gl/gl_image.c 2012-01-19 04:03:04.000000000 -0500
+@@ -486,7 +486,7 @@
+ /* set error handling since we are using the setjmp/longjmp method
+ * (this is the normal method of doing things with libpng).
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ sdlgl_warning("Problem within LibPNG (unknown)\n");
+ goto failed;