aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com> 2018-03-08 17:49:25 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com> 2018-03-08 17:49:25 -0500
commit0cee93cf1fb776e8e2d5b96ff01b5c69d57c7c75 (patch)
tree39594465ab85421ba503db512971dac463b7c3e8
parent7442499990b44130ad9de911808161177b214322 (diff)
user/xsane: new package1.0-alpha5
-rw-r--r--user/xsane/APKBUILD37
-rw-r--r--user/xsane/xsane-0.999-libpng16.patch20
2 files changed, 57 insertions, 0 deletions
diff --git a/user/xsane/APKBUILD b/user/xsane/APKBUILD
new file mode 100644
index 00000000..aa18627a
--- /dev/null
+++ b/user/xsane/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=xsane
+pkgver=0.999
+pkgrel=0
+pkgdesc="Graphical scanning software"
+url="http://xsane.org/"
+arch="all"
+options="!check" # No test suite.
+license="GPL-2.0+"
+depends=""
+makedepends="gettext-dev gtk+2.0-dev lcms-dev libjpeg-turbo-dev libpng-dev
+ sane-dev tiff-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://www.xsane.org/download/xsane-$pkgver.tar.gz
+ xsane-0.999-libpng16.patch"
+builddir="$srcdir/xsane-$pkgver"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed xsane-0.999.tar.gz
+6b271360b9cb7e2db165fbd67eed95fdfa9a2e52d61ce54679f5a6a0bdc6cee79be3224063da22907f6eaa6e6645d321ccddd9b37484156ba55aef8977e25738 xsane-0.999-libpng16.patch"
diff --git a/user/xsane/xsane-0.999-libpng16.patch b/user/xsane/xsane-0.999-libpng16.patch
new file mode 100644
index 00000000..2f947e73
--- /dev/null
+++ b/user/xsane/xsane-0.999-libpng16.patch
@@ -0,0 +1,20 @@
+--- xsane-0.999/src/xsane-save.c.old 2010-11-16 21:06:00.000000000 +0000
++++ xsane-0.999/src/xsane-save.c 2018-03-08 22:45:17.763964565 +0000
+@@ -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);