# HG changeset patch # User Matthew Sheets # Date 1248885823 0 # Node ID 356a280531762ab35ba5eee8bb880c71b5743b10 # Parent fcdd092085ae16d9159eb5a4b8029e509cde3e32 Add: commoncpp2 (1.7.3) diff -r fcdd092085ae -r 356a28053176 commoncpp2-dev/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/commoncpp2-dev/receipt Wed Jul 29 16:43:43 2009 +0000 @@ -0,0 +1,22 @@ +# SliTaz package receipt. + +PACKAGE="commoncpp2-dev" +VERSION="1.7.3" +CATEGORY="development" +SHORT_DESC="Devel files for commoncpp2." +MAINTAINER="rcx@zoominternet.net" +DEPENDS="" +BUILD_DEPENDS="" +WEB_SITE="http://www.gnu.org/software/commoncpp/" +WANTED="commoncpp2" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib $fs/usr/share + cp -a $_pkg/usr/lib/*.*a $fs/usr/lib + cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib + cp -a $_pkg/usr/bin $fs/usr + cp -a $_pkg/usr/include $fs/usr + cp -a $_pkg/usr/share/aclocal $fs/usr/share +} diff -r fcdd092085ae -r 356a28053176 commoncpp2/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/commoncpp2/receipt Wed Jul 29 16:43:43 2009 +0000 @@ -0,0 +1,42 @@ +# SliTaz package receipt. + +PACKAGE="commoncpp2" +VERSION="1.7.3" +CATEGORY="development" +SHORT_DESC="A very portable and highly optimized class framework for writing C++ applications." +MAINTAINER="rcx@zoominternet.net" +DEPENDS="" +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" + +# 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 \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + $CONFIGURE_ARGS && + make && + make DESTDIR=$PWD/_pkg install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib + cp -a $_pkg/usr/lib/*.so* $fs/usr/lib +} diff -r fcdd092085ae -r 356a28053176 commoncpp2/stuff/1.7.3-gcc4.4.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/commoncpp2/stuff/1.7.3-gcc4.4.diff Wed Jul 29 16:43:43 2009 +0000 @@ -0,0 +1,24 @@ +--- 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; +