[arch-commits] Commit in glhack/trunk (PKGBUILD glhack-libpng15.patch)

[Eric Bélanger]

    Date: Thursday, January 19, 2012 @ 05:07:45
  Author: eric
Revision: 146928

upgpkg: glhack 1.2-6

Rebuild against libpng 1.5 and libtiff 4.0

Added:
  glhack/trunk/glhack-libpng15.patch
Modified:
  glhack/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   10 +++++-----
 glhack-libpng15.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-19 10:01:03 UTC (rev 146927)
+++ PKGBUILD	2012-01-19 10:07:45 UTC (rev 146928)
@@ -3,7 +3,7 @@
 
 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 @@
 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

Added: glhack-libpng15.patch
===================================================================
--- glhack-libpng15.patch	                        (rev 0)
+++ glhack-libpng15.patch	2012-01-19 10:07:45 UTC (rev 146928)
@@ -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;