commit 56b407ec729850b004a8ecdc9791a83c5c44a9ea
Author: Scott Kostyshak <[email protected]>
Date: Fri Jan 17 13:13:54 2025 +0100
lyxbuild --patch-old: cherry-pick for GCC 15
See José's commit at 527d3d66 for details.
---
development/lyx-tester/lyxbuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/development/lyx-tester/lyxbuild b/development/lyx-tester/lyxbuild
index 9f840111c3..a2d71c024b 100755
--- a/development/lyx-tester/lyxbuild
+++ b/development/lyx-tester/lyxbuild
@@ -382,6 +382,10 @@ if [ "${patch_old}" = "1" ]; then
git cherry-pick --keep-redundant-commits -x -X theirs "6874c86c"
fi
+ if ! git merge-base --is-ancestor "527d3d66" HEAD; then
+ git cherry-pick --keep-redundant-commits -x -X theirs "527d3d66"
+ fi
+
# EXPIRE:
# The following is not strictly (because we do not run the cmake dev flags if
# --patch-old) necessary and it sync not apply cleanly in many cases.
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
