Fix building against pthreads-win32 (bug #407371, thanks to Nathan Phillip Brink (binki)).

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 48 insertions, 9 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 74253b528033..785d62e50c97 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.336 2012/03/03 19:45:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.337 2012/03/08 06:59:48 tetromino Exp $
+
+  08 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libxml2-2.7.8-r5.ebuild, +files/libxml2-2.7.8-windows-thread_t.patch:
+  Fix building against pthreads-win32 (bug #407371, thanks to Nathan Phillip
+  Brink (binki)).
 
   03 Mar 2012; Raúl Porcel <armin76@gentoo.org> libxml2-2.7.8-r5.ebuild:
   arm/ia64/m68k/s390/sh/sparc stable wrt #405261
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index eb1f1e3591f9..219847ad7167 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libxml2-2.7.1-catalog_path.patch 2209 RMD160 0306a8611cde6a7b78f5fd43c93ebbfddc6607e7 SHA1 bec0ee91757e2fa093c89d6eba1821f40878f002 SHA256 b3343f0611f9cb6e55bf62047a988653e3e9cc50f194b18adbc330b455236290
 AUX libxml2-2.7.2-winnt.patch 2120 RMD160 943293107d0c8313a525c2516f06861c013d9777 SHA1 4e68c44fe1b932c7d61b06bffb4d634701e29e0a SHA256 63cb134dbef1b7be1b9dc400da8aef1816436a193a2f97db0028cdd70e3e4cf0
@@ -10,6 +10,7 @@ AUX libxml2-2.7.8-hardening-xpath.patch 7579 RMD160 2a3739e9de88af87f866a0a65642
 AUX libxml2-2.7.8-hash-randomization.patch 9234 RMD160 4ba7306793d3c57a9febfacca3a7e931b8031ad4 SHA1 d6256c55c6bdaca7c8bbf9b305f60cd75d8452f0 SHA256 4ba25eb0d32d91321570e360906c4ec2899ec416c1e872c6e23a280fa4ed120f
 AUX libxml2-2.7.8-reactivate-script.patch 628 RMD160 7c0da0a849af6f98e176acd595b8cf8fcc3e41e8 SHA1 90cd59c02e8043a66eb37b06c261a49c08f907cf SHA256 379102cf7547c47fdcc94daecb310e55b80bd157ea5280d72194eedf9ad371de
 AUX libxml2-2.7.8-reallocation-failures.patch 3465 RMD160 4faa06af94d418fb33b5aa0791e5f320287c073e SHA1 9b275f97479b74c0af94560ed8e1d0c894ad4701 SHA256 8a115c7ead8612ff7f8bd1e36615ebf20dbe42d3e79f216ee66d5cf6a59f02d6
+AUX libxml2-2.7.8-windows-thread_t.patch 921 RMD160 497a4ba51f1717ff543d59874a2fc846c04e2051 SHA1 537eecd4b5dd10d6612722931ed5750d03a23c58 SHA256 79c0dc3e73cbae032244ad96a2a0ba359e8f1625ab876d6f5b63e268591e3a6b
 AUX libxml2-2.7.8-xpath-freeing.patch 1042 RMD160 ecd781d93ba067cea9448ef02e408c2002ce019c SHA1 87eff7814372ef5dd224c7079106cf1fcb35bf3f SHA256 655a1cd96df3bcbd02e3a7fe9b812ee7e116dea036a9a5bfb529be714f288e87
 AUX libxml2-2.7.8-xpath-freeing2.patch 885 RMD160 d2c0c1e1b55ddc7ba5ccae8d7795b07887937cbd SHA1 fc67cc2c8e7a703f5cf01460dca5f828d42f5ab0 SHA256 112e93fb8c4f76e74b705d709ae741f33228cad82ba3bd2f55524af2fd863bfd
 AUX libxml2-2.7.8-xpath-memory.patch 889 RMD160 bff2a0a59e7d8f82a915d65b084a93902bfdaf99 SHA1 17adc8c2fb6ded205c2eb746ed9506cf696e412e SHA256 919a7dd27fd22cd30d8301d3ca8a8f8a8f971d4494c9914f7f8e6531216be5a1
@@ -17,13 +18,13 @@ DIST libxml2-2.7.8.tar.gz 4881808 RMD160 30709622cfe3e2175e73d6701b7e19a25ab5ac4
 DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914
 DIST xsts-2004-01-14.tar.gz 2761085 RMD160 faff2d7826e47ae9968564bc83dab1b54c5e4bf6 SHA1 5896c2aa2cda464246306c5cf0577ed506eefaab SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17
 EBUILD libxml2-2.7.8-r4.ebuild 6805 RMD160 d2932ca6955a2f3e4dab9707f0b8883530ef8c1d SHA1 70bb58899896dd4b7d2f71e78ba9603c99a8e8d1 SHA256 faa2f431e5ffa037c3e6240621e1cf821b1a78264f6f1a747033c6fe9afa9786
-EBUILD libxml2-2.7.8-r5.ebuild 6913 RMD160 4fc310d939f1357e7055fec82d6ba1c957d0b993 SHA1 b161d28226d6b22f2310506da7c7000795eee7f6 SHA256 cb3504702079a1f0ab0334d5979fa92b6abf37061f724779b092ef8c2b66f78a
-MISC ChangeLog 46004 RMD160 e8d3a8fa1763df0927875d78976bc298be5bc203 SHA1 ea2c3409dc48af1b6267ee4dc722474b051da9df SHA256 a4c8ba5bcfddebbd51fc23c5ad69081f3815b734e778b7843aa3de3b5c4877eb
+EBUILD libxml2-2.7.8-r5.ebuild 7018 RMD160 072bcbf9a0d9e313e549f5fd48760908d76ad069 SHA1 fe87c893faee3347602d697fc75d3c392f816836 SHA256 3abe53e15ddb09e59252c209cf2424212d9b2dabb1a18e69b50bcc9075193394
+MISC ChangeLog 46233 RMD160 58f3ae4711a1fb515dd6a7b81e578a45a358500f SHA1 b3a97b3de67b32ec56b7b1abecc18a2a9e508cc3 SHA256 c871837b0d99964434afbcd016b7dbedece56ce747bb8bcf539f993288fd752e
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9SdPAACgkQuQc30/atMkCvJwCgjk2Uc4Z33RaqhagxFOXvRkLB
-YGoAniVrrSWhlXYwdCNAiixtrunvp2gv
-=anRB
+iF4EAREIAAYFAk9YWOoACgkQdjK8w9WeBnCZLwD/Q1/R9nRElTaxzB58mDnul4d8
+pTpNhFzxHKQFZ3OV78YA/iN+cjkRA7hHedKnXyPpb2AT31QWww/xQPY+dmH8BnBM
+=vWpD
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/files/libxml2-2.7.8-windows-thread_t.patch b/dev-libs/libxml2/files/libxml2-2.7.8-windows-thread_t.patch
new file mode 100644
index 000000000000..7916917005e3
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.7.8-windows-thread_t.patch
@@ -0,0 +1,30 @@
+From d794a84a9e147498069b4c582d57b899bf068187 Mon Sep 17 00:00:00 2001
+From: "Andrew W. Nosenko" <andrew.w.nosenko@gmail.com>
+Date: Mon, 15 Nov 2010 13:00:29 +0100
+Subject: [PATCH] 599241 fix an initialization problem on Win64
+
+as the thread_t is not an integral datatype on that platform
+---
+ testThreads.c |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/testThreads.c b/testThreads.c
+index b43cbd0..bff5391 100644
+--- a/testThreads.c
++++ b/testThreads.c
+@@ -105,10 +105,8 @@ main(void)
+     for (repeat = 0;repeat < 500;repeat++) {
+ 	xmlLoadCatalog(catalog);
+ 
+-	for (i = 0; i < num_threads; i++) {
+-	    results[i] = NULL;
+-	    tid[i] = (pthread_t) -1;
+-	}
++        memset(results, 0, sizeof(*results)*num_threads);
++        memset(tid, 0xff, sizeof(*tid)*num_threads);
+ 
+ 	for (i = 0; i < num_threads; i++) {
+ 	    ret = pthread_create(&tid[i], NULL, thread_specific_data,
+-- 
+1.7.8.5
+
diff --git a/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild b/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild
index d06bb45519c7..27668e6f6c04 100644
--- a/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild,v 1.8 2012/03/03 19:45:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild,v 1.9 2012/03/08 06:59:48 tetromino Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -93,6 +93,9 @@ src_prepare() {
 	# Make hash functions less predictable to prevent DoS
 	epatch "${FILESDIR}/${P}-hash-randomization.patch"
 
+	# Fix building against pthreads-win32, bug #407371
+	epatch "${FILESDIR}/${P}-windows-thread_t.patch"
+
 	# Please do not remove, as else we get references to PORTAGE_TMPDIR
 	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
 	# We now need to run eautoreconf at the end to prevent maintainer mode.