media-gfx/inkscape: Fix compatibility with API changes in boehm-gc-7.4.0, #495210

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 108 insertions, 16 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index ffa0ba3b266d..40c2b99b48e0 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/inkscape
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.202 2013/12/26 14:46:55 maekke Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.203 2014/01/08 11:54:52 jlec Exp $
+
+  08 Jan 2014; Justin Lecher <jlec@gentoo.org> inkscape-0.48.4-r1.ebuild,
+  +files/inkscape-0.48.4-gc74-configure.patch,
+  +files/inkscape-0.48.4-gc74.patch:
+  Fix compatibility with API changes in boehm-gc-7.4.0, #495210
 
   26 Dec 2013; Markus Meier <maekke@gentoo.org> inkscape-0.48.4-r1.ebuild:
   add ~arm, bug #488594
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 6b744cbb4ec9..2b73ed84867e 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX inkscape-0.48.0-spell.patch 1815 SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f SHA512 17f0f9397eebbd5a322757db9f574e4fc848bc1f53e2e0f603eb3c5d7bdf6772b8461189365533fbaa5adb4fdce5264b0c3da015c9ed5ca54873d64cc860880c WHIRLPOOL 6868334e146f00b81c521e54bc261e0153c17e8fd6b176fda826e75203674b8e6904fa092db2856b6512dfe2040b9f268781af909a9a2690bdd8e9152fbdfded
 AUX inkscape-0.48.1-libpng15.patch 1616 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87 SHA512 f783982c8cf2cfc805cb56b6f93e5ecfdce676955f5ddd150f8d9868aa3d7d5ad571dcb1fe12c9c03e35cc05609625ea129894c95b002f0897571016d177c58e WHIRLPOOL d8f3576bb78c9e2491adc0778987f3c72846a3dc1b561c9d4550ef85aca6c8d5fff5a24a8b1854a302891339aecee4aefd4d80121c0db23cb85e2f29a6a10e1c
@@ -8,17 +8,29 @@ AUX inkscape-0.48.3.1-desktop.patch 508 SHA256 4d15c12545613e1d63c976d21b5ae86f7
 AUX inkscape-0.48.4-automake-1.13.patch 408 SHA256 b08e8dd941ef6f9b836f21e1a2b6f1bde4ed9ec8c4e41a3c8c3592a5b0c2635c SHA512 1e63ba31537976bd3007db76d0ec20200d5d12af30723c57ca940381573c92f14707b7da67aad5eb74027171aa6fe421a1dfce8c7228803810b684e45b107008 WHIRLPOOL c3b23563a4f986ec7cdaea3b69d1fdf7c86482e88ca05a977b3f422a1079d0856bbe9017a6728d194827c1674c61c8982255b1804b29e8620cfcd1895b6b519e
 AUX inkscape-0.48.4-epython.patch 441 SHA256 279c1dd278bf69c69f4ac2351d8d069f08aa444e45c32ccd564f6962304f3cdb SHA512 49253f2cc984b70cb09e90393fda8690efb47b511883ec6e8fcd9942442dadbb2085f5b6eb529b8cf4cb7cd1f4b8e39b88bf68a867d7f0724382d3da89eddc67 WHIRLPOOL 768acee72f3747fdb23a5bdf0665364a316c8b6d9abaa582a7d897153b38f271db25bc1a9c2d4893a45021f1098565dbedba77360add0d50404f2320cb134d87
 AUX inkscape-0.48.4-fix-member-decl.patch 336 SHA256 f80b2a534f0455e2b90c35f369c09c8f8d5cca21f3908e27bdf9fcb0bc4098d4 SHA512 7286c58a666396ae6c9f5664493c512985429872f3da82ea6ae6af33b97dae60e01cd8cc6d23c2ae2fcfc716b287c06cdf634c8740f4f4e6773b3f44785f88d7 WHIRLPOOL 317e8f22c21266f67c9cd56f3755edb66797f1bbf1d48e9282a774ee9294df71872a87ea76e578505d6d932c8c210ddce66ac04cfc897128c16afb40f8bd34a9
+AUX inkscape-0.48.4-gc74-configure.patch 558 SHA256 1d378b0d90f2bde6469a040d61e3dbd8ecfcdf3b8c6c086b5dc8eb744918c20e SHA512 04254fcb2f910e73b30c85de5bed9009ec51dd8936eafa49909a90b8e7b44cdee79a73fca9d043a8659bbd551cc3db26f6dc9155849b6ff3df0d2f73bd4b163c WHIRLPOOL 5b74b3a9cea371f8ae862fba4c9848f13a4d450e1a253b789634b3bbe88df9d86e3e501da04805d3d755e613e8439d79c1ac7ff515a3693cafe615d62effe7c9
+AUX inkscape-0.48.4-gc74.patch 2131 SHA256 e9f308ea08b76af028184fd9e6a3228c7efa57b75697eb65bb0edbf7d6d12f4b SHA512 d4b3189b19c41dff5e835e3ca5454cec7f962cfd5c3bd4098f4346913029bb00d8d8f4b61e6fe056059b3f059c91c350b610cc4d85c830293b5d3ed31202a317 WHIRLPOOL 9ddf564290eb9e7f7b281233c6cac7f1b46fdf338d88a0af699dd48077f10289a482c21ede8f3ceac71cca080b20691dac449b53063805f3d7ababb6b87efdde
 AUX inkscape-0.48.4-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
 DIST inkscape-0.48.4-freetype251.patch 355 SHA256 dfbd16faa4f27559561e3bad79b7ecbb3ea7d4824223cbfe2e2c1c2f429ce663 SHA512 4b629974954a6228586a4ddff2a1107b170348d6aa2a5886bf8422c44826ea4b6e1eea2e4fb886a6153029b371a33f56d4a62ecbbcb3c705456cca893d1986b7 WHIRLPOOL 2e419a35993dca56d6b6def94d5f58aea4b56fc100aedf52fe8e2c79a8d93ea8fbbe097197e51b962f015564b2316ce1798771ad038cf1ae48759ea2de0c4751
 DIST inkscape-0.48.4.tar.bz2 19712522 SHA256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d SHA512 55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be WHIRLPOOL 927dafd74c81c41ff794b22ed80fb6b6e8fcb60fc5f5b6d21ce222812cf6e34bcea9d415ee1f663d2685f64c1f89c4f62d8475da143d2763c53406d7b50f4053
-EBUILD inkscape-0.48.4-r1.ebuild 3057 SHA256 bd84c556e09eca42552a80a39ec9b66387f063e79ba6249dfb38da96fe905d87 SHA512 ffbb0bfe0aa094be8a5838fa94af6c164c56dc7e8aebc42bcf0c67074b2642717b275ec0291c421e52f83e4ccc5d1949e242f61a0077c34e7f72ed31bde23441 WHIRLPOOL ee974ab55fbb55e896a7e85593dc9b40da17c4063e2b4e30c22960d10e999ca0eb01a2fd32632483d2a56ea823afb30bfcef1d2926979ea2f371d0854d32699c
+EBUILD inkscape-0.48.4-r1.ebuild 3141 SHA256 e239c6facbd5644cb7eb0e5307051705629ca9fbefd93ec7b5facb535519f074 SHA512 e8c216d5ee7c667603379b9361c88df5b8f45f49e1b3429677056e35f9dddb67ff385dc885489d8b006402f348bcc950c13dd56dfba557b137849430fb9861c8 WHIRLPOOL d9bf9f3d2a1e18c222431cfacdb6f7bfbc462a84904d88b927a251dd64a606a6941c88b807b3f8fd71aef299035260d63a4e9a7f6d59ce1ebb464f9dede1d9a1
 EBUILD inkscape-0.48.4.ebuild 2587 SHA256 3802d97d446339961106577d5b1b7d5828d84fe377a635630c3b58596e635c50 SHA512 e979fa089a773fe5e07eca605036c58386a54f56daa3beda1d0b6c134a06b576df0a84e3cc2c4dd7aa7588424c6135440e4c4a45a2e90d15010e1d1dc38eebd0 WHIRLPOOL fb4d4dca9d58e576c87a45d05fb114f0416410bbd51d9eda51e64033b5c55d74e8db0505ba5a3f2b402aba0973825cebe69c8e06d72b5a5e3a551bcec9b0c945
-MISC ChangeLog 28635 SHA256 771941720fcf2da9ef93a2013454705040215b52577ae8f49cc9ad5ac923acaa SHA512 5d22104d0c73564d1da304b698eae410c8a14d9d0d6277b43fa792b4d35721007952e3cea22ee46a625fea54e8b2d6463b90f37a102ca206105bd5952f83e30f WHIRLPOOL 21f838aba885da8abc68f214070031738f869b67a4e8f9221a6ddc7924ad3a95fae99a4785f5e2ad627abe03fe47bbe874425fddbd9f538d303faea6ec036a87
+MISC ChangeLog 28856 SHA256 3d89175f12023ee5ca1161efd527d534d7371b6f70676b1b08f31960e3d21e2c SHA512 6e268477b7522e9f6f1f830342325a8c79c8d30f12c9e8c87b1055e0b487cf6c78db39c9cbb8807a191ccbe286c086674141c1ac4d60eaea6d2040afd1ef611f WHIRLPOOL 4f1b3c1061132b3c166f24416ba5cbd8ce752deb30c9e1ba2b1f9058837d47b31e21a7038de69f6471a4acb0ed287e181fe1fcd374f396437a1caa426da2d04c
 MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK8QwgACgkQkKaRLQcq0GKYJQCeP7nbm7U/0upY78yjBRqS+WjV
-hScAn0g/v+WaXDCUgQxTda9GsZj1URHL
-=xKjQ
+iQIcBAEBCgAGBQJSzTyNAAoJELnU8jG9FVirlOcP/itkRYRnumIEQmJ0xzJX6luc
+D16xumQ3aSp0iaiMb8SiZ4VxKhJmB6eqPIkbF0neozU59fqIkI+sLfEJ0pEaUUjy
+EfNJUbCnyizNw68Zsplid0X3BO5o3awWbL9VJzsegJr4i/dE4jJAwqH4sPItHWrI
+5u7Z9+Msvu1bB1UGU0crh1fgHMPXKQ9Fjpw7fqx7fiXfuyp2t1XzEDVUpVXuKgJa
+T1GK2nq3qUqsId1T1ZDFl86SKQDg+ljOUQaDqLcH61Poe4z4Je6MyOjZdGCY6kKV
+m6l3pDqy4mDjz4qET05qXP9FCNcmjFCsXqkP5LtHuHIGufj+vxTm28Pn8Eo8bgeo
+qPeCeUxM8WxIIukn7eius2yeQ4+I5ztsv1T/XZ0dFljg5/SzELFCXsustu0vTRyR
+fDqMq508aUuz7y5Noq+YvYOcZW4GZEMnRJ2cSyeKh0Y4Hzcsq4zQYTViVj7+tdH1
+PhW4ANlueVXxK/putLvQXrBO+LKnk2JcoTBIfloBEEpgziSvCUrY+wNNSV1P9SO9
+Ot2VCKImJDzKhil9IyJH1KEdFfhs5kQEM31ZvtvbuOjrdCKmCgNXY8HC8iiDpAwv
+frR7AagGOfgmr+/YfwhbtCPotgOSNO9AWjeyBklrvsyJccSW3wNI7YtyIvd89JsV
+QuynM8vxCZLTAsRTqqG5
+=mbIJ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch b/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch
new file mode 100644
index 000000000000..3ef7ce2c98b6
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch
@@ -0,0 +1,15 @@
+--- inkscape-0.48.4/configure.ac	2013-12-31 00:38:18.592732496 +0400
++++ inkscape-0.48.4/configure.ac	2013-12-31 00:39:13.558730872 +0400
+@@ -263,7 +263,11 @@
+ 			# include <gc.h>
+ 			#endif
+ 			#include <stdio.h>
+-			extern unsigned GC_version;
++			#if (GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 4)
++				unsigned GC_version = GC_get_version();
++			#else
++				extern unsigned GC_version;
++			#endif
+ 			int main(void){
+ 				unsigned min = ((6 << 16) | (4 << 8) | 0);
+ 				printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF);
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-gc74.patch b/media-gfx/inkscape/files/inkscape-0.48.4-gc74.patch
new file mode 100644
index 000000000000..41615ac49a30
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-gc74.patch
@@ -0,0 +1,54 @@
+--- inkscape-0.48.4/src/gc-core.h.old	2013-12-31 01:22:38.976653890 +0400
++++ inkscape-0.48.4/src/gc-core.h	2013-12-31 01:22:48.525653608 +0400
+@@ -57,7 +57,7 @@
+                                            CleanupFunc *old_func,
+                                            void **old_data);
+     int (*general_register_disappearing_link)(void **p_ptr,
+-                                              void *base);
++                                              const void *base);
+     int (*unregister_disappearing_link)(void **p_ptr);
+     std::size_t (*get_heap_size)();
+     std::size_t (*get_free_bytes)();
+--- inkscape-0.48.4/src/gc.cpp.old	2013-12-31 01:23:50.462651778 +0400
++++ inkscape-0.48.4/src/gc.cpp	2013-12-31 01:40:37.718622017 +0400
+@@ -70,8 +70,8 @@
+     return base + debug_base_fixup();
+ }
+ 
+-int debug_general_register_disappearing_link(void **p_ptr, void *base) {
+-    char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup();
++int debug_general_register_disappearing_link(void **p_ptr, const void *base) {
++    char *real_base=const_cast<char *>(reinterpret_cast<const char *>(base)) - debug_base_fixup();
+     return GC_general_register_disappearing_link(p_ptr, real_base);
+ }
+ 
+@@ -90,7 +90,7 @@
+     }
+ }
+ 
+-int dummy_general_register_disappearing_link(void **, void *) { return false; }
++int dummy_general_register_disappearing_link(void **, const void *) { return false; }
+ 
+ int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
+ 
+@@ -112,7 +112,11 @@
+     &GC_malloc_atomic_uncollectable,
+     &GC_base,
+     &GC_register_finalizer_ignore_self,
++#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
+     &GC_general_register_disappearing_link,
++#else
++    (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
++#endif
+     &GC_unregister_disappearing_link,
+     &GC_get_heap_size,
+     &GC_get_free_bytes,
+@@ -202,7 +206,7 @@
+     die_because_not_initialized();
+ }
+ 
+-int stub_general_register_disappearing_link(void **, void *) {
++int stub_general_register_disappearing_link(void **, const void *) {
+     die_because_not_initialized();
+     return 0;
+ }
diff --git a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
index 0abb86e89e9f..d2ab75bbcb56 100644
--- a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.7 2013/12/26 14:46:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.8 2014/01/08 11:54:52 jlec Exp $
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="xml"
 GCONF_DEBUG=no
@@ -13,17 +14,21 @@ MY_P=${P/_/}
 
 DESCRIPTION="A SVG based generic vector-drawing program"
 HOMEPAGE="http://www.inkscape.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+SRC_URI="
+	mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	https://launchpadlibrarian.net/157792073/1255830-fix-freetype-includes-backport-0.48.x-v1.diff -> ${P}-freetype251.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="dia gnome postscript inkjar lcms nls spell wmf"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
 	>=app-text/poppler-0.12.3-r3:=[cairo,xpdf-headers(+)]
 	dev-cpp/glibmm
 	>=dev-cpp/gtkmm-2.18.0:2.4
@@ -38,8 +43,6 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0
-	app-text/libwpd:0.9
-	app-text/libwpg:0.2
 	sci-libs/gsl
 	x11-libs/libX11
 	>=x11-libs/gtk+-2.10.7:2
@@ -64,9 +67,9 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
+	>=dev-util/intltool-0.29
 	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.29"
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
@@ -74,12 +77,15 @@ RESTRICT="test"
 
 src_prepare() {
 	gnome2_src_prepare
-	epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.48.0-spell.patch \
 		"${FILESDIR}"/${PN}-0.48.2-libwpg.patch \
 		"${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
 		"${FILESDIR}"/${PN}-0.48.4-epython.patch \
 		"${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch \
 		"${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \
+		"${FILESDIR}"/${P}-gc74-configure.patch \
+		"${FILESDIR}"/${P}-gc74.patch \
 		"${DISTDIR}"/${P}-freetype251.patch
 
 	sed -i \