download.lst                              |    4 ++--
 external/poppler/clang-std-ranges.patch.1 |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e739e07a45647057e50f7240a5a3bff82a7984ad
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jun 4 10:33:51 2025 +0200
Commit:     Michael Stahl <michael.st...@collabora.com>
CommitDate: Tue Aug 19 14:15:16 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 <xiscofa...@libreoffice.org>
    (cherry picked from commit 81fe441ce3533285ee1a4265c5c289a19d15fb13)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189207
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/download.lst b/download.lst
index 53c74be88c08..fa5aa4c5bd31 100644
--- a/download.lst
+++ b/download.lst
@@ -646,8 +646,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..f9117b872a19 100644
--- a/external/poppler/clang-std-ranges.patch.1
+++ b/external/poppler/clang-std-ranges.patch.1
@@ -341,7 +341,7 @@ In file included from 
/opt/rh/gcc-toolset-12/root/usr/lib/gcc/x86_64-redhat-linu
 +++ poppler/poppler/Annot.cc   2025-01-09 17:40:14.021036519 +0100
 @@ -7499,7 +7499,11 @@
  
- bool Annots::removeAnnot(Annot *annot)
+ bool Annots::removeAnnot(const std::shared_ptr<Annot> &annot)
  {
 +#ifndef __clang__
      auto idx = std::ranges::find(annots, annot);

Reply via email to