Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

1 files changed, 16 insertions, 14 deletions

diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD
index 0a0f1c527..cad28724a 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
-arch=(i686 x86_64 'mips64el')
+pkgrel=2
+arch=(i686 x86_64 mips64el)
 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')