external/lpsolve/0001-const-up-some-statics.patch.1 | 129 ++++++++++++++++++++ external/lpsolve/UnpackedTarball_lpsolve.mk | 8 + vcl/commonfuzzer.mk | 2 3 files changed, 138 insertions(+), 1 deletion(-)
New commits: commit 525c68e2106b9d057a94061b2d04f0472ea641c5 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jul 22 13:14:48 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jul 25 12:27:27 2025 +0200 const up lpsolve Change-Id: I03d35fe5626b72d201a7980f5db688e9627fcffa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188316 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/external/lpsolve/0001-const-up-some-statics.patch.1 b/external/lpsolve/0001-const-up-some-statics.patch.1 new file mode 100644 index 000000000000..7d1a8173ba66 --- /dev/null +++ b/external/lpsolve/0001-const-up-some-statics.patch.1 @@ -0,0 +1,129 @@ +From 75ba3f247d6f0baa6dc83b7eca09ec67dabe0924 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <[email protected]> +Date: Tue, 22 Jul 2025 13:12:12 +0100 +Subject: [PATCH] const up some statics + +--- + lp_params.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/lp_params.c b/lp_params.c +index e8fcd2e..c5de106 100644 +--- a/lp_params.c ++++ b/lp_params.c +@@ -53,13 +53,13 @@ + REAL_set_function *REAL_set_function; /* set via setREALfunction */ + } set_function; + int type; /* set via set*function */ +- struct _values *values; /* set via setvalues to a structure of _values */ ++ const struct _values *values; /* set via setvalues to a structure of _values */ + int elements; /* or via setNULLvalues if the value is shown as is */ + unsigned int basemask; + int mask; /* WRITE_ACTIVE or WRITE_COMMENTED */ + }; + +-static struct _values anti_degen[] = ++static const struct _values anti_degen[] = + { + { setvalue(ANTIDEGEN_NONE) }, + { setvalue(ANTIDEGEN_FIXEDVARS) }, +@@ -74,7 +74,7 @@ + { setvalue(ANTIDEGEN_BOUNDFLIP) }, + }; + +-static struct _values basiscrash[] = ++static const struct _values basiscrash[] = + { + { setvalue(CRASH_NONE) }, + /* { setvalue(CRASH_NONBASICBOUNDS) }, */ /* not yet implemented */ +@@ -82,14 +82,14 @@ + { setvalue(CRASH_LEASTDEGENERATE) }, + }; + +-static struct _values bb_floorfirst[] = ++static const struct _values bb_floorfirst[] = + { + { setvalue(BRANCH_CEILING) }, + { setvalue(BRANCH_FLOOR) }, + { setvalue(BRANCH_AUTOMATIC) }, + }; + +-static struct _values bb_rule[] = ++static const struct _values bb_rule[] = + { + { setvalue(NODE_FIRSTSELECT) }, + { setvalue(NODE_GAPSELECT) }, +@@ -114,7 +114,7 @@ + { setvalue(NODE_STRONGINIT) }, + }; + +-static struct _values improve[] = ++static const struct _values improve[] = + { + { setvalue(IMPROVE_NONE) }, + { setvalue(IMPROVE_SOLUTION) }, +@@ -143,7 +143,7 @@ + set_mip_gap(lp, FALSE, mip_gap); + } + +-static struct _values pivoting[] = ++static const struct _values pivoting[] = + { + { setvalue(PRICER_FIRSTINDEX) }, + { setvalue(PRICER_DANTZIG) }, +@@ -161,7 +161,7 @@ + { setvalue(PRICE_TRUENORMINIT) }, + }; + +-static struct _values presolving[] = ++static const struct _values presolving[] = + { + { setvalue(PRESOLVE_NONE) }, + { setvalue(PRESOLVE_ROWS) }, +@@ -217,14 +217,14 @@ + set_presolve(lp, get_presolve(lp), maxloops); + } + +-static struct _values print_sol[] = ++static const struct _values print_sol[] = + { + { FALSE, "0" }, + { TRUE, "1" }, + { setvalue(AUTOMATIC) }, + }; + +-static struct _values scaling[] = ++static const struct _values scaling[] = + { + { setvalue(SCALE_NONE) }, + { setvalue(SCALE_EXTREME) }, +@@ -243,7 +243,7 @@ + { setvalue(SCALE_COLSONLY) }, + }; + +-static struct _values simplextype[] = ++static const struct _values simplextype[] = + { + { setvalue(SIMPLEX_PRIMAL_PRIMAL) }, + { setvalue(SIMPLEX_DUAL_PRIMAL) }, +@@ -251,7 +251,7 @@ + { setvalue(SIMPLEX_DUAL_DUAL) }, + }; + +-static struct _values verbose[] = ++static const struct _values verbose[] = + { + { setvalue(NEUTRAL) }, + { setvalue(CRITICAL) }, +@@ -262,7 +262,7 @@ + { setvalue(FULL) }, + }; + +-static struct _functions functions[] = ++static const struct _functions functions[] = + { + /* solve options */ + { "ANTI_DEGEN", setintfunction(get_anti_degen, set_anti_degen), setvalues(anti_degen, ~0), WRITE_ACTIVE }, +-- +2.49.0 + diff --git a/external/lpsolve/UnpackedTarball_lpsolve.mk b/external/lpsolve/UnpackedTarball_lpsolve.mk index bcb885fb9186..2e289861cede 100644 --- a/external/lpsolve/UnpackedTarball_lpsolve.mk +++ b/external/lpsolve/UnpackedTarball_lpsolve.mk @@ -13,6 +13,14 @@ $(eval $(call gb_UnpackedTarball_set_tarball,lpsolve,$(LPSOLVE_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3)) +# external/lpsolve/0001-const-up-some-statics.patch.1 +# upstreaming attempt as: +# https://github.com/lp-solve/lp_solve/pull/1 + +$(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\ + external/lpsolve/0001-const-up-some-statics.patch.1 \ +)) + ifeq ($(OS_FOR_BUILD),WNT) $(eval $(call gb_UnpackedTarball_set_patchflags,lpsolve,--binary)) commit 0637e24b8d5f4c8135842ab726eb8651ab719104 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Jul 25 09:19:48 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jul 25 12:27:15 2025 +0200 fix oss-build better Change-Id: I50d34844c573359ce83f3cd2857ef71d2a3a5023 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188321 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk index 46b8c66e810b..2d41dc27be24 100644 --- a/vcl/commonfuzzer.mk +++ b/vcl/commonfuzzer.mk @@ -38,6 +38,7 @@ fuzzer_externals = \ libpng \ libtiff \ libwebp \ + md4c \ openssl \ expat \ mythes \ @@ -176,7 +177,6 @@ fuzzer_writer_libraries = \ sw_writerfilter \ wpftwriter \ textfd \ - md4c \ guesslang \ fuzzer_draw_libraries = \
