From 35a953b15cbe984f6bfade71321a5e61b2d563fc Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 29 Apr 2020 05:13:46 +0000 Subject: [PATCH] Update to simple-scan-3.34.6. --- graphics/simple-scan/Makefile | 4 ++-- graphics/simple-scan/distinfo | 4 ++-- .../simple-scan/patches/patch-src_simple-scan_vala | 11 +++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/graphics/simple-scan/Makefile b/graphics/simple-scan/Makefile index dab72316a1a..76b04bdee3e 100644 --- a/graphics/simple-scan/Makefile +++ b/graphics/simple-scan/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.60 2020/02/16 07:59:31 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.61 2020/04/29 05:13:46 ajacoutot Exp $ COMMENT= simple scanning utility GNOME_PROJECT= simple-scan -GNOME_VERSION= 3.34.4 +GNOME_VERSION= 3.34.6 CATEGORIES= graphics diff --git a/graphics/simple-scan/distinfo b/graphics/simple-scan/distinfo index 25363f983c3..3dff2a41ab1 100644 --- a/graphics/simple-scan/distinfo +++ b/graphics/simple-scan/distinfo @@ -1,2 +1,2 @@ -SHA256 (simple-scan-3.34.4.tar.xz) = fzQb7r1J6gp0d9xcKEWaqWusBLNI1W5p09JQ/8Uxfnc= -SIZE (simple-scan-3.34.4.tar.xz) = 795228 +SHA256 (simple-scan-3.34.6.tar.xz) = AZstTWWJnvtBK3pGrKfqAbRsVmPb+hwMliOuxRQd6Vs= +SIZE (simple-scan-3.34.6.tar.xz) = 801064 diff --git a/graphics/simple-scan/patches/patch-src_simple-scan_vala b/graphics/simple-scan/patches/patch-src_simple-scan_vala index dfe73e9dddd..680b54c13a2 100644 --- a/graphics/simple-scan/patches/patch-src_simple-scan_vala +++ b/graphics/simple-scan/patches/patch-src_simple-scan_vala @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_simple-scan_vala,v 1.9 2019/10/19 09:20:13 ajacoutot Exp $ +$OpenBSD: patch-src_simple-scan_vala,v 1.10 2020/04/29 05:13:46 ajacoutot Exp $ No gusb on OpenBSD. @@ -39,7 +39,7 @@ Index: src/simple-scan.vala scanner.free (); } -@@ -184,34 +171,8 @@ public class SimpleScan : Gtk.Application +@@ -1265,33 +1252,7 @@ public class SimpleScan : Gtk.Application public string? suggest_driver () { @@ -53,7 +53,7 @@ Index: src/simple-scan.vala - add_devices (driver_map, brscan4_devices, "brscan4"); - add_devices (driver_map, samsung_devices, "samsung"); - add_devices (driver_map, hpaio_devices, "hpaio"); -- add_devices (driver_map, epkowa_devices, "epkowa"); +- add_devices (driver_map, epkowa_devices, "epkowa"); - var devices = usb_context.get_devices (); - for (var i = 0; i < devices.length; i++) - { @@ -64,13 +64,12 @@ Index: src/simple-scan.vala - } - return null; - } +- } - - private void add_devices (HashTable map, uint32[] devices, string driver) - { - for (var i = 0; i < devices.length; i++) - map.insert (devices[i], driver); -- } + } private void authorize_cb (Scanner scanner, string resource) - {