Hi,
update to poppler-25.04.0, of course to be done after ports are
unlocked.
No breakage in a bulk build (to my surprise); tested as usual (using
some pdf viewers, importing some pdfs in inkscape and scribus).
For the changes in pkg/PLIST-main and pkg/PLIST-qt6 (moving
include/poppler/qt6/poppler-converter.h): The @conflict marker in
PLIST-main should be enough to get rid of the mess I introduced
last year. A run of pkg_add -u on a machine with poppler-qt6-25.03.0
installed resulted in a merged update of poppler and poppler-qt6
to 25.04.0 without problems.
Ciao,
Kil
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.194 Makefile
--- Makefile 23 Mar 2025 22:04:27 -0000 1.194
+++ Makefile 11 Apr 2025 21:18:30 -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= 25.03.0
+V= 25.04.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -13,11 +13,11 @@ PKGNAME-qt6= poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 89.0 # 147.0
+SHARED_LIBS += poppler 90.0 # 148.0
SHARED_LIBS += poppler-glib 19.15 # 8.29
SHARED_LIBS += poppler-qt5 9.1 # 1.38
SHARED_LIBS += poppler-qt6 2.1 # 3.10
-SHARED_LIBS += poppler-cpp 19.0 # 2.0
+SHARED_LIBS += poppler-cpp 19.1 # 2.1
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
diff -u -p -r1.111 distinfo
--- distinfo 23 Mar 2025 22:04:27 -0000 1.111
+++ distinfo 11 Apr 2025 21:18:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-25.03.0.tar.xz) = l9pP+IUXprvXKVKfGV+FyNegw7tKPVfLDGhcuwUv6Dc=
-SIZE (poppler-25.03.0.tar.xz) = 1954516
+SHA256 (poppler-25.04.0.tar.xz) = sBDFltzhJ/uohTL9LxBD5V6jBgF2eVLQ8sCoDn3A2j0=
+SIZE (poppler-25.04.0.tar.xz) = 1957260
Index: patches/patch-cpp_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-cpp_CMakeLists_txt,v
diff -u -p -r1.6 patch-cpp_CMakeLists_txt
--- patches/patch-cpp_CMakeLists_txt 6 Jan 2025 22:14:11 -0000 1.6
+++ patches/patch-cpp_CMakeLists_txt 11 Apr 2025 21:18:30 -0000
@@ -7,7 +7,7 @@ Index: cpp/CMakeLists.txt
add_library(poppler-cpp ${poppler_cpp_SRCS})
generate_export_header(poppler-cpp BASE_NAME poppler-cpp EXPORT_FILE_NAME
"${CMAKE_CURRENT_BINARY_DIR}/poppler_cpp_export.h")
--set_target_properties(poppler-cpp PROPERTIES VERSION 2.0.0 SOVERSION 2)
+-set_target_properties(poppler-cpp PROPERTIES VERSION 2.1.0 SOVERSION 2)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_CPP_SOVERSION poppler-cpp SOVERSION)
set_target_properties(poppler-cpp PROPERTIES SUFFIX
"-${POPPLER_CPP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
diff -u -p -r1.46 PLIST-main
--- pkg/PLIST-main 6 Dec 2024 07:12:30 -0000 1.46
+++ pkg/PLIST-main 11 Apr 2025 21:18:30 -0000
@@ -1,4 +1,5 @@
@conflict poppler-qt-<0.5.4p0
+@conflict poppler-qt6-<25.04.0
@pkgpath print/poppler
include/poppler/
include/poppler/Annot.h
@@ -117,7 +118,6 @@ include/poppler/goo/grandom.h
include/poppler/goo/gstrtod.h
include/poppler/poppler-config.h
include/poppler/poppler_private_export.h
-include/poppler/qt6/poppler-converter.h
include/poppler/splash/
include/poppler/splash/Splash.h
include/poppler/splash/SplashBitmap.h
Index: pkg/PLIST-qt6
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-qt6,v
diff -u -p -r1.2 PLIST-qt6
--- pkg/PLIST-qt6 11 Mar 2022 19:51:06 -0000 1.2
+++ pkg/PLIST-qt6 11 Apr 2025 21:18:30 -0000
@@ -1,5 +1,6 @@
include/poppler/qt6/
include/poppler/qt6/poppler-annotation.h
+include/poppler/qt6/poppler-converter.h
include/poppler/qt6/poppler-export.h
include/poppler/qt6/poppler-form.h
include/poppler/qt6/poppler-link.h
