gcc4 fix, okay'ed by Obz

Package-Manager: portage-2.0.51.19

4 files changed, 38 insertions, 8 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index d2d80a5a1b4c..47681d248aef 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/dia
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.47 2005/04/11 20:34:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.48 2005/04/17 04:26:16 halcy0n Exp $
+
+  17 Apr 2005; Mark Loeser <halcy0n@gentoo.org> +files/dia-0.94-gcc4.patch,
+  dia-0.94-r1.ebuild:
+  Adding patch to fix GCC4 compilation issues.
 
   11 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.94-r1.ebuild:
   Stable on sparc
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index a1b864f56a2e..c545f17cd211 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b43772bb5d906d29925f9fbd3e762d16 ChangeLog 6085
+MD5 0cc259b8578665b19aa2c569106f9a72 ChangeLog 6230
 MD5 8919b8358acac532bb4c2283e7bdcbb3 dia-0.93.ebuild 1074
 MD5 858a96d79b7c8b479edd95aedcf0c0c6 metadata.xml 589
-MD5 1e90a32859e935b68fc540fc801bc8c1 dia-0.94-r1.ebuild 1222
+MD5 a49cca09d7a8328038cefbbb43a45e3f dia-0.94-r1.ebuild 1280
 MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766
 MD5 7459df6c8efd61f2c725351d0da979ad files/dia-0.93-fix_py_prefix.patch 499
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62
 MD5 1df50dee999cd3aa4746682bfc1d1d72 files/digest-dia-0.93 62
 MD5 5825798492b196ec96d3757e9e1d0de8 files/dia-0.94-no_font_cache.patch 473
+MD5 159070f80a109b691f1a945755bf2b7c files/dia-0.94-gcc4.patch 934
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCWt9XKRy60XGEcJIRAg/LAJ41aT0ydsZYBOYnCW4KhovqUW3y9QCfWupf
-Cly9wwN/Aq/p2dw/dQNw+eI=
-=c/aN
+iD8DBQFCYeV2CRZPokWLroQRAjb3AJ9Hvm9nP0iK3IZsAD0S3amiekGCnwCgtNfm
+lMRYte7qrI6yCZL0mnfPLck=
+=vpIl
 -----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.94-r1.ebuild b/app-office/dia/dia-0.94-r1.ebuild
index 8dd765b4f52c..ec0ab1ed5a00 100644
--- a/app-office/dia/dia-0.94-r1.ebuild
+++ b/app-office/dia/dia-0.94-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r1.ebuild,v 1.5 2005/04/11 20:34:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r1.ebuild,v 1.6 2005/04/17 04:26:16 halcy0n Exp $
 
 inherit eutils gnome2
 
@@ -42,4 +42,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-no_font_cache.patch
 	# Fix help display. See bug #83726.
 	epatch ${FILESDIR}/${P}-help.patch
+	# GCC 4 compile fixes
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
diff --git a/app-office/dia/files/dia-0.94-gcc4.patch b/app-office/dia/files/dia-0.94-gcc4.patch
new file mode 100644
index 000000000000..134c429435c0
--- /dev/null
+++ b/app-office/dia/files/dia-0.94-gcc4.patch
@@ -0,0 +1,23 @@
+diff -ur dia-0.94-orig/objects/custom/shape_info.h dia-0.94/objects/custom/shape_info.h
+--- dia-0.94-orig/objects/custom/shape_info.h	2005-04-15 18:45:52.000000000 -0400
++++ dia-0.94/objects/custom/shape_info.h	2005-04-15 18:36:55.000000000 -0400
+@@ -166,7 +166,6 @@
+ 
+ void shape_info_realise(ShapeInfo* info);
+ void shape_info_print(ShapeInfo *info);
+-void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
+ 
+ /*MC 11/03 handy g_new0 variant for struct with variable size */
+ #define g_new0_ext(struct_type, ext_size)		\
+diff -ur dia-0.94-orig/plug-ins/python/pydia-object.h dia-0.94/plug-ins/python/pydia-object.h
+--- dia-0.94-orig/plug-ins/python/pydia-object.h	2005-04-15 18:45:13.000000000 -0400
++++ dia-0.94/plug-ins/python/pydia-object.h	2005-04-15 18:46:31.000000000 -0400
+@@ -22,7 +22,7 @@
+ 
+ #include <Python.h>
+ 
+-#include "object.h"
++#include "lib/object.h"
+ 
+ typedef struct {
+     PyObject_HEAD