From a975c414842f07fee336250914bb452f436b59ee Mon Sep 17 00:00:00 2001 From: kili Date: Sat, 25 May 2024 20:10:08 +0000 Subject: [PATCH] Update to poppler-24.05.0. --- print/poppler/Makefile | 10 +++++----- print/poppler/distinfo | 4 ++-- print/poppler/patches/patch-cpp_CMakeLists_txt | 2 +- print/poppler/patches/patch-qt5_src_CMakeLists_txt | 2 +- print/poppler/patches/patch-qt6_src_CMakeLists_txt | 2 +- print/poppler/pkg/PLIST-main | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 5cca399dd56..66e21e95dba 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -3,7 +3,7 @@ COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-qt6= Qt6 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 24.04.0 +V= 24.05.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 79.0 # 136.0 +SHARED_LIBS += poppler 80.0 # 137.0 SHARED_LIBS += poppler-glib 19.12 # 8.26 -SHARED_LIBS += poppler-qt5 8.12 # 1.33 -SHARED_LIBS += poppler-qt6 1.4 # 3.4 -SHARED_LIBS += poppler-cpp 17.1 # 0.11 +SHARED_LIBS += poppler-qt5 8.13 # 1.34 +SHARED_LIBS += poppler-qt6 1.5 # 3.5 +SHARED_LIBS += poppler-cpp 18.0 # 1.0 HOMEPAGE= https://poppler.freedesktop.org/ diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 04ad3fd7f48..c9f34a03786 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,2 +1,2 @@ -SHA256 (poppler-24.04.0.tar.xz) = HoBOxWWs9xJusum7O1ZCKrIDn34Fhjpd+r3R/9G7d6c= -SIZE (poppler-24.04.0.tar.xz) = 1904936 +SHA256 (poppler-24.05.0.tar.xz) = 2MXrMLUCha2fCvjGM1zC07lZf8pHXLwlmKVHn6N593k= +SIZE (poppler-24.05.0.tar.xz) = 1909164 diff --git a/print/poppler/patches/patch-cpp_CMakeLists_txt b/print/poppler/patches/patch-cpp_CMakeLists_txt index 01d296840ec..97fdff23396 100644 --- a/print/poppler/patches/patch-cpp_CMakeLists_txt +++ b/print/poppler/patches/patch-cpp_CMakeLists_txt @@ -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 0.11.0 SOVERSION 0) +-set_target_properties(poppler-cpp PROPERTIES VERSION 1.0.0 SOVERSION 1) 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}") diff --git a/print/poppler/patches/patch-qt5_src_CMakeLists_txt b/print/poppler/patches/patch-qt5_src_CMakeLists_txt index 2e2f1daf0cd..0f982c32fd4 100644 --- a/print/poppler/patches/patch-qt5_src_CMakeLists_txt +++ b/print/poppler/patches/patch-qt5_src_CMakeLists_txt @@ -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.33.0 SOVERSION 1) +-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.34.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}") diff --git a/print/poppler/patches/patch-qt6_src_CMakeLists_txt b/print/poppler/patches/patch-qt6_src_CMakeLists_txt index abb62519131..abc05b4c2d8 100644 --- a/print/poppler/patches/patch-qt6_src_CMakeLists_txt +++ b/print/poppler/patches/patch-qt6_src_CMakeLists_txt @@ -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.4.0 SOVERSION 3) +-set_target_properties(poppler-qt6 PROPERTIES VERSION 3.5.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}") diff --git a/print/poppler/pkg/PLIST-main b/print/poppler/pkg/PLIST-main index 7dd517d69b2..7f7fcf63a80 100644 --- a/print/poppler/pkg/PLIST-main +++ b/print/poppler/pkg/PLIST-main @@ -31,6 +31,7 @@ include/poppler/GfxFont.h include/poppler/GfxState.h include/poppler/GfxState_helpers.h include/poppler/GlobalParams.h +include/poppler/HashAlgorithm.h include/poppler/Hints.h include/poppler/JArithmeticDecoder.h include/poppler/JBIG2Stream.h @@ -62,6 +63,7 @@ include/poppler/PreScanOutputDev.h include/poppler/ProfileData.h include/poppler/Rendition.h include/poppler/SecurityHandler.h +include/poppler/SignatureInfo.h include/poppler/Sound.h include/poppler/SplashOutputDev.h include/poppler/Stream-CCITT.h @@ -154,7 +156,6 @@ include/poppler/splash/SplashState.h include/poppler/splash/SplashTypes.h include/poppler/splash/SplashXPath.h include/poppler/splash/SplashXPathScanner.h -lib/girepository-1.0/ lib/girepository-1.0/Poppler-0.18.typelib @lib lib/libpoppler-cpp.so.${LIBpoppler-cpp_VERSION} @lib lib/libpoppler-glib.so.${LIBpoppler-glib_VERSION} @@ -162,5 +163,4 @@ lib/girepository-1.0/Poppler-0.18.typelib lib/pkgconfig/poppler-cpp.pc lib/pkgconfig/poppler-glib.pc lib/pkgconfig/poppler.pc -share/gir-1.0/ share/gir-1.0/Poppler-0.18.gir