# HG changeset patch
# User Matthew Sheets <rcx@zoominternet.net>
# Date 1282256338 0
# Node ID 08b8d9c3741dfe618c10baf5ffaef16358a30f8b
# Parent  d4cddb6e510038db590e2f741fc159344a9c21da
commoncpp2: Upgrade to 1.8.0

diff -r d4cddb6e5100 -r 08b8d9c3741d commoncpp2-dev/receipt
--- a/commoncpp2-dev/receipt	Thu Aug 19 21:53:57 2010 +0000
+++ b/commoncpp2-dev/receipt	Thu Aug 19 22:18:58 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="commoncpp2-dev"
-VERSION="1.7.3"
+VERSION="1.8.0"
 CATEGORY="development"
 SHORT_DESC="Devel files for commoncpp2."
 MAINTAINER="rcx@zoominternet.net"
diff -r d4cddb6e5100 -r 08b8d9c3741d commoncpp2/receipt
--- a/commoncpp2/receipt	Thu Aug 19 21:53:57 2010 +0000
+++ b/commoncpp2/receipt	Thu Aug 19 22:18:58 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="commoncpp2"
-VERSION="1.7.3"
+VERSION="1.8.0"
 CATEGORY="development"
 SHORT_DESC="A very portable and highly optimized class framework for writing C++ applications."
 MAINTAINER="rcx@zoominternet.net"
@@ -9,21 +9,12 @@
 BUILD_DEPENDS="slitaz-toolchain"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/commoncpp/"
-WGET_URL="http://www.gnutelephony.org/dist/tarballs/$TARBALL"
+WGET_URL="$GNU_MIRROR/commoncpp/$TARBALL"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	# Apply patch from http://bugs.gentoo.org/show_bug.cgi?id=279505
-	local commoncpp2_diff
-	commoncpp2_diff=$PWD/stuff/1.7.3-gcc4.4.diff
-
 	cd $src
-	# Only apply the patch once
-	if [ ! -e $src/1.7.3-gcc4.4.diff ] ; then
-		patch -p1 < $commoncpp2_diff
-		cp $commoncpp2_diff $src/1.7.3-gcc4.4.diff
-	fi
 
 	./configure \
 		--prefix=/usr \
diff -r d4cddb6e5100 -r 08b8d9c3741d commoncpp2/stuff/1.7.3-gcc4.4.diff
--- a/commoncpp2/stuff/1.7.3-gcc4.4.diff	Thu Aug 19 21:53:57 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- commoncpp2-1.7.3.org/src/cidr.cpp	2009-01-16 07:27:00.000000000 -0500
-+++ commoncpp2-1.7.3/src/cidr.cpp	2009-07-28 15:29:02.881384386 -0400
-@@ -199,11 +199,7 @@ void IPV4Cidr::set(const char *cp)
- 	bitset((bit_t *)&netmask, getMask(cp));
- 	setString(cbuf, sizeof(cbuf), cp);
- 	
--#if defined(_MSC_VER) && _MSC_VER >= 1500
--	ep = (char *)strchr(cp, '/');
--#else
-- 	ep = strchr(cp, '/');
--#endif
-+ 	ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750
- 
- 	if(ep)
- 		*ep = 0;
-@@ -332,7 +328,7 @@ void IPV6Cidr::set(const char *cp)
- 	memset(&netmask, 0, sizeof(netmask));
- 	bitset((bit_t *)&netmask, getMask(cp));
- 	setString(cbuf, sizeof(cbuf), cp);
--	ep = strchr(cp, '/');
-+ 	ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750
- 	if(ep)
- 		*ep = 0;
-