add xml patch, #74279

7 files changed, 58 insertions, 36 deletions

diff --git a/net-p2p/dclib/ChangeLog b/net-p2p/dclib/ChangeLog
index 0297d6f56de9..e251a626c83d 100644
--- a/net-p2p/dclib/ChangeLog
+++ b/net-p2p/dclib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/dclib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dclib/ChangeLog,v 1.49 2004/11/11 21:11:19 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dclib/ChangeLog,v 1.50 2004/12/13 21:59:43 squinky86 Exp $
+
+*dclib-0.3.3-r1 (13 Dec 2004)
+
+  13 Dec 2004; Jon Hood <squinky86@gentoo.org>
+  -files/dclib-0.3.2-gcc2.patch, +files/dclib-0.3.3-xml.patch,
+  -dclib-0.3.2.ebuild, +dclib-0.3.3-r1.ebuild:
+  Add libxml2 patch from Marien <m_zwart@123mail.org> and dclib forums, #74279.
 
   11 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> dclib-0.3.3.ebuild:
   Stable on alpha.
diff --git a/net-p2p/dclib/Manifest b/net-p2p/dclib/Manifest
index 8bb133820a4c..f70ff6de4c6e 100644
--- a/net-p2p/dclib/Manifest
+++ b/net-p2p/dclib/Manifest
@@ -1,27 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c93e2a8e2204bdcac6b3a05a82db0ac4 ChangeLog 6523
-MD5 f6361f3c806b9dc01ac155a9e4fa0ac7 dclib-0.3.3.ebuild 717
-MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 68781321fb016a7323f70249bdc2de00 dclib-0.3.2.ebuild 721
-MD5 3aac8f154de18b20af0dc6c53cb6d290 dclib-0.2.21.ebuild 730
 MD5 a0bc6a1b30b863ff477e789457cad381 dclib-0.2.20.ebuild 728
+MD5 f6361f3c806b9dc01ac155a9e4fa0ac7 dclib-0.3.3.ebuild 717
 MD5 e041abe99036edd93134a444f6a2ce3f dclib-0.3.0.ebuild 719
-MD5 baa8778c127486a1084a097e98405a9a files/digest-dclib-0.3.0 64
-MD5 0e80e3d1905179f858af0d704dfcee8e files/digest-dclib-0.2.21 65
-MD5 257441a8793e2c0b6849fca25911edcc files/dclib-0.3.3-gcc2.patch 318
-MD5 257441a8793e2c0b6849fca25911edcc files/dclib-0.2.21-gcc2.patch 318
+MD5 3aac8f154de18b20af0dc6c53cb6d290 dclib-0.2.21.ebuild 730
+MD5 c93e2a8e2204bdcac6b3a05a82db0ac4 ChangeLog 6523
+MD5 29b2dfe8bce710da5a801fee1a69dbd8 dclib-0.3.3-r1.ebuild 721
+MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 257441a8793e2c0b6849fca25911edcc files/dclib-0.3.0-gcc2.patch 318
-MD5 257441a8793e2c0b6849fca25911edcc files/dclib-0.2.20-gcc2.patch 318
-MD5 6d7f9ee5723f2c699934aa8a6b5dae29 files/digest-dclib-0.2.20 65
 MD5 257441a8793e2c0b6849fca25911edcc files/dclib-0.3.2-gcc2.patch 318
-MD5 a30765ec8cc97673a37d8a6c6ac4a64f files/digest-dclib-0.3.2 64
+MD5 257441a8793e2c0b6849fca25911edcc files/dclib-0.3.3-gcc2.patch 318
+MD5 6d7f9ee5723f2c699934aa8a6b5dae29 files/digest-dclib-0.2.20 65
+MD5 0e80e3d1905179f858af0d704dfcee8e files/digest-dclib-0.2.21 65
+MD5 c973c56c5bf413e3d4421444ae796b01 files/digest-dclib-0.3.3-r1 64
+MD5 257441a8793e2c0b6849fca25911edcc files/dclib-0.2.20-gcc2.patch 318
+MD5 baa8778c127486a1084a097e98405a9a files/digest-dclib-0.3.0 64
 MD5 c973c56c5bf413e3d4421444ae796b01 files/digest-dclib-0.3.3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBk9WDugEuf3OQ0akRAhVMAJ9PP2YRvl3aiSblqdq0LZu2jJG5zQCcDAr/
-t8JbYgDuY5cRm1r6Ex2d23Q=
-=wIAT
------END PGP SIGNATURE-----
+MD5 257441a8793e2c0b6849fca25911edcc files/dclib-0.2.21-gcc2.patch 318
diff --git a/net-p2p/dclib/dclib-0.3.2.ebuild b/net-p2p/dclib/dclib-0.3.3-r1.ebuild
index 983703bb9a5f..65931c080772 100644
--- a/net-p2p/dclib/dclib-0.3.2.ebuild
+++ b/net-p2p/dclib/dclib-0.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dclib/dclib-0.3.2.ebuild,v 1.5 2004/10/04 21:55:15 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dclib/dclib-0.3.3-r1.ebuild,v 1.1 2004/12/13 21:59:43 squinky86 Exp $
 
 inherit gcc eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.berlios.de/dcgui/${P}.tar.bz2"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~alpha ~hppa ~ia64 ~amd64"
+KEYWORDS="~x86 ~ppc ~alpha ~hppa ~ia64 ~amd64"
 
 DEPEND=">=app-arch/bzip2-1.0.2
 	>=dev-libs/libxml2-2.4.22"
@@ -19,6 +19,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	[ `gcc-major-version` == 2 ] && epatch ${FILESDIR}/${P}-gcc2.patch
+	epatch ${FILESDIR}/${P}-xml.patch
 }
 
 src_install() {
diff --git a/net-p2p/dclib/files/dclib-0.3.2-gcc2.patch b/net-p2p/dclib/files/dclib-0.3.2-gcc2.patch
deleted file mode 100644
index e71a2f6a7a98..000000000000
--- a/net-p2p/dclib/files/dclib-0.3.2-gcc2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dclib/core/cthread.cpp.orig	2002-12-19 19:01:57.000000000 -0500
-+++ dclib/core/cthread.cpp	2002-12-19 19:02:09.000000000 -0500
-@@ -16,6 +16,7 @@
-  ***************************************************************************/
- 
- #include <stdio.h>
-+#define __USE_POSIX199309
- #include <time.h>
- #include <errno.h>
- 
diff --git a/net-p2p/dclib/files/dclib-0.3.3-xml.patch b/net-p2p/dclib/files/dclib-0.3.3-xml.patch
new file mode 100644
index 000000000000..3e93c3d80257
--- /dev/null
+++ b/net-p2p/dclib/files/dclib-0.3.3-xml.patch
@@ -0,0 +1,34 @@
+--- dclib/core/cxml.cpp.orig	Thu Aug 12 10:32:06 2004
++++ dclib/core/cxml.cpp	Thu Dec  2 01:08:00 2004
+@@ -145,12 +145,12 @@
+ 
+ 	res = UTF8Toisolat1( b, &outlen, (unsigned char*)s, &inlen );
+ 
+-	if ( res == -2 )
++	if ( res >= 0 )
++		r = (char*)b;
++	else if ( res == -2 )
+ 		printf("UTF8Toisolat1 transcoding fail: '%s'\n",s);
+ 	else if ( res == -1 )
+ 		printf("UTF8Toisolat1 fail: '%s'\n",s);
+-	else if ( res == 0 )
+-		r = (char*)b;
+ 	else
+ 		printf("CXml::xml_UTF8Toisolat1 error %d\n",res);
+ 
+@@ -178,10 +178,12 @@
+ 
+ 	res = isolat1ToUTF8( b, &outlen, (unsigned char*)s, &inlen );
+ 
+-	if ( res == -1 )
++	if ( res >= 0 )
++	        r = (char*)b;
++	else if ( res == -1 )
+ 		printf("isolat1ToUTF8 fail: '%s'\n",s);
+-	else if ( res == 0 )
+-		r = (char*)b;
++	else
++		printf("CXml::xml_isolat1ToUTF8 error %d\n",res);
+ 
+ 	free(b);
+ 
diff --git a/net-p2p/dclib/files/digest-dclib-0.3.2 b/net-p2p/dclib/files/digest-dclib-0.3.2
deleted file mode 100644
index 0e25a5d91ed1..000000000000
--- a/net-p2p/dclib/files/digest-dclib-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e4914382d793fa9106617382a769b85 dclib-0.3.2.tar.bz2 606049
diff --git a/net-p2p/dclib/files/digest-dclib-0.3.3-r1 b/net-p2p/dclib/files/digest-dclib-0.3.3-r1
new file mode 100644
index 000000000000..4a0b05de4acd
--- /dev/null
+++ b/net-p2p/dclib/files/digest-dclib-0.3.3-r1
@@ -0,0 +1 @@
+MD5 e25f9afae22341670fa993eb766aaf1e dclib-0.3.3.tar.bz2 541976