external/poppler/clang-std-ranges.patch.1 | 45 ------------------------------
1 file changed, 45 deletions(-)
New commits:
commit d5785b8f8363f62adc3c9f144c8309a69f26bb77
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue May 27 14:15:42 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue May 27 17:05:43 2025 +0200
Revert "poppler: avoid more std::ranges afer update to 25.04.0"
This reverts commit 8cdbe3666440f81aa71539e8d38d5a93eec17b26.
Reason for revert: build baseline was bumped so the workaround is not
needed anymore
Change-Id: I551ba5d4fbfb786f748fd603e48d715962ea9847
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185910
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/external/poppler/clang-std-ranges.patch.1
b/external/poppler/clang-std-ranges.patch.1
index 28841ed6a005..c1484d9ab81b 100644
--- a/external/poppler/clang-std-ranges.patch.1
+++ b/external/poppler/clang-std-ranges.patch.1
@@ -415,48 +415,3 @@ In file included from
/opt/rh/gcc-toolset-12/root/usr/lib/gcc/x86_64-redhat-linu
}
}
-diff -ur poppler.org/poppler/TextOutputDev.cc poppler/poppler/TextOutputDev.cc
---- poppler.org/poppler/TextOutputDev.cc 2025-04-22 15:42:57.000000000
+0200
-+++ poppler/poppler/TextOutputDev.cc 2025-04-22 15:49:06.000000000 +0200
-@@ -2419,7 +2419,11 @@
- }
- }
- }
-+#ifndef __clang__
- std::ranges::sort(words, &TextWord::cmpYX);
-+#else
-+ std::sort(words.begin(), words.end(), &TextWord::cmpYX);
-+#endif
-
- } else {
- for (flow = text->flows; flow; flow = flow->next) {
-@@ -4402,9 +4406,17 @@
- // if all lines in the region have the same rotation, use it;
- // otherwise, use the page's primary rotation
- if (oneRot) {
-+#ifndef __clang__
- std::ranges::sort(frags, &TextLineFrag::cmpYXLineRot);
-+#else
-+ std::sort(frags.begin(), frags.end(),
&TextLineFrag::cmpYXLineRot);
-+#endif
- } else {
-+#ifndef __clang__
- std::ranges::sort(frags, &TextLineFrag::cmpYXPrimaryRot);
-+#else
-+ std::sort(frags.begin(), frags.end(),
&TextLineFrag::cmpYXPrimaryRot);
-+#endif
- }
- for (auto it = frags.begin(); it != frags.end();) {
- double delta = maxIntraLineDelta * it->line->words->fontSize;
-@@ -5416,7 +5428,11 @@
- frags.back().computeCoords(true);
- }
- }
-+#ifndef __clang__
- std::ranges::sort(frags, &TextLineFrag::cmpYXPrimaryRot);
-+#else
-+ std::sort(frags.begin(), frags.end(), &TextLineFrag::cmpYXPrimaryRot);
-+#endif
- for (auto it = frags.begin(); it != frags.end();) {
- double delta = maxIntraLineDelta * it->line->words->fontSize;
- double base = it->base;
