37585350 Upgrade poppler to 25.02.0

37444402 problem in LIBRARY/POPPLER

components/desktop/poppler/Makefile

@@ -20,23 +20,24 @@
 #
 
 #
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 #
 BUILD_BITS= 64_and_32
 COMPILER=gcc
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		poppler
-COMPONENT_VERSION=	24.08.0
+COMPONENT_VERSION=	25.02.0
 # must not be zero padded
-IPS_COMPONENT_VERSION=	24.8.0
+IPS_COMPONENT_VERSION=	$(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\.0\([^.]\)/.\1/g')
 COMPONENT_PROJECT_URL=	https://poppler.freedesktop.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
-COMPONENT_ARCHIVE_HASH= sha256:97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174
+COMPONENT_ARCHIVE_HASH= sha256:21234cb2a9647d73c752ce4031e65a79d11a511a835f2798284c2497b8701dee
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
+COMPONENT_SIG_URL=	$(COMPONENT_ARCHIVE_URL).sig
 COMPONENT_BUGDB=	library/poppler
 COMPONENT_ANITYA_ID=	3686
-COMPONENT_BAID_POPPLER=	175805
+COMPONENT_BAID_POPPLER=	196101
 
 COMPONENT_NAME_1=	poppler-data
 COMPONENT_VERSION_1=	0.4.12
@@ -45,6 +46,7 @@ COMPONENT_ARCHIVE_1=	$(COMPONENT_SRC_1).tar.gz
 COMPONENT_ARCHIVE_HASH_1= \
 	sha256:c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
 COMPONENT_ARCHIVE_URL_1= $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE_1)
+COMPONENT_SIG_URL_1=	$(COMPONENT_ARCHIVE_URL_1).sig
 COMPONENT_ANITYA_ID_1=	3687
 COMPONENT_BAID_POPPLER_DATA=	151084
 
@@ -107,7 +109,6 @@ REQUIRED_PACKAGES += library/nspr
 REQUIRED_PACKAGES += library/security/nss
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += print/filter/poppler
-REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/fontconfig
 REQUIRED_PACKAGES += system/library/freetype-2
 REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime

components/desktop/poppler/patches/01-stdc_want_lib_ext1.patch

@@ -3,9 +3,9 @@ functions defined.
 
 This is a Solaris specific patch.
 
---- a/test/perf-test.cc	2020-10-01 21:44:58.000000000 +0200
-+++ b/test/perf-test.cc	2020-11-10 09:23:38.566053281 +0100
-@@ -18,6 +18,9 @@
+--- a/test/perf-test.cc
++++ b/test/perf-test.cc
+@@ -20,6 +20,9 @@ option to force writing the -out file).
       of a previous run.
  */
 

components/desktop/poppler/patches/02-gsed.patch

@@ -1,8 +1,8 @@
 Not suitable for upstream.
 
---- poppler-24.07.0/CMakeLists.txt
-+++ poppler-24.07.0/CMakeLists.txt
-@@ -399,7 +399,7 @@ configure_file(config.h.cmake ${CMAKE_CU
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -393,7 +393,7 @@ configure_file(config.h.cmake ${CMAKE_CU
  configure_file(poppler/poppler-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h)
 
  find_program(GPERF gperf)

components/desktop/poppler/patches/03-remove-version-script.patch

@@ -3,9 +3,9 @@ and created this patch till the issue is resolved.
 
 https://gitlab.freedesktop.org/poppler/poppler/-/issues/1438
 
---- a/CMakeLists.txt	2023-09-05 23:15:14.000000000 +0200
-+++ b/CMakeLists.txt	2023-09-26 08:59:47.459557954 +0200
-@@ -638,7 +638,7 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -633,7 +633,7 @@ set_target_properties(poppler PROPERTIES
                                VERSION ${POPPLER_SOVERSION_NUMBER}.0.0
                                SOVERSION ${POPPLER_SOVERSION_NUMBER})
 

components/desktop/poppler/patches/04-po.patch

@@ -0,0 +1,20 @@
+Not suitable for upstream.
+
+--- a/utils/po/CMakeLists.txt
++++ b/utils/po/CMakeLists.txt
+@@ -19,13 +19,13 @@
+   set(COPY_NEW_POTFILE ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${_potFile}.new ${CMAKE_CURRENT_SOURCE_DIR}/${_potFile})
+   if (NOT (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows"))
+     # IF the new potfile carries changes other than an updated POT-creation-date (autogenerated) THEN proceed to use that new potfile
+-    set(CM diff --brief --ignore-matching-lines="POT-Creation-Date.*" ${CMAKE_CURRENT_SOURCE_DIR}/${_potFile} ${CMAKE_CURRENT_BINARY_DIR}/${_potFile}.new || ${COPY_NEW_POTFILE})
++    set(CM gdiff --brief --ignore-matching-lines="POT-Creation-Date.*" ${CMAKE_CURRENT_SOURCE_DIR}/${_potFile} ${CMAKE_CURRENT_BINARY_DIR}/${_potFile}.new || ${COPY_NEW_POTFILE})
+   else ()
+     set(CM ${COPY_NEW_POTFILE})
+   endif ()
+
+   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_potFile}.new
+-                     COMMAND xgettext ${input}.cc --package-name=${input} --keyword=_ -F --output="${CMAKE_CURRENT_BINARY_DIR}/${_potFile}.new"
++                     COMMAND gxgettext ${input}.cc --package-name=${input} --keyword=_ -F --output="${CMAKE_CURRENT_BINARY_DIR}/${_potFile}.new"
+                      COMMAND ${CM}
+                      ${_commands}
+                      DEPENDS ../${input}.cc

components/desktop/poppler/poppler-desktop.p5m

@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 #
 
 <transform file path=usr/share/gtk-doc/html/poppler/(.+)$ -> \
@@ -62,12 +62,12 @@ file path=usr/include/poppler/glib/poppler.h
 file path=usr/lib/$(MACH64)/girepository-1.0/Poppler-0.18.typelib
 link path=usr/lib/$(MACH64)/libpoppler-glib.so target=libpoppler-glib.so.8
 link path=usr/lib/$(MACH64)/libpoppler-glib.so.8 \
-    target=libpoppler-glib.so.8.26.0
-file path=usr/lib/$(MACH64)/libpoppler-glib.so.8.26.0
+    target=libpoppler-glib.so.8.29.0
+file path=usr/lib/$(MACH64)/libpoppler-glib.so.8.29.0
 file path=usr/lib/$(MACH64)/pkgconfig/poppler-glib.pc
 link path=usr/lib/libpoppler-glib.so target=libpoppler-glib.so.8
-link path=usr/lib/libpoppler-glib.so.8 target=libpoppler-glib.so.8.26.0
-file path=usr/lib/libpoppler-glib.so.8.26.0
+link path=usr/lib/libpoppler-glib.so.8 target=libpoppler-glib.so.8.29.0
+file path=usr/lib/libpoppler-glib.so.8.29.0
 file path=usr/lib/pkgconfig/poppler-glib.pc
 file path=usr/share/gir-1.0/Poppler-0.18.gir
 file path=usr/share/man/man1/pdftocairo.1