Date: Tuesday, January 24, 2012 @ 22:22:07 Author: eric Revision: 147252
archrelease: copy trunk to staging-i686, staging-x86_64 Added: xsane/repos/staging-i686/ xsane/repos/staging-i686/PKGBUILD (from rev 147251, xsane/trunk/PKGBUILD) xsane/repos/staging-i686/xsane-0.995-xdg-open.patch (from rev 147251, xsane/trunk/xsane-0.995-xdg-open.patch) xsane/repos/staging-i686/xsane.install (from rev 147251, xsane/trunk/xsane.install) xsane/repos/staging-x86_64/ xsane/repos/staging-x86_64/PKGBUILD (from rev 147251, xsane/trunk/PKGBUILD) xsane/repos/staging-x86_64/xsane-0.995-xdg-open.patch (from rev 147251, xsane/trunk/xsane-0.995-xdg-open.patch) xsane/repos/staging-x86_64/xsane.install (from rev 147251, xsane/trunk/xsane.install) -------------------------------------------+ staging-i686/PKGBUILD | 68 ++++++++++++++++++++++++++++ staging-i686/xsane-0.995-xdg-open.patch | 12 ++++ staging-i686/xsane.install | 16 ++++++ staging-x86_64/PKGBUILD | 68 ++++++++++++++++++++++++++++ staging-x86_64/xsane-0.995-xdg-open.patch | 12 ++++ staging-x86_64/xsane.install | 16 ++++++ 6 files changed, 192 insertions(+) Copied: xsane/repos/staging-i686/PKGBUILD (from rev 147251, xsane/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-01-25 03:22:07 UTC (rev 147252) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: Sarah Hay <sarah...@mb.sympatico.ca> + +pkgbase=xsane +pkgname=('xsane' 'xsane-gimp') +pkgver=0.998 +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/$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" + sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c + + ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp + 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/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install +} + +package_xsane-gimp() { + pkgdesc="XSane Gimp plugin" + depends=('xsane' 'gimp') + 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" + 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, +# gentoo has something similar +#%post gimp +#107 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then +#108 %{_sbindir}/gimp-plugin-mgr --install xsane +#109 fi +#110 +#111 %preun gimp +#112 if [ $1 = 0 ]; then +#113 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then +#114 %{_sbindir}/gimp-plugin-mgr --uninstall xsane +#115 fi +#116 fi +} Copied: xsane/repos/staging-i686/xsane-0.995-xdg-open.patch (from rev 147251, xsane/trunk/xsane-0.995-xdg-open.patch) =================================================================== --- staging-i686/xsane-0.995-xdg-open.patch (rev 0) +++ staging-i686/xsane-0.995-xdg-open.patch 2012-01-25 03:22:07 UTC (rev 147252) @@ -0,0 +1,12 @@ +diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h +--- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200 ++++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100 +@@ -251,7 +251,7 @@ + # elif defined(HAVE_OS2_H) + # define DEFAULT_BROWSER "netscape" + # else +-# define DEFAULT_BROWSER "netscape" ++# define DEFAULT_BROWSER "xdg-open" + # endif + #endif + Copied: xsane/repos/staging-i686/xsane.install (from rev 147251, xsane/trunk/xsane.install) =================================================================== --- staging-i686/xsane.install (rev 0) +++ staging-i686/xsane.install 2012-01-25 03:22:07 UTC (rev 147252) @@ -0,0 +1,16 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_install() { + echo "NOTE:" + echo " If you experience any problems after installing xsane " + echo " it may help to remove the setup and preferences files" + echo " of xsane:" + echo "" + echo " \$ rm -rf ~/.sane/xsane" + echo "" +} + +post_upgrade() { + post_install $1 +} Copied: xsane/repos/staging-x86_64/PKGBUILD (from rev 147251, xsane/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2012-01-25 03:22:07 UTC (rev 147252) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: Sarah Hay <sarah...@mb.sympatico.ca> + +pkgbase=xsane +pkgname=('xsane' 'xsane-gimp') +pkgver=0.998 +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/$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" + sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c + + ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp + 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/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install +} + +package_xsane-gimp() { + pkgdesc="XSane Gimp plugin" + depends=('xsane' 'gimp') + 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" + 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, +# gentoo has something similar +#%post gimp +#107 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then +#108 %{_sbindir}/gimp-plugin-mgr --install xsane +#109 fi +#110 +#111 %preun gimp +#112 if [ $1 = 0 ]; then +#113 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then +#114 %{_sbindir}/gimp-plugin-mgr --uninstall xsane +#115 fi +#116 fi +} Copied: xsane/repos/staging-x86_64/xsane-0.995-xdg-open.patch (from rev 147251, xsane/trunk/xsane-0.995-xdg-open.patch) =================================================================== --- staging-x86_64/xsane-0.995-xdg-open.patch (rev 0) +++ staging-x86_64/xsane-0.995-xdg-open.patch 2012-01-25 03:22:07 UTC (rev 147252) @@ -0,0 +1,12 @@ +diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h +--- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200 ++++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100 +@@ -251,7 +251,7 @@ + # elif defined(HAVE_OS2_H) + # define DEFAULT_BROWSER "netscape" + # else +-# define DEFAULT_BROWSER "netscape" ++# define DEFAULT_BROWSER "xdg-open" + # endif + #endif + Copied: xsane/repos/staging-x86_64/xsane.install (from rev 147251, xsane/trunk/xsane.install) =================================================================== --- staging-x86_64/xsane.install (rev 0) +++ staging-x86_64/xsane.install 2012-01-25 03:22:07 UTC (rev 147252) @@ -0,0 +1,16 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_install() { + echo "NOTE:" + echo " If you experience any problems after installing xsane " + echo " it may help to remove the setup and preferences files" + echo " of xsane:" + echo "" + echo " \$ rm -rf ~/.sane/xsane" + echo "" +} + +post_upgrade() { + post_install $1 +}