Ungzipped and renamed gcc4 patch

(Portage version: 2.0.51.22-r2)

4 files changed, 53 insertions, 3 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 6d32b0a898c5..de69bf5567b3 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.88 2005/09/06 13:42:09 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.89 2005/09/07 20:48:49 stkn Exp $
+
+  07 Sep 2005; Stefan Knoblich <stkn@gentoo.org> +files/pwlib-1.8.4-gcc4.diff,
+  -files/pwlib-gcc4.gz, pwlib-1.8.4.ebuild:
+  Ungzipped and renamed gcc4 patch (origin unknown -> .diff).
 
   06 Sep 2005; Hanno Boeck <hanno@gentoo.org> +files/pwlib-gcc4.gz,
   pwlib-1.8.4.ebuild:
diff --git a/dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff b/dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff
new file mode 100644
index 000000000000..e15465854342
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff
@@ -0,0 +1,46 @@
+diff -Naur pwlib-1.8.4/include/ptlib/pprocess.h pwlib-1.8.4-gcc4/include/ptlib/pprocess.h
+--- pwlib-1.8.4/include/ptlib/pprocess.h	2004-06-30 14:17:04.000000000 +0200
++++ pwlib-1.8.4-gcc4/include/ptlib/pprocess.h	2005-09-06 15:06:16.032949750 +0200
+@@ -249,6 +249,7 @@
+ #include <ptlib/syncpoint.h>
+ #include <ptlib/pfactory.h>
+ 
++class PHouseKeepingThread;
+ 
+ /**Create a process.
+    This macro is used to create the components necessary for a user PWLib
+@@ -752,10 +753,10 @@
+ 
+     PArgList arguments;
+     // The list of arguments
+-
++  public:
+     PTimerList timers;
+     // List of active timers in system
+-
++  private:
+     PTime programStartTime;
+     // time at which process was intantiated, i.e. started
+ 
+diff -Naur pwlib-1.8.4/include/ptlib/timer.h pwlib-1.8.4-gcc4/include/ptlib/timer.h
+--- pwlib-1.8.4/include/ptlib/timer.h	2003-09-17 11:01:00.000000000 +0200
++++ pwlib-1.8.4-gcc4/include/ptlib/timer.h	2005-09-06 15:06:16.036950000 +0200
+@@ -123,6 +123,7 @@
+ #endif
+ 
+ class PThread;
++class PTimerList;
+ 
+ #include <ptlib/notifier.h>
+ 
+diff -Naur pwlib-1.8.4/include/ptlib/unix/ptlib/pprocess.h pwlib-1.8.4-gcc4/include/ptlib/unix/ptlib/pprocess.h
+--- pwlib-1.8.4/include/ptlib/unix/ptlib/pprocess.h	2004-05-23 23:11:39.000000000 +0200
++++ pwlib-1.8.4-gcc4/include/ptlib/unix/ptlib/pprocess.h	2005-09-06 15:06:16.036950000 +0200
+@@ -171,6 +171,7 @@
+     PDICTIONARY(ThreadDict, POrdinalKey, PThread);
+     ThreadDict activeThreads;
+     PMutex     threadMutex;
++  public:
+     int        timerChangePipe[2];
+     PHouseKeepingThread * housekeepingThread;
+ 
diff --git a/dev-libs/pwlib/files/pwlib-gcc4.gz b/dev-libs/pwlib/files/pwlib-gcc4.gz
deleted file mode 100644
index a8e3807bef46..000000000000
--- a/dev-libs/pwlib/files/pwlib-gcc4.gz
+++ /dev/null
diff --git a/dev-libs/pwlib/pwlib-1.8.4.ebuild b/dev-libs/pwlib/pwlib-1.8.4.ebuild
index 1e6c3efb93b1..a07d58a1b3ac 100644
--- a/dev-libs/pwlib/pwlib-1.8.4.ebuild
+++ b/dev-libs/pwlib/pwlib-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.6 2005/09/06 13:42:09 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.7 2005/09/07 20:48:49 stkn Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -31,7 +31,7 @@ DEPEND=">=sys-devel/bison-1.28
 src_unpack() {
 	unpack ${A}
 
-	epatch ${FILESDIR}/pwlib-gcc4.gz
+	epatch ${FILESDIR}/pwlib-1.8.4-gcc4.diff
 
 	cd ${S}/make