summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-04-29 01:38:40 +0000
committerTravis Tilley <lv@gentoo.org>2004-04-29 01:38:40 +0000
commit339cec66549439a48d2590270cc74d85626d61c0 (patch)
treeb286d4d5de5fc3312a221dc105216b91ea36e46d /media-gfx/gimp
parentStable on sparc (Manifest recommit) (diff)
downloadgentoo-2-339cec66549439a48d2590270cc74d85626d61c0.tar.gz
gentoo-2-339cec66549439a48d2590270cc74d85626d61c0.tar.bz2
gentoo-2-339cec66549439a48d2590270cc74d85626d61c0.zip
gcc 3.4 fix
Diffstat (limited to 'media-gfx/gimp')
-rw-r--r--media-gfx/gimp/ChangeLog6
-rw-r--r--media-gfx/gimp/files/gimp-2.0.0-gcc34.patch23
-rw-r--r--media-gfx/gimp/gimp-2.0.0.ebuild5
3 files changed, 32 insertions, 2 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 62805b0374ff..a8ac1746cdd1 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/gimp
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.77 2004/04/27 21:42:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.78 2004/04/29 01:38:39 lv Exp $
+
+ 28 Apr 2004; Travis Tilley <lv@gentoo.org> +files/gimp-2.0.0-gcc34.patch,
+ gimp-2.0.0.ebuild:
+ added patch for compiling with gcc 3.4
27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gimp-2.0_pre3-r1.ebuild:
Add inherit eutils
diff --git a/media-gfx/gimp/files/gimp-2.0.0-gcc34.patch b/media-gfx/gimp/files/gimp-2.0.0-gcc34.patch
new file mode 100644
index 000000000000..74150cdd9ff1
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.0.0-gcc34.patch
@@ -0,0 +1,23 @@
+--- app/paint-funcs/paint-funcs.h.old 2004-04-23 09:31:21.854795584 +0100
++++ app/paint-funcs/paint-funcs.h 2004-04-23 09:32:15.623621480 +0100
+@@ -350,13 +350,13 @@
+ PixelRegion *dest,
+ guint pixel);
+
+-void initial_region (PixelRegion *, PixelRegion *,
+- PixelRegion *,
+- guchar *,
+- gint,
+- GimpLayerModeEffects,
+- gboolean *,
+- CombinationMode);
++void initial_region (PixelRegion *src, PixelRegion *dest,
++ PixelRegion *mask,
++ guchar *data,
++ gint opacity,
++ GimpLayerModeEffects mode,
++ gboolean *affect,
++ InitialMode type);
+
+ void combine_regions (PixelRegion *, PixelRegion *,
+ PixelRegion *, PixelRegion *,
diff --git a/media-gfx/gimp/gimp-2.0.0.ebuild b/media-gfx/gimp/gimp-2.0.0.ebuild
index a5609203fac1..819270553849 100644
--- a/media-gfx/gimp/gimp-2.0.0.ebuild
+++ b/media-gfx/gimp/gimp-2.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.0.ebuild,v 1.3 2004/04/15 12:25:27 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.0.ebuild,v 1.4 2004/04/29 01:38:40 lv Exp $
inherit flag-o-matic libtool eutils
@@ -54,6 +54,9 @@ src_unpack() {
# void liquidx's hack, so it is removed.
epatch ${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch
+ # fix to compile using gcc 3.4
+ epatch ${FILESDIR}/${P}-gcc34.patch
+
}
src_compile() {