[arch-commits] Commit in xsane/trunk (MissingCapsFlag.patch PKGBUILD)

[Eric Bélanger]

    Date: Wednesday, July 8, 2009 @ 20:00:45
  Author: eric
Revision: 45273

upgpkg: xsane 0.996-2
    libjpeg rebuild, added build patch, FHS man pages

Added:
  xsane/trunk/MissingCapsFlag.patch
Modified:
  xsane/trunk/PKGBUILD

-----------------------+
 MissingCapsFlag.patch |   14 ++++++++++++++
 PKGBUILD              |   23 ++++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)

Added: MissingCapsFlag.patch
===================================================================
--- MissingCapsFlag.patch	                        (rev 0)
+++ MissingCapsFlag.patch	2009-07-09 00:00:45 UTC (rev 45273)
@@ -0,0 +1,14 @@
+--- src/xsane-back-gtk.c	2009-06-24 00:12:18.000000000 +0200
++++ src/xsane-back-gtk,c.new	2009-06-24 00:13:41.000000000 +0200
+@@ -2612,10 +2612,7 @@
+       continue;
+     }
+ 
+-    if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
+-    {
+-      gtk_widget_set_sensitive(xsane.element[i].widget, sensitive);
+-    }
++    gtk_widget_set_sensitive(xsane.element[i].widget, sensitive);
+   }
+ 
+   if (xsane.xsanemode_widget)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-08 23:27:22 UTC (rev 45272)
+++ PKGBUILD	2009-07-09 00:00:45 UTC (rev 45273)
@@ -4,30 +4,31 @@
 
 pkgname=xsane
 pkgver=0.996
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK-based X11 frontend for SANE and plugin for Gimp."
 arch=(i686 x86_64)
+url="http://www.xsane.org"
 license=('GPL2')
 makedepends=('gimp')
-depends=('gtk2' 'lcms' 'sane' 'zlib')
+depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg>=7')
 install=$pkgname.install
-source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz)
-url="http://www.xsane.org"
+source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz MissingCapsFlag.patch)
+md5sums=('7dcbcdf0e83322d7c0a543672d9ca2d8' '720796dd649b0f244ce9d7189c90f55c')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 < ../MissingCapsFlag.patch || return 1
 
-  ./configure --prefix=/usr --disable-gimp
+  ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
   /usr/bin/make || return 1
-  /usr/bin/make prefix=$startdir/pkg/usr install
+  /usr/bin/make DESTDIR="$pkgdir" install || return 1
   # build xsane with gimp
   make clean
   ./configure --prefix=/usr
   /usr/bin/make || return 1
-  install -D -m755 $startdir/src/$pkgname-$pkgver/src/xsane $startdir/pkg/usr/bin/xsane-gimp
+  install -D -m755 "$srcdir/$pkgname-$pkgver/src/xsane" "$pkgdir/usr/bin/xsane-gimp" || return 1
   ## For making Gimp Plugin available 
-  /bin/mkdir -p $startdir/pkg/usr/lib/gimp/2.0/plug-ins
-  cd $startdir/pkg/usr/lib/gimp/2.0/plug-ins/
+  /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins"
+  cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/"
   /bin/ln -s ../../../../bin/xsane-gimp xsane
 }
-md5sums=('7dcbcdf0e83322d7c0a543672d9ca2d8')