CVS commit: pkgsrc/print/pdf2djvu

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr  3 10:09:58 UTC 2022

Modified Files:
        pkgsrc/print/pdf2djvu: Makefile distinfo
Added Files:
        pkgsrc/print/pdf2djvu/patches: patch-pdf-backend.cc patch-pdf2djvu.cc
Removed Files:
        pkgsrc/print/pdf2djvu/patches: patch-configure

Log Message:
pdf2djvu: update to 0.9.18.2.

Add poppler-22.03 compatibility patches from upstream.

pdf2djvu (0.9.18.2) unstable; urgency=low

  * Document minimum required Exiv2 version.
  * Fix build failure with upcoming Exiv2 1.0.
  * Remove spurious zero-width spaces from the Ukrainian manual page.
  * Improve the test suite:
    + Fix test failure with Exiv2 ≥ 0.27.5.
      Thanks to Kamil Cukrowski for the bug report and the initial patch.
      https://github.com/jwilk/pdf2djvu/issues/149

 -- Jakub Wilk <jwilk%jwilk.net@localhost>  Mon, 22 Nov 2021 18:38:23 +0100

pdf2djvu (0.9.18.1) unstable; urgency=low

  * Fix build failure with Poppler ≥ 21.10.
  * Windows: don't hardcode Poppler data path in the library.

 -- Jakub Wilk <jwilk%jwilk.net@localhost>  Wed, 13 Oct 2021 14:48:56 +0200

pdf2djvu (0.9.18) unstable; urgency=low

  [ Ilia Gobjila ]
  * Fix typo in the Russian documentation.

  [ Atri Bhattacharya ]
  * Fix configure check for Poppler ≥ 20.12.
    Thanks to Evangelos Foutras for the bug report.
    https://github.com/jwilk/pdf2djvu/issues/144

  [ Jakub Wilk ]
  * Fix build failure with GCC 11.
    https://github.com/jwilk/pdf2djvu/issues/146
  * Upgrade libraries bundled with the Windows package:
    - Poppler to 21.06;
    - poppler-data to 0.4.10;
    - DjVuLibre to 3.5.28;
    - GraphicsMagick to 1.3.36;
    - Expat to 2.4.1;
    - Exiv2 to 0.27.3;
    - FreeType to 2.10.4;
    - OpenJPEG to 2.4.0.
  * Drop support for Python 2.6.

 -- Jakub Wilk <jwilk%jwilk.net@localhost>  Mon, 07 Jun 2021 20:04:15 +0200


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/print/pdf2djvu/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/pdf2djvu/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/print/pdf2djvu/patches/patch-configure
cvs rdiff -u -r0 -r1.6 pkgsrc/print/pdf2djvu/patches/patch-pdf-backend.cc \
    pkgsrc/print/pdf2djvu/patches/patch-pdf2djvu.cc

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

Modified files:

Index: pkgsrc/print/pdf2djvu/Makefile
diff -u pkgsrc/print/pdf2djvu/Makefile:1.101 pkgsrc/print/pdf2djvu/Makefile:1.102
--- pkgsrc/print/pdf2djvu/Makefile:1.101        Wed Dec  8 16:06:14 2021
+++ pkgsrc/print/pdf2djvu/Makefile      Sun Apr  3 10:09:58 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2021/12/08 16:06:14 adam Exp $
+# $NetBSD: Makefile,v 1.102 2022/04/03 10:09:58 wiz Exp $
 
-DISTNAME=      pdf2djvu-0.9.17.1
-PKGREVISION=   9
+DISTNAME=      pdf2djvu-0.9.18.2
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jwilk/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -17,7 +16,7 @@ DEPENDS+=     djvulibre-tools-[0-9]*:../../g
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes
-USE_LANGUAGES=         c++
+USE_LANGUAGES=         c++17
 USE_TOOLS+=            pkg-config gmake intltool msgfmt xgettext
 
 CONFIGURE_ARGS+=       --localedir=${PREFIX}/${PKGLOCALEDIR}/locale

Index: pkgsrc/print/pdf2djvu/distinfo
diff -u pkgsrc/print/pdf2djvu/distinfo:1.20 pkgsrc/print/pdf2djvu/distinfo:1.21
--- pkgsrc/print/pdf2djvu/distinfo:1.20 Tue Oct 26 11:12:12 2021
+++ pkgsrc/print/pdf2djvu/distinfo      Sun Apr  3 10:09:58 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 11:12:12 nia Exp $
+$NetBSD: distinfo,v 1.21 2022/04/03 10:09:58 wiz Exp $
 
-BLAKE2s (pdf2djvu-0.9.17.1.tar.xz) = 3f243acfacab65e0fb81f4b6231d2578e02463517a1a238387897464dcdb24b9
-SHA512 (pdf2djvu-0.9.17.1.tar.xz) = 59f4ea9a396907b3084a69fbec418d057d8625d18486185bafafb5e3273ee18e9441925a294a4829260cc3d14e7e64d69b47637d530e23360b854daeed0ed8bc
-Size (pdf2djvu-0.9.17.1.tar.xz) = 295540 bytes
-SHA1 (patch-configure) = a9528432178995625babbf6e26542373d729401b
+BLAKE2s (pdf2djvu-0.9.18.2.tar.xz) = 754ca087465884c72886146e0f5cb3942ab7ce09842a3db3263a9f9f9a675749
+SHA512 (pdf2djvu-0.9.18.2.tar.xz) = 9edf43499229c1d3f39bf1cce3d89230dd2ed37b6b1bdb37757e49c0b5ff0190644ff79a02837428da342a3ef51a7c85aabd5f4a207f492d0c67a981d84e3484
+Size (pdf2djvu-0.9.18.2.tar.xz) = 305912 bytes
+SHA1 (patch-pdf-backend.cc) = 4c0cb70376f12a383a5c1638211c726635919de9
+SHA1 (patch-pdf2djvu.cc) = 9c55c31f58ec339ea23f091dec3306759b3954a8

Added files:

Index: pkgsrc/print/pdf2djvu/patches/patch-pdf-backend.cc
diff -u /dev/null pkgsrc/print/pdf2djvu/patches/patch-pdf-backend.cc:1.6
--- /dev/null   Sun Apr  3 10:09:58 2022
+++ pkgsrc/print/pdf2djvu/patches/patch-pdf-backend.cc  Sun Apr  3 10:09:58 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-pdf-backend.cc,v 1.6 2022/04/03 10:09:58 wiz Exp $
+
+Poppler-22.03 compat from upstream.
+
+--- pdf-backend.cc.orig        2021-11-22 17:38:31.000000000 +0000
++++ pdf-backend.cc
+@@ -130,7 +130,11 @@ void pdf::Environment::set_antialias(boo
+  */
+ 
+ pdf::Document::Document(const std::string &file_name)
+-: ::PDFDoc(new pdf::String(file_name.c_str()), nullptr, nullptr)
++#if POPPLER_VERSION >= 220300
++: ::PDFDoc(std::make_unique<pdf::String>(file_name.c_str()))
++#else
++: ::PDFDoc(new pdf::String(file_name.c_str()))
++#endif
+ {
+   if (!this->isOk())
+     throw LoadError();
Index: pkgsrc/print/pdf2djvu/patches/patch-pdf2djvu.cc
diff -u /dev/null pkgsrc/print/pdf2djvu/patches/patch-pdf2djvu.cc:1.6
--- /dev/null   Sun Apr  3 10:09:58 2022
+++ pkgsrc/print/pdf2djvu/patches/patch-pdf2djvu.cc     Sun Apr  3 10:09:58 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-pdf2djvu.cc,v 1.6 2022/04/03 10:09:58 wiz Exp $
+
+poppler-22.03 fix from upstream.
+
+--- pdf2djvu.cc.orig   2021-11-22 17:38:31.000000000 +0000
++++ pdf2djvu.cc
+@@ -89,7 +89,7 @@ static int get_page_for_goto_link(pdf::l
+ #endif
+   }
+   else
+-    dest.reset(orig_dest->copy());
++    dest.reset(new pdf::link::Destination(*orig_dest));
+   if (dest.get() != nullptr)
+   {
+     int page;