diff --git a/common/shlibs b/common/shlibs index 66fd07c4b32..ab4de933304 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1525,6 +1525,7 @@ libgncmod-app-utils.so libgnucash-2.6.3_1 libgncmod-engine.so libgnucash-2.6.3_1 libgncmod-gnome-utils.so libgnucash-2.6.3_1 libcppunit-1.12.so.1 libcppunit-1.12.1_1 +libcppunit-1.14.so.0 libcppunit-1.14.0_1 libOgreMain.so.1.9.0 libogre-1.9.0_1 libOgrePaging.so.1.9.0 libogre-1.9.0_1 libOgreProperty.so.1.9.0 libogre-1.9.0_1 diff --git a/srcpkgs/libcppunit-examples b/srcpkgs/libcppunit-examples new file mode 120000 index 00000000000..0fde94116b5 --- /dev/null +++ b/srcpkgs/libcppunit-examples @@ -0,0 +1 @@ +libcppunit \ No newline at end of file diff --git a/srcpkgs/libcppunit/patches/gcc-4.5.patch b/srcpkgs/libcppunit/patches/gcc-4.5.patch deleted file mode 100644 index b08ae6a0316..00000000000 --- a/srcpkgs/libcppunit/patches/gcc-4.5.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/cppunit/Makefile.am -+++ src/cppunit/Makefile.am -@@ -63,5 +63,11 @@ - - libcppunit_la_LDFLAGS= \ - -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -- -release $(LT_RELEASE) -+ -release $(LT_RELEASE) @LIBADD_DL@ - -+TESTS = t_link -+ -+check_PROGRAMS = t_link -+ -+t_link_SOURCES = t_link.cpp -+t_link_LDADD = libcppunit.la diff --git a/srcpkgs/libcppunit/template b/srcpkgs/libcppunit/template index e8a11c2f195..8f35d32c9e2 100644 --- a/srcpkgs/libcppunit/template +++ b/srcpkgs/libcppunit/template @@ -1,15 +1,16 @@ # Template file for 'libcppunit' pkgname=libcppunit -version=1.12.1 -revision=3 +version=1.14.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake libtool" short_desc="C++ unit testing framework" maintainer="Enno Boland " license="LGPL-2.1" +# Also see https://mmohrhard.wordpress.com/2017/05/01/cppunit-1-14-released/ homepage="http://cppunit.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/cppunit/cppunit/${version}/cppunit-$version.tar.gz" -checksum=ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a +distfiles="http://dev-www.libreoffice.org/src/cppunit-${version}.tar.gz" +checksum=3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780 wrksrc="cppunit-$version" LDFLAGS="-dl" @@ -26,8 +27,15 @@ libcppunit-devel_package() { vmove usr/lib/pkgconfig vmove "usr/lib/*.a" vmove "usr/lib/*.so" - vmove /usr/bin/cppunit-config - vmove /usr/share/man/man1/cppunit-config.1 - vmove usr/share/aclocal + vmove usr/bin/DllPlugInTester + } +} + +libcppunit-examples_package() { + depends="libcppunit-devel>=${version}_${revision}" + short_desc+=" - examples" + pkg_install() { + vmkdir usr/share/libcppunit + vcopy examples usr/share/libcppunit } }