================================ cppunit:source=1.12.1-3 (previous: 1.12.1-2) cvc rdiff cppunit -1 /weasel.rpath.org@wgl:3-devel/1.12.1-3 ================================ 1.12.1-3 Filip Brcic (brcha@xxxxxxxxxxxx) Tue Jun 15 16:27:14 2010 cppunit 1.12.1 cppunit-1.10.2-asneeded.patch: new --- /dev/null +++ cppunit-1.10.2-asneeded.patch @@ -0,0 +10 @@ +Index: cppunit-1.10.2/src/cppunit/Makefile.am +=================================================================== +--- cppunit-1.10.2.orig/src/cppunit/Makefile.am ++++ cppunit-1.10.2/src/cppunit/Makefile.am +@@ -64,4 +64,5 @@ libcppunit_la_SOURCES = \ + libcppunit_la_LDFLAGS= \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) ++libcppunit_la_LIBADD = $(LIBADD_DL) + cppunit-1.12.1-add_missing_include.patch: new --- /dev/null +++ cppunit-1.12.1-add_missing_include.patch @@ -0,0 +23 @@ +http://bugs.gentoo.org/show_bug.cgi?id=271229 +https://sourceforge.net/tracker/?func=detail&aid=2796543&group_id=11795&atid=111795 + +--- config/ax_cxx_gcc_abi_demangle.m4 ++++ config/ax_cxx_gcc_abi_demangle.m4 +@@ -15,6 +15,7 @@ + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include <typeinfo> + #include <cxxabi.h> ++#include <malloc.h> + #include <string> + + template<typename TYPE> +--- src/cppunit/TypeInfoHelper.cpp ++++ src/cppunit/TypeInfoHelper.cpp +@@ -6,6 +6,7 @@ + #include <string> + + #if CPPUNIT_HAVE_GCC_ABI_DEMANGLE ++#include <malloc.h> + #include <cxxabi.h> + #endif + cppunit.recipe: changed Index: cppunit.recipe ==================================================================== contents(size sha1) inode(mtime) --- cppunit.recipe /weasel.rpath.org@wgl:3-devel/1.12.1-2 +++ cppunit.recipe /weasel.rpath.org@wgl:3-devel/1.12.1-3 @@ -1,5 +1,5 @@ # -# Copyright (c) 2008 Filip Brcic <brcha@xxxxxxx> +# Copyright (c) 2008-2010 Filip Brcic <brcha@xxxxxxx> # Distributed under the terms of the GNU General Public License v3 # @@ -8,8 +8,52 @@ version = '1.12.1' buildRequires = [ - 'libstdc++:devel', + 'libstdc++:devel', 'gcc-c++:runtime', + 'autoconf-wrapper:runtime', 'autoconf25:runtime', + 'automake-wrapper:runtime', 'automake110:runtime', + 'libtool:runtime', 'libtool:devel', 'm4:runtime', ] + if Use.builddocs: + buildRequires.extend(['doxygen:runtime', 'graphviz:runtime']) + + shortDesc = 'C++ unit testing framework' + longDesc = """ +CppUnit is a C++ unit testing framework. It started its life as a port +of JUnit to C++ by Michael Feathers. +""" + url = 'http://cppunit.sourceforge.net/' + licenses = [ 'LGPL-2.1' ] + categories = [ 'Development/Utilities' ] + def unpack(r): - r.addArchive('mirror://sourceforge/%(name)s/%(name)s-%(version)s.tar.gz') + r.addArchive('mirror://sourceforge/%(name)s/') + + r.addPatch('cppunit-1.10.2-asneeded.patch') + r.addPatch('cppunit-1.12.1-add_missing_include.patch') + + r.Autoreconf(m4Dir='config') + + def configure(r): + if Use.builddocs: + confArgs = ( + ' --enable-doxygen' + ' --enable-dot' + ) + else: + confArgs = ( + ' --disable-doxygen' + ' --disable-dot' + ) + + r.Configure( + confArgs + ) + + def policy(r): + r.Doc('AUTHORS', 'ChangeLog', 'BUGS', 'NEWS', 'README', + 'THANKS', 'TODO', 'doc/FAQ') + + r.Run('find examples -iname "*.o" -delete') + r.Remove('examples/simple/.libs', recursive=True) + r.Doc('examples') Committed by: brcha