Hi,
the diff below updates poppler to 21.12.0 and also includes a fix
for inkscape.
I've already tested this on my machine.
Note that poppler-qt6 wants qt6.1 but still at least builds with
qt6.0. Afaics, no port currently depends on poppler-qt6, so there
should be no breakage even if poppler-21.12.0 and qt6.0 don't play
well together.
ok? (especially for the inkscape patch)
Ciao,
Kili
Index: print/poppler/Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- print/poppler/Makefile 1 Nov 2021 18:33:24 -0000 1.169
+++ print/poppler/Makefile 21 Dec 2021 11:09:20 -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.10.0
+V= 21.12.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -15,8 +15,8 @@ PKGNAME-qt6= poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 72.0 # 113.0
-SHARED_LIBS += poppler-glib 19.9 # 8.21
+SHARED_LIBS += poppler 73.0 # 116.0
+SHARED_LIBS += poppler-glib 19.10 # 8.22
SHARED_LIBS += poppler-qt5 8.10 # 1.30
SHARED_LIBS += poppler-qt6 1.1 # 3.1
SHARED_LIBS += poppler-cpp 17.0 # 0.9
Index: print/poppler/distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.92
diff -u -p -r1.92 distinfo
--- print/poppler/distinfo 1 Nov 2021 18:33:25 -0000 1.92
+++ print/poppler/distinfo 21 Dec 2021 11:09:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-21.10.0.tar.xz) = lktbFikPvsP65XwqW83qSbsHNr11DDo3EcR5lcnvw5Q=
-SIZE (poppler-21.10.0.tar.xz) = 1779668
+SHA256 (poppler-21.12.0.tar.xz) = rLhAwsHsB9B+U8V8Szof8+PuLYiNROHp8vAarxaBTec=
+SIZE (poppler-21.12.0.tar.xz) = 1798780
Index: print/poppler/patches/patch-CMakeLists_txt
===================================================================
RCS file: print/poppler/patches/patch-CMakeLists_txt
diff -N print/poppler/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ print/poppler/patches/patch-CMakeLists_txt 21 Dec 2021 11:09:20 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Allow to build against qt-6.0.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -191,7 +191,7 @@ endif()
+
+ if (ENABLE_QT6)
+ SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
+- find_package(Qt6 6.1 COMPONENTS Core Gui Widgets Test QUIET)
++ find_package(Qt6 COMPONENTS Core Gui Widgets Test QUIET)
+ if (NOT (Qt6Core_FOUND AND Qt6Gui_FOUND AND Qt6Widgets_FOUND AND
Qt6Test_FOUND))
+ message("-- Package Qt6Core or Qt6Gui or Qt6Widgets or Qt6Test not found")
+ set(ENABLE_QT6 OFF)
Index: print/poppler/patches/patch-glib_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.10
diff -u -p -r1.10 patch-glib_CMakeLists_txt
--- print/poppler/patches/patch-glib_CMakeLists_txt 19 May 2021 19:57:03
-0000 1.10
+++ print/poppler/patches/patch-glib_CMakeLists_txt 21 Dec 2021 11:09:20
-0000
@@ -9,7 +9,7 @@ Index: glib/CMakeLists.txt
)
add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
generate_export_header(poppler-glib EXPORT_MACRO_NAME POPPLER_PUBLIC
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-macros.h")
--set_target_properties(poppler-glib PROPERTIES VERSION 8.21.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.22.0 SOVERSION 8)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION)
set_target_properties(poppler-glib PROPERTIES SUFFIX
"-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: print/poppler/patches/patch-poppler_Form_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.10
diff -u -p -r1.10 patch-poppler_Form_cc
--- print/poppler/patches/patch-poppler_Form_cc 1 Nov 2021 18:33:25 -0000
1.10
+++ print/poppler/patches/patch-poppler_Form_cc 21 Dec 2021 11:09:20 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.10 2
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -38,6 +38,7 @@
+@@ -39,6 +39,7 @@
#include <config.h>
#include <set>
Index: print/poppler/patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.26
diff -u -p -r1.26 patch-poppler_XRef_cc
--- print/poppler/patches/patch-poppler_XRef_cc 8 Sep 2021 17:50:37 -0000
1.26
+++ print/poppler/patches/patch-poppler_XRef_cc 21 Dec 2021 11:09:20 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.26 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1075,7 +1075,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -1076,7 +1076,7 @@ bool XRef::isRefEncrypted(Ref r)
bool XRef::okToPrint(bool ignoreOwnerPW) const
{
@@ -11,7 +11,7 @@ Index: poppler/XRef.cc
}
// we can print at high res if we are only doing security handler revision
-@@ -1083,48 +1083,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1084,48 +1084,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
// 3 and we are allowed to print, and bit 12 is set.
bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
{
Index: print/poppler/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.41
diff -u -p -r1.41 PLIST-main
--- print/poppler/pkg/PLIST-main 1 Nov 2021 18:33:25 -0000 1.41
+++ print/poppler/pkg/PLIST-main 21 Dec 2021 11:09:20 -0000
@@ -20,6 +20,8 @@ include/poppler/Decrypt.h
include/poppler/Dict.h
include/poppler/Error.h
include/poppler/ErrorCodes.h
+include/poppler/FDPDFDocBuilder.h
+include/poppler/FILECacheLoader.h
include/poppler/FileSpec.h
include/poppler/FontEncodingTables.h
include/poppler/FontInfo.h
@@ -63,8 +65,6 @@ include/poppler/Rendition.h
include/poppler/SecurityHandler.h
include/poppler/Sound.h
include/poppler/SplashOutputDev.h
-include/poppler/StdinCachedFile.h
-include/poppler/StdinPDFDocBuilder.h
include/poppler/Stream-CCITT.h
include/poppler/Stream.h
include/poppler/StructElement.h
Index:
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
===================================================================
RCS file:
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
diff -N
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
21 Dec 2021 11:09:20 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix build with poppler-21.11.0.
+From upstream commit 5724c21b9cb7b6176a7b36ca24068b148c817e82.
+
+Index: src/extension/internal/pdfinput/pdf-parser.cpp
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig
++++ src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2169,7 +2169,7 @@ void PdfParser::opSetFont(Object args[], int /*numArgs
+ }
+ if (printCommands) {
+ printf(" font: tag=%s name='%s' %g\n",
+- font->getTag()->getCString(),
++ font->getTag().c_str(),
+ font->getName() ? font->getName()->getCString() : "???",
+ args[1].getNum());
+ fflush(stdout);
