pwlib-1.2.20 for new gnomemeeting

4 files changed, 183 insertions, 2 deletions

diff --git a/dev-libs/pwlib/files/digest-pwlib-1.2.20 b/dev-libs/pwlib/files/digest-pwlib-1.2.20
new file mode 100644
index 000000000000..b6d185b6ef84
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.2.20
@@ -0,0 +1 @@
+MD5 3005d79ac66c6d1278df4ca9d9e552d2 pwlib_1.2.20.tar.gz 842660
diff --git a/dev-libs/pwlib/files/pwlib-1.2.20.diff b/dev-libs/pwlib/files/pwlib-1.2.20.diff
new file mode 100644
index 000000000000..79a4ea0888e2
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.2.20.diff
@@ -0,0 +1,128 @@
+diff -urN pwlib-orig/include/ptclib/asner.h pwlib/include/ptclib/asner.h
+--- pwlib-orig/include/ptclib/asner.h	Tue May 28 19:22:35 2002
++++ pwlib/include/ptclib/asner.h	Wed Jul  3 13:45:56 2002
+@@ -535,8 +535,8 @@
+     operator const PBYTEArray &() const { return value; }
+     operator const BYTE *() const { return value; }
+     PString AsString() const;
+-    BYTE operator[](PINDEX i) const { return value[i]; }
+-    BYTE & operator[](PINDEX i) { return value[i]; }
++    BYTE operator[](int i) const { return value[(PINDEX) i]; }
++    BYTE & operator[](int i) { return value[(PINDEX) i]; }
+     BYTE * GetPointer(PINDEX sz = 0) { return value.GetPointer(sz); }
+     PINDEX GetSize() const { return value.GetSize(); }
+     BOOL SetSize(PINDEX newSize);
+diff -urN pwlib-orig/include/ptlib/array.h pwlib/include/ptlib/array.h
+--- pwlib-orig/include/ptlib/array.h	Thu Feb 14 16:37:53 2002
++++ pwlib/include/ptlib/array.h	Wed Jul  3 13:46:03 2002
+@@ -406,8 +406,8 @@
+        value at the array position.
+      */
+     T operator[](
+-      PINDEX index  /// Position on the array to get value from.
+-    ) const { return GetAt(index); }
++      int index  /// Position on the array to get value from.
++    ) const { return GetAt((PINDEX) index); }
+ 
+     /**Get a reference to value from the array. If the #index# is
+        beyond the end of the allocated array then the array is expanded. If a
+@@ -420,8 +420,9 @@
+        reference to value at the array position.
+      */
+     T & operator[](
+-      PINDEX index  /// Position on the array to get value from.
+-    ) { PASSERTINDEX(index); PAssert(SetMinSize(index+1), POutOfMemory);
++      int i  /// Position on the array to get value from.
++    ) { PINDEX index =i; 
++       PASSERTINDEX(index); PAssert(SetMinSize(index+1), POutOfMemory);
+         return ((T *)theArray)[index]; }
+ 
+     /**Get a pointer to the internal array. The user may not modify the
+@@ -508,10 +509,10 @@
+     inline P_##cls##_Base_Type GetAt(PINDEX index) const \
+       { PASSERTINDEX(index); return index < GetSize() ? \
+           ((P_##cls##_Base_Type*)theArray)[index] : (P_##cls##_Base_Type)0; } \
+-    inline P_##cls##_Base_Type operator[](PINDEX index) const \
+-      { PASSERTINDEX(index); return GetAt(index); } \
+-    inline P_##cls##_Base_Type & operator[](PINDEX index) \
+-      { PASSERTINDEX(index); PAssert(SetMinSize(index+1), POutOfMemory); \
++    inline P_##cls##_Base_Type operator[](int index) const \
++      { PASSERTINDEX(index); return GetAt((PINDEX) index); } \
++    inline P_##cls##_Base_Type & operator[](int i) \
++      { PINDEX index = i; PASSERTINDEX(index); PAssert(SetMinSize(index+1), POutOfMemory); \
+         return ((P_##cls##_Base_Type *)theArray)[index]; } \
+     inline void Attach(const P_##cls##_Base_Type * buffer, PINDEX bufferSize) \
+       { PAbstractArray::Attach(buffer, bufferSize); } \
+diff -urN pwlib-orig/make/unix.mak pwlib/make/unix.mak
+--- pwlib-orig/make/unix.mak	Fri May 31 00:37:22 2002
++++ pwlib/make/unix.mak	Wed Jul  3 13:46:11 2002
+@@ -565,6 +565,9 @@
+ 
+ ifeq ($(OSTYPE),linux)
+ 
++# We want to be GCC 3.1 compatible
++STDCCFLAGS      += -DGCC3 -D__USE_STL__
++
+ # i486 Linux for x86, using gcc 2.7.2
+ STDCCFLAGS	+= -DP_LINUX
+ 
+@@ -1112,7 +1115,16 @@
+ PW_LIBDIR	= $(PWLIBDIR)/lib
+ 
+ # set name of the PT library
+-PTLIB_BASE	= pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
++ifeq ($(findstring $(OBJ_SUFFIX),d),)
++ifeq ($(LIB_SUFFIX),a)
++PTLIB_BASE      = pt
++else
++PTLIB_BASE      = pt$(LIBPTCOMPAT)
++endif
++LIB_TYPE        =
++else
++PTLIB_BASE      = pt_$(OBJ_SUFFIX)
++endif
+ PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
+ PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
+ PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
+diff -urN pwlib-orig/src/ptlib/common/osutils.cxx pwlib/src/ptlib/common/osutils.cxx
+--- pwlib-orig/src/ptlib/common/osutils.cxx	Thu May 30 22:10:44 2002
++++ pwlib/src/ptlib/common/osutils.cxx	Wed Jul  3 13:46:21 2002
+@@ -877,12 +877,12 @@
+      stderr is used the unitbuf flag causes the out_waiting() not to work so we 
+      must suffer with blank lines in that case.
+    */
+-  if ((s.flags()&ios::unitbuf) != 0 || s.rdbuf()->out_waiting() > 0) {
++  //if ((s.flags()&ios::unitbuf) != 0 || s.rdbuf()->out_waiting() > 0) {
+     if ((PTraceOptions&SystemLogStream) != 0)
+       s.flush();
+     else
+       s << endl;
+-  }
++ // }
+ 
+   PTraceMutex->Signal();
+ 
+diff -urN pwlib-orig/src/ptlib/common/sockets.cxx pwlib/src/ptlib/common/sockets.cxx
+--- pwlib-orig/src/ptlib/common/sockets.cxx	Wed May 22 01:18:46 2002
++++ pwlib/src/ptlib/common/sockets.cxx	Wed Jul  3 13:46:28 2002
+@@ -805,6 +805,8 @@
+ 
+ PSocket::PSocket()
+ {
++  SetReadTimeout(10000);
++  SetWriteTimeout(10000);
+   port = 0;
+ }
+ 
+diff -urN pwlib-orig/src/ptlib/unix/channel.cxx pwlib/src/ptlib/unix/channel.cxx
+--- pwlib-orig/src/ptlib/unix/channel.cxx	Sat Jan 26 16:58:15 2002
++++ pwlib/src/ptlib/unix/channel.cxx	Wed Jul  3 13:46:37 2002
+@@ -354,7 +354,7 @@
+   return stat;
+ }
+ 
+-PString PChannel::GetErrorText(Errors normalisedError, int osError = 0)
++PString PChannel::GetErrorText(Errors normalisedError, int osError)
+ {
+   if (osError == 0) {
+     if (normalisedError == NoError)
diff --git a/dev-libs/pwlib/pwlib-1.2.20.ebuild b/dev-libs/pwlib/pwlib-1.2.20.ebuild
new file mode 100644
index 000000000000..a3831b453b74
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.2.20.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.2.20.ebuild,v 1.1 2002/07/03 21:30:09 drobbins Exp $
+
+S="${WORKDIR}/${PN}"
+DESCRIPTION="Libs needed for GnomeMeeting"
+SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
+HOMEPAGE="http://www.openh323.org"
+DEPEND="virtual/glibc >=sys-devel/bison-1.28 >=sys-devel/flex-2.5.4a"
+SLOT="1.2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/pwlib-1.2.20.diff || die
+}
+
+src_compile() {
+	cd ${S}
+	export PWLIBDIR=${S}
+	export PWLIB_BUILD="yes"
+	make optshared || die
+	cd tools/asnparser
+	make optshared || die
+}
+
+src_install() {
+	mkdir -p ${D}/usr/lib
+	mkdir -p ${D}/usr/include/ptclib
+	mkdir -p ${D}/usr/include/ptlib/unix/ptlib
+	mkdir -p ${D}/usr/share/pwlib
+	cd ${S}	
+	cp -a lib/*so* ${D}/usr/lib
+	cp -a include/ptlib.h ${D}/usr/include
+	cp -a include/ptlib/*.h ${D}/usr/include/ptlib/
+	cp -a include/ptlib/*.inl ${D}/usr/include/ptlib/	
+	cp -a include/ptlib/unix/ptlib/*.h ${D}/usr/include/ptlib/unix/ptlib
+	cp -a include/ptlib/unix/ptlib/*.inl ${D}/usr/include/ptlib/unix/ptlib
+	cp -a include/ptclib/*.h ${D}/usr/include/ptclib/
+
+	cp -a * ${D}/usr/share/pwlib/
+	rm -rf ${D}/usr/share/pwlib/make/CVS
+	#cp -a tools/* ${D}/usr/share/pwlib/tools/
+        rm -rf ${D}/usr/share/pwlib/tools/CVS
+	rm -rf ${D}/usr/share/pwlib/tools/asnparser/CVS
+	rm -rf ${D}/usr/share/pwlib/src
+	rm -rf ${D}/usr/share/pwlib/include/CVS
+	rm -rf ${D}/usr/share/pwlib/include/ptlib/unix/CVS
+	rm -rf ${D}/usr/share/pwlib/include/ptlib/CVS
+	cd ${D}/usr/lib
+	ln -sf libpt.so.${PV} libpt.so
+}
diff --git a/dev-libs/pwlib/pwlib-1.3.1.ebuild b/dev-libs/pwlib/pwlib-1.3.1.ebuild
index 62af20b98801..eb2a928be630 100644
--- a/dev-libs/pwlib/pwlib-1.3.1.ebuild
+++ b/dev-libs/pwlib/pwlib-1.3.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.3.1.ebuild,v 1.2 2002/07/03 18:33:26 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.3.1.ebuild,v 1.3 2002/07/03 21:30:09 drobbins Exp $
 
 S="${WORKDIR}/${PN}"
 DESCRIPTION="Libs needed for GnomeMeeting"
 SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
 HOMEPAGE="http://www.openh323.org"
-
+SLOT="1.3"
 DEPEND="virtual/glibc >=sys-devel/bison-1.28 >=sys-devel/flex-2.5.4a"
 
 src_compile() {