download.lst | 4 ++-- external/poppler/clang-std-ranges.patch.1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 4fdbbe04e533da628cf8418a24b2acd664b91a5a Author: Xisco Fauli <[email protected]> AuthorDate: Thu Aug 7 00:44:36 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Mon Aug 18 17:57:41 2025 +0200 poppler: upgrade to 25.08 Downloaded from https://poppler.freedesktop.org/poppler-25.08.0.tar.xz Change-Id: Ifdc52a9b6d1412d3fe70baa2e9fb367a476c05fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189028 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 3fe840e33667c12d615774cd0a3a5aaa97f7b547) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189039 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189530 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/download.lst b/download.lst index af0b6d3ca47c..5e3939a1e21e 100644 --- a/download.lst +++ b/download.lst @@ -578,8 +578,8 @@ LIBTIFF_TARBALL := tiff-4.7.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -POPPLER_SHA256SUM := c504a9066dbdfebe377ad53cec641fd971ee96c4e1e8ca74e6c9c03d46d817ae -POPPLER_TARBALL := poppler-25.07.0.tar.xz +POPPLER_SHA256SUM := 425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d +POPPLER_TARBALL := poppler-25.08.0.tar.xz POPPLER_DATA_SHA256SUM := c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz # three static lines commit cd83e4adb58174fdcb8ca5ab820c590f6ac031f7 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jul 4 22:27:45 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Mon Aug 18 17:57:34 2025 +0200 poppler: upgrade to 25.07 Downloaded from https://poppler.freedesktop.org/poppler-25.07.0.tar.xz Change-Id: Ia38e14845351ba5300613fd4ecd055bea45150e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187429 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 406bcd8066cd94dfb2e39454fe32543eafd01428) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187434 Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189529 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/download.lst b/download.lst index 8521a413e22e..af0b6d3ca47c 100644 --- a/download.lst +++ b/download.lst @@ -578,8 +578,8 @@ LIBTIFF_TARBALL := tiff-4.7.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -POPPLER_SHA256SUM := 8199532d38984fab46dbd0020ec9c40f20e928e33e9b4cc6043572603a821d83 -POPPLER_TARBALL := poppler-25.06.0.tar.xz +POPPLER_SHA256SUM := c504a9066dbdfebe377ad53cec641fd971ee96c4e1e8ca74e6c9c03d46d817ae +POPPLER_TARBALL := poppler-25.07.0.tar.xz POPPLER_DATA_SHA256SUM := c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz # three static lines commit 66292faf719a395012cc97864d94b04bd3d2e7d9 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Jun 4 10:33:51 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Mon Aug 18 17:57:27 2025 +0200 poppler: uggrade to 25.06 Downloaded from https://poppler.freedesktop.org/poppler-25.06.0.tar.xz Change-Id: I2a24b6126d24255ac89c9e1e218b86d275f698f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186182 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186652 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/download.lst b/download.lst index b4fd08de46f8..8521a413e22e 100644 --- a/download.lst +++ b/download.lst @@ -578,8 +578,8 @@ LIBTIFF_TARBALL := tiff-4.7.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -POPPLER_SHA256SUM := 9b1627c5b76816ac5e4052a03f5b605ba40b45cf06b02cadd0479620b499ab38 -POPPLER_TARBALL := poppler-25.05.0.tar.xz +POPPLER_SHA256SUM := 8199532d38984fab46dbd0020ec9c40f20e928e33e9b4cc6043572603a821d83 +POPPLER_TARBALL := poppler-25.06.0.tar.xz POPPLER_DATA_SHA256SUM := c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz # three static lines diff --git a/external/poppler/clang-std-ranges.patch.1 b/external/poppler/clang-std-ranges.patch.1 index 28841ed6a005..8037ded0566f 100644 --- a/external/poppler/clang-std-ranges.patch.1 +++ b/external/poppler/clang-std-ranges.patch.1 @@ -339,9 +339,9 @@ In file included from /opt/rh/gcc-toolset-12/root/usr/lib/gcc/x86_64-redhat-linu } --- poppler/poppler/Annot.cc.orig 2025-01-09 17:40:31.125125064 +0100 +++ poppler/poppler/Annot.cc 2025-01-09 17:40:14.021036519 +0100 -@@ -7499,7 +7499,11 @@ +@@ -7470,7 +7470,11 @@ - bool Annots::removeAnnot(Annot *annot) + bool Annots::removeAnnot(const std::shared_ptr<Annot> &annot) { +#ifndef __clang__ auto idx = std::ranges::find(annots, annot);
