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

---
 extra/xsane/PKGBUILD | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'extra/xsane')

diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD
index 531985301..c06616e23 100644
--- a/extra/xsane/PKGBUILD
+++ b/extra/xsane/PKGBUILD
@@ -1,46 +1,50 @@
-# $Id: PKGBUILD 100458 2010-11-23 17:10:57Z tpowa $
+# $Id: PKGBUILD 148984 2012-02-05 11:58:59Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgbase=xsane
 pkgname=('xsane' 'xsane-gimp')
 pkgver=0.998
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://www.xsane.org"
 license=('GPL2')
 makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
 source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
 	xsane-0.995-xdg-open.patch)
+md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
+         '15541ff0ddc10acfa2059cf99d5478eb')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver"
   # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora
-  patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch || return 1
-  
+  patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch"
+  sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
+
   ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp
-  /usr/bin/make || return 1
+  make
   mv src/xsane src/xsane-gimp
 
   # build again with gimp enabled
   make clean
   ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
+  make
 }
 
 package_xsane() {
   pkgdesc="A GTK-based X11 frontend for SANE and plugin for Gimp."
   install=$pkgname.install
   depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg')  
-  optdepends=('xsane-gimp; for gimp plugin support')
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install || return 1
+  optdepends=('xsane-gimp: for gimp plugin support')
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
 
 package_xsane-gimp() {
   pkgdesc="XSane Gimp plugin"
   depends=('xsane' 'gimp')
-  cd "$srcdir/$pkgname-$pkgver"
-  install -D -m755 src/xsane-gimp ${pkgdir}/usr/bin/xsane-gimp || return 1
+  cd "$srcdir/$pkgbase-$pkgver"
+  install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp"
 
   ## For making Gimp Plugin available 
   /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins"
@@ -62,5 +66,3 @@ package_xsane-gimp() {
 #115 	fi
 #116 	fi 
 }
-md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
-         '15541ff0ddc10acfa2059cf99d5478eb')
-- 
cgit v1.2.3-54-g00ecf