summaryrefslogtreecommitdiff
path: root/extra/xsane
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-05-20 00:57:43 -0700
committerroot <root@rshg054.dnsready.net>2013-05-20 00:57:43 -0700
commit383955a81810f344e11b1472bd4c5069fa77020c (patch)
tree6017ed943ee9ae2ca0da830ede5f00f6d7817cf7 /extra/xsane
parent9a30c3d0083b8330b1aa6c0f89245e68ae762ee5 (diff)
Mon May 20 00:57:42 PDT 2013
Diffstat (limited to 'extra/xsane')
-rw-r--r--extra/xsane/PKGBUILD23
1 files changed, 14 insertions, 9 deletions
diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD
index 0b0257f22..bc68f6eb5 100644
--- a/extra/xsane/PKGBUILD
+++ b/extra/xsane/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184456 2013-05-06 19:40:28Z foutrelis $
+# $Id: PKGBUILD 185793 2013-05-19 08:52:55Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
pkgbase=xsane
pkgname=('xsane' 'xsane-gimp')
pkgver=0.998
-pkgrel=4
+pkgrel=5
arch=(i686 x86_64)
url="http://www.xsane.org"
license=('GPL2')
@@ -15,11 +15,15 @@ source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
'15541ff0ddc10acfa2059cf99d5478eb')
-build() {
- cd "$srcdir/$pkgbase-$pkgver"
+prepare() {
+ cd "$srcdir/$pkgname-$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"
+ 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
+}
+
+build() {
+ cd "$srcdir/$pkgbase-$pkgver"
./configure --prefix=/usr \
--mandir=/usr/share/man \
@@ -29,7 +33,7 @@ build() {
# build again with gimp enabled
make clean
- ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
+ ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --disable-gimp
make
}
@@ -49,9 +53,10 @@ package_xsane-gimp() {
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"
- cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/"
- /bin/ln -s ../../../../bin/xsane-gimp xsane
+ mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins"
+ ln -sf /usr/bin/xsane-gimp $pkgdir/usr/lib/gimp/2.0/plug-ins/xsane
+ #cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/"
+ #/bin/ln -s ../../../../bin/xsane-gimp xsane
# http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup
# when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora,