From 3c494bfb24cc380d2d813b85427e9878e121cc9e Mon Sep 17 00:00:00 2001 From: kili Date: Fri, 24 Dec 2021 10:09:02 +0000 Subject: [PATCH] Update to poppler-21.12.0. --- print/poppler/Makefile | 8 ++++---- print/poppler/distinfo | 4 ++-- print/poppler/patches/patch-CMakeLists_txt | 16 ++++++++++++++++ print/poppler/patches/patch-glib_CMakeLists_txt | 4 ++-- print/poppler/patches/patch-poppler_Form_cc | 4 ++-- print/poppler/patches/patch-poppler_XRef_cc | 6 +++--- print/poppler/pkg/PLIST-main | 6 +++--- 7 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 print/poppler/patches/patch-CMakeLists_txt diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 9faef1a8db6..53f89496e8a 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.169 2021/11/01 18:33:24 kili Exp $ +# $OpenBSD: Makefile,v 1.170 2021/12/24 10:09:02 kili Exp $ COMMENT-main= PDF rendering library COMMENT-qt5= Qt5 interface to PDF rendering library 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 diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 6385885bdbd..b76d66eb8ea 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -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 diff --git a/print/poppler/patches/patch-CMakeLists_txt b/print/poppler/patches/patch-CMakeLists_txt new file mode 100644 index 00000000000..4c61fbd7878 --- /dev/null +++ b/print/poppler/patches/patch-CMakeLists_txt @@ -0,0 +1,16 @@ +$OpenBSD: patch-CMakeLists_txt,v 1.1 2021/12/24 10:09:02 kili Exp $ + +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) diff --git a/print/poppler/patches/patch-glib_CMakeLists_txt b/print/poppler/patches/patch-glib_CMakeLists_txt index 88372949fa5..2cb43efaa56 100644 --- a/print/poppler/patches/patch-glib_CMakeLists_txt +++ b/print/poppler/patches/patch-glib_CMakeLists_txt @@ -1,4 +1,4 @@ -$OpenBSD: patch-glib_CMakeLists_txt,v 1.10 2021/05/19 19:57:03 kili Exp $ +$OpenBSD: patch-glib_CMakeLists_txt,v 1.11 2021/12/24 10:09:02 kili Exp $ - Remove hardcoded SOVERSION @@ -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}") diff --git a/print/poppler/patches/patch-poppler_Form_cc b/print/poppler/patches/patch-poppler_Form_cc index 96dc3151db9..1da00e144bf 100644 --- a/print/poppler/patches/patch-poppler_Form_cc +++ b/print/poppler/patches/patch-poppler_Form_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-poppler_Form_cc,v 1.10 2021/11/01 18:33:25 kili Exp $ +$OpenBSD: patch-poppler_Form_cc,v 1.11 2021/12/24 10:09:02 kili Exp $ Index: poppler/Form.cc --- poppler/Form.cc.orig +++ poppler/Form.cc -@@ -38,6 +38,7 @@ +@@ -39,6 +39,7 @@ #include #include diff --git a/print/poppler/patches/patch-poppler_XRef_cc b/print/poppler/patches/patch-poppler_XRef_cc index 0118de81f49..0b873cbe682 100644 --- a/print/poppler/patches/patch-poppler_XRef_cc +++ b/print/poppler/patches/patch-poppler_XRef_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-poppler_XRef_cc,v 1.26 2021/09/08 17:50:37 kili Exp $ +$OpenBSD: patch-poppler_XRef_cc,v 1.27 2021/12/24 10:09:02 kili Exp $ 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 { diff --git a/print/poppler/pkg/PLIST-main b/print/poppler/pkg/PLIST-main index c4a6893b385..084be7d42af 100644 --- a/print/poppler/pkg/PLIST-main +++ b/print/poppler/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.41 2021/11/01 18:33:25 kili Exp $ +@comment $OpenBSD: PLIST-main,v 1.42 2021/12/24 10:09:02 kili Exp $ @conflict poppler-qt-<0.5.4p0 @pkgpath print/poppler include/poppler/ @@ -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