summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2008-04-06 13:53:06 +0000
committerMarkus Meier <maekke@gentoo.org>2008-04-06 13:53:06 +0000
commit0bce7103a44089b331614fdc660ee89f4bf12d9e (patch)
treeec096f1954b590018caa79640576ffe818234775 /media-gfx/inkscape
parentamd64 stable, security bug #215694 (diff)
downloadgentoo-2-0bce7103a44089b331614fdc660ee89f4bf12d9e.tar.gz
gentoo-2-0bce7103a44089b331614fdc660ee89f4bf12d9e.tar.bz2
gentoo-2-0bce7103a44089b331614fdc660ee89f4bf12d9e.zip
fix building with gcc-4.3, thanks Bert Karwatzki for the patch (bug #215574)
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r--media-gfx/inkscape/ChangeLog7
-rw-r--r--media-gfx/inkscape/files/inkscape-0.46-gcc43.patch11
-rw-r--r--media-gfx/inkscape/inkscape-0.46-r2.ebuild9
3 files changed, 25 insertions, 2 deletions
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index df8935c09cdf..1362bb9c892e 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/inkscape
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.93 2008/03/29 18:35:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.94 2008/04/06 13:53:05 maekke Exp $
+
+ 06 Apr 2008; Markus Meier <maekke@gentoo.org>
+ +files/inkscape-0.46-gcc43.patch, inkscape-0.46-r2.ebuild:
+ fix building with gcc-4.3, thanks Bert Karwatzki for the patch (bug
+ #215574)
29 Mar 2008; Markus Meier <maekke@gentoo.org> -inkscape-0.46.ebuild,
-inkscape-0.46-r1.ebuild:
diff --git a/media-gfx/inkscape/files/inkscape-0.46-gcc43.patch b/media-gfx/inkscape/files/inkscape-0.46-gcc43.patch
new file mode 100644
index 000000000000..a72af077eb5c
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.46-gcc43.patch
@@ -0,0 +1,11 @@
+diff -aur src.old/dom/dom.h src/dom/dom.h
+--- src.old/dom/dom.h 2008-03-29 16:56:05.000000000 +0100
++++ src/dom/dom.h 2008-03-29 17:14:30.000000000 +0100
+@@ -30,6 +30,7 @@
+ */
+
+ #include <vector>
++#include <cstring>
+
+ //# include this before the #ifdefs below
+ #include "domconfig.h"
diff --git a/media-gfx/inkscape/inkscape-0.46-r2.ebuild b/media-gfx/inkscape/inkscape-0.46-r2.ebuild
index 00bd8e9b4032..571149e871f4 100644
--- a/media-gfx/inkscape/inkscape-0.46-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.46-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r2.ebuild,v 1.1 2008/03/29 18:33:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r2.ebuild,v 1.2 2008/04/06 13:53:05 maekke Exp $
inherit gnome2 eutils
@@ -86,4 +86,11 @@ pkg_setup() {
G2CONF="${G2CONF} $(use_with perl)"
}
+src_unpack() {
+ gnome2_src_unpack
+
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
DOCS="AUTHORS ChangeLog NEWS README"