diff options
| author | wiz <wiz> | 2000-05-17 21:52:22 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2000-05-17 21:52:22 +0000 |
| commit | cd3e524baa04279998e92ce641d922a1a603b247 (patch) | |
| tree | 98fe3ed85a398efe042223b2f6a91f4e8cfc8c23 /graphics | |
| parent | 447de1bf656b3d094b146dec9fd1065689278921 (diff) | |
| download | pkgsrc-cd3e524baa04279998e92ce641d922a1a603b247.tar.gz | |
make it compile with gimp-current, change dependency to gimp>=1.0.4
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/sane/Makefile | 4 | ||||
| -rw-r--r-- | graphics/sane/files/patch-sum | 3 | ||||
| -rw-r--r-- | graphics/sane/patches/patch-ac | 40 |
3 files changed, 44 insertions, 3 deletions
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile index 4a7985655d1..adfe171b5cc 100644 --- a/graphics/sane/Makefile +++ b/graphics/sane/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1999/10/25 10:00:40 tron Exp $ +# $NetBSD: Makefile,v 1.17 2000/05/17 21:52:22 wiz Exp $ # FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp # @@ -15,7 +15,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mostang.com/sane/ DEPENDS+= gtk+-1.2.*:../../x11/gtk -DEPENDS+= gimp-1.0.4:../../graphics/gimp +DEPENDS+= gimp>=1.0.4:../../graphics/gimp GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/graphics/sane/files/patch-sum b/graphics/sane/files/patch-sum index a5cc19e24f2..8d3e0141a7a 100644 --- a/graphics/sane/files/patch-sum +++ b/graphics/sane/files/patch-sum @@ -1,4 +1,5 @@ -$NetBSD: patch-sum,v 1.2 1999/11/27 22:27:37 rh Exp $ +$NetBSD: patch-sum,v 1.3 2000/05/17 21:52:23 wiz Exp $ MD5 (patch-aa) = a98114db4f2cef1b570314cf950d729f MD5 (patch-ab) = 6684bff447363003e74ff05c4b43b1c4 +MD5 (patch-ac) = 1fce580a2771d283bca7e59597dc364d diff --git a/graphics/sane/patches/patch-ac b/graphics/sane/patches/patch-ac new file mode 100644 index 00000000000..ba4a3b59c5b --- /dev/null +++ b/graphics/sane/patches/patch-ac @@ -0,0 +1,40 @@ +$NetBSD: patch-ac,v 1.6 2000/05/17 21:52:23 wiz Exp $ + +--- frontend/xscanimage.c.orig Sat Apr 3 06:07:57 1999 ++++ frontend/xscanimage.c Mon May 15 16:09:50 2000 +@@ -75,7 +75,7 @@ + + enum + { +- STANDALONE, GIMP_EXTENSION ++ STANDALONE, GIMP_EXTENSION_2 + }; + + static struct +@@ -301,7 +301,7 @@ + int nargs; + + run_mode = param[0].data.d_int32; +- scan_win.mode = GIMP_EXTENSION; ++ scan_win.mode = GIMP_EXTENSION_2; + + *nreturn_vals = 1; + *return_vals = values; +@@ -456,7 +456,7 @@ + sane_exit (); + gtk_main_quit (); + #ifdef HAVE_LIBGIMP_GIMP_H +- if (scan_win.mode == GIMP_EXTENSION) ++ if (scan_win.mode == GIMP_EXTENSION_2) + gimp_quit (); + #endif + exit (0); +@@ -803,7 +803,7 @@ + gsg_set_sensitivity (dialog, FALSE); + + #ifdef HAVE_LIBGIMP_GIMP_H +- if (scan_win.mode == GIMP_EXTENSION && scan_win.tile) ++ if (scan_win.mode == GIMP_EXTENSION_2 && scan_win.tile) + { + int height, remaining; + |