From 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 6 Feb 2012 23:14:50 +0000
Subject: Mon Feb  6 23:14:50 UTC 2012

---
 community/silly/PKGBUILD              | 20 +++++++++++---------
 community/silly/silly-libpng1.5.patch | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 community/silly/silly-libpng1.5.patch

(limited to 'community/silly')

diff --git a/community/silly/PKGBUILD b/community/silly/PKGBUILD
index 390c82194..12ac8800a 100644
--- a/community/silly/PKGBUILD
+++ b/community/silly/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 63954 2010-01-19 05:25:26Z eric $
+# $Id: PKGBUILD 63742 2012-02-05 12:11:01Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=silly
 pkgver=0.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple Image Loading LibrarY, a part of the CEGUI project"
 arch=('i686' 'x86_64')
 url="http://www.cegui.org.uk/wiki/index.php/SILLY"
 license=('MIT')
 depends=('libjpeg' 'libpng' 'gcc-libs')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz)
-md5sums=('c3721547fced7792a36ffc9ce6ec23fd')
-sha1sums=('ef5c8ed6c5c57d7d792dbb9e02006c3770334869')
+source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz
+        silly-libpng1.5.patch)
+md5sums=('c3721547fced7792a36ffc9ce6ec23fd'
+         '530551c2942aea6fa20f10d06f1e604f')
 
 build() {
   cd "${srcdir}/SILLY-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
+  patch -Np1 < $srcdir/silly-libpng1.5.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/community/silly/silly-libpng1.5.patch b/community/silly/silly-libpng1.5.patch
new file mode 100644
index 000000000..0b2d27252
--- /dev/null
+++ b/community/silly/silly-libpng1.5.patch
@@ -0,0 +1,14 @@
+ILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp
+--- SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~    2006-06-19 00:42:12.000000000 +0200
++++ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp 2011-12-06 14:38:31.738251526 +0100
+@@ -64,10 +64,7 @@ void PNG_error_function(png_structp png_
+                         png_const_charp error)
+ {
+     //  printf("PNG Error: %s\n", error);
+-    // copied from libpng's pngerror.cpp
+-    jmp_buf buf;
+-    memcpy(buf, png_ptr->jmpbuf, sizeof(jmp_buf));
+-    longjmp(buf, 1);
++    png_longjmp(png_ptr, 1);
+ }
+
-- 
cgit v1.2.3-54-g00ecf