Added patch to fix compilation-problems with USE="icon -threads" (bug #218964, thanks to Kai Blaschke)

Package-Manager: portage-2.1.5.4

4 files changed, 26 insertions, 5 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index 1a9bca534121..9e19a4cae8e5 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xerces-c
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.57 2008/06/07 14:35:25 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.58 2008/06/07 19:53:10 dev-zero Exp $
+
+  07 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/xerces-c-2.8.0-IconvGNUTransService.cpp.patch,
+  xerces-c-2.8.0.ebuild:
+  Added patch to fix compilation-problems with USE="icon -threads" (bug
+  #218964, thanks to Kai Blaschke)
 
   07 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
   xerces-c-2.7.0-r1.ebuild:
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index eb09f0f68db0..5b1b3683ea18 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -2,12 +2,13 @@ AUX 50xerces-c 43 RMD160 b69c19f1ee7be74447f08ad633c0dd4bc0ce4954 SHA1 bf05f4e51
 AUX xerces-c-2.7.0-libpath.patch 1586 RMD160 44df40b77aefb2d446e84940f06420bb5dce8e21 SHA1 defaad81f4044b03aedc2d38da6e83725f5d0f61 SHA256 c981098908bb4acdb4f3d893983bed113e0d8fc2be717bcff4458261017b26cd
 AUX xerces-c-2.7.0-multilib.patch 3267 RMD160 2fbd2a9400ff4bf962c04667b825945eca2e6c8d SHA1 6a9760ab87c309e401574b5bd6652a87b568f253 SHA256 5b070554239570f31c1fe6736a69b45305e03bf34166ba3ca813c8e92aee47ca
 AUX xerces-c-2.8.0-64bit_cast.patch 727 RMD160 b0cc302d30c95f324e474a802ad4f14eba57e1c9 SHA1 218b982f7b9c6cf086bd17a392b2c036769677a4 SHA256 74cc58e469980c32a1161941b69a9e18362e983687a5979ee4ab1fd1d83699d8
+AUX xerces-c-2.8.0-IconvGNUTransService.cpp.patch 381 RMD160 0c7795b47869d1b37d9332903721612f267fb096 SHA1 c058f789343406e5c870f2ca44d184a4a2e99e67 SHA256 bc6dcda04bd804aed20bee6cbe342759c9f4b642665580f4b17bb5e530522f70
 AUX xerces-c-2.8.0-icu_ressource_fix.patch 1924 RMD160 f994c6003136494672aceaa072ceb7ccc74f7a42 SHA1 fac51469c89c279fed291067ed1d2c1cab660616 SHA256 88b8ee0ec3fd5974c4ccf8d599d91932a1e15ef84927331f42fbce46f7f51046
 AUX xqilla-xercesc_content_type.patch 65395 RMD160 8335d58163b813d4e7ba94b406039e1f6d51e164 SHA1 0a30ee2b6d1192aaeb7c1b7159cec3a1a9588b12 SHA256 60978dd2db53197c8166c92918045c33fe395e440948219e8db11e8e98b0149e
 AUX xqilla-xercesc_regex.patch 46363 RMD160 152e646713a6cc9a75033d94b749d84ad319e143 SHA1 30bc755ebff51e069f9b7a3778e96549859708f7 SHA256 3c2ad2a107ff8b27ab719571b60cb786c4967c2796343928d9ecd3adb3e87d24
 DIST xerces-c-src_2_7_0.tar.gz 7760004 RMD160 80914da4898c694bf0299d612164483f83857baf SHA1 56f9587f33fca0a573a45f07762e3262a255d73f SHA256 77fae8a1e7aa58007115c939aa68fd5028da79c481fc457dfce546b50c9dfda5
 DIST xerces-c-src_2_8_0.tar.gz 7893039 RMD160 d576df7870b043a338358834a0e1180dca39e838 SHA1 f0803b1330daec3f44b17dee64c3c99de6b3cd3e SHA256 416eaf74bbe6ff3b3c64a282e886810cad6cbb48478d3c83344661504c09c8d6
 EBUILD xerces-c-2.7.0-r1.ebuild 1522 RMD160 c0e82972a2aec92f2f02b07b46f8b0b5d813f285 SHA1 3901b46df422c1bc4505596a6ef7dadcd64f9cdd SHA256 89ff6c8601cf1bc4885e836d62f0d1bef9bcd6318c19f22e17a52e502b1e8776
-EBUILD xerces-c-2.8.0.ebuild 4839 RMD160 a989391c6cf487eb3303b2c558b19c965dc43571 SHA1 41be449e15a7325845031965f6557ad91791b6a8 SHA256 6a1a6f49d61e78b64a182daaa584ea72adaad3f02ad45181a7e415d83d3f36f1
-MISC ChangeLog 9017 RMD160 dd22f3e191264d5b030f46660bc498193f934980 SHA1 168e201d5b480c589131e7025cec8ddf473e34cf SHA256 5a31f5e3a53bbb6590a65b4ac82a7d8636fa414f42ba1b314e9f386a22afef5e
+EBUILD xerces-c-2.8.0.ebuild 4893 RMD160 86adf7e68823d86cfdb5bdacedfd6f19caeb9627 SHA1 886a13b7d3c3a85a03eeb670d31bb957da82f642 SHA256 32076aa87167c90ed42a77011a7ea345c53e228a04bcbb5db162ea4d281d46c6
+MISC ChangeLog 9259 RMD160 51216ccf174da8d421612b2e153f6bacd4d9d28d SHA1 a70a29e8808562fc0d37102251c0f2c530a10dc5 SHA256 21e2fd0d4fb956c8f7b9153089b4043dc43b2f09fc32f313dd2b010ca10d4ab0
 MISC metadata.xml 964 RMD160 4f84e3f119473a1d383dbb7a0dee32720ac1dbca SHA1 6d2371cf7164435b472a9e403ceccab016478e20 SHA256 f06bfb193802e9385300bd9b8cab0203a5c44d43eb87d6d9465e34f1d503c75d
diff --git a/dev-libs/xerces-c/files/xerces-c-2.8.0-IconvGNUTransService.cpp.patch b/dev-libs/xerces-c/files/xerces-c-2.8.0-IconvGNUTransService.cpp.patch
new file mode 100644
index 000000000000..d7b7426b33e0
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-2.8.0-IconvGNUTransService.cpp.patch
@@ -0,0 +1,13 @@
+--- /src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.orig.cpp	Mon Jun  4 18:17:26 2007
++++ /src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp	Mon Jun  4 18:25:22 2007
+@@ -429,8 +427,10 @@
+ 
+ void reinitIconvGNUMutex()
+ {
++#if !defined(APP_NO_THREADS)
+     delete gIconvMutex;
+     gIconvMutex = 0;
++#endif
+ }
+ 
+ IconvGNUTransService::IconvGNUTransService()
diff --git a/dev-libs/xerces-c/xerces-c-2.8.0.ebuild b/dev-libs/xerces-c/xerces-c-2.8.0.ebuild
index 07c162c75dc9..bbaa9612b99c 100644
--- a/dev-libs/xerces-c/xerces-c-2.8.0.ebuild
+++ b/dev-libs/xerces-c/xerces-c-2.8.0.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/dev-libs/xerces-c/xerces-c-2.8.0.ebuild,v 1.4 2008/05/22 13:50:10 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.8.0.ebuild,v 1.5 2008/06/07 19:53:10 dev-zero Exp $
 
 EAPI="1"
 
@@ -60,7 +60,8 @@ src_unpack() {
 
 	epatch \
 		"${FILESDIR}/${P}-64bit_cast.patch" \
-		"${FILESDIR}/${P}-icu_ressource_fix.patch"
+		"${FILESDIR}/${P}-icu_ressource_fix.patch" \
+		"${FILESDIR}/${P}-IconvGNUTransService.cpp.patch"
 
 	use xqilla && epatch \
 		"${FILESDIR}/xqilla-xercesc_content_type.patch" \