Fix runtime crash with gcc-4.4, bug 268992. Thanks to Daniel J. <sleeperseven@hotmail.com> for the patch.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 41 insertions, 15 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 9d9f58cafdbc..1c16b70da224 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,11 @@
 # 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.114 2009/04/20 19:16:58 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.115 2009/05/08 02:01:53 loki_val Exp $
+
+  08 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  inkscape-0.46-r5.ebuild, +files/inkscape-0.46-gcc44_p2.patch:
+  Fix runtime crash with gcc-4.4, bug 268992. Thanks to Daniel J.
+  <sleeperseven@hotmail.com> for the patch.
 
   20 Apr 2009; Markus Meier <maekke@gentoo.org>
   +files/inkscape-0.46-gcc44.patch, inkscape-0.46-r5:
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 942c4761c585..38b48726005f 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,20 +1,11 @@
------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-gcc44_p2.patch 1296 RMD160 3c3125bb92856e4f939328849dfef222a3a660ae SHA1 c20cb7caee6f9e27dac77ec3d0fea595e6ffec1c SHA256 35b8f651267431fc8b47bceb9edc6d0e9d9d985d752c40e3593f08e888b3da2e
 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 2349 RMD160 805edb1dd72925c549c795d2732c07973324b747 SHA1 9b7a21db2922525076aa65517994715b422215ef SHA256 285606041cf5fb8719f0f040c63b62a1ece2113efee52676e457e42312637059
-MISC ChangeLog 15127 RMD160 737b7dedeb80147f2359e2e66c5596d6afbfdecd SHA1 2bfb60c84bebeb116923aa450f7accca8f54d5d7 SHA256 4c7e15c15315cc56685a74167c9cd8d12c634a9f7c77d2d0fc974fb377d238f3
+EBUILD inkscape-0.46-r5.ebuild 2393 RMD160 ff0f033d6e36c2dfb51239810dea891f5f98fc66 SHA1 5b215735e76a4ad77cb8a0f142c08fc8cf55264d SHA256 f45161c20406ae7b2cb5f7b7d187cf97dfdd558c17fc480e6a4e67f4c5f169f5
+MISC ChangeLog 15357 RMD160 29cb8b29b83e62431862c22767cc08ae1f1c9fe9 SHA1 b1b5856aaa14f4481e1c6c36dba31ea34dad631d SHA256 314da6f43d4d11f3a46b619e71bb6aa990c6358c25b7ea79535a440e72ce83e5
 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_p2.patch b/media-gfx/inkscape/files/inkscape-0.46-gcc44_p2.patch
new file mode 100644
index 000000000000..0d2fcd4619cb
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.46-gcc44_p2.patch
@@ -0,0 +1,29 @@
+One more typing fix for GCC 4.4, and fix a NULL dereference on startup.
+
+Lubomir Rintel <lkundrak@v3.sk>
+
+diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp
+--- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44	2009-01-28 22:12:57.000000000 +0100
++++ inkscape/src/extension/internal/bitmap/imagemagick.cpp	2009-03-02 17:05:57.000000000 +0100
+@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha
+ 	char *search = (char *) g_strndup(xlink, 30);
+ 	if (strstr(search, "base64") != (char*)NULL) {
+ 		// 7 = strlen("base64") + strlen(",")
+-		char* pureBase64 = strstr(xlink, "base64") + 7;		
++		const char* pureBase64 = strstr(xlink, "base64") + 7;		
+ 		Magick::Blob blob;
+ 		blob.base64(pureBase64);
+ 		image->read(blob);
+diff -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp
+--- inkscape/src/libnr/nr-object.cpp.gcc44	2009-03-02 17:06:46.000000000 +0100
++++ inkscape/src/libnr/nr-object.cpp	2009-03-02 17:06:58.000000000 +0100
+@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
+     );
+     memset(object, 0xf0, c->isize);
+ 
+-    object->klass = c;
+     c->cpp_ctor(object);
++    object->klass = c;
+     nr_class_tree_object_invoke_init (c, object);
+ 
+     return object;
diff --git a/media-gfx/inkscape/inkscape-0.46-r5.ebuild b/media-gfx/inkscape/inkscape-0.46-r5.ebuild
index df6496f177cc..f27d924ca620 100644
--- a/media-gfx/inkscape/inkscape-0.46-r5.ebuild
+++ b/media-gfx/inkscape/inkscape-0.46-r5.ebuild
@@ -1,6 +1,6 @@
 # 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.12 2009/04/20 19:16:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r5.ebuild,v 1.13 2009/05/08 02:01:53 loki_val Exp $
 
 EAPI="2"
 
@@ -75,6 +75,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch
 	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-gcc44_p2.patch
 	epatch "${FILESDIR}"/${P}-poppler-0.8.3.patch
 	epatch "${FILESDIR}"/${P}-bug-174720-0.patch
 	epatch "${FILESDIR}"/${P}-bug-174720-1.patch