From d106e114930e5a990ab8d9adddc7d101ffc8c9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de> Date: Wed, 11 Jan 2017 14:03:38 +0100 Subject: [PATCH] New package: xsane-0.999 --- srcpkgs/xsane-gimp | 1 + srcpkgs/xsane/patches/fix-png_jmpbuf.patch | 20 +++++++++++ srcpkgs/xsane/patches/xdg-open.patch | 11 ++++++ srcpkgs/xsane/template | 39 ++++++++++++++++++++++ 4 files changed, 71 insertions(+) create mode 120000 srcpkgs/xsane-gimp create mode 100644 srcpkgs/xsane/patches/fix-png_jmpbuf.patch create mode 100644 srcpkgs/xsane/patches/xdg-open.patch create mode 100644 srcpkgs/xsane/template diff --git a/srcpkgs/xsane-gimp b/srcpkgs/xsane-gimp new file mode 120000 index 00000000000..aec7cacadda --- /dev/null +++ b/srcpkgs/xsane-gimp @@ -0,0 +1 @@ +xsane \ No newline at end of file diff --git a/srcpkgs/xsane/patches/fix-png_jmpbuf.patch b/srcpkgs/xsane/patches/fix-png_jmpbuf.patch new file mode 100644 index 00000000000..7118ee9bc60 --- /dev/null +++ b/srcpkgs/xsane/patches/fix-png_jmpbuf.patch @@ -0,0 +1,20 @@ +--- src/xsane-save.c 2010-11-16 22:06:00.000000000 +0100 ++++ src/xsane-save.c 2017-01-11 13:10:33.311935745 +0100 +@@ -4910,7 +4910,7 @@ + return -1; /* error */ + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); +@@ -5100,7 +5100,7 @@ + return -1; /* error */ + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); diff --git a/srcpkgs/xsane/patches/xdg-open.patch b/srcpkgs/xsane/patches/xdg-open.patch new file mode 100644 index 00000000000..e1f33852f99 --- /dev/null +++ b/srcpkgs/xsane/patches/xdg-open.patch @@ -0,0 +1,11 @@ +--- src/xsane.h 2007-08-13 09:20:32.000000000 +0200 ++++ 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 + diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template new file mode 100644 index 00000000000..f666306ef33 --- /dev/null +++ b/srcpkgs/xsane/template @@ -0,0 +1,39 @@ +# Template file for 'xsane' +pkgname=xsane +version=0.999 +revision=1 +hostmakedepends="pkg-config" +makedepends="gtk+-devel lcms-devel sane-devel gimp-devel" +depends="sane" +short_desc="GTK-based X11 frontend for SANE" +maintainer="Jürgen Buchmüller <pullmoll@t-online.de>" +license="GPL-2" +homepage="http://www.xsane.org" +distfiles="http://www.xsane.org/download/${pkgname}-${version}.tar.gz" +checksum=5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b + +do_build() { + local _args="--prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man" + ./configure ${_args} --enable-gimp + make ${makejobs} + mv src/xsane{,-gimp} + make clean + echo "=== ./configure ${config_args} --disable-gimp" + ./configure ${_args} --disable-gimp + sed -i 's;/usr/local;/usr;g' src/Makefile + make ${makejobs} +} + +do_install() { + make DESTDIR="${DESTDIR}" install +} + +xsane-gimp_package() { + short_desc+=" - plugin for GIMP" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vbin src/xsane-gimp + vmkdir usr/lib/gimp/2.0/plug-ins + ln -s /usr/bin/xsane-gimp ${PKGDESTDIR}/usr/lib/gimp/2.0/plug-ins/xsane + } +}