Skip to content

Commit c8236b1

Browse files
committed
iscan: disable gimp2 plugin + fix sscanf for C99
1 parent 150a038 commit c8236b1

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Most scanners will require some nonfree plugins.
2-
Check the iscan-plugins-* packages to see if you need to install
2+
Check the iscan-plugin-* packages to see if you need to install
33
additional packages.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- a/backend/cfg-obj.c
2+
+++ b/backend/cfg-obj.c
3+
@@ -1026,7 +1026,7 @@ _cfg_register_scsi_entry (const char *string)
4+
char *vendor = NULL;
5+
char *model = NULL;
6+
7+
- sscanf (string, "%*s %as %as", &vendor, &model);
8+
+ sscanf (string, "%*s %ms %ms", &vendor, &model);
9+
10+
if (list_append (_cfg->seen[CFG_KEY_SCSI], info))
11+
{
12+
@@ -1108,7 +1108,7 @@ _cfg_register_interpreter_entry (const char *string)
13+
char *library = NULL;
14+
char *firmware = NULL;
15+
16+
- sscanf (string, "%*s %*s %x %x %as %as",
17+
+ sscanf (string, "%*s %*s %x %x %ms %ms",
18+
&vendor, &product, &library, &firmware);
19+
20+
if (library && _cfg_have_interpreter (library, firmware)

srcpkgs/iscan/template

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# Template file for 'iscan'
22
pkgname=iscan
33
version=2.30.4
4-
revision=1
4+
revision=2
55
_srcrev=2
66
archs="i686 x86_64"
77
build_style=gnu-configure
8-
configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png --enable-gimp"
8+
configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png"
99
hostmakedepends="pkg-config"
10-
makedepends="gtk+-devel gimp-devel libxml2-devel libjpeg-turbo-devel tiff-devel libltdl-devel libpng-devel sane-devel libusb-devel"
10+
makedepends="gtk+-devel libxml2-devel libjpeg-turbo-devel tiff-devel libltdl-devel
11+
libpng-devel sane-devel libusb-devel"
1112
depends="sane-epkowa"
1213
short_desc="EPSON Image Scan! front-end"
1314
maintainer="Orphaned <orphan@voidlinux.org>"

0 commit comments

Comments
 (0)