summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
Diffstat (limited to 'print')
-rw-r--r--print/pdf2djvu/Makefile7
-rw-r--r--print/pdf2djvu/distinfo11
-rw-r--r--print/pdf2djvu/patches/patch-configure77
-rw-r--r--print/pdf2djvu/patches/patch-pdf-backend.cc19
-rw-r--r--print/pdf2djvu/patches/patch-pdf2djvu.cc15
5 files changed, 43 insertions, 86 deletions
diff --git a/print/pdf2djvu/Makefile b/print/pdf2djvu/Makefile
index 5693b5dbccd..16f0f1a864a 100644
--- a/print/pdf2djvu/Makefile
+++ b/print/pdf2djvu/Makefile
@@ -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]*:../../graphics/djvulibre-tools
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 --git a/print/pdf2djvu/distinfo b/print/pdf2djvu/distinfo
index 2107afd37f7..45d7cbef815 100644
--- a/print/pdf2djvu/distinfo
+++ b/print/pdf2djvu/distinfo
@@ -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 --git a/print/pdf2djvu/patches/patch-configure b/print/pdf2djvu/patches/patch-configure
deleted file mode 100644
index 11b4045cff8..00000000000
--- a/print/pdf2djvu/patches/patch-configure
+++ /dev/null
@@ -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 --git a/print/pdf2djvu/patches/patch-pdf-backend.cc b/print/pdf2djvu/patches/patch-pdf-backend.cc
new file mode 100644
index 00000000000..c216499008a
--- /dev/null
+++ b/print/pdf2djvu/patches/patch-pdf-backend.cc
@@ -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 --git a/print/pdf2djvu/patches/patch-pdf2djvu.cc b/print/pdf2djvu/patches/patch-pdf2djvu.cc
new file mode 100644
index 00000000000..984eed501d7
--- /dev/null
+++ b/print/pdf2djvu/patches/patch-pdf2djvu.cc
@@ -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;
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 17:14:23 +0000