summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2004-06-14 15:55:59 +0000
committerHanno Boeck <hanno@gentoo.org>2004-06-14 15:55:59 +0000
commit674afa5ab4b46c0e9bbcdc32f63fdd73e841c408 (patch)
treef50f6eab415ff990abb7f9af11d9224157e890c2 /media-gfx
parentonly allow -O1 on amd64 (bug #53136) (diff)
downloadhistorical-674afa5ab4b46c0e9bbcdc32f63fdd73e841c408.tar.gz
historical-674afa5ab4b46c0e9bbcdc32f63fdd73e841c408.tar.bz2
historical-674afa5ab4b46c0e9bbcdc32f63fdd73e841c408.zip
inkscape gcc 3.4 fix
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/inkscape/ChangeLog6
-rw-r--r--media-gfx/inkscape/Manifest11
-rw-r--r--media-gfx/inkscape/files/string.patch11
-rw-r--r--media-gfx/inkscape/inkscape-0.38.1.ebuild7
4 files changed, 28 insertions, 7 deletions
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 11df593a0df3..3fff628b4c70 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/inkscape
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.6 2004/05/25 10:11:13 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.7 2004/06/14 15:55:59 hanno Exp $
+
+ 14 Jun 2004; Hanno Boeck <hanno@gentoo.org> +files/string.patch,
+ inkscape-0.38.1.ebuild:
+ Compilation fix for gcc 3.4.
25 May 2004; Marc Hildebrand <zypher@gentoo.org> inkscape-0.38.1.ebuild:
Changed libsigc++ dep from >=v.1.2 to =v.1.2* resolves bug #51325.
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e47ee08d8ace..04b0e05ec401 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,8 +1,9 @@
-MD5 bbfdac61c3ab12201ae57d4a0e23fe7c inkscape-0.37.ebuild 1026
-MD5 4b114e2cba79d6472c1e6ade022e8910 inkscape-0.38.1.ebuild 1037
-MD5 12a316197f679ae3a2a40199aea363ed ChangeLog 782
+MD5 8ec79af51ee7e5dc78f7fdd668ddf8ca ChangeLog 905
+MD5 5b4c2f4c19d58ac4089e55b84b9359bc inkscape-0.37.ebuild 1025
+MD5 225819a551a59274cb2a36831fcfc458 inkscape-0.38.1.ebuild 1099
+MD5 f0e8acfba6fa55d5ba4c71881c4ea534 inkscape-0.38.ebuild 1027
MD5 45828204906035f66f3428b9f2f53eca metadata.xml 223
-MD5 56f4fb28b73178414050635813dac128 inkscape-0.38.ebuild 1028
-MD5 2351ba855aa9cbb514d6b9d61c29158b files/digest-inkscape-0.38 66
MD5 43383d33f039e916a8092b3703f3ede2 files/digest-inkscape-0.37 66
+MD5 2351ba855aa9cbb514d6b9d61c29158b files/digest-inkscape-0.38 66
MD5 2e95c9a487b220b70e9d2a0485316ff4 files/digest-inkscape-0.38.1 68
+MD5 96ffe3671e95f776e9e90718e5e3132a files/string.patch 489
diff --git a/media-gfx/inkscape/files/string.patch b/media-gfx/inkscape/files/string.patch
new file mode 100644
index 000000000000..06490a8ffed1
--- /dev/null
+++ b/media-gfx/inkscape/files/string.patch
@@ -0,0 +1,11 @@
+--- inkscape-0.38.1/src/libnr/nr-maybe.h 2004/04/22 11:17:19 1.1
++++ inkscape-0.38.1/src/libnr/nr-maybe.h 2004/04/22 11:17:52
+@@ -24,7 +24,7 @@
+ /** An exception class for run-time type errors */
+ template <typename T>
+ class IsNot : public std::domain_error {
+- IsNot() : domain_error(string("Is not ") + typeid(T).name()) {}
++ IsNot() : domain_error(std::string("Is not ") + typeid(T).name()) {}
+ };
+
+ /** A type with only one value, which (in principle) is only equal to itself.
diff --git a/media-gfx/inkscape/inkscape-0.38.1.ebuild b/media-gfx/inkscape/inkscape-0.38.1.ebuild
index bfe928af788a..ad675c712c29 100644
--- a/media-gfx/inkscape/inkscape-0.38.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.38.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.38.1.ebuild,v 1.3 2004/05/25 10:11:13 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.38.1.ebuild,v 1.4 2004/06/14 15:55:59 hanno Exp $
inherit gnome2
@@ -34,4 +34,9 @@ G2CONF="${G2CONF} --with-xft --with-popt"
use mmx || G2CONF="${G2CONF} --disable-mmx"
use gnome && G2CONF="${G2CONF} --with-gnome-print"
+src_unpack() {
+ unpack ${A}
+ epatch ${FILESDIR}/string.patch
+}
+
DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README"