add mutex crash fix patch as well

Package-Manager: portage-2.1.5_rc2

4 files changed, 22 insertions, 8 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 8b878933fa41..05c04f83f733 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,12 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.177 2008/04/11 20:16:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.178 2008/04/11 20:18:40 cardoe Exp $
 
 *cairo-1.6.2 (11 Apr 2008)
 
   11 Apr 2008; Doug Goldstein <cardoe@gentoo.org>
   +files/cairo-1.6.2-fix-g++-linking.patch, +cairo-1.6.2.ebuild:
-  add working cairo 1.6.x release with g++ linking patch
+  add working cairo 1.6.x release with g++ linking patch and mutex crash fix
 
 *cairo-1.5.20 (08 Apr 2008)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 7982b22e7955..64add2ff04f2 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX cairo-1.6.2-fix-g++-linking.patch 600 RMD160 63079ada4eaa24e61427d7df45e6e1361a733bb6 SHA1 a481f4e35539e39c88812767bcd1459315c169a3 SHA256 bb49dacab2649648a061ca661d3fc65f38753b8f8f8c36b2f8702b5aa96f43e0
+AUX cairo-1.6.2-mutex-crash-fix.patch 484 RMD160 5fbbca323358c014112a1a895ad36771323e5233 SHA1 3ad160f7bb84bad242b929a56debbd9901b79274 SHA256 b6fc7c72c2ad066f1ac4db459dbd3ca940008a6f110ae244990792bb6ec448f0
 DIST cairo-1.4.12.tar.gz 3276610 RMD160 5ed65d5872c0561f3392e60007898d9360d83d0a SHA1 45d5257e5a0c1524bcc25660a96b2c79d012ad3f SHA256 a1a1e4ccec8da980141d903adbe83535481b4fda96a479456438d3dfbc767d5d
 DIST cairo-1.4.14.tar.gz 3283608 RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd SHA1 63310243ba8af949060b06c01fc28ee5471ed5a4 SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
 DIST cairo-1.5.18.tar.gz 4997107 RMD160 0c0382a51a7ec60f16f54d1691590a3ca4de6fc0 SHA1 68d9e7fed9158d8584cf8a7831fe7b3441f7970f SHA256 ccb82a7ff945b49ab842340ab28ce2b41acb23f3a6a1a40387c7f56b9e27e0e0
@@ -11,13 +12,13 @@ EBUILD cairo-1.4.12.ebuild 1968 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c
 EBUILD cairo-1.4.14.ebuild 1972 RMD160 06f0ae6196b41ff259db656903356373a25d1ba8 SHA1 bff03a7c214146b57d4e68b21d52c27f05097667 SHA256 3537f26ed2da98a84bd1cc039d0e3f1c8c5fe540fca00832b16a07b2e748fb24
 EBUILD cairo-1.5.18.ebuild 2075 RMD160 f9daa90cdf6ed9fbaf21719b852ef2b0a9a8a135 SHA1 1a913aae722ce7f522023c5ea182b6cc016aec05 SHA256 0e0c3e457eb7843726f30dc1b4d159529f7e73e7ffaa9caaf4f8fbb01a2cf94e
 EBUILD cairo-1.5.20.ebuild 2075 RMD160 ef670c8bda3bf06fd664177375d94c8c0a98c49d SHA1 2f405f48c5666418d0d8ee355f7a924d9ee67f3f SHA256 f9a9b133b2bbea13318498f0aec1835a334ab131244029e4c1acbc33d52d03dc
-EBUILD cairo-1.6.2.ebuild 2147 RMD160 7256b1e84df2fd4ba6a4bf3643de969f3e0158d5 SHA1 fac236f77a130bade483eba66dc9e16ad17dd6bd SHA256 cc06497cd3390d16a99735d17f70a9c486250bd1108851c7dd7ed7c902937768
-MISC ChangeLog 24810 RMD160 c2f82e2dfbd36deb0759f6afb5408faead8a83db SHA1 9e92def799ec404d0d3f2d85a00b206ea0820ec0 SHA256 b8415439315782141e9337dfdef04b64ae63fabf208841d1186b8d45f627af8d
+EBUILD cairo-1.6.2.ebuild 2203 RMD160 9258856f37565d055761df000e006eac755d7b4a SHA1 42a13dcf9f02deb8c33801ce1911a5ec6ed6b9b4 SHA256 57b5f2def6ae1e21d86581a5d121821ad855e1587b356566b1aa38eef53babd9
+MISC ChangeLog 24830 RMD160 d6f18264019cfd49fc360fb9dbbee4063671a509 SHA1 d8779571fefcd5ce3672a68c93e60e73d377d2e4 SHA256 daeb138f7290986032462f6f9b25e9e0e677d54625ec56bf45856eca7e68aa2e
 MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf/xy8ACgkQoeSe8B0zEfwkeQCfeWxrA0bL0AzFgH/DmlvxLak6
-1YUAni0nfQVdR0NuLbst0add0bGyobd5
-=IVQ4
+iEYEARECAAYFAkf/x6YACgkQoeSe8B0zEfytVgCeOQ8CU5tnaNl/TI3R/XnhK0RC
+03UAn0nFVU3dNHpSTu/uN2TFuNm/ofWL
+=fqAw
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.6.2.ebuild b/x11-libs/cairo/cairo-1.6.2.ebuild
index 93132d3bd6ea..b3d85da8cb5f 100644
--- a/x11-libs/cairo/cairo-1.6.2.ebuild
+++ b/x11-libs/cairo/cairo-1.6.2.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/x11-libs/cairo/cairo-1.6.2.ebuild,v 1.1 2008/04/11 20:16:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.2.ebuild,v 1.2 2008/04/11 20:18:40 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -53,6 +53,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-1.6.2-fix-g++-linking.patch
+	epatch "${FILESDIR}"/${PN}-1.6.2-mutex-crash-fix.patch
 
 	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
 	elibtoolize
diff --git a/x11-libs/cairo/files/cairo-1.6.2-mutex-crash-fix.patch b/x11-libs/cairo/files/cairo-1.6.2-mutex-crash-fix.patch
new file mode 100644
index 000000000000..4632ea1ff5ac
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.6.2-mutex-crash-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c

+index c456b16..60421cd 100644

+--- a/src/cairo-xlib-screen.c

++++ b/src/cairo-xlib-screen.c

+@@ -400,6 +400,7 @@ _cairo_xlib_screen_get_gc (cairo_xlib_screen_info_t *info, int depth)

+     gc = info->gc[depth];

+     info->gc[depth] = NULL;

+     needs_reset = info->gc_needs_clip_reset & (1 << depth);

++    info->gc_needs_clip_reset &= ~(1 << depth);

+     CAIRO_MUTEX_UNLOCK (info->mutex);

+ 

+     if (needs_reset)