diff options
| author | shannonjr <shannonjr> | 2004-06-01 10:09:31 +0000 |
|---|---|---|
| committer | shannonjr <shannonjr> | 2004-06-01 10:09:31 +0000 |
| commit | 3df97d305aae1b919dc7f8857e11fcda3454a5aa (patch) | |
| tree | 45159d276f0b37a804a52e852255a717ddbc995b | |
| parent | 45378c2dfe6e580be68cc66eb4f99d8abcf221c7 (diff) | |
| download | pkgsrc-3df97d305aae1b919dc7f8857e11fcda3454a5aa.tar.gz | |
Re: PR 25724 Difference between function declaration and definition
prevents compilation of gimp with gcc 3.4.0
The problem is that the parameter "type" is declared to be of type
"CombinationMode" in the header file and "InitialMode" in the ".c" file.
The patch corrects the type in the ".c" file to match the header.
This closes the PR.
| -rw-r--r-- | graphics/gimp/distinfo | 3 | ||||
| -rw-r--r-- | graphics/gimp/patches/patch-ae | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo index 959bd15df68..a2e6523dd42 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2004/05/03 06:45:28 adam Exp $ +$NetBSD: distinfo,v 1.11 2004/06/01 10:09:31 shannonjr Exp $ SHA1 (gimp-2.0.1.tar.bz2) = 001b76ab22367a9245f1c3be3fd7c55240b1edbf Size (gimp-2.0.1.tar.bz2) = 13467677 bytes @@ -6,3 +6,4 @@ SHA1 (patch-aa) = b233a944fa69481685770aa4d5b24a07f127afcf SHA1 (patch-ab) = 1b50ef4dfebb70a2e06a97decaa135526767cbcb SHA1 (patch-ac) = a45e93e27d0078c5120eed5017de385ce7f29175 SHA1 (patch-ad) = 39eadbc4822fedf09d962ab500afa9d735db92a4 +SHA1 (patch-ae) = f8f85be1a1559427e70064d0a0e18211ec5c1c87 diff --git a/graphics/gimp/patches/patch-ae b/graphics/gimp/patches/patch-ae new file mode 100644 index 00000000000..1d8dbaba66e --- /dev/null +++ b/graphics/gimp/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.3 2004/06/01 10:09:31 shannonjr Exp $ + +--- ./app/paint-funcs/paint-funcs.c.orig 2004-03-13 04:34:45.000000000 -0700 ++++ ./app/paint-funcs/paint-funcs.c +@@ -4480,7 +4480,7 @@ initial_region (PixelRegion *src, + gint opacity, + GimpLayerModeEffects mode, + gboolean *affect, +- InitialMode type) ++ CombinationMode type) + { + struct initial_regions_struct st; + |