update graphics/pdf2djvu

Hi,

pdf2djvu needs an update to be built against poppler-21.10.0.

Below are diffs for both ports. ok?

Ciao,
Kili

ps: I guess poppler-21.11.0 will be released soon, but 21.10.0 is
what I've tested so far.


Index: graphics/pdf2djvu/Makefile
===================================================================
RCS file: /cvs/ports/graphics/pdf2djvu/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- graphics/pdf2djvu/Makefile 17 Sep 2020 20:36:12 -0000 1.40
+++ graphics/pdf2djvu/Makefile 28 Oct 2021 19:56:25 -0000
@@ -2,7 +2,7 @@

COMMENT = creates DjVu files from PDF files

-V = 0.9.17.1
+V = 0.9.18.1
DISTNAME = pdf2djvu-${V}

CATEGORIES = graphics
Index: graphics/pdf2djvu/distinfo
===================================================================
RCS file: /cvs/ports/graphics/pdf2djvu/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- graphics/pdf2djvu/distinfo 17 Sep 2020 20:36:12 -0000 1.18
+++ graphics/pdf2djvu/distinfo 28 Oct 2021 19:56:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (pdf2djvu-0.9.17.1.tar.xz) = W7u3vceFih7qxv8nDloyM5Dyq7a9Owsq4IwZZSciJqM=
-SIZE (pdf2djvu-0.9.17.1.tar.xz) = 295540
+SHA256 (pdf2djvu-0.9.18.1.tar.xz) = q0XXxwuoN/Aea1tcGKz4r2IA2tS66OR+TCygH78vqTA=
+SIZE (pdf2djvu-0.9.18.1.tar.xz) = 304492
Index: graphics/pdf2djvu/patches/patch-configure
===================================================================
RCS file: graphics/pdf2djvu/patches/patch-configure
diff -N graphics/pdf2djvu/patches/patch-configure
--- graphics/pdf2djvu/patches/patch-configure 7 Dec 2020 21:30:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2020/12/07 21:30:13 kili Exp $
-
-Let it build with poppler-20.12.
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -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"
Index: print/poppler/Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.168
diff -u -p -r1.168 Makefile
--- print/poppler/Makefile 8 Sep 2021 17:50:37 -0000 1.168
+++ print/poppler/Makefile 28 Oct 2021 19:56:25 -0000
@@ -5,7 +5,7 @@ COMMENT-qt5= Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities

-V= 21.09.0
+V= 21.10.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -15,10 +15,10 @@ PKGNAME-qt6= poppler-qt6-$V

EXTRACT_SUFX= .tar.xz

-SHARED_LIBS += poppler 71.0 # 113.0
+SHARED_LIBS += poppler 72.0 # 113.0
SHARED_LIBS += poppler-glib 19.9 # 8.21
-SHARED_LIBS += poppler-qt5 8.9 # 1.29
-SHARED_LIBS += poppler-qt6 1.0 # 3.0
+SHARED_LIBS += poppler-qt5 8.10 # 1.30
+SHARED_LIBS += poppler-qt6 1.1 # 3.1
SHARED_LIBS += poppler-cpp 17.0 # 0.9

HOMEPAGE= https://poppler.freedesktop.org/
Index: print/poppler/distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.91
diff -u -p -r1.91 distinfo
--- print/poppler/distinfo 8 Sep 2021 17:50:37 -0000 1.91
+++ print/poppler/distinfo 28 Oct 2021 19:56:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-21.09.0.tar.xz) = Wkf+9zjCuZRx+bRZqL+LQK77fu2SyqSGHDeYsuEm0Fs=
-SIZE (poppler-21.09.0.tar.xz) = 1722828
+SHA256 (poppler-21.10.0.tar.xz) = lktbFikPvsP65XwqW83qSbsHNr11DDo3EcR5lcnvw5Q=
+SIZE (poppler-21.10.0.tar.xz) = 1779668
Index: print/poppler/patches/patch-poppler_Form_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.9
diff -u -p -r1.9 patch-poppler_Form_cc
--- print/poppler/patches/patch-poppler_Form_cc 8 Sep 2021 17:50:37 -0000 1.9
+++ print/poppler/patches/patch-poppler_Form_cc 28 Oct 2021 19:56:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.9 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -37,6 +37,7 @@
+@@ -38,6 +38,7 @@
#include <config.h>

#include <set>
Index: print/poppler/patches/patch-qt5_src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-qt5_src_CMakeLists_txt
--- print/poppler/patches/patch-qt5_src_CMakeLists_txt 8 Sep 2021 17:50:37 -0000 1.6
+++ print/poppler/patches/patch-qt5_src_CMakeLists_txt 28 Oct 2021 19:56:25 -0000
@@ -9,7 +9,7 @@ Index: qt5/src/CMakeLists.txt
)
add_library(poppler-qt5 ${poppler_qt5_SRCS})
generate_export_header(poppler-qt5 BASE_NAME poppler-qt5 EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
--set_target_properties(poppler-qt5 PROPERTIES VERSION 1.29.0 SOVERSION 1)
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.30.0 SOVERSION 1)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: print/poppler/patches/patch-qt6_src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt6_src_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-qt6_src_CMakeLists_txt
--- print/poppler/patches/patch-qt6_src_CMakeLists_txt 8 Sep 2021 17:50:37 -0000 1.3
+++ print/poppler/patches/patch-qt6_src_CMakeLists_txt 28 Oct 2021 19:56:25 -0000
@@ -9,7 +9,7 @@ Index: qt6/src/CMakeLists.txt
)
add_library(poppler-qt6 ${poppler_qt6_SRCS})
generate_export_header(poppler-qt6 BASE_NAME poppler-qt6 EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
--set_target_properties(poppler-qt6 PROPERTIES VERSION 3.0.0 SOVERSION 3)
+-set_target_properties(poppler-qt6 PROPERTIES VERSION 3.1.0 SOVERSION 3)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_QT6_SOVERSION poppler-qt6 SOVERSION)
set_target_properties(poppler-qt6 PROPERTIES SUFFIX "-${POPPLER_QT6_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: print/poppler/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.40
diff -u -p -r1.40 PLIST-main
--- print/poppler/pkg/PLIST-main 19 May 2021 19:57:03 -0000 1.40
+++ print/poppler/pkg/PLIST-main 28 Oct 2021 19:56:25 -0000
@@ -3,6 +3,7 @@
@pkgpath print/poppler
include/poppler/
include/poppler/Annot.h
+include/poppler/AnnotStampImageHelper.h
include/poppler/Array.h
include/poppler/BBoxOutputDev.h
include/poppler/CMap.h