filter flags for gimp

4 files changed, 25 insertions, 17 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index fac5bf4cc1ff..f88f71b42a2e 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.39 2003/06/17 22:57:21 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.40 2003/06/19 22:19:53 liquidx Exp $
+
+  19 Jun 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.2.5.ebuild,
+  gimp-1.3.15.ebuild:
+  filter -fno-inline because gimp uses inline functions
 
 *gimp-1.2.5 (17 Jun 2003)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index c48ebd95844e..8e83fc0c34c9 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,21 +1,21 @@
-MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492
-MD5 cf4c8fe40269dc8c7264609ad8aeb8d5 gimp-1.2.5.ebuild 2975
+MD5 426a1b80fbb98fccc4d3db64d9ed6b78 ChangeLog 6537
+MD5 6606255b200760d9524e19a95740a492 gimp-1.2.3-r2.ebuild 4080
 MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717
-MD5 29551bea3b9848d4373c27f1b17fc039 gimp-1.3.13.ebuild 2356
 MD5 9d05730cd0589897cf6e6df5afa81a71 gimp-1.2.4.ebuild 2977
-MD5 ca1e4e0274ba2b70f9b861dfebc13827 ChangeLog 6388
-MD5 edbec97563e2f24bf3859ee033879d5f gimp-1.3.15.ebuild 1904
-MD5 6606255b200760d9524e19a95740a492 gimp-1.2.3-r2.ebuild 4080
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
+MD5 29551bea3b9848d4373c27f1b17fc039 gimp-1.3.13.ebuild 2356
+MD5 c947cdff76003284096cc58bd1fc6e5d gimp-1.3.15.ebuild 1998
+MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492
+MD5 33fdbec752518ffb628a8d76d731f159 gimp-1.2.5.ebuild 3068
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r2 65
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
-MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
-MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
-MD5 13e882e38fccf991bbea8677bedca67e files/digest-gimp-1.3.13 66
-MD5 89fee7931deb88ed771f5ec2ec28aea4 files/digest-gimp-1.3.14 66
 MD5 ba7261fba402df352c9f7d8d496457db files/digest-gimp-1.3.15 66
+MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
+MD5 13e882e38fccf991bbea8677bedca67e files/digest-gimp-1.3.13 66
+MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
+MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
+MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
+MD5 89fee7931deb88ed771f5ec2ec28aea4 files/digest-gimp-1.3.14 66
 MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
-MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
diff --git a/media-gfx/gimp/gimp-1.2.5.ebuild b/media-gfx/gimp/gimp-1.2.5.ebuild
index 25946d870a68..11b3b7036c97 100644
--- a/media-gfx/gimp/gimp-1.2.5.ebuild
+++ b/media-gfx/gimp/gimp-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.1 2003/06/17 22:57:21 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.2 2003/06/19 22:19:53 liquidx Exp $
 
 inherit eutils flag-o-matic
 
@@ -41,6 +41,8 @@ src_compile() {
 
 	# fix problem with k6's (#22115)
 	replace-flags "-march=k6*" "-march=i586"
+	# gimp has inline functions (plug-ins/common/grid.c) (#23078)
+	filter-flags "-fno-inline"
 
 	local mymake=""
 	local AA
diff --git a/media-gfx/gimp/gimp-1.3.15.ebuild b/media-gfx/gimp/gimp-1.3.15.ebuild
index 535a0479f19a..de6201e7a739 100644
--- a/media-gfx/gimp/gimp-1.3.15.ebuild
+++ b/media-gfx/gimp/gimp-1.3.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.15.ebuild,v 1.4 2003/06/17 22:57:21 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.15.ebuild,v 1.5 2003/06/19 22:19:53 liquidx Exp $
 
 IUSE="doc python perl aalib png jpeg tiff gtkhtml"
 
@@ -46,6 +46,8 @@ src_compile() {
 
 	# Strip out -fomit-frame-pointer for k6's
 	is-flag "-march=k6*" && filter-flags "-fomit-frame-pointer"
+	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
+	filter-flags "-fno-inline"
 
 	econf ${myconf} \
 		`use_enable doc gtk-doc` \