external/coinmp/UnpackedTarball_coinmp.mk | 4 ++
external/coinmp/const.patch.1 | 44 ++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
New commits:
commit d94d4efde4a57ec80ebbf8870901886aba7c132d
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 19 12:27:13 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Jul 19 21:35:24 2025 +0200
const up coinmp
Change-Id: I4b7f1bbb408888c0c1f5ed8c34d8871b5fd2c90a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188063
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk
b/external/coinmp/UnpackedTarball_coinmp.mk
index 20cf9184516e..fbb6ecdd4bad 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -37,6 +37,9 @@ endif
# * external/coinmp/Wnon-c-typedef-for-linkage.patch upstream at
#
<https://list.coin-or.org/pipermail/coin-discuss/2020-February/003972.html>
"[Coin-discuss]
# Small patch to fix Clang -Wnon-c-typedef-for-linkage in Clp":
+# * external/coinmp/const.patch.1 upstream at
+# <https://github.com/coin-or/CoinMP/pull/26> and
+# <https://github.com/coin-or/Clp/pull/315>
$(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-undef.patch.0 \
@@ -52,6 +55,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/bind2nd.patch.1 \
external/coinmp/clang-with-path.patch \
external/coinmp/odr.patch \
+ external/coinmp/const.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/const.patch.1 b/external/coinmp/const.patch.1
new file mode 100644
index 000000000000..d7e462f0a987
--- /dev/null
+++ b/external/coinmp/const.patch.1
@@ -0,0 +1,44 @@
+diff -ru coinmp.orig/Clp/src/CbcOrClpParam.cpp coinmp/Clp/src/CbcOrClpParam.cpp
+--- coinmp.orig/Clp/src/CbcOrClpParam.cpp 2025-07-19 12:25:58.571664720
+0100
++++ coinmp/Clp/src/CbcOrClpParam.cpp 2025-07-19 12:31:48.302362167 +0100
+@@ -29,9 +29,9 @@
+ #endif
+ #ifdef COIN_HAS_CBC
+ // from CoinSolve
+-static char coin_prompt[] = "Coin:";
++static const char coin_prompt[] = "Coin:";
+ #else
+-static char coin_prompt[] = "Clp:";
++static const char coin_prompt[] = "Clp:";
+ #endif
+ #ifdef CLP_CILK
+ #ifndef CBC_THREAD
+diff -ru coinmp.orig/Clp/src/ClpLsqr.cpp coinmp/Clp/src/ClpLsqr.cpp
+--- coinmp.orig/Clp/src/ClpLsqr.cpp 2025-07-19 12:25:58.565664691 +0100
++++ coinmp/Clp/src/ClpLsqr.cpp 2025-07-19 12:26:11.300280454 +0100
+@@ -20,7 +20,7 @@
+ */
+
+ // Initialize.
+- static char term_msg[8][80] = {
++ static const char term_msg[8][80] = {
+ "The exact solution is x = 0",
+ "The residual Ax - b is small enough, given ATOL and BTOL",
+ "The least squares error is small enough, given ATOL",
+diff -ru coinmp.orig/CoinMP/src/CoinMP.cpp coinmp/CoinMP/src/CoinMP.cpp
+--- coinmp.orig/CoinMP/src/CoinMP.cpp 2025-07-19 12:25:58.538664560 +0100
++++ coinmp/CoinMP/src/CoinMP.cpp 2025-07-19 12:29:50.486149026 +0100
+@@ -35,11 +35,11 @@
+ #include "CoinMP.h"
+
+
+-const char* COINMP_VERSIONSTR = "1.8.4";
++const char* const COINMP_VERSIONSTR = "1.8.4";
+ const int COINMP_VERSIONINT = 184;
+ const double COINMP_VERSIONDBL = 1.84;
+
+-const char* COINMP_NAME = "CoinMP";
++const char* const COINMP_NAME = "CoinMP";
+
+
+ /************************************************************************/
