Download raw body.
update print/poppler
Hi,
I know I'm late ;-)
This updates poppler to 25.10.0. A couple of ports need patches
(following in a day or two, after I've got a chance to test them a
little bit):
editors/calligra
editors/libreoffice
geo/gdal
graphics/dia
graphics/inkscape
print/scribus
Ciao,
Kili
ps: 15+ years ago, dozens of projects included a (patched) copy of
Xpdf (some still do in their distfiles, but now with poppler) and
required heavy patching whenever a serious bug in Xpdf had been
discovered. Today, the situation is much better, because brave
people forked Xpdf into a library named poppler, which requires
heavy patching and miles-long #ifdef-chains on a monthly base in
upstream projects, even if there are no serious bugs. And in case
there are some serious bugs, they aren't mentioned in the release
notes.
(The above paragraph may contain some sarcasm)
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.201 Makefile
--- Makefile 20 Oct 2025 21:22:19 -0000 1.201
+++ Makefile 28 Oct 2025 01:31:55 -0000
@@ -3,8 +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.09.1
-REVISION= 0
+V= 25.10.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -14,11 +13,11 @@ PKGNAME-qt6= poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 95.0 # 153.0
-SHARED_LIBS += poppler-glib 19.17 # 8.30
+SHARED_LIBS += poppler 96.0 # 154.0
+SHARED_LIBS += poppler-glib 19.18 # 8.31
SHARED_LIBS += poppler-qt5 9.2 # 1.39
SHARED_LIBS += poppler-qt6 2.2 # 3.11
-SHARED_LIBS += poppler-cpp 19.1 # 2.1
+SHARED_LIBS += poppler-cpp 19.2 # 2.2
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
diff -u -p -r1.117 distinfo
--- distinfo 20 Sep 2025 20:21:32 -0000 1.117
+++ distinfo 28 Oct 2025 01:31:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-25.09.1.tar.xz) = DBCR0B090WZKE4FoYegS0CspIB6WZlRUuBtS0mH61lg=
-SIZE (poppler-25.09.1.tar.xz) = 1980980
+SHA256 (poppler-25.10.0.tar.xz) = a16btk2rsVeHoU2xZ1KRx6+vk4dDjMk6T7f2rsTub+A=
+SIZE (poppler-25.10.0.tar.xz) = 1985796
Index: patches/patch-cpp_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-cpp_CMakeLists_txt,v
diff -u -p -r1.7 patch-cpp_CMakeLists_txt
--- patches/patch-cpp_CMakeLists_txt 14 Apr 2025 20:31:39 -0000 1.7
+++ patches/patch-cpp_CMakeLists_txt 28 Oct 2025 01:31:55 -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.1.0 SOVERSION 2)
+-set_target_properties(poppler-cpp PROPERTIES VERSION 2.2.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: patches/patch-glib_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
diff -u -p -r1.18 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt 19 Jun 2025 20:17:30 -0000 1.18
+++ patches/patch-glib_CMakeLists_txt 28 Oct 2025 01:31:55 -0000
@@ -7,7 +7,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.30.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.31.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: patches/patch-poppler_StructTreeRoot_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_StructTreeRoot_cc,v
diff -u -p -r1.1 patch-poppler_StructTreeRoot_cc
--- patches/patch-poppler_StructTreeRoot_cc 20 Oct 2025 21:22:19 -0000 1.1
+++ patches/patch-poppler_StructTreeRoot_cc 28 Oct 2025 01:31:55 -0000
@@ -1,18 +0,0 @@
-Fix CVE-2025-52885.
-
-From upstream commit eb46147bd1cd23b48e22af667106153bd1aa0794.
-
-Index: poppler/StructTreeRoot.cc
---- poppler/StructTreeRoot.cc.orig
-+++ poppler/StructTreeRoot.cc
-@@ -137,6 +137,10 @@ void StructTreeRoot::parseNumberTreeNode(Dict *node)
- }
- int keyVal = key.getInt();
- std::vector<Parent> &vec = parentTree[keyVal];
-+ if (!vec.empty()) {
-+ error(errSyntaxError, -1, "Nums item at position {0:d} is a duplicate entry for key {1:d}", i, keyVal);
-+ continue;
-+ }
-
- Object valueArray = nums.arrayGet(i + 1);
- if (valueArray.isArray()) {
update print/poppler