Update to poppler-24.10.0.
Diffs to (kind of) fix the following ports will follow:
editors/libreoffice
graphics/inkscape
print/scribus
print/xournalpp
I've also a question to the maintainers of devel/boost: is there
any knob to install BoostConfig.cmake? It would probably make
patches/patch-CMakeLists_txt obsolete.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.189 Makefile
--- Makefile 6 Sep 2024 18:45:35 -0000 1.189
+++ Makefile 22 Oct 2024 18:03:26 -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= 24.09.0
+V= 24.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 84.0 # 141.0
-SHARED_LIBS += poppler-glib 19.12 # 8.26
-SHARED_LIBS += poppler-qt5 8.15 # 1.36
-SHARED_LIBS += poppler-qt6 1.7 # 3.7
+SHARED_LIBS += poppler 85.0 # 142.0
+SHARED_LIBS += poppler-glib 19.13 # 8.27
+SHARED_LIBS += poppler-qt5 8.16 # 1.37
+SHARED_LIBS += poppler-qt6 1.8 # 3.8
SHARED_LIBS += poppler-cpp 18.0 # 1.0
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
diff -u -p -r1.106 distinfo
--- distinfo 6 Sep 2024 18:45:35 -0000 1.106
+++ distinfo 22 Oct 2024 18:03:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-24.09.0.tar.xz) = 69hXmH4jlWCMaf3EQAlpLVkG8TthLFKAvv9loLddwlU=
-SIZE (poppler-24.09.0.tar.xz) = 1914488
+SHA256 (poppler-24.10.0.tar.xz) = WO0YSYEPBKELN8f/bz5BGEXIpX1zHVmdAEWsx6f/8J0=
+SIZE (poppler-24.10.0.tar.xz) = 1920580
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-CMakeLists_txt,v
diff -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 11 Oct 2023 18:09:12 -0000 1.4
+++ patches/patch-CMakeLists_txt 22 Oct 2024 18:03:26 -0000
@@ -1,5 +1,8 @@
Allow to build against qt-6.5.
+Re-enable the "OLD" behaviour for finding boost until our boost
+package contains BoostConfig.cmake.
+
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -12,3 +15,12 @@ Index: CMakeLists.txt
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})
+@@ -225,7 +225,7 @@ find_soft_mandatory_package(ENABLE_QT6 Qt6Test ${QT6_V
+ # Check for Cairo rendering backend
+ macro_optional_find_package(Cairo ${CAIRO_VERSION})
+
+-find_package(Boost 1.74.0 CONFIG)
++find_package(Boost 1.74.0)
+ if(Boost_FOUND)
+ set(USE_BOOST_HEADERS ON)
+ elseif(ENABLE_BOOST)
Index: patches/patch-glib_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
diff -u -p -r1.14 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt 11 Oct 2023 18:09:12 -0000 1.14
+++ patches/patch-glib_CMakeLists_txt 22 Oct 2024 18:03:26 -0000
@@ -3,15 +3,15 @@
Index: glib/CMakeLists.txt
--- glib/CMakeLists.txt.orig
+++ glib/CMakeLists.txt
-@@ -90,7 +90,6 @@ set(poppler_glib_generated_SRCS
+@@ -91,7 +91,6 @@ set(poppler_glib_generated_SRCS
)
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.26.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.27.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}")
-@@ -135,6 +134,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
+@@ -136,6 +135,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-qt5_src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
diff -u -p -r1.13 patch-qt5_src_CMakeLists_txt
--- patches/patch-qt5_src_CMakeLists_txt 5 Aug 2024 17:54:29 -0000
1.13
+++ patches/patch-qt5_src_CMakeLists_txt 22 Oct 2024 18:03:26 -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.36.0 SOVERSION 1)
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.37.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
diff -u -p -r1.10 patch-qt6_src_CMakeLists_txt
--- patches/patch-qt6_src_CMakeLists_txt 5 Aug 2024 17:54:29 -0000
1.10
+++ patches/patch-qt6_src_CMakeLists_txt 22 Oct 2024 18:03:26 -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.7.0 SOVERSION 3)
+-set_target_properties(poppler-qt6 PROPERTIES VERSION 3.8.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}")
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
diff -u -p -r1.44 PLIST-main
--- pkg/PLIST-main 25 May 2024 20:10:08 -0000 1.44
+++ pkg/PLIST-main 22 Oct 2024 18:03:26 -0000
@@ -107,6 +107,7 @@ include/poppler/glib/
include/poppler/glib/poppler-action.h
include/poppler/glib/poppler-annot.h
include/poppler/glib/poppler-attachment.h
+include/poppler/glib/poppler-autocleanups.h
include/poppler/glib/poppler-date.h
include/poppler/glib/poppler-document.h
include/poppler/glib/poppler-enums.h
@@ -135,6 +136,7 @@ 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
