Hi,
update to poppler-23.10.0.
No idea why upstream applied major bumps to -glib, -qt5 and -qt6;
according to /usr/src/lib/check_sym only minor bumps are necessary (no
removed dynamic export changes).
I'm using this since a few days without any problems.
ok?
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.175
diff -u -p -r1.175 Makefile
--- Makefile 27 Sep 2023 14:32:03 -0000 1.175
+++ Makefile 7 Oct 2023 19:43:40 -0000
@@ -3,7 +3,7 @@ COMMENT-qt5= Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 23.05.0
+V= 23.10.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -13,10 +13,10 @@ PKGNAME-qt6= poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 74.0 # 128.0
-SHARED_LIBS += poppler-glib 19.11 # 8.24
-SHARED_LIBS += poppler-qt5 8.11 # 1.31
-SHARED_LIBS += poppler-qt6 1.2 # 3.2
+SHARED_LIBS += poppler 75.0 # 132.0
+SHARED_LIBS += poppler-glib 19.12 # 8.26
+SHARED_LIBS += poppler-qt5 8.12 # 1.33
+SHARED_LIBS += poppler-qt6 1.3 # 3.4
SHARED_LIBS += poppler-cpp 17.1 # 0.11
HOMEPAGE= https://poppler.freedesktop.org/
@@ -98,7 +98,8 @@ WANTLIB-utils= ${COMPILER_LIBCXX} c cair
CONFIGURE_ARGS+=-DENABLE_UNSTABLE_API_ABI_HEADERS=True \
-DBUILD_GTK_TESTS=False \
-DENABLE_LIBCURL=False \
- -DCMAKE_DISABLE_FIND_PACKAGE_NSS3=True \
+ -DENABLE_GPGME=False \
+ -DENABLE_NSS3=False \
-DOpenJPEG_DIR=${LOCALBASE}/lib/openjp2 \
-DX11BASE=${X11BASE}
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.94
diff -u -p -r1.94 distinfo
--- distinfo 17 Jul 2023 20:45:52 -0000 1.94
+++ distinfo 7 Oct 2023 19:43:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-23.05.0.tar.xz) = OClN5xSevkWBkabm0OKDfafbqGg5AKY1JS9tDuI1+ZA=
-SIZE (poppler-23.05.0.tar.xz) = 1856488
+SHA256 (poppler-23.10.0.tar.xz) = MaPf3qefSSJALTE3N0FaRNRNwU1rMX+VmnfFu6Bkfdk=
+SIZE (poppler-23.10.0.tar.xz) = 1892152
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 17 Jul 2023 20:45:52 -0000 1.3
+++ patches/patch-CMakeLists_txt 7 Oct 2023 19:43:40 -0000
@@ -1,14 +1,14 @@
-Allow to build against qt-6.0.
+Allow to build against qt-6.5.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -204,7 +204,7 @@ endif()
+@@ -215,7 +215,7 @@ find_soft_mandatory_package(ENABLE_QT5 Qt5Xml ${QT5_VE
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Widgets ${QT5_VERSION})
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Test ${QT5_VERSION})
- if (ENABLE_QT6)
- SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
-- find_package(Qt6 6.2 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)
+-set(QT6_VERSION "6.2")
++set(QT6_VERSION "6")
+ SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
+ find_soft_mandatory_package(ENABLE_QT6 Qt6Core ${QT6_VERSION})
+ find_soft_mandatory_package(ENABLE_QT6 Qt6Gui ${QT6_VERSION})
Index: patches/patch-glib_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.13
diff -u -p -r1.13 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt 17 Jul 2023 20:45:52 -0000 1.13
+++ patches/patch-glib_CMakeLists_txt 7 Oct 2023 19:43:40 -0000
@@ -7,11 +7,11 @@ 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.24.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.26.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}")
-@@ -131,6 +130,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
+@@ -135,6 +134,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
_gir_list_prefix(_includes _tmp_includes "-I")
# And set flags for gir compiler and scanner
set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR}
-L${CMAKE_CURRENT_BINARY_DIR})
Index: patches/patch-poppler_Form_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.13
diff -u -p -r1.13 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 17 Jul 2023 20:45:52 -0000 1.13
+++ patches/patch-poppler_Form_cc 7 Oct 2023 19:43:40 -0000
@@ -1,9 +1,9 @@
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -42,6 +42,7 @@
- #include <config.h>
+@@ -43,6 +43,7 @@
+ #include <array>
#include <set>
+#include <ctype.h>
#include <limits>
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.29
diff -u -p -r1.29 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 17 Jul 2023 20:45:52 -0000 1.29
+++ patches/patch-poppler_XRef_cc 7 Oct 2023 19:43:40 -0000
@@ -1,7 +1,7 @@
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1094,7 +1094,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -1110,7 +1110,7 @@ bool XRef::isRefEncrypted(Ref r)
bool XRef::okToPrint(bool ignoreOwnerPW) const
{
@@ -10,7 +10,7 @@ Index: poppler/XRef.cc
}
// we can print at high res if we are only doing security handler revision
-@@ -1102,48 +1102,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1118,48 +1118,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: patches/patch-qt5_src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
retrieving revision 1.9
diff -u -p -r1.9 patch-qt5_src_CMakeLists_txt
--- patches/patch-qt5_src_CMakeLists_txt 17 Jul 2023 20:45:52 -0000
1.9
+++ patches/patch-qt5_src_CMakeLists_txt 7 Oct 2023 19:43:40 -0000
@@ -7,7 +7,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.31.0 SOVERSION 1)
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.33.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: patches/patch-qt6_src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt6_src_CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-qt6_src_CMakeLists_txt
--- patches/patch-qt6_src_CMakeLists_txt 17 Jul 2023 20:45:52 -0000
1.6
+++ patches/patch-qt6_src_CMakeLists_txt 7 Oct 2023 19:43:40 -0000
@@ -7,7 +7,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.2.0 SOVERSION 3)
+-set_target_properties(poppler-qt6 PROPERTIES VERSION 3.4.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}")
