CVS commit: pkgsrc/textproc/libodfgen

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Apr  5 13:13:02 UTC 2020

Modified Files:
        pkgsrc/textproc/libodfgen: Makefile distinfo
        pkgsrc/textproc/libodfgen/patches: patch-src_PageSpan.cxx

Log Message:
libodfgen: Update to 0.1.7

libodfgen 0.1.7
- All:
    + switch to C++-11
    + fuzzing: correct many problem
    + support more text's style attributes
    + add support for named's graphic style
    + ods/odt: try to retrieve some MathML equations
- Chart:
    + support more attributes,
- Spreadsheet:
    + allow external file reference
    + do not create invalid file if there is more than 26*26 columns
- Other improvements and fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/libodfgen/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/libodfgen/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/libodfgen/patches/patch-src_PageSpan.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/libodfgen/Makefile
diff -u pkgsrc/textproc/libodfgen/Makefile:1.27 pkgsrc/textproc/libodfgen/Makefile:1.28
--- pkgsrc/textproc/libodfgen/Makefile:1.27     Fri Mar 20 11:58:27 2020
+++ pkgsrc/textproc/libodfgen/Makefile  Sun Apr  5 13:13:02 2020
@@ -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"

Index: pkgsrc/textproc/libodfgen/distinfo
diff -u pkgsrc/textproc/libodfgen/distinfo:1.8 pkgsrc/textproc/libodfgen/distinfo:1.9
--- pkgsrc/textproc/libodfgen/distinfo:1.8      Wed Feb  7 17:03:28 2018
+++ pkgsrc/textproc/libodfgen/distinfo  Sun Apr  5 13:13:02 2020
@@ -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

Index: pkgsrc/textproc/libodfgen/patches/patch-src_PageSpan.cxx
diff -u pkgsrc/textproc/libodfgen/patches/patch-src_PageSpan.cxx:1.1 pkgsrc/textproc/libodfgen/patches/patch-src_PageSpan.cxx:1.2
--- pkgsrc/textproc/libodfgen/patches/patch-src_PageSpan.cxx:1.1        Wed Feb  7 17:03:28 2018
+++ pkgsrc/textproc/libodfgen/patches/patch-src_PageSpan.cxx    Sun Apr  5 13:13:02 2020
@@ -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)