Added patch to compile with gcc34.

4 files changed, 33 insertions, 4 deletions

diff --git a/dev-libs/zthread/ChangeLog b/dev-libs/zthread/ChangeLog
index 904176825922..9f0878f479f1 100644
--- a/dev-libs/zthread/ChangeLog
+++ b/dev-libs/zthread/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/zthread
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.10 2004/06/03 16:39:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.11 2004/06/19 13:31:36 zul Exp $
+
+  19 Jun 2004; Chuck Short <zul@gentoo.org> zthread-2.2.10-r1.ebuild,
+  files/zthread-gcc34.patch:
+  Added patch to compile with gcc34. Closes #53742.
 
   03 Jun 2004; Aron Griffis <agriffis@gentoo.org> zthread-1.5.3.ebuild:
   Fix use invocation
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index 681497dfcaf2..b8d08a074732 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -1,7 +1,8 @@
 MD5 a0a1e434509e86f261fff6580592c7f1 zthread-1.5.3.ebuild 804
-MD5 2c6781403e20dc7705b884e239e348ee zthread-2.2.10-r1.ebuild 839
+MD5 1c51edf243f738b9c2d4f9606f25fe2b zthread-2.2.10-r1.ebuild 897
 MD5 b81ebf560cb866a75545d27f4066c7cd zthread-2.3.1.ebuild 739
-MD5 1245ea880c59313d3a80197140ef83ff ChangeLog 1343
+MD5 bb62a6c2471f92085e2362c01ca3a7e3 ChangeLog 1490
 MD5 4feee37e807073aafeeaafbc52797633 files/digest-zthread-1.5.3 65
 MD5 368ff02a9eb850ad51265d76953eb2e0 files/digest-zthread-2.3.1 65
+MD5 e7a8dff68ee9c400e82941b399176b6c files/zthread-gcc34.patch 819
 MD5 100fbefa1605a3be25b20d4d698fdf67 files/digest-zthread-2.2.10-r1 66
diff --git a/dev-libs/zthread/files/zthread-gcc34.patch b/dev-libs/zthread/files/zthread-gcc34.patch
new file mode 100644
index 000000000000..51c716b00abe
--- /dev/null
+++ b/dev-libs/zthread/files/zthread-gcc34.patch
@@ -0,0 +1,22 @@
+diff -Naur ZThread-2.2.10/src/posix/FastLock.h ZThread-2.2.10-gentoo/src/posix/FastLock.h
+--- ZThread-2.2.10/src/posix/FastLock.h	2002-07-02 20:23:05.000000000 +0000
++++ ZThread-2.2.10-gentoo/src/posix/FastLock.h	2004-06-18 11:20:01.038016496 +0000
+@@ -28,6 +28,7 @@
+ #include "zthread/Exceptions.h"
+ #include "zthread/NonCopyable.h"
+ #include <pthread.h>
++#include <assert.h>
+ 
+ namespace ZThread {
+ 
+diff -Naur ZThread-2.2.10/tests/ReadWriteTests.cxx ZThread-2.2.10-gentoo/tests/ReadWriteTests.cxx
+--- ZThread-2.2.10/tests/ReadWriteTests.cxx	2002-06-29 14:31:17.000000000 +0000
++++ ZThread-2.2.10-gentoo/tests/ReadWriteTests.cxx	2004-06-18 11:20:19.312238392 +0000
+@@ -3,6 +3,7 @@
+ #include "zthread/BiasedReadWriteLock.h"
+ 
+ #include <iostream>
++#include <assert.h>
+ using namespace std;
+ using namespace ZThread;
+ 
diff --git a/dev-libs/zthread/zthread-2.2.10-r1.ebuild b/dev-libs/zthread/zthread-2.2.10-r1.ebuild
index f812578d80df..4a639540489c 100644
--- a/dev-libs/zthread/zthread-2.2.10-r1.ebuild
+++ b/dev-libs/zthread/zthread-2.2.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.2.10-r1.ebuild,v 1.4 2004/03/14 12:28:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.2.10-r1.ebuild,v 1.5 2004/06/19 13:31:36 zul Exp $
 
 DESCRIPTION="a platform-independent object-oriented threading architecture"
 HOMEPAGE="http://www.cs.buffalo.edu/~crahen/projects/zthread/"
@@ -15,6 +15,8 @@ DEPEND="virtual/glibc"
 S=${WORKDIR}/ZThread-${PV}
 
 src_compile() {
+	epatch ${FILESDIR}/zthread-gcc34.patch || die "patch failed."
+
 	local myconf=""
 	use debug \
 		&& myconf="--enable-debug=yes" \