[pkgsrc/trunk]: pkgsrc/graphics/gimp Re: PR 25724 Difference between function...

[shannonjr <shannonjr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b7ca69dda7d
branches:  trunk
changeset: 476001:4b7ca69dda7d
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Tue Jun 01 10:09:31 2004 +0000

description:
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.

diffstat:

 graphics/gimp/distinfo         |   3 ++-
 graphics/gimp/patches/patch-ae |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r f3cdbda1c076 -r 4b7ca69dda7d graphics/gimp/distinfo
--- a/graphics/gimp/distinfo    Tue Jun 01 08:55:34 2004 +0000
+++ b/graphics/gimp/distinfo    Tue Jun 01 10:09:31 2004 +0000
@@ -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-ab) = 1b50ef4dfebb70a2e06a97decaa135526767cbcb
 SHA1 (patch-ac) = a45e93e27d0078c5120eed5017de385ce7f29175
 SHA1 (patch-ad) = 39eadbc4822fedf09d962ab500afa9d735db92a4
+SHA1 (patch-ae) = f8f85be1a1559427e70064d0a0e18211ec5c1c87
diff -r f3cdbda1c076 -r 4b7ca69dda7d graphics/gimp/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gimp/patches/patch-ae    Tue Jun 01 10:09:31 2004 +0000
@@ -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;
+