diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-05-08 02:01:53 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-05-08 02:01:53 +0000 |
| commit | a290782e2463f17e2d90c9d2e2a03d53e80d54ae (patch) | |
| tree | 3738a2a9a3d0de9e64dd9712e66be6d102a708f7 /media-gfx/inkscape | |
| parent | Fix GCC 4.4 compatibility, bug 268086. Thanks to Andreas Sturmlechner <andrea... (diff) | |
| download | gentoo-2-a290782e2463f17e2d90c9d2e2a03d53e80d54ae.tar.gz gentoo-2-a290782e2463f17e2d90c9d2e2a03d53e80d54ae.tar.bz2 gentoo-2-a290782e2463f17e2d90c9d2e2a03d53e80d54ae.zip | |
Fix runtime crash with gcc-4.4, bug 268992. Thanks to Daniel J. <sleeperseven@hotmail.com> for the patch.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/inkscape')
| -rw-r--r-- | media-gfx/inkscape/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/inkscape/files/inkscape-0.46-gcc44_p2.patch | 29 | ||||
| -rw-r--r-- | media-gfx/inkscape/inkscape-0.46-r5.ebuild | 3 |
3 files changed, 38 insertions, 3 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/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 |