Add patch to change static int DiscWithHoleFlag to int DiscWithHoleFlag in tool_disc.c, allowing giram to compile with gcc-4.1.1. Fixes bug 154273, reported by Andrey Grozin <A.G.Grozin at inp.nsk.su>. Also, removing old ebuild.

Package-Manager: portage-2.1.1-r2

4 files changed, 27 insertions, 4 deletions

diff --git a/media-gfx/giram/ChangeLog b/media-gfx/giram/ChangeLog
index a1b198a2ee45..a2355e88ace4 100644
--- a/media-gfx/giram/ChangeLog
+++ b/media-gfx/giram/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/giram
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/ChangeLog,v 1.8 2005/12/15 22:09:58 vanquirius Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/ChangeLog,v 1.9 2006/12/10 03:30:54 vanquirius Exp $
+
+  10 Dec 2006; Marcelo Goes <vanquirius@gentoo.org>
+  -files/giram-0.3.4-fbsd.patch, +files/giram-0.3.5-tool_disc.diff,
+  -giram-0.3.4.ebuild, giram-0.3.5.ebuild:
+  Add patch to change static int DiscWithHoleFlag to int DiscWithHoleFlag in
+  tool_disc.c, allowing giram to compile with gcc-4.1.1. Fixes bug 154273,
+  reported by Andrey Grozin <A.G.Grozin at inp.nsk.su>. Also, removing old
+  ebuild.
 
   15 Dec 2005; Marcelo Goes <vanquirius@gentoo.org> -giram-0.3.3.ebuild,
   giram-0.3.5.ebuild:
diff --git a/media-gfx/giram/files/digest-giram-0.3.5 b/media-gfx/giram/files/digest-giram-0.3.5
index 4b9382d29299..4480e2f61e49 100644
--- a/media-gfx/giram/files/digest-giram-0.3.5
+++ b/media-gfx/giram/files/digest-giram-0.3.5
@@ -1 +1,3 @@
 MD5 1197134bd838669f202fc2f2f1b5da9b giram-0.3.5.tar.gz 1028404
+RMD160 4535ff962ceb68f774e2d8b3176dac9dd9eceed1 giram-0.3.5.tar.gz 1028404
+SHA256 8dc6edddb1437476626f9c1ae5e308ea10e5e5d064e441a310b32df763daddd8 giram-0.3.5.tar.gz 1028404
diff --git a/media-gfx/giram/files/giram-0.3.5-tool_disc.diff b/media-gfx/giram/files/giram-0.3.5-tool_disc.diff
new file mode 100644
index 000000000000..36b0dd72093a
--- /dev/null
+++ b/media-gfx/giram/files/giram-0.3.5-tool_disc.diff
@@ -0,0 +1,11 @@
+--- giram-0.3.5.fbsd/src/tools/tool_disc.c	2006-12-10 01:15:56.000000000 -0200
++++ giram-0.3.5/src/tools/tool_disc.c	2006-12-10 01:23:21.000000000 -0200
+@@ -33,7 +33,7 @@
+ 
+ #include "giramintl.h"
+ 
+-static int DiscWithHoleFlag;
++int DiscWithHoleFlag;
+ 
+ static double Xorg, Yorg, Radius, HoleRadius;
+ static guint id;
diff --git a/media-gfx/giram/giram-0.3.5.ebuild b/media-gfx/giram/giram-0.3.5.ebuild
index 1444d7da412d..b33418db750b 100644
--- a/media-gfx/giram/giram-0.3.5.ebuild
+++ b/media-gfx/giram/giram-0.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/giram-0.3.5.ebuild,v 1.3 2005/12/15 22:09:59 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/giram-0.3.5.ebuild,v 1.4 2006/12/10 03:30:54 vanquirius Exp $
 
 inherit eutils libtool
 
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${P}-fbsd.patch
+	# bug 154273
+	epatch "${FILESDIR}"/${PN}-0.3.5-tool_disc.diff
 	cd "${S}"/povfront
 	sed -i -e "s:strlen (g_config_file_to_parse) == 0:g_config_file_to_parse == NULL:" povfront.c
 	cd "${S}"; elibtoolize