wok-6.x rev 6058

commoncpp2: Upgrade to 1.8.0
author Matthew Sheets <rcx@zoominternet.net>
date Thu Aug 19 22:18:58 2010 +0000 (2010-08-19)
parents d4cddb6e5100
children ac683b0c8b2c
files commoncpp2-dev/receipt commoncpp2/receipt commoncpp2/stuff/1.7.3-gcc4.4.diff
line diff
     1.1 --- a/commoncpp2-dev/receipt	Thu Aug 19 21:53:57 2010 +0000
     1.2 +++ b/commoncpp2-dev/receipt	Thu Aug 19 22:18:58 2010 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="commoncpp2-dev"
     1.7 -VERSION="1.7.3"
     1.8 +VERSION="1.8.0"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Devel files for commoncpp2."
    1.11  MAINTAINER="rcx@zoominternet.net"
     2.1 --- a/commoncpp2/receipt	Thu Aug 19 21:53:57 2010 +0000
     2.2 +++ b/commoncpp2/receipt	Thu Aug 19 22:18:58 2010 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="commoncpp2"
     2.7 -VERSION="1.7.3"
     2.8 +VERSION="1.8.0"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="A very portable and highly optimized class framework for writing C++ applications."
    2.11  MAINTAINER="rcx@zoominternet.net"
    2.12 @@ -9,21 +9,12 @@
    2.13  BUILD_DEPENDS="slitaz-toolchain"
    2.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.15  WEB_SITE="http://www.gnu.org/software/commoncpp/"
    2.16 -WGET_URL="http://www.gnutelephony.org/dist/tarballs/$TARBALL"
    2.17 +WGET_URL="$GNU_MIRROR/commoncpp/$TARBALL"
    2.18  
    2.19  # Rules to configure and make the package.
    2.20  compile_rules()
    2.21  {
    2.22 -	# Apply patch from http://bugs.gentoo.org/show_bug.cgi?id=279505
    2.23 -	local commoncpp2_diff
    2.24 -	commoncpp2_diff=$PWD/stuff/1.7.3-gcc4.4.diff
    2.25 -
    2.26  	cd $src
    2.27 -	# Only apply the patch once
    2.28 -	if [ ! -e $src/1.7.3-gcc4.4.diff ] ; then
    2.29 -		patch -p1 < $commoncpp2_diff
    2.30 -		cp $commoncpp2_diff $src/1.7.3-gcc4.4.diff
    2.31 -	fi
    2.32  
    2.33  	./configure \
    2.34  		--prefix=/usr \
     3.1 --- a/commoncpp2/stuff/1.7.3-gcc4.4.diff	Thu Aug 19 21:53:57 2010 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,24 +0,0 @@
     3.4 ---- commoncpp2-1.7.3.org/src/cidr.cpp	2009-01-16 07:27:00.000000000 -0500
     3.5 -+++ commoncpp2-1.7.3/src/cidr.cpp	2009-07-28 15:29:02.881384386 -0400
     3.6 -@@ -199,11 +199,7 @@ void IPV4Cidr::set(const char *cp)
     3.7 - 	bitset((bit_t *)&netmask, getMask(cp));
     3.8 - 	setString(cbuf, sizeof(cbuf), cp);
     3.9 - 	
    3.10 --#if defined(_MSC_VER) && _MSC_VER >= 1500
    3.11 --	ep = (char *)strchr(cp, '/');
    3.12 --#else
    3.13 -- 	ep = strchr(cp, '/');
    3.14 --#endif
    3.15 -+ 	ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750
    3.16 - 
    3.17 - 	if(ep)
    3.18 - 		*ep = 0;
    3.19 -@@ -332,7 +328,7 @@ void IPV6Cidr::set(const char *cp)
    3.20 - 	memset(&netmask, 0, sizeof(netmask));
    3.21 - 	bitset((bit_t *)&netmask, getMask(cp));
    3.22 - 	setString(cbuf, sizeof(cbuf), cp);
    3.23 --	ep = strchr(cp, '/');
    3.24 -+ 	ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750
    3.25 - 	if(ep)
    3.26 - 		*ep = 0;
    3.27 -