user/sane: bump to 1.0.28

3 files changed, 15 insertions, 19 deletions

diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD
index 42b4984c7..73b025de2 100644
--- a/user/sane/APKBUILD
+++ b/user/sane/APKBUILD
@@ -3,8 +3,8 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=sane
 _pkgname=sane-backends
-pkgver=1.0.27
-pkgrel=6
+pkgver=1.0.28
+pkgrel=0
 pkgdesc="Scanner access library"
 url="http://www.sane-project.org/"
 arch="all"
@@ -20,24 +20,24 @@ _backends="abaton agfafocus apple artec artec_eplus48u as6e avision bh canon
 	canon630u canon_dr canon_pp cardscan coolscan coolscan2 coolscan3 dc25
 	dc210 dc240 dell1600n_net dmc epjitsu epson epson2 epsonds fujitsu
 	genesys gphoto2 gt68xx hp hp3500 hp3900 hp4200 hp5400 hp5590 hpsj5s
-	hpljm1005 hs2p ibm kodak kodakaio kvs1025 kvs20xx kvs40xx leo lexmark
-	ma1509 magicolor matsushita microtek microtek2 mustek mustek_pp
-	mustek_usb mustek_usb2 nec net niash p5 pie pieusb pixma plustek
-	plustek_pp ricoh rts8891 s9036 sceptre sharp sm3600 sm3840 snapscan
-	sp15c st400 stv680 tamarack teco1 teco2 teco3 test u12 umax umax_pp
-	umax1220u v4l xerox_mfp"
+	hpljm1005 hs2p ibm kodak kodakaio kvs1025 kvs20xx leo lexmark ma1509
+	magicolor matsushita microtek microtek2 mustek mustek_pp mustek_usb
+	nec net niash p5 pie pieusb pixma plustek plustek_pp ricoh ricoh2
+	rts8891 s9036 sceptre sharp sm3600 sm3840 snapscan sp15c st400 stv680
+	tamarack teco1 teco2 teco3 test u12 umax umax_pp umax1220u v4l
+	xerox_mfp"
 case "$CARCH" in
 x86*) _backends="$_backends qcam";;
 esac
 
-_pkgdesc_dell1600n_net="SANE backend for Dell 1600n that supports colour and monochrome scans over ethernet, usb not supported"
+_pkgdesc_dell1600n_net="SANE backend for Dell 1600n (Ethernet only; USB not supported)"
 for _backend in $_backends; do
 	subpackages="$subpackages $pkgname-backend-$_backend:_backend"
 done
 subpackages="$pkgname-doc $pkgname-dev $subpackages $pkgname-utils saned
 	saned-openrc:openrc:noarch $pkgname-udev::noarch $_pkgname::noarch
 	$pkgname-lang"
-source="http://distfiles.gentoo.org/distfiles/$_pkgname-$pkgver.tar.gz
+source="https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-1.0.28.tar.gz
 	saned.initd
 	include.patch
 	network.patch
@@ -47,11 +47,9 @@ source="http://distfiles.gentoo.org/distfiles/$_pkgname-$pkgver.tar.gz
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--with-docdir=/usr/share/doc/$pkgname \
 		--with-usb \
 		--disable-rpath \
 		--disable-locking
@@ -59,12 +57,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	printf "" > "$pkgdir"/etc/sane.d/dll.conf
 	install -Dm644 backend/dll.aliases "$pkgdir"/etc/sane.d/dll.aliases
@@ -141,9 +137,9 @@ _backend() {
 	fi
 }
 
-sha512sums="c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5  sane-backends-1.0.27.tar.gz
+sha512sums="84607739cea28c31f9a2f21df583c3d9f3ad1e7e87ad54fb8af8103450b22d2de6cf1670563eaa8310750491f840b377a2ca42c5eaee45aaec500a0a6792b3af  sane-backends-1.0.28.tar.gz
 0a06eaa28b345202f2bdf8361e06f843bb7a010b7d8f80132f742672c94249c43f64031cefa161e415e2e2ab3a53b23070fb63854283f9e040f5ff79394ac7d1  saned.initd
 1779ff8beb1ba5f9238c25d819a7f0045f7e257c19b511315feb85650e445ca86450a9e1d7ff8650499d3dae808589a6c2e358d5f3f39a3f40ce4999179b86d6  include.patch
 9cb595841f59b5105ecc85e4c0ad8781c52caa2354fb823c920ec467e88afbe47f2b3f4a7a3980bef5dbf22983c5786f051a9d10aea97b4bf7c4a05378592029  network.patch
-09505943f9441854a6c333f19e2535b4a646a8cc060fe82c6261e7d29c72773ebe98d43a91acc951f4336a3c8b4c84ab7c7b0763426136b4b59d9546bc2fa8c0  pidfile.patch
-cfa327209efd9a2a2db7cbcf571852959823aaa19b43d5f6415834cd5ae38b6324ecae16779f6f896aa0d7ac890fe23244100b7d6a68e5e9d52cd38ec82bfac8  check.patch"
+8f0a1529a5793bc78422419b674963b543527c932476c9ea2d92ea0ad0a286691da306020824c1aaa0b35929f571480d21d7fc464a9f652e15664854c75a4cea  pidfile.patch
+4de6f60452c0451769f5ce41e41ca4c2867a723e0d2bf22796dc8a266359bdc8a9e9542f4ba2dc42b15bd25b1c83d2c339177796043fdbcbc9d73ad4957f723c  check.patch"
diff --git a/user/sane/check.patch b/user/sane/check.patch
index afbc7ef4c..e79ecbdf7 100644
--- a/user/sane/check.patch
+++ b/user/sane/check.patch
@@ -1,6 +1,6 @@
 --- a/testsuite/sanei/Makefile.in
 +++ b/testsuite/sanei/Makefile.in
-@@ -77,7 +77,7 @@
+@@ -87,7 +87,7 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
diff --git a/user/sane/pidfile.patch b/user/sane/pidfile.patch
index 457755bdb..32989f651 100644
--- a/user/sane/pidfile.patch
+++ b/user/sane/pidfile.patch
@@ -1,6 +1,6 @@
 --- a/frontend/saned.c
 +++ b/frontend/saned.c
-@@ -224,7 +224,7 @@
+@@ -229,7 +229,7 @@
  int numchildren;
  
  #define SANED_CONFIG_FILE "saned.conf"