[arch-commits] Commit in xsane/repos/extra-x86_64 (6 files)
Felix Yan
felixonmars at archlinux.org
Thu May 31 03:35:59 UTC 2018
Date: Thursday, May 31, 2018 @ 03:35:59
Author: felixonmars
Revision: 325395
archrelease: copy trunk to extra-x86_64
Added:
xsane/repos/extra-x86_64/PKGBUILD
(from rev 325394, xsane/trunk/PKGBUILD)
xsane/repos/extra-x86_64/xsane-0.995-xdg-open.patch
(from rev 325394, xsane/trunk/xsane-0.995-xdg-open.patch)
xsane/repos/extra-x86_64/xsane.install
(from rev 325394, xsane/trunk/xsane.install)
Deleted:
xsane/repos/extra-x86_64/PKGBUILD
xsane/repos/extra-x86_64/xsane-0.995-xdg-open.patch
xsane/repos/extra-x86_64/xsane.install
----------------------------+
PKGBUILD | 150 +++++++++++++++++++++----------------------
xsane-0.995-xdg-open.patch | 24 +++---
xsane.install | 34 ++++-----
3 files changed, 104 insertions(+), 104 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-31 03:35:34 UTC (rev 325394)
+++ PKGBUILD 2018-05-31 03:35:59 UTC (rev 325395)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-
-pkgbase=xsane
-pkgname=('xsane' 'xsane-gimp')
-pkgver=0.999
-pkgrel=1
-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=('9927f21e1ab6ba96315e7f0e30746deb'
- '15541ff0ddc10acfa2059cf99d5478eb')
-
-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
- 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 \
- --enable-gimp
- make
- mv src/xsane src/xsane-gimp
-
- # build again with gimp enabled
- make clean
- ./configure --prefix=/usr --sbindir=/usr/bin --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
- 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,
-# 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/extra-x86_64/PKGBUILD (from rev 325394, xsane/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-31 03:35:59 UTC (rev 325395)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+
+pkgbase=xsane
+pkgname=('xsane' 'xsane-gimp')
+pkgver=0.999
+pkgrel=2
+arch=(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)
+sha512sums=('73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed'
+ 'ed1c1b0fab10b456f7dc6befd6f91eb8d3e1bae0f1be3abf71d334d4a2ae8f8335ba37fdd73f336f7c5f45916df917dc77fd792e6b849a87bde95babc698bf39')
+
+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
+ 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 \
+ --enable-gimp
+ make
+ mv src/xsane src/xsane-gimp
+
+ # build again with gimp enabled
+ make clean
+ ./configure --prefix=/usr --sbindir=/usr/bin --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
+ 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,
+# 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
+}
Deleted: xsane-0.995-xdg-open.patch
===================================================================
--- xsane-0.995-xdg-open.patch 2018-05-31 03:35:34 UTC (rev 325394)
+++ xsane-0.995-xdg-open.patch 2018-05-31 03:35:59 UTC (rev 325395)
@@ -1,12 +0,0 @@
-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/extra-x86_64/xsane-0.995-xdg-open.patch (from rev 325394, xsane/trunk/xsane-0.995-xdg-open.patch)
===================================================================
--- xsane-0.995-xdg-open.patch (rev 0)
+++ xsane-0.995-xdg-open.patch 2018-05-31 03:35:59 UTC (rev 325395)
@@ -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
+
Deleted: xsane.install
===================================================================
--- xsane.install 2018-05-31 03:35:34 UTC (rev 325394)
+++ xsane.install 2018-05-31 03:35:59 UTC (rev 325395)
@@ -1,17 +0,0 @@
-# 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 ""
- echo "Xsane only supports creation of pdf files in 8bit colour depth!"
-}
-
-post_upgrade() {
- post_install $1
-}
Copied: xsane/repos/extra-x86_64/xsane.install (from rev 325394, xsane/trunk/xsane.install)
===================================================================
--- xsane.install (rev 0)
+++ xsane.install 2018-05-31 03:35:59 UTC (rev 325395)
@@ -0,0 +1,17 @@
+# 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 ""
+ echo "Xsane only supports creation of pdf files in 8bit colour depth!"
+}
+
+post_upgrade() {
+ post_install $1
+}
More information about the arch-commits
mailing list