diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/libodfgen/Makefile | 23 | ||||
| -rw-r--r-- | textproc/libodfgen/distinfo | 12 | ||||
| -rw-r--r-- | textproc/libodfgen/patches/patch-src_PageSpan.cxx | 8 |
3 files changed, 17 insertions, 26 deletions
diff --git a/textproc/libodfgen/Makefile b/textproc/libodfgen/Makefile index 78115f8b09b..010d3f8720c 100644 --- a/textproc/libodfgen/Makefile +++ b/textproc/libodfgen/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2020/03/20 11:58:27 nia Exp $ +# $NetBSD: Makefile,v 1.28 2020/04/05 13:13:02 nia Exp $ -DISTNAME= libodfgen-0.1.6 -PKGREVISION= 11 +DISTNAME= libodfgen-0.1.7 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwpd/libodfgen/libodfgen-${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.xz @@ -14,24 +13,16 @@ LICENSE= mpl-2.0 OR gnu-lgpl-v2 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 +# C++11 +GCC_REQD+= 4.7 + +CONFIGURE_ARGS+= --disable-werror CONFIGURE_ARGS+= --without-docs PKGCONFIG_OVERRIDE+= libodfgen.pc.in -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CONFIGURE_ARGS+= --with-sharedptr=c++11 -.else -CONFIGURE_ARGS+= --with-sharedptr=tr1 -.endif - -# Avoid erroring out due to multiple -Werror=parentheses with gcc8 -.if !empty(CC_VERSION:Mgcc-[89]*) -CONFIGURE_ARGS+= --disable-werror -.endif - .include "../../converters/libetonyek/buildlink3.mk" .include "../../converters/librevenge/buildlink3.mk" .include "../../converters/libwpd/buildlink3.mk" diff --git a/textproc/libodfgen/distinfo b/textproc/libodfgen/distinfo index 38c832181a7..935f502fb35 100644 --- a/textproc/libodfgen/distinfo +++ b/textproc/libodfgen/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2018/02/07 17:03:28 jperkin Exp $ +$NetBSD: distinfo,v 1.9 2020/04/05 13:13:02 nia Exp $ -SHA1 (libodfgen-0.1.6.tar.xz) = 49da7cc0dc4adfe0452e951d2dea3c225358fd63 -RMD160 (libodfgen-0.1.6.tar.xz) = 9c3fcb5aecb0ad54bab246fbf16bf5d3ac562bb6 -SHA512 (libodfgen-0.1.6.tar.xz) = bc5e6908ee14c576adececdf8a94ae01f2ed487e6f2490e41aab787e1e8f72a3fb2a786f51ceeefa327710af215741ce13bcf4bb3d99d2aaf403f568c5db75a5 -Size (libodfgen-0.1.6.tar.xz) = 359988 bytes -SHA1 (patch-src_PageSpan.cxx) = 8397b3a3bce846d2ab5544d079f3cdf8bb6430f8 +SHA1 (libodfgen-0.1.7.tar.xz) = 42628faa433c57497566438f9048ce44e820b945 +RMD160 (libodfgen-0.1.7.tar.xz) = b65e5504731bd0d24e411eb44c6371658c9f42f8 +SHA512 (libodfgen-0.1.7.tar.xz) = eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e +Size (libodfgen-0.1.7.tar.xz) = 384760 bytes +SHA1 (patch-src_PageSpan.cxx) = b61c6af1885e3d863671708d1562f37724fbda94 diff --git a/textproc/libodfgen/patches/patch-src_PageSpan.cxx b/textproc/libodfgen/patches/patch-src_PageSpan.cxx index 3590231591e..3858380c7c3 100644 --- a/textproc/libodfgen/patches/patch-src_PageSpan.cxx +++ b/textproc/libodfgen/patches/patch-src_PageSpan.cxx @@ -1,12 +1,12 @@ -$NetBSD: patch-src_PageSpan.cxx,v 1.1 2018/02/07 17:03:28 jperkin Exp $ +$NetBSD: patch-src_PageSpan.cxx,v 1.2 2020/04/05 13:13:02 nia Exp $ Fix -Wtautological-unsigned-enum-zero-compare ---- src/PageSpan.cxx.orig 2015-12-26 09:22:22.000000000 +0000 +--- src/PageSpan.cxx.orig 2018-04-20 08:51:38.000000000 +0000 +++ src/PageSpan.cxx -@@ -186,7 +186,7 @@ librevenge::RVNGString PageSpan::protect +@@ -185,7 +185,7 @@ librevenge::RVNGString PageSpan::protect - void PageSpan::storeContent(ContentType type, libodfgen::DocumentElementVector *pContent) + void PageSpan::storeContent(ContentType type, const std::shared_ptr<libodfgen::DocumentElementVector> &pContent) { - if (type<0||type>=C_NumContentTypes) + if (type>=C_NumContentTypes) |