fix building with gcc-4.4 by Daniel J. in bug #265041

Package-Manager: portage-2.2_rc30/cvs/Linux i686

4 files changed, 209 insertions, 5 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 4c9241b5a7d5..9d9f58cafdbc 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.113 2009/03/30 13:44:06 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.114 2009/04/20 19:16:58 maekke Exp $
+
+  20 Apr 2009; Markus Meier <maekke@gentoo.org>
+  +files/inkscape-0.46-gcc44.patch, inkscape-0.46-r5:
+  fix building with gcc-4.4 by Daniel J. in bug #265041
 
   30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
   inkscape-0.46-r5.ebuild:
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index cc407298c79f..942c4761c585 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX inkscape-0.46-bug-174720-0.patch 908 RMD160 ea73954482813cac9644d7dbe99c2f27d1ed9722 SHA1 354f42f93974519391492cda599887dbf89f24ea SHA256 0c42debc80f1cbc254a49f3a737bbadaa8a975d81a850b2448bd1267500ee66e
 AUX inkscape-0.46-bug-174720-1.patch 862 RMD160 c356fe9abfcc79575dcfe58b13240a7ad3939a00 SHA1 b6d3e2f821f0dc877ccb1ff3c5f751406daff767 SHA256 e038344cdb69176eaba5ff5f67e5eea5690608bd69e5b5e4e47b491d55a82394
 AUX inkscape-0.46-bug-214171.patch 952 RMD160 a946a3c2c191fe981c7756ffb9344c8da11f5291 SHA1 c7e492fcbebc8a417e61eb56f8bc70fe2e78eab5 SHA256 e4d74045d8e30289d6d7095461dbe3df083fd4fbc664f1944763bb6e71170226
 AUX inkscape-0.46-gcc43.patch 287 RMD160 68f9810c6dd7da96d7b1f73c76dab97ae3da7f25 SHA1 499d102c60122e6680b49a941f72b422b3d6d395 SHA256 dba42470e243e02e396b3bb148115ce80bf1f5a74df26a4911ebd9dcfa8dc221
+AUX inkscape-0.46-gcc44.patch 6201 RMD160 692cd77ea2a25902f606a6dd033b355fc4ed08eb SHA1 927bd2e39d829e61ac990fc72a2fb2de3952c3ec SHA256 d43974b3f930d2201dcd0b16b26adebf755897673b27cb08096b3a0cee9c525d
 AUX inkscape-0.46-poppler-0.8.3.patch 1571 RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c
 DIST inkscape-0.46.tar.gz 18615326 RMD160 449e07fa4caa71f20025774353d19cad674631ac SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a
-EBUILD inkscape-0.46-r5.ebuild 2302 RMD160 7f5fc188623eb87270fe60dcc00161ecce29d034 SHA1 a0a7e0d232b5ba88692f17627ff4a67b8be1f18b SHA256 da02d45705eedf78fd857a90a82b06c1b12c393d3cb8b4e4f38123d668ec3439
-MISC ChangeLog 14970 RMD160 e4fb7d7a94f8199102608027fc3de3190aa3392d SHA1 d29e7f26014ba6d4575c1d332fc8a5ccea32004c SHA256 dcb7be1967094a8e428d5093bd612f3c7bcef27ea550ef7f4ab6c860db8ac876
+EBUILD inkscape-0.46-r5.ebuild 2349 RMD160 805edb1dd72925c549c795d2732c07973324b747 SHA1 9b7a21db2922525076aa65517994715b422215ef SHA256 285606041cf5fb8719f0f040c63b62a1ece2113efee52676e457e42312637059
+MISC ChangeLog 15127 RMD160 737b7dedeb80147f2359e2e66c5596d6afbfdecd SHA1 2bfb60c84bebeb116923aa450f7accca8f54d5d7 SHA256 4c7e15c15315cc56685a74167c9cd8d12c634a9f7c77d2d0fc974fb377d238f3
 MISC metadata.xml 458 RMD160 90cb8f8058926fe666fc2dbec1af647248210f6c SHA1 9af2ef1f67bb9be6e9eecb2dc2f70badeb6277b1 SHA256 52763c744f2f6615fd6f900c3843356432ead07777ebdb548836b1e4fbed20ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknsyoEACgkQkKaRLQcq0GLS7QCfUX4BQNZUC646C2GXRD3nzNwb
+HrUAniXstd0BeNkRPJPi1LH4p+qHAyqx
+=A5gm
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.46-gcc44.patch b/media-gfx/inkscape/files/inkscape-0.46-gcc44.patch
new file mode 100644
index 000000000000..5a7369c0c871
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.46-gcc44.patch
@@ -0,0 +1,188 @@
+diff -Naur inkscape-0.46-orig/src/2geom/sbasis-math.cpp inkscape-0.46/src/2geom/sbasis-math.cpp
+--- inkscape-0.46-orig/src/2geom/sbasis-math.cpp	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/2geom/sbasis-math.cpp	2009-04-05 18:21:30.000000000 -0400
+@@ -38,11 +38,11 @@
+ //#define ZERO 1e-3
+ 
+ 
+-namespace Geom {
++#include <math.h>
++#include <cstdio>
+ 
++namespace Geom {
+ 
+-#include <stdio.h>
+-#include <math.h>
+ 
+ //-|x|-----------------------------------------------------------------------
+ Piecewise<SBasis> abs(SBasis const &f){
+diff -Naur inkscape-0.46-orig/src/2geom/svg-path-parser.h inkscape-0.46/src/2geom/svg-path-parser.h
+--- inkscape-0.46-orig/src/2geom/svg-path-parser.h	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/2geom/svg-path-parser.h	2009-04-05 18:21:30.000000000 -0400
+@@ -32,6 +32,7 @@
+ #ifndef SEEN_SVG_PATH_PARSER_H
+ #define SEEN_SVG_PATH_PARSER_H
+ 
++#include <cstdio>
+ #include <vector>
+ #include <iterator>
+ #include <stdexcept>
+diff -Naur inkscape-0.46-orig/src/dom/domimpl.cpp inkscape-0.46/src/dom/domimpl.cpp
+--- inkscape-0.46-orig/src/dom/domimpl.cpp	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/domimpl.cpp	2009-04-05 18:21:30.000000000 -0400
+@@ -30,6 +30,8 @@
+ 
+ #include "domimpl.h"
+ 
++#include <cstdio>
++
+ namespace org
+ {
+ namespace w3c
+diff -Naur inkscape-0.46-orig/src/dom/io/domstream.h inkscape-0.46/src/dom/io/domstream.h
+--- inkscape-0.46-orig/src/dom/io/domstream.h	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/io/domstream.h	2009-04-05 18:21:30.000000000 -0400
+@@ -33,6 +33,8 @@
+ 
+ #include <dom/dom.h>
+ 
++#include <cstdio>
++
+ namespace org
+ {
+ namespace w3c
+diff -Naur inkscape-0.46-orig/src/dom/io/socket.h inkscape-0.46/src/dom/io/socket.h
+--- inkscape-0.46-orig/src/dom/io/socket.h	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/io/socket.h	2009-04-05 18:34:14.000000000 -0400
+@@ -29,6 +29,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <cstdio>
+ #include "dom/dom.h"
+ 
+ #ifdef HAVE_SSL
+diff -Naur inkscape-0.46-orig/src/dom/io/stringstream.h inkscape-0.46/src/dom/io/stringstream.h
+--- inkscape-0.46-orig/src/dom/io/stringstream.h	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/io/stringstream.h	2009-04-05 18:22:50.000000000 -0400
+@@ -29,7 +29,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
+-
++#include <cstdio>
+ #include "domstream.h"
+ 
+ 
+diff -Naur inkscape-0.46-orig/src/dom/svg/svgtypes.h inkscape-0.46/src/dom/svg/svgtypes.h
+--- inkscape-0.46-orig/src/dom/svg/svgtypes.h	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/svg/svgtypes.h	2009-04-05 18:21:30.000000000 -0400
+@@ -47,6 +47,7 @@
+ #include "dom/smil.h"
+ 
+ 
++#include <cstdio>
+ #include <math.h>
+ 
+ 
+diff -Naur inkscape-0.46-orig/src/dom/xpathtoken.h inkscape-0.46/src/dom/xpathtoken.h
+--- inkscape-0.46-orig/src/dom/xpathtoken.h	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/xpathtoken.h	2009-04-05 18:21:30.000000000 -0400
+@@ -35,6 +35,7 @@
+ 
+ #include <math.h>
+ 
++#include <cstdio>
+ #include <vector>
+ 
+ namespace org
+diff -Naur inkscape-0.46-orig/src/io/inkscapestream.h inkscape-0.46/src/io/inkscapestream.h
+--- inkscape-0.46-orig/src/io/inkscapestream.h	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/io/inkscapestream.h	2009-04-05 18:21:30.000000000 -0400
+@@ -12,6 +12,7 @@
+  */
+ 
+ 
++#include <cstdio>
+ #include <glibmm.h>
+ 
+ namespace Inkscape
+diff -Naur inkscape-0.46-orig/src/io/sys.cpp inkscape-0.46/src/io/sys.cpp
+--- inkscape-0.46-orig/src/io/sys.cpp	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/io/sys.cpp	2009-04-05 18:21:30.000000000 -0400
+@@ -22,6 +22,8 @@
+ #include <glibmm/ustring.h>
+ #include <gtk/gtkmessagedialog.h>
+ 
++#include <cstdio>
++
+ #include "prefs-utils.h"
+ #include "sys.h"
+ 
+diff -Naur inkscape-0.46-orig/src/libavoid/vertices.h inkscape-0.46/src/libavoid/vertices.h
+--- inkscape-0.46-orig/src/libavoid/vertices.h	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/libavoid/vertices.h	2009-04-05 18:21:30.000000000 -0400
+@@ -23,6 +23,7 @@
+ #ifndef AVOID_VERTICES_H
+ #define AVOID_VERTICES_H
+ 
++#include <cstdio>
+ #include <list>
+ #include <set>
+ #include <map>
+diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp inkscape-0.46/src/libnr/nr-matrix-fns.cpp
+--- inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/libnr/nr-matrix-fns.cpp	2009-04-05 18:21:30.000000000 -0400
+@@ -1,5 +1,7 @@
+ #include <libnr/nr-matrix-fns.h>
+ 
++#include <cstdio>
++
+ namespace NR {
+ 
+ Matrix elliptic_quadratic_form(Matrix const &m) {
+diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix.cpp inkscape-0.46/src/libnr/nr-matrix.cpp
+--- inkscape-0.46-orig/src/libnr/nr-matrix.cpp	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/libnr/nr-matrix.cpp	2009-04-05 18:21:30.000000000 -0400
+@@ -11,6 +11,7 @@
+  * This code is in public domain
+  */
+ 
++#include <cstdio>
+ #include <cstdlib>
+ #include "nr-matrix.h"
+ 
+diff -Naur inkscape-0.46-orig/src/streams-handles.cpp inkscape-0.46/src/streams-handles.cpp
+--- inkscape-0.46-orig/src/streams-handles.cpp	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/streams-handles.cpp	2009-04-05 18:21:30.000000000 -0400
+@@ -12,6 +12,7 @@
+ #include "streams-handles.h"
+ #include "uri.h"
+ 
++#include <cstdio>
+ #include <iostream>
+ 
+ namespace Inkscape {
+diff -Naur inkscape-0.46-orig/src/streams-zlib.cpp inkscape-0.46/src/streams-zlib.cpp
+--- inkscape-0.46-orig/src/streams-zlib.cpp	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/streams-zlib.cpp	2009-04-05 18:21:30.000000000 -0400
+@@ -9,6 +9,7 @@
+  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
+  */
+ 
++#include <cstdio>
+ #include <cstring>
+ #include <string>
+ #include <string.h>
+diff -Naur inkscape-0.46-orig/src/xml/event.cpp inkscape-0.46/src/xml/event.cpp
+--- inkscape-0.46-orig/src/xml/event.cpp	2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/xml/event.cpp	2009-04-05 18:21:30.000000000 -0400
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <glib.h> // g_assert()
++#include <cstdio>
+ 
+ #include "event.h"
+ #include "event-fns.h"
+
diff --git a/media-gfx/inkscape/inkscape-0.46-r5.ebuild b/media-gfx/inkscape/inkscape-0.46-r5.ebuild
index 210f6e054b0c..df6496f177cc 100644
--- a/media-gfx/inkscape/inkscape-0.46-r5.ebuild
+++ b/media-gfx/inkscape/inkscape-0.46-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r5.ebuild,v 1.11 2009/03/30 13:44:06 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r5.ebuild,v 1.12 2009/04/20 19:16:58 maekke Exp $
 
 EAPI="2"
 
-inherit gnome2 eutils
+inherit gnome2 eutils autotools
 
 DESCRIPTION="A SVG based generic vector-drawing program"
 HOMEPAGE="http://www.inkscape.org/"
@@ -74,6 +74,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 	epatch "${FILESDIR}"/${P}-poppler-0.8.3.patch
 	epatch "${FILESDIR}"/${P}-bug-174720-0.patch
 	epatch "${FILESDIR}"/${P}-bug-174720-1.patch