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
commit9a45d8a057de8c6c06f768fbf56635021e305ee3 (patch)
treea02c9555fd7f52ac63917b569bb0f412202a7c2f /media-gfx/inkscape
parentamd64 stable, security bug #215694 (diff)
downloadhistorical-9a45d8a057de8c6c06f768fbf56635021e305ee3.tar.gz
historical-9a45d8a057de8c6c06f768fbf56635021e305ee3.tar.bz2
historical-9a45d8a057de8c6c06f768fbf56635021e305ee3.zip
fix building with gcc-4.3, thanks Bert Karwatzki for the patch (bug #215574)
Package-Manager: portage-2.1.5_rc2
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r--media-gfx/inkscape/ChangeLog7
-rw-r--r--media-gfx/inkscape/Manifest11
-rw-r--r--media-gfx/inkscape/files/inkscape-0.46-gcc43.patch11
-rw-r--r--media-gfx/inkscape/inkscape-0.46-r2.ebuild9
4 files changed, 31 insertions, 7 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/Manifest b/media-gfx/inkscape/Manifest
index 99ac5c42a458..11563e7c223c 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,16 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX inkscape-0.46-gcc43.patch 287 RMD160 68f9810c6dd7da96d7b1f73c76dab97ae3da7f25 SHA1 499d102c60122e6680b49a941f72b422b3d6d395 SHA256 dba42470e243e02e396b3bb148115ce80bf1f5a74df26a4911ebd9dcfa8dc221
DIST inkscape-0.45.1.tar.gz 13244235 RMD160 f21d43196a1fbaddc4f4baa2a51a5d085ceb20e4 SHA1 f3df9eafc0fdfcc5f5024ea4bec4d7c477698380 SHA256 0d4c6277a599a3d18182e1947d8cf50805f06023b2a574a350c64286ea4a0bf8
DIST inkscape-0.46.tar.gz 18615326 RMD160 449e07fa4caa71f20025774353d19cad674631ac SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a
EBUILD inkscape-0.45.1-r1.ebuild 2251 RMD160 79184e7a33770c9283a2922f663f5ff83de4d73a SHA1 1526810879dd41975aa0c4380f69b1eb00bf192a SHA256 8037e07912491d7405b9b24d3f30778b37134ccced005d3a31b98446f2f60913
-EBUILD inkscape-0.46-r2.ebuild 2572 RMD160 912134c092d2a5727bc4d37699bb446b939f05eb SHA1 c84836fe90a50b8851c72d85d5a584dd6e5dd6fc SHA256 708056a96509159e8121ded98e702db7d15e5a8fb20bdd335ecb221e2f3c3369
-MISC ChangeLog 12145 RMD160 87a79cfc7f777e09af28988ae6865781fa76a17f SHA1 6c25e10e1b1fb302c5a0c39d61b4c208551df785 SHA256 71d328b7fbc754326fd4fe0417dfa104bce1e71d652fd5a8b639e56b7a18bdbb
+EBUILD inkscape-0.46-r2.ebuild 2660 RMD160 a45004221df1a1d5612b3dbfaf708fbd7a082002 SHA1 59493ee186dedb0e6d868dca3c77b80129757943 SHA256 d2e8877e7f12abab9bda031ad0cfa5a904babeb1aac788af1bb5a9b6257388a9
+MISC ChangeLog 12336 RMD160 e82cea4af02d7cc51299994e5a8bcbfc8493b782 SHA1 de6f72c6fbb516d77ee0f7029c93b581ce5b613d SHA256 4178ef0c0f774df4ad07d5eca3a770cf35eb0fb13afe03886bf57cd7811b7f22
MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkfujFAACgkQkKaRLQcq0GIpxwCeJx8dv03o/jaOYswiOhtyIm0Q
-CxEAn2nEGCLIJhv2K4V5+DFEWj11Tf5R
-=gg9J
+iEYEARECAAYFAkf41e8ACgkQkKaRLQcq0GL92gCeIodc9aqQoxRyJ+yzPN8aS+2o
+kpgAmQHwbrpPbZLxeEY98NHdYEYTB//h
+=qXcK
-----END PGP SIGNATURE-----
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"