[pkgsrc/trunk]: pkgsrc/print/pdf2djvu pdf2djvu: update to 0.9.18.2.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print/pdf2djvu pdf2djvu: update to 0.9.18.2.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Sun, 03 Apr 2022 11:56:07 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc41cc6c5310
branches:  trunk
changeset: 376179:fc41cc6c5310
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Apr 03 10:09:58 2022 +0000

description:
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

diffstat:

 print/pdf2djvu/Makefile                     |   7 +-
 print/pdf2djvu/distinfo                     |  11 ++-
 print/pdf2djvu/patches/patch-configure      |  77 -----------------------------
 print/pdf2djvu/patches/patch-pdf-backend.cc |  19 +++++++
 print/pdf2djvu/patches/patch-pdf2djvu.cc    |  15 +++++
 5 files changed, 43 insertions(+), 86 deletions(-)

diffs (161 lines):

diff -r adab700baa20 -r fc41cc6c5310 print/pdf2djvu/Makefile
--- a/print/pdf2djvu/Makefile   Sun Apr 03 10:05:29 2022 +0000
+++ b/print/pdf2djvu/Makefile   Sun Apr 03 10:09:58 2022 +0000
@@ -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 @@
 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
diff -r adab700baa20 -r fc41cc6c5310 print/pdf2djvu/distinfo
--- a/print/pdf2djvu/distinfo   Sun Apr 03 10:05:29 2022 +0000
+++ b/print/pdf2djvu/distinfo   Sun Apr 03 10:09:58 2022 +0000
@@ -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
diff -r adab700baa20 -r fc41cc6c5310 print/pdf2djvu/patches/patch-configure
--- a/print/pdf2djvu/patches/patch-configure    Sun Apr 03 10:05:29 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2021/01/16 14:54:14 mef Exp $
-
-https://openbsdmailbox.blogspot.com/2020/12/graphicspdf2djvu-unbreak-for-poppler.html
-the pdf2djvu configure script performs checks against poppler-splash,
-but poppler-splash.pc had been removed in poppler-20.12. Check against
-poppler itself to unbreak the build. 
-
---- configure.orig     2020-08-08 02:13:47.000000000 +0900
-+++ configure  2021-01-16 23:46:31.375535210 +0900
-@@ -4006,19 +4006,19 @@ $as_echo "ok" >&6; }
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler-splash >= 0.35.0" >&5
--$as_echo_n "checking for poppler-splash >= 0.35.0... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler >= 0.35.0" >&5
-+$as_echo_n "checking for poppler >= 0.35.0... " >&6; }
- 
- if test -n "$POPPLER_CFLAGS"; then
-     pkg_cv_POPPLER_CFLAGS="$POPPLER_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler-splash >= 0.35.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "poppler-splash >= 0.35.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.35.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "poppler >= 0.35.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler-splash >= 0.35.0" 2>/dev/null`
-+  pkg_cv_POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.35.0" 2>/dev/null`
-                     test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -4030,12 +4030,12 @@ if test -n "$POPPLER_LIBS"; then
-     pkg_cv_POPPLER_LIBS="$POPPLER_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler-splash >= 0.35.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "poppler-splash >= 0.35.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.35.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "poppler >= 0.35.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_POPPLER_LIBS=`$PKG_CONFIG --libs "poppler-splash >= 0.35.0" 2>/dev/null`
-+  pkg_cv_POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.35.0" 2>/dev/null`
-                     test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -4056,14 +4056,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--              POPPLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler-splash >= 0.35.0" 2>&1`
-+              POPPLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.35.0" 2>&1`
-         else
--              POPPLER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler-splash >= 0.35.0" 2>&1`
-+              POPPLER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.35.0" 2>&1`
-         fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$POPPLER_PKG_ERRORS" >&5
- 
--      as_fn_error $? "Package requirements (poppler-splash >= 0.35.0) were not met:
-+      as_fn_error $? "Package requirements (poppler >= 0.35.0) were not met:
- 
- $POPPLER_PKG_ERRORS
- 
-@@ -4095,7 +4095,7 @@ else
- $as_echo "yes" >&6; }
- 
- fi
--poppler_version=$($PKG_CONFIG --modversion poppler-splash)
-+poppler_version=$($PKG_CONFIG --modversion poppler)
- 
- cat >>confdefs.h <<_ACEOF
- #define POPPLER_VERSION_STRING "$poppler_version"
diff -r adab700baa20 -r fc41cc6c5310 print/pdf2djvu/patches/patch-pdf-backend.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/pdf2djvu/patches/patch-pdf-backend.cc       Sun Apr 03 10:09:58 2022 +0000
@@ -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();
diff -r adab700baa20 -r fc41cc6c5310 print/pdf2djvu/patches/patch-pdf2djvu.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/pdf2djvu/patches/patch-pdf2djvu.cc  Sun Apr 03 10:09:58 2022 +0000
@@ -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;
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated print/pdf2djvu to 0.9.18.2
Next by Date: [pkgsrc/trunk]: pkgsrc/net/socat net/socat: Patch ctype(3) abuse.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated print/pdf2djvu to 0.9.18.2
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/socat net/socat: Patch ctype(3) abuse.
Indexes:
Home | Main Index | Thread Index | Old Index