external/clucene/patches/clucene-const.patch.1 | 189 ++++---
external/lcms2/0001-Mark-some-tables-as-const.patch.1 | 40 +
external/lcms2/0001-const-up-some-static-arrays.patch.1 | 392 ----------------
external/lcms2/UnpackedTarball_lcms2.mk | 4
4 files changed, 147 insertions(+), 478 deletions(-)
New commits:
commit 136ccf68c4b138945354e9deb8e2a386877415da
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jul 22 11:54:44 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jul 22 18:36:06 2025 +0200
more clucene const ups
Change-Id: I1559e5acb1bf1226cc2bd87012f450954cbd7035
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188173
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/clucene/patches/clucene-const.patch.1
b/external/clucene/patches/clucene-const.patch.1
index d51098a59d7d..b6391c636444 100644
--- a/external/clucene/patches/clucene-const.patch.1
+++ b/external/clucene/patches/clucene-const.patch.1
@@ -1,6 +1,27 @@
+diff -ru clucene.orig/src/contribs-lib/CLucene/snowball/libstemmer/modules.h
clucene/src/contribs-lib/CLucene/snowball/libstemmer/modules.h
+--- clucene.orig/src/contribs-lib/CLucene/snowball/libstemmer/modules.h
2025-07-22 11:53:24.795091157 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/libstemmer/modules.h
2025-07-22 11:53:59.994967168 +0100
+@@ -62,7 +62,7 @@
+ void (*close)(struct SN_env *);
+ int (*stem)(struct SN_env *);
+ };
+-static struct stemmer_modules modules[] = {
++static const struct stemmer_modules modules[] = {
+ {"da", ENC_ISO_8859_1, danish_ISO_8859_1_create_env,
danish_ISO_8859_1_close_env, danish_ISO_8859_1_stem},
+ {"da", ENC_UTF_8, danish_UTF_8_create_env, danish_UTF_8_close_env,
danish_UTF_8_stem},
+ {"dan", ENC_ISO_8859_1, danish_ISO_8859_1_create_env,
danish_ISO_8859_1_close_env, danish_ISO_8859_1_stem},
+@@ -147,7 +147,7 @@
+ {"swedish", ENC_UTF_8, swedish_UTF_8_create_env, swedish_UTF_8_close_env,
swedish_UTF_8_stem},
+ {0,0,0,0,0}
+ };
+-static const char * algorithm_names[] = {
++static const char* const algorithm_names[] = {
+ "danish",
+ "dutch",
+ "english",
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish.c
2025-07-14 10:02:16.697229310 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish.c
2025-07-22 11:53:24.797765105 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish.c
2025-07-22 11:53:28.916972707 +0100
@@ -13,40 +13,40 @@
extern struct SN_env * danish_ISO_8859_1_create_env(void);
extern void danish_ISO_8859_1_close_env(struct SN_env * z);
@@ -133,8 +154,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_da
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.c
2025-07-14 10:02:16.698405000 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.c
2025-07-22 11:53:24.797765105 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.c
2025-07-22 11:53:28.917771880 +0100
@@ -17,18 +17,18 @@
extern struct SN_env * dutch_ISO_8859_1_create_env(void);
extern void dutch_ISO_8859_1_close_env(struct SN_env * z);
@@ -314,8 +335,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_du
static int r_prelude(struct SN_env * z) {
int among_var;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english.c
2025-07-14 10:02:16.699761448 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english.c
2025-07-22 11:53:24.797765105 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english.c
2025-07-22 11:53:28.918547052 +0100
@@ -23,34 +23,34 @@
extern struct SN_env * english_ISO_8859_1_create_env(void);
extern void english_ISO_8859_1_close_env(struct SN_env * z);
@@ -754,8 +775,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_en
static int r_prelude(struct SN_env * z) {
z->B[0] = 0; /* unset Y_found, line 26 */
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.c
2025-07-14 10:02:16.700733919 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.c
2025-07-22 11:53:24.797765105 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.c
2025-07-22 11:53:28.920862479 +0100
@@ -19,18 +19,18 @@
extern struct SN_env * finnish_ISO_8859_1_create_env(void);
extern void finnish_ISO_8859_1_close_env(struct SN_env * z);
@@ -1086,8 +1107,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_fi
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french.c
2025-07-14 10:02:16.701126506 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french.c
2025-07-22 11:53:24.797765105 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french.c
2025-07-22 11:53:28.922723934 +0100
@@ -20,11 +20,11 @@
extern struct SN_env * french_ISO_8859_1_create_env(void);
extern void french_ISO_8859_1_close_env(struct SN_env * z);
@@ -1551,8 +1572,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_fr
static int r_prelude(struct SN_env * z) {
while(1) { /* repeat, line 38 */
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german.c
2025-07-14 10:02:16.701563342 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german.c
2025-07-22 11:53:24.797765105 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german.c
2025-07-22 11:53:28.923596831 +0100
@@ -14,13 +14,13 @@
extern struct SN_env * german_ISO_8859_1_create_env(void);
extern void german_ISO_8859_1_close_env(struct SN_env * z);
@@ -1702,8 +1723,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_ge
static int r_prelude(struct SN_env * z) {
{ int c_test = z->c; /* test, line 30 */
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian.c
2025-07-14 10:02:16.701759821 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian.c
2025-07-22 11:53:28.924466109 +0100
@@ -18,14 +18,14 @@
extern struct SN_env * italian_ISO_8859_1_create_env(void);
extern void italian_ISO_8859_1_close_env(struct SN_env * z);
@@ -2233,8 +2254,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_it
static int r_prelude(struct SN_env * z) {
int among_var;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.c
2025-07-14 10:02:13.791063032 +0100
-+++
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.c
2025-07-14 10:02:16.702126767 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.c
2025-07-22 11:53:24.797844184 +0100
++++
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.c
2025-07-22 11:53:28.925135716 +0100
@@ -12,37 +12,37 @@
extern struct SN_env * norwegian_ISO_8859_1_create_env(void);
extern void norwegian_ISO_8859_1_close_env(struct SN_env * z);
@@ -2365,8 +2386,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_no
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter.c
2025-07-14 10:02:16.702304373 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter.c
2025-07-22 11:53:28.925961067 +0100
@@ -19,12 +19,12 @@
extern struct SN_env * porter_ISO_8859_1_create_env(void);
extern void porter_ISO_8859_1_close_env(struct SN_env * z);
@@ -2640,8 +2661,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_po
static int r_shortv(struct SN_env * z) {
if (!(out_grouping_b(z, g_v_WXY, 89, 121))) return 0;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.c
2025-07-14 10:02:13.791063032 +0100
-+++
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.c
2025-07-14 10:02:16.702502440 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.c
2025-07-22 11:53:24.797844184 +0100
++++
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.c
2025-07-22 11:53:28.927017684 +0100
@@ -18,32 +18,32 @@
extern struct SN_env * portuguese_ISO_8859_1_create_env(void);
extern void portuguese_ISO_8859_1_close_env(struct SN_env * z);
@@ -3155,8 +3176,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_po
static int r_prelude(struct SN_env * z) {
int among_var;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.c
2025-07-14 10:02:16.702922549 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.c
2025-07-22 11:53:28.927805367 +0100
@@ -18,13 +18,13 @@
extern struct SN_env * spanish_ISO_8859_1_create_env(void);
extern void spanish_ISO_8859_1_close_env(struct SN_env * z);
@@ -3712,8 +3733,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_sp
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.c
2025-07-14 10:02:16.703178426 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.c
2025-07-22 11:53:28.928736275 +0100
@@ -12,45 +12,45 @@
extern struct SN_env * swedish_ISO_8859_1_create_env(void);
extern void swedish_ISO_8859_1_close_env(struct SN_env * z);
@@ -3860,8 +3881,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_sw
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian.c
2025-07-14 10:02:16.703365277 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian.c
2025-07-22 11:53:28.929337955 +0100
@@ -18,17 +18,17 @@
extern struct SN_env * russian_KOI8_R_create_env(void);
extern void russian_KOI8_R_close_env(struct SN_env * z);
@@ -4235,8 +4256,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russia
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish.c
2025-07-14 10:02:16.703551795 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish.c
2025-07-22 11:53:28.929986527 +0100
@@ -13,40 +13,40 @@
extern struct SN_env * danish_UTF_8_create_env(void);
extern void danish_UTF_8_close_env(struct SN_env * z);
@@ -4369,8 +4390,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish.
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch.c
2025-07-14 10:02:16.703730673 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch.c
2025-07-22 11:53:28.930525646 +0100
@@ -17,18 +17,18 @@
extern struct SN_env * dutch_UTF_8_create_env(void);
extern void dutch_UTF_8_close_env(struct SN_env * z);
@@ -4550,8 +4571,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch.c
static int r_prelude(struct SN_env * z) {
int among_var;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english.c
2025-07-14 10:02:16.703914434 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english.c
2025-07-22 11:53:28.931155500 +0100
@@ -23,34 +23,34 @@
extern struct SN_env * english_UTF_8_create_env(void);
extern void english_UTF_8_close_env(struct SN_env * z);
@@ -4990,8 +5011,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english
static int r_prelude(struct SN_env * z) {
z->B[0] = 0; /* unset Y_found, line 26 */
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish.c
2025-07-14 10:02:16.704290745 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish.c
2025-07-22 11:53:28.931976470 +0100
@@ -19,18 +19,18 @@
extern struct SN_env * finnish_UTF_8_create_env(void);
extern void finnish_UTF_8_close_env(struct SN_env * z);
@@ -5322,8 +5343,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french.c
2025-07-14 10:02:13.791063032 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french.c
2025-07-14 10:02:16.704570638 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french.c
2025-07-22 11:53:24.797844184 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french.c
2025-07-22 11:53:28.932564428 +0100
@@ -20,11 +20,11 @@
extern struct SN_env * french_UTF_8_create_env(void);
extern void french_UTF_8_close_env(struct SN_env * z);
@@ -5787,8 +5808,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french.
static int r_prelude(struct SN_env * z) {
while(1) { /* repeat, line 38 */
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german.c
2025-07-14 10:02:13.792063038 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german.c
2025-07-14 10:02:16.704959841 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german.c
2025-07-22 11:53:24.798844189 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german.c
2025-07-22 11:53:28.933184872 +0100
@@ -14,13 +14,13 @@
extern struct SN_env * german_UTF_8_create_env(void);
extern void german_UTF_8_close_env(struct SN_env * z);
@@ -5938,8 +5959,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german.
static int r_prelude(struct SN_env * z) {
{ int c_test = z->c; /* test, line 30 */
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian.c
2025-07-14 10:02:13.792063038 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian.c
2025-07-14 10:02:16.705154803 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian.c
2025-07-22 11:53:24.798844189 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian.c
2025-07-22 11:53:28.933611915 +0100
@@ -18,14 +18,14 @@
extern struct SN_env * italian_UTF_8_create_env(void);
extern void italian_UTF_8_close_env(struct SN_env * z);
@@ -6469,8 +6490,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian
static int r_prelude(struct SN_env * z) {
int among_var;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian.c
2025-07-14 10:02:13.792063038 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian.c
2025-07-14 10:02:16.705480225 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian.c
2025-07-22 11:53:24.799844193 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian.c
2025-07-22 11:53:28.934151901 +0100
@@ -12,37 +12,37 @@
extern struct SN_env * norwegian_UTF_8_create_env(void);
extern void norwegian_UTF_8_close_env(struct SN_env * z);
@@ -6601,8 +6622,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegi
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter.c
2025-07-14 10:02:13.792063038 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter.c
2025-07-14 10:02:16.705646813 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter.c
2025-07-22 11:53:24.799844193 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter.c
2025-07-22 11:53:28.934517711 +0100
@@ -19,12 +19,12 @@
extern struct SN_env * porter_UTF_8_create_env(void);
extern void porter_UTF_8_close_env(struct SN_env * z);
@@ -6876,8 +6897,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter.
static int r_shortv(struct SN_env * z) {
if (!(out_grouping_b_U(z, g_v_WXY, 89, 121))) return 0;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese.c
----
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese.c
2025-07-14 10:02:13.792063038 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese.c
2025-07-14 10:02:16.705938785 +0100
+---
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese.c
2025-07-22 11:53:24.799844193 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese.c
2025-07-22 11:53:28.934982071 +0100
@@ -18,32 +18,32 @@
extern struct SN_env * portuguese_UTF_8_create_env(void);
extern void portuguese_UTF_8_close_env(struct SN_env * z);
@@ -7391,8 +7412,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portugu
static int r_prelude(struct SN_env * z) {
int among_var;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian.c
2025-07-14 10:02:13.792063038 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian.c
2025-07-14 10:02:16.706356248 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian.c
2025-07-22 11:53:24.799844193 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian.c
2025-07-22 11:53:28.935552428 +0100
@@ -18,17 +18,17 @@
extern struct SN_env * russian_UTF_8_create_env(void);
extern void russian_UTF_8_close_env(struct SN_env * z);
@@ -7766,8 +7787,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish.c
2025-07-14 10:02:13.792063038 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish.c
2025-07-14 10:02:16.706577456 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish.c
2025-07-22 11:53:24.799844193 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish.c
2025-07-22 11:53:28.936016852 +0100
@@ -18,13 +18,13 @@
extern struct SN_env * spanish_UTF_8_create_env(void);
extern void spanish_UTF_8_close_env(struct SN_env * z);
@@ -8323,8 +8344,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish.c
clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish.c
---- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish.c
2025-07-14 10:02:13.792063038 +0100
-+++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish.c
2025-07-14 10:02:16.706862622 +0100
+--- clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish.c
2025-07-22 11:53:24.799844193 +0100
++++ clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish.c
2025-07-22 11:53:28.936522584 +0100
@@ -12,45 +12,45 @@
extern struct SN_env * swedish_UTF_8_create_env(void);
extern void swedish_UTF_8_close_env(struct SN_env * z);
@@ -8471,8 +8492,8 @@ diff -ru
clucene.orig/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
diff -ru clucene.orig/src/core/CLucene/analysis/Analyzers.cpp
clucene/src/core/CLucene/analysis/Analyzers.cpp
---- clucene.orig/src/core/CLucene/analysis/Analyzers.cpp 2025-07-14
21:22:25.560506427 +0100
-+++ clucene/src/core/CLucene/analysis/Analyzers.cpp 2025-07-14
21:22:35.955552591 +0100
+--- clucene.orig/src/core/CLucene/analysis/Analyzers.cpp 2025-07-22
11:53:24.804844215 +0100
++++ clucene/src/core/CLucene/analysis/Analyzers.cpp 2025-07-22
11:53:28.937049573 +0100
@@ -195,7 +195,7 @@
bool StopFilter::getEnablePositionIncrements() const { return
enablePositionIncrements; }
void StopFilter::setEnablePositionIncrements(const bool enable) {
this->enablePositionIncrements = enable; }
@@ -8492,8 +8513,8 @@ diff -ru
clucene.orig/src/core/CLucene/analysis/Analyzers.cpp clucene/src/core/C
_T("a"), _T("an"), _T("and"), _T("are"), _T("as"), _T("at"), _T("be"),
_T("but"), _T("by"),
_T("for"), _T("if"), _T("in"), _T("into"), _T("is"), _T("it"),
diff -ru clucene.orig/src/core/CLucene/analysis/Analyzers.h
clucene/src/core/CLucene/analysis/Analyzers.h
---- clucene.orig/src/core/CLucene/analysis/Analyzers.h 2025-07-14
21:22:25.560506427 +0100
-+++ clucene/src/core/CLucene/analysis/Analyzers.h 2025-07-14
21:22:35.957413701 +0100
+--- clucene.orig/src/core/CLucene/analysis/Analyzers.h 2025-07-22
11:53:24.804844215 +0100
++++ clucene/src/core/CLucene/analysis/Analyzers.h 2025-07-22
11:53:28.937453346 +0100
@@ -160,7 +160,7 @@
* Note: the stopWords list must be a static list because the strings
are not copied
*/
@@ -8513,8 +8534,8 @@ diff -ru
clucene.orig/src/core/CLucene/analysis/Analyzers.h clucene/src/core/CLu
diff -ru clucene.orig/src/core/CLucene/index/IndexFileNames.cpp
clucene/src/core/CLucene/index/IndexFileNames.cpp
---- clucene.orig/src/core/CLucene/index/IndexFileNames.cpp 2025-07-14
21:22:25.582506524 +0100
-+++ clucene/src/core/CLucene/index/IndexFileNames.cpp 2025-07-14
21:22:30.824736167 +0100
+--- clucene.orig/src/core/CLucene/index/IndexFileNames.cpp 2025-07-22
11:53:24.808844233 +0100
++++ clucene/src/core/CLucene/index/IndexFileNames.cpp 2025-07-22
11:53:28.937911664 +0100
@@ -13,26 +13,26 @@
CL_NS_DEF(index)
@@ -8563,8 +8584,8 @@ diff -ru
clucene.orig/src/core/CLucene/index/IndexFileNames.cpp clucene/src/core
const char* IndexFileNames_INDEX_EXTENSIONS_s[] =
{
diff -ru clucene.orig/src/core/CLucene/index/_IndexFileNames.h
clucene/src/core/CLucene/index/_IndexFileNames.h
---- clucene.orig/src/core/CLucene/index/_IndexFileNames.h 2025-07-14
10:02:13.797063065 +0100
-+++ clucene/src/core/CLucene/index/_IndexFileNames.h 2025-07-14
10:05:34.796157976 +0100
+--- clucene.orig/src/core/CLucene/index/_IndexFileNames.h 2025-07-22
11:53:24.808844233 +0100
++++ clucene/src/core/CLucene/index/_IndexFileNames.h 2025-07-22
11:53:28.938818701 +0100
@@ -14,26 +14,26 @@
static CL_NS(util)::ConstValueArray<const char*> _COMPOUND_EXTENSIONS;
static CL_NS(util)::ConstValueArray<const char*> _VECTOR_EXTENSIONS;
@@ -8613,8 +8634,8 @@ diff -ru
clucene.orig/src/core/CLucene/index/_IndexFileNames.h clucene/src/core/
LUCENE_STATIC_CONSTANT(int32_t,COMPOUND_EXTENSIONS_LENGTH=7);
LUCENE_STATIC_CONSTANT(int32_t,VECTOR_EXTENSIONS_LENGTH=3);
diff -ru clucene.orig/src/core/CLucene/index/IndexWriter.cpp
clucene/src/core/CLucene/index/IndexWriter.cpp
---- clucene.orig/src/core/CLucene/index/IndexWriter.cpp 2025-07-14
10:02:13.797063065 +0100
-+++ clucene/src/core/CLucene/index/IndexWriter.cpp 2025-07-14
10:04:47.076055233 +0100
+--- clucene.orig/src/core/CLucene/index/IndexWriter.cpp 2025-07-22
11:53:24.808844233 +0100
++++ clucene/src/core/CLucene/index/IndexWriter.cpp 2025-07-22
11:53:28.939104136 +0100
@@ -40,7 +40,7 @@
CL_NS_DEF(index)
@@ -8625,8 +8646,8 @@ diff -ru
clucene.orig/src/core/CLucene/index/IndexWriter.cpp clucene/src/core/CL
const int32_t IndexWriter::MERGE_READ_BUFFER_SIZE = 4096;
diff -ru clucene.orig/src/core/CLucene/index/IndexWriter.h
clucene/src/core/CLucene/index/IndexWriter.h
---- clucene.orig/src/core/CLucene/index/IndexWriter.h 2025-07-14
10:02:13.797063065 +0100
-+++ clucene/src/core/CLucene/index/IndexWriter.h 2025-07-14
10:04:43.787880123 +0100
+--- clucene.orig/src/core/CLucene/index/IndexWriter.h 2025-07-22
11:53:24.808844233 +0100
++++ clucene/src/core/CLucene/index/IndexWriter.h 2025-07-22
11:53:28.940003758 +0100
@@ -353,7 +353,7 @@
/**
* Name of the write lock in the index.
@@ -8637,8 +8658,8 @@ diff -ru
clucene.orig/src/core/CLucene/index/IndexWriter.h clucene/src/core/CLuc
/**
* @deprecated
diff -ru clucene.orig/src/core/CLucene/queryParser/QueryParserConstants.h
clucene/src/core/CLucene/queryParser/QueryParserConstants.h
---- clucene.orig/src/core/CLucene/queryParser/QueryParserConstants.h
2025-07-14 21:22:25.584506533 +0100
-+++ clucene/src/core/CLucene/queryParser/QueryParserConstants.h
2025-07-14 21:22:35.958548353 +0100
+--- clucene.orig/src/core/CLucene/queryParser/QueryParserConstants.h
2025-07-22 11:53:24.810408214 +0100
++++ clucene/src/core/CLucene/queryParser/QueryParserConstants.h
2025-07-22 11:53:28.940666729 +0100
@@ -53,7 +53,7 @@
DEFAULT = 3
};
@@ -8649,8 +8670,8 @@ diff -ru
clucene.orig/src/core/CLucene/queryParser/QueryParserConstants.h clucen
protected:
/**
diff -ru clucene.orig/src/core/CLucene/queryParser/QueryParser.cpp
clucene/src/core/CLucene/queryParser/QueryParser.cpp
---- clucene.orig/src/core/CLucene/queryParser/QueryParser.cpp 2025-07-14
21:22:25.587506546 +0100
-+++ clucene/src/core/CLucene/queryParser/QueryParser.cpp 2025-07-14
21:22:35.959114783 +0100
+--- clucene.orig/src/core/CLucene/queryParser/QueryParser.cpp 2025-07-22
11:53:24.810408214 +0100
++++ clucene/src/core/CLucene/queryParser/QueryParser.cpp 2025-07-22
11:53:28.940905259 +0100
@@ -43,7 +43,7 @@
CL_NS_DEF(queryParser)
@@ -8670,8 +8691,8 @@ diff -ru
clucene.orig/src/core/CLucene/queryParser/QueryParser.cpp clucene/src/c
// TODO: Check to see what's a realistic initial value for the buffers here
// TODO: Make eol configurable (will be useful for PrintStream
implementation as well later)?
diff -ru clucene.orig/src/core/CLucene/queryParser/QueryParser.h
clucene/src/core/CLucene/queryParser/QueryParser.h
---- clucene.orig/src/core/CLucene/queryParser/QueryParser.h 2025-07-14
21:22:25.584506533 +0100
-+++ clucene/src/core/CLucene/queryParser/QueryParser.h 2025-07-14
21:22:35.960694453 +0100
+--- clucene.orig/src/core/CLucene/queryParser/QueryParser.h 2025-07-22
11:53:24.810408214 +0100
++++ clucene/src/core/CLucene/queryParser/QueryParser.h 2025-07-22
11:53:28.941764082 +0100
@@ -524,7 +524,7 @@
TCHAR* getParseExceptionMessage(QueryToken* currentToken,
CL_NS(util)::CLVector< CL_NS(util)::ValueArray<int32_t>*,
@@ -8682,8 +8703,8 @@ diff -ru
clucene.orig/src/core/CLucene/queryParser/QueryParser.h clucene/src/cor
CL_NS_END
#endif
diff -ru clucene.orig/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
clucene/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
---- clucene.orig/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
2025-07-14 21:22:25.587506546 +0100
-+++ clucene/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
2025-07-14 21:22:30.826276026 +0100
+--- clucene.orig/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
2025-07-22 11:53:24.810408214 +0100
++++ clucene/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
2025-07-22 11:53:28.942300758 +0100
@@ -23,12 +23,12 @@
15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27,
2, 4, 5, 0, 1
@@ -8700,8 +8721,8 @@ diff -ru
clucene.orig/src/core/CLucene/queryParser/QueryParserTokenManager.cpp c
_T("RangeEx"),
_T("RangeIn"),
diff -ru clucene.orig/src/core/CLucene/queryParser/QueryParserTokenManager.h
clucene/src/core/CLucene/queryParser/QueryParserTokenManager.h
---- clucene.orig/src/core/CLucene/queryParser/QueryParserTokenManager.h
2025-07-14 10:02:13.798859548 +0100
-+++ clucene/src/core/CLucene/queryParser/QueryParserTokenManager.h
2025-07-14 10:04:16.156729609 +0100
+--- clucene.orig/src/core/CLucene/queryParser/QueryParserTokenManager.h
2025-07-22 11:53:24.810408214 +0100
++++ clucene/src/core/CLucene/queryParser/QueryParserTokenManager.h
2025-07-22 11:53:28.942700800 +0100
@@ -68,8 +68,8 @@
const int64_t l2);
@@ -8714,8 +8735,8 @@ diff -ru
clucene.orig/src/core/CLucene/queryParser/QueryParserTokenManager.h clu
static const int64_t jjtoToken [];
static const int64_t jjtoSkip [];
diff -ru clucene.orig/src/core/CLucene/util/MD5Digester.cpp
clucene/src/core/CLucene/util/MD5Digester.cpp
---- clucene.orig/src/core/CLucene/util/MD5Digester.cpp 2025-07-14
10:02:13.802928930 +0100
-+++ clucene/src/core/CLucene/util/MD5Digester.cpp 2025-07-14
10:02:16.707048030 +0100
+--- clucene.orig/src/core/CLucene/util/MD5Digester.cpp 2025-07-22
11:53:24.815276214 +0100
++++ clucene/src/core/CLucene/util/MD5Digester.cpp 2025-07-22
11:53:28.942865174 +0100
@@ -44,7 +44,7 @@
#include "_MD5Digester.h"
CL_NS_DEF(util)
@@ -8762,8 +8783,8 @@ diff -ru
clucene.orig/src/core/CLucene/util/MD5Digester.cpp clucene/src/core/CLu
uint32_t i, j;
diff -ru clucene.orig/src/core/CLucene/util/_MD5Digester.h
clucene/src/core/CLucene/util/_MD5Digester.h
---- clucene.orig/src/core/CLucene/util/_MD5Digester.h 2025-07-14
10:02:13.802928930 +0100
-+++ clucene/src/core/CLucene/util/_MD5Digester.h 2025-07-14
10:02:16.707185796 +0100
+--- clucene.orig/src/core/CLucene/util/_MD5Digester.h 2025-07-22
11:53:24.815276214 +0100
++++ clucene/src/core/CLucene/util/_MD5Digester.h 2025-07-22
11:53:28.943363542 +0100
@@ -58,15 +58,15 @@
public:
md5() { Init(); }
@@ -8785,8 +8806,8 @@ diff -ru
clucene.orig/src/core/CLucene/util/_MD5Digester.h clucene/src/core/CLuc
inline uint32_t rotate_left(uint32_t x, uint32_t n)
diff -ru clucene.orig/src/shared/CLucene/SharedHeader.cpp
clucene/src/shared/CLucene/SharedHeader.cpp
---- clucene.orig/src/shared/CLucene/SharedHeader.cpp 2025-07-14
10:02:13.807381245 +0100
-+++ clucene/src/shared/CLucene/SharedHeader.cpp 2025-07-14
10:03:56.173760153 +0100
+--- clucene.orig/src/shared/CLucene/SharedHeader.cpp 2025-07-22
11:53:24.826861980 +0100
++++ clucene/src/shared/CLucene/SharedHeader.cpp 2025-07-22
11:53:28.943715967 +0100
@@ -13,8 +13,8 @@
#endif
@@ -8799,8 +8820,8 @@ diff -ru clucene.orig/src/shared/CLucene/SharedHeader.cpp
clucene/src/shared/CLu
#if defined(_ASCII)
diff -ru clucene.orig/src/shared/CLucene/_SharedHeader.h
clucene/src/shared/CLucene/_SharedHeader.h
---- clucene.orig/src/shared/CLucene/_SharedHeader.h 2025-07-14
10:02:13.807381245 +0100
-+++ clucene/src/shared/CLucene/_SharedHeader.h 2025-07-14 10:03:51.636596029
+0100
+--- clucene.orig/src/shared/CLucene/_SharedHeader.h 2025-07-22
11:53:24.826861980 +0100
++++ clucene/src/shared/CLucene/_SharedHeader.h 2025-07-22 11:53:28.943864199
+0100
@@ -47,9 +47,9 @@
@@ -8814,8 +8835,8 @@ diff -ru clucene.orig/src/shared/CLucene/_SharedHeader.h
clucene/src/shared/CLuc
#if defined(_WIN32) || defined(_WIN64)
diff -ru clucene.orig/src/shared/CLucene/util/Misc.cpp
clucene/src/shared/CLucene/util/Misc.cpp
---- clucene.orig/src/shared/CLucene/util/Misc.cpp 2025-07-14
10:02:13.807762156 +0100
-+++ clucene/src/shared/CLucene/util/Misc.cpp 2025-07-14 10:02:16.707295208
+0100
+--- clucene.orig/src/shared/CLucene/util/Misc.cpp 2025-07-22
11:53:24.826861980 +0100
++++ clucene/src/shared/CLucene/util/Misc.cpp 2025-07-22 11:53:28.944014973
+0100
@@ -407,7 +407,7 @@
}
commit 037837d1bde51a2320fab6e159b277378ec36648
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jul 22 11:48:14 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jul 22 18:35:51 2025 +0200
update lcms patch to what was merged
Change-Id: Ib730717bc676ca91017103a2225b78801b6634d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188172
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/lcms2/0001-Mark-some-tables-as-const.patch.1
b/external/lcms2/0001-Mark-some-tables-as-const.patch.1
new file mode 100644
index 000000000000..6c00dd89faba
--- /dev/null
+++ b/external/lcms2/0001-Mark-some-tables-as-const.patch.1
@@ -0,0 +1,40 @@
+From 58affbcc90f060b6b34bad2ed508a2d159fd9320 Mon Sep 17 00:00:00 2001
+From: Marti Maria <marti.ma...@littlecms.com>
+Date: Mon, 21 Jul 2025 20:12:09 +0200
+Subject: [PATCH] Mark some tables as const
+
+per PR #501
+---
+ src/cmsalpha.c | 2 +-
+ src/cmscgats.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cmsalpha.c b/src/cmsalpha.c
+index a5f1a16..b8e1a26 100644
+--- a/src/cmsalpha.c
++++ b/src/cmsalpha.c
+@@ -377,7 +377,7 @@ int FormatterPos(cmsUInt32Number frm)
+ static
+ cmsFormatterAlphaFn _cmsGetFormatterAlpha(cmsContext id, cmsUInt32Number in,
cmsUInt32Number out)
+ {
+-static cmsFormatterAlphaFn FormattersAlpha[6][6] = {
++static const cmsFormatterAlphaFn FormattersAlpha[6][6] = {
+
+ /* from 8 */ { copy8, from8to16, from8to16SE, from8toHLF,
from8toFLT, from8toDBL },
+ /* from 16*/ { from16to8, copy16, from16to16, from16toHLF,
from16toFLT, from16toDBL },
+diff --git a/src/cmscgats.c b/src/cmscgats.c
+index 53e3442..7df8a16 100644
+--- a/src/cmscgats.c
++++ b/src/cmscgats.c
+@@ -266,7 +266,7 @@ typedef struct {
+ WRITEMODE as; // How is supposed to be written
+ } PROPERTY;
+
+-static PROPERTY PredefinedProperties[] = {
++static const PROPERTY PredefinedProperties[] = {
+
+ {"NUMBER_OF_FIELDS", WRITE_UNCOOKED}, // Required - NUMBER OF
FIELDS
+ {"NUMBER_OF_SETS", WRITE_UNCOOKED}, // Required - NUMBER OF SETS
+--
+2.49.0
+
diff --git a/external/lcms2/0001-const-up-some-static-arrays.patch.1
b/external/lcms2/0001-const-up-some-static-arrays.patch.1
deleted file mode 100644
index c61b11d6b2ca..000000000000
--- a/external/lcms2/0001-const-up-some-static-arrays.patch.1
+++ /dev/null
@@ -1,392 +0,0 @@
-From f48dd19c6cd6152b5fe56c6fb94d2e966c709f57 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
-Date: Sun, 20 Jul 2025 17:43:36 +0100
-Subject: [PATCH] const up some static arrays
-
-which enables moving them out of the .data section
----
- src/cmsalpha.c | 2 +-
- src/cmscgats.c | 4 ++--
- src/cmscnvrt.c | 8 ++++----
- src/cmsio0.c | 14 +++++++-------
- src/cmsopt.c | 12 ++++++------
- src/cmspcs.c | 26 +++++++++++++-------------
- src/cmsps2.c | 4 ++--
- src/cmssamp.c | 2 +-
- src/cmstypes.c | 16 ++++++++--------
- src/lcms2_internal.h | 8 ++++----
- 10 files changed, 48 insertions(+), 48 deletions(-)
-
-diff --git a/src/cmsalpha.c b/src/cmsalpha.c
-index a5f1a16..b8e1a26 100644
---- a/src/cmsalpha.c
-+++ b/src/cmsalpha.c
-@@ -377,7 +377,7 @@ int FormatterPos(cmsUInt32Number frm)
- static
- cmsFormatterAlphaFn _cmsGetFormatterAlpha(cmsContext id, cmsUInt32Number in,
cmsUInt32Number out)
- {
--static cmsFormatterAlphaFn FormattersAlpha[6][6] = {
-+static const cmsFormatterAlphaFn FormattersAlpha[6][6] = {
-
- /* from 8 */ { copy8, from8to16, from8to16SE, from8toHLF,
from8toFLT, from8toDBL },
- /* from 16*/ { from16to8, copy16, from16to16, from16toHLF,
from16toFLT, from16toDBL },
-diff --git a/src/cmscgats.c b/src/cmscgats.c
-index 53e3442..27be3b9 100644
---- a/src/cmscgats.c
-+++ b/src/cmscgats.c
-@@ -266,7 +266,7 @@ typedef struct {
- WRITEMODE as; // How is supposed to be written
- } PROPERTY;
-
--static PROPERTY PredefinedProperties[] = {
-+static const PROPERTY PredefinedProperties[] = {
-
- {"NUMBER_OF_FIELDS", WRITE_UNCOOKED}, // Required - NUMBER OF
FIELDS
- {"NUMBER_OF_SETS", WRITE_UNCOOKED}, // Required - NUMBER OF SETS
-@@ -344,7 +344,7 @@ static PROPERTY PredefinedProperties[] = {
-
-
- // Predefined sample types on dataset
--static const char* PredefinedSampleID[] = {
-+static const char* const PredefinedSampleID[] = {
- "SAMPLE_ID", // Identifies sample that data represents
- "STRING", // Identifies label, or other non-machine readable
value.
- // Value must begin and end with a " symbol
-diff --git a/src/cmscnvrt.c b/src/cmscnvrt.c
-index 9dfca7d..a050db3 100644
---- a/src/cmscnvrt.c
-+++ b/src/cmscnvrt.c
-@@ -103,7 +103,7 @@ void DupPluginIntentsList(struct _cmsContext_struct* ctx,
- const struct
_cmsContext_struct* src)
- {
- _cmsIntentsPluginChunkType newHead = { NULL };
-- cmsIntentsList* entry;
-+ const cmsIntentsList* entry;
- cmsIntentsList* Anterior = NULL;
- _cmsIntentsPluginChunkType* head = (_cmsIntentsPluginChunkType*)
src->chunks[IntentPlugin];
-
-@@ -148,10 +148,10 @@ void _cmsAllocIntentsPluginChunk(struct
_cmsContext_struct* ctx,
-
- // Search the list for a suitable intent. Returns NULL if not found
- static
--cmsIntentsList* SearchIntent(cmsContext ContextID, cmsUInt32Number Intent)
-+const cmsIntentsList* SearchIntent(cmsContext ContextID, cmsUInt32Number
Intent)
- {
- _cmsIntentsPluginChunkType* ctx = ( _cmsIntentsPluginChunkType*)
_cmsContextGetClientChunk(ContextID, IntentPlugin);
-- cmsIntentsList* pt;
-+ const cmsIntentsList* pt;
-
- for (pt = ctx -> Intents; pt != NULL; pt = pt -> Next)
- if (pt ->Intent == Intent) return pt;
-@@ -1108,7 +1108,7 @@ cmsPipeline* _cmsLinkProfiles(cmsContext ContextID,
- cmsUInt32Number dwFlags)
- {
- cmsUInt32Number i;
-- cmsIntentsList* Intent;
-+ const cmsIntentsList* Intent;
-
- // Make sure a reasonable number of profiles is provided
- if (nProfiles <= 0 || nProfiles > 255) {
-diff --git a/src/cmsio0.c b/src/cmsio0.c
-index 859def3..30b6f1e 100644
---- a/src/cmsio0.c
-+++ b/src/cmsio0.c
-@@ -658,7 +658,7 @@ void _cmsDeleteTagByPos(_cmsICCPROFILE* Icc, int i)
- _cmsFree(Icc ->ContextID, Icc ->TagPtrs[i]);
- }
- else {
-- cmsTagTypeHandler* TypeHandler = Icc ->TagTypeHandlers[i];
-+ const cmsTagTypeHandler* TypeHandler = Icc ->TagTypeHandlers[i];
-
- if (TypeHandler != NULL) {
-
-@@ -1310,7 +1310,7 @@ cmsBool SaveTags(_cmsICCPROFILE* Icc, _cmsICCPROFILE*
FileOrig)
- cmsTagDescriptor* TagDescriptor;
- cmsTagTypeSignature TypeBase;
- cmsTagTypeSignature Type;
-- cmsTagTypeHandler* TypeHandler;
-+ const cmsTagTypeHandler* TypeHandler;
- cmsFloat64Number Version = cmsGetProfileVersion((cmsHPROFILE) Icc);
- cmsTagTypeHandler LocalTypeHandler;
-
-@@ -1564,7 +1564,7 @@ void freeOneTag(_cmsICCPROFILE* Icc, cmsUInt32Number i)
- {
- if (Icc->TagPtrs[i]) {
-
-- cmsTagTypeHandler* TypeHandler = Icc->TagTypeHandlers[i];
-+ const cmsTagTypeHandler* TypeHandler = Icc->TagTypeHandlers[i];
-
- if (TypeHandler != NULL) {
- cmsTagTypeHandler LocalTypeHandler = *TypeHandler;
-@@ -1637,7 +1637,7 @@ void* CMSEXPORT cmsReadTag(cmsHPROFILE hProfile,
cmsTagSignature sig)
- {
- _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
- cmsIOHANDLER* io;
-- cmsTagTypeHandler* TypeHandler;
-+ const cmsTagTypeHandler* TypeHandler;
- cmsTagTypeHandler LocalTypeHandler;
- cmsTagDescriptor* TagDescriptor;
- cmsTagTypeSignature BaseType;
-@@ -1771,7 +1771,7 @@ Error:
- cmsTagTypeSignature _cmsGetTagTrueType(cmsHPROFILE hProfile, cmsTagSignature
sig)
- {
- _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
-- cmsTagTypeHandler* TypeHandler;
-+ const cmsTagTypeHandler* TypeHandler;
- int n;
-
- // Search for given tag in ICC profile directory
-@@ -1789,7 +1789,7 @@ cmsTagTypeSignature _cmsGetTagTrueType(cmsHPROFILE
hProfile, cmsTagSignature sig
- cmsBool CMSEXPORT cmsWriteTag(cmsHPROFILE hProfile, cmsTagSignature sig,
const void* data)
- {
- _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
-- cmsTagTypeHandler* TypeHandler = NULL;
-+ const cmsTagTypeHandler* TypeHandler = NULL;
- cmsTagTypeHandler LocalTypeHandler;
- cmsTagDescriptor* TagDescriptor = NULL;
- cmsTagTypeSignature Type;
-@@ -1910,7 +1910,7 @@ cmsUInt32Number CMSEXPORT cmsReadRawTag(cmsHPROFILE
hProfile, cmsTagSignature si
- void *Object;
- int i;
- cmsIOHANDLER* MemIO;
-- cmsTagTypeHandler* TypeHandler = NULL;
-+ const cmsTagTypeHandler* TypeHandler = NULL;
- cmsTagTypeHandler LocalTypeHandler;
- cmsTagDescriptor* TagDescriptor = NULL;
- cmsUInt32Number rc;
-diff --git a/src/cmsopt.c b/src/cmsopt.c
-index 7d4fcf4..27f8d6b 100644
---- a/src/cmsopt.c
-+++ b/src/cmsopt.c
-@@ -547,7 +547,7 @@ cmsBool PatchLUT(cmsStage* CLUT, cmsUInt16Number At[],
cmsUInt16Number Value[],
-
- // Auxiliary, to see if two values are equal or very different
- static
--cmsBool WhitesAreEqual(cmsUInt32Number n, cmsUInt16Number White1[],
cmsUInt16Number White2[] )
-+cmsBool WhitesAreEqual(cmsUInt32Number n, const cmsUInt16Number White1[],
const cmsUInt16Number White2[] )
- {
- cmsUInt32Number i;
-
-@@ -564,7 +564,7 @@ cmsBool WhitesAreEqual(cmsUInt32Number n, cmsUInt16Number
White1[], cmsUInt16Num
- static
- cmsBool FixWhiteMisalignment(cmsPipeline* Lut, cmsColorSpaceSignature
EntryColorSpace, cmsColorSpaceSignature ExitColorSpace)
- {
-- cmsUInt16Number *WhitePointIn, *WhitePointOut;
-+ const cmsUInt16Number *WhitePointIn, *WhitePointOut;
- cmsUInt16Number WhiteIn[cmsMAXCHANNELS], WhiteOut[cmsMAXCHANNELS],
ObtainedOut[cmsMAXCHANNELS];
- cmsUInt32Number i, nOuts, nIns;
- cmsStage *PreLin = NULL, *CLUT = NULL, *PostLin = NULL;
-@@ -1799,13 +1799,13 @@ typedef struct _cmsOptimizationCollection_st {
-
- _cmsOPToptimizeFn OptimizePtr;
-
-- struct _cmsOptimizationCollection_st *Next;
-+ const struct _cmsOptimizationCollection_st *Next;
-
- } _cmsOptimizationCollection;
-
-
- // The built-in list. We currently implement 4 types of optimizations.
Joining of curves, matrix-shaper, linearization and resampling
--static _cmsOptimizationCollection DefaultOptimization[] = {
-+static const _cmsOptimizationCollection DefaultOptimization[] = {
-
- { OptimizeByJoiningCurves, &DefaultOptimization[1] },
- { OptimizeMatrixShaper, &DefaultOptimization[2] },
-@@ -1823,7 +1823,7 @@ void DupPluginOptimizationList(struct
_cmsContext_struct* ctx,
- const struct _cmsContext_struct* src)
- {
- _cmsOptimizationPluginChunkType newHead = { NULL };
-- _cmsOptimizationCollection* entry;
-+ const _cmsOptimizationCollection* entry;
- _cmsOptimizationCollection* Anterior = NULL;
- _cmsOptimizationPluginChunkType* head = (_cmsOptimizationPluginChunkType*)
src->chunks[OptimizationPlugin];
-
-@@ -1910,7 +1910,7 @@ cmsBool CMSEXPORT _cmsOptimizePipeline(cmsContext
ContextID,
- cmsUInt32Number* dwFlags)
- {
- _cmsOptimizationPluginChunkType* ctx = (
_cmsOptimizationPluginChunkType*) _cmsContextGetClientChunk(ContextID,
OptimizationPlugin);
-- _cmsOptimizationCollection* Opts;
-+ const _cmsOptimizationCollection* Opts;
- cmsBool AnySuccess = FALSE;
- cmsStage* mpe;
-
-diff --git a/src/cmspcs.c b/src/cmspcs.c
-index 84a62b4..6295dfd 100644
---- a/src/cmspcs.c
-+++ b/src/cmspcs.c
-@@ -705,22 +705,22 @@ cmsUInt32Number CMSEXPORT
_cmsReasonableGridpointsByColorspace(cmsColorSpaceSign
-
-
- cmsBool _cmsEndPointsBySpace(cmsColorSpaceSignature Space,
-- cmsUInt16Number **White,
-- cmsUInt16Number **Black,
-+ const cmsUInt16Number **White,
-+ const cmsUInt16Number **Black,
- cmsUInt32Number *nOutputs)
- {
- // Only most common spaces
-
-- static cmsUInt16Number RGBblack[4] = { 0, 0, 0 };
-- static cmsUInt16Number RGBwhite[4] = { 0xffff, 0xffff, 0xffff };
-- static cmsUInt16Number CMYKblack[4] = { 0xffff, 0xffff, 0xffff, 0xffff
}; // 400% of ink
-- static cmsUInt16Number CMYKwhite[4] = { 0, 0, 0, 0 };
-- static cmsUInt16Number LABblack[4] = { 0, 0x8080, 0x8080 };
// V4 Lab encoding
-- static cmsUInt16Number LABwhite[4] = { 0xFFFF, 0x8080, 0x8080 };
-- static cmsUInt16Number CMYblack[4] = { 0xffff, 0xffff, 0xffff };
-- static cmsUInt16Number CMYwhite[4] = { 0, 0, 0 };
-- static cmsUInt16Number Grayblack[4] = { 0 };
-- static cmsUInt16Number GrayWhite[4] = { 0xffff };
-+ static const cmsUInt16Number RGBblack[4] = { 0, 0, 0 };
-+ static const cmsUInt16Number RGBwhite[4] = { 0xffff, 0xffff, 0xffff };
-+ static const cmsUInt16Number CMYKblack[4] = { 0xffff, 0xffff, 0xffff,
0xffff }; // 400% of ink
-+ static const cmsUInt16Number CMYKwhite[4] = { 0, 0, 0, 0 };
-+ static const cmsUInt16Number LABblack[4] = { 0, 0x8080, 0x8080 };
// V4 Lab encoding
-+ static const cmsUInt16Number LABwhite[4] = { 0xFFFF, 0x8080, 0x8080 };
-+ static const cmsUInt16Number CMYblack[4] = { 0xffff, 0xffff, 0xffff };
-+ static const cmsUInt16Number CMYwhite[4] = { 0, 0, 0 };
-+ static const cmsUInt16Number Grayblack[4] = { 0 };
-+ static const cmsUInt16Number GrayWhite[4] = { 0xffff };
-
- switch (Space) {
-
-@@ -947,4 +947,4 @@ cmsUInt32Number CMSEXPORT
cmsChannelsOf(cmsColorSpaceSignature ColorSpace)
- int n = cmsChannelsOfColorSpace(ColorSpace);
- if (n < 0) return 3;
- return (cmsUInt32Number)n;
--}
-\ No newline at end of file
-+}
-diff --git a/src/cmsps2.c b/src/cmsps2.c
-index cb2db85..6fb828e 100644
---- a/src/cmsps2.c
-+++ b/src/cmsps2.c
-@@ -573,8 +573,8 @@ int OutputValueSampler(CMSREGISTER const cmsUInt16Number
In[], CMSREGISTER cmsUI
- if ((In[1] >= 0x7800 && In[1] <= 0x8800) &&
- (In[2] >= 0x7800 && In[2] <= 0x8800)) {
-
-- cmsUInt16Number* Black;
-- cmsUInt16Number* White;
-+ const cmsUInt16Number* Black;
-+ const cmsUInt16Number* White;
- cmsUInt32Number nOutputs;
-
- if (!_cmsEndPointsBySpace(sc ->ColorSpace, &White, &Black,
&nOutputs))
-diff --git a/src/cmssamp.c b/src/cmssamp.c
-index af76afa..56aa859 100644
---- a/src/cmssamp.c
-+++ b/src/cmssamp.c
-@@ -66,7 +66,7 @@ cmsBool BlackPointAsDarkerColorant(cmsHPROFILE hInput,
- cmsCIEXYZ* BlackPoint,
- cmsUInt32Number dwFlags)
- {
-- cmsUInt16Number *Black;
-+ const cmsUInt16Number *Black;
- cmsHTRANSFORM xform;
- cmsColorSpaceSignature Space;
- cmsUInt32Number nChannels;
-diff --git a/src/cmstypes.c b/src/cmstypes.c
-index b456276..d9c0105 100644
---- a/src/cmstypes.c
-+++ b/src/cmstypes.c
-@@ -44,7 +44,7 @@
- typedef struct _cmsTagTypeLinkedList_st {
-
- cmsTagTypeHandler Handler;
-- struct _cmsTagTypeLinkedList_st* Next;
-+ const struct _cmsTagTypeLinkedList_st* Next;
-
- } _cmsTagTypeLinkedList;
-
-@@ -96,9 +96,9 @@ cmsBool RegisterTypesPlugin(cmsContext id, cmsPluginBase*
Data, _cmsMemoryClient
- // Return handler for a given type or NULL if not found. Shared between
normal types and MPE. It first tries the additions
- // made by plug-ins and then the built-in defaults.
- static
--cmsTagTypeHandler* GetHandler(cmsTagTypeSignature sig, _cmsTagTypeLinkedList*
PluginLinkedList, _cmsTagTypeLinkedList* DefaultLinkedList)
-+const cmsTagTypeHandler* GetHandler(cmsTagTypeSignature sig,
_cmsTagTypeLinkedList* PluginLinkedList, const _cmsTagTypeLinkedList*
DefaultLinkedList)
- {
-- _cmsTagTypeLinkedList* pt;
-+ const _cmsTagTypeLinkedList* pt;
-
- for (pt = PluginLinkedList;
- pt != NULL;
-@@ -4701,7 +4701,7 @@ cmsBool Type_MPEclut_Write(struct
_cms_typehandler_struct* self, cmsIOHANDLER*
-
-
- // This is the list of built-in MPE types
--static _cmsTagTypeLinkedList SupportedMPEtypes[] = {
-+static const _cmsTagTypeLinkedList SupportedMPEtypes[] = {
-
- {{ (cmsTagTypeSignature) cmsSigBAcsElemType, NULL, NULL, NULL, NULL, NULL, 0
}, &SupportedMPEtypes[1] }, // Ignore those elements for now
- {{ (cmsTagTypeSignature) cmsSigEAcsElemType, NULL, NULL, NULL, NULL, NULL, 0
}, &SupportedMPEtypes[2] }, // (That's what the spec says)
-@@ -4721,7 +4721,7 @@ cmsBool ReadMPEElem(struct _cms_typehandler_struct* self,
- cmsUInt32Number SizeOfTag)
- {
- cmsStageSignature ElementSig;
-- cmsTagTypeHandler* TypeHandler;
-+ const cmsTagTypeHandler* TypeHandler;
- cmsUInt32Number nItems;
- cmsPipeline *NewLUT = (cmsPipeline *) Cargo;
- _cmsTagTypePluginChunkType* MPETypePluginChunk = (
_cmsTagTypePluginChunkType*) _cmsContextGetClientChunk(self->ContextID,
MPEPlugin);
-@@ -4817,7 +4817,7 @@ cmsBool Type_MPE_Write(struct _cms_typehandler_struct*
self, cmsIOHANDLER* io, v
- cmsStageSignature ElementSig;
- cmsPipeline* Lut = (cmsPipeline*) Ptr;
- cmsStage* Elem = Lut ->Elements;
-- cmsTagTypeHandler* TypeHandler;
-+ const cmsTagTypeHandler* TypeHandler;
- _cmsTagTypePluginChunkType* MPETypePluginChunk = (
_cmsTagTypePluginChunkType*) _cmsContextGetClientChunk(self->ContextID,
MPEPlugin);
-
- BaseOffset = io ->Tell(io) - sizeof(_cmsTagBase);
-@@ -5934,7 +5934,7 @@ void DupTagTypeList(struct _cmsContext_struct* ctx,
- int loc)
- {
- _cmsTagTypePluginChunkType newHead = { NULL };
-- _cmsTagTypeLinkedList* entry;
-+ const _cmsTagTypeLinkedList* entry;
- _cmsTagTypeLinkedList* Anterior = NULL;
- _cmsTagTypePluginChunkType* head = (_cmsTagTypePluginChunkType*)
src->chunks[loc];
-
-@@ -6006,7 +6006,7 @@ cmsBool
_cmsRegisterMultiProcessElementPlugin(cmsContext id, cmsPluginBase* Dat
-
-
- // Wrapper for tag types
--cmsTagTypeHandler* _cmsGetTagTypeHandler(cmsContext ContextID,
cmsTagTypeSignature sig)
-+const cmsTagTypeHandler* _cmsGetTagTypeHandler(cmsContext ContextID,
cmsTagTypeSignature sig)
- {
- _cmsTagTypePluginChunkType* ctx = ( _cmsTagTypePluginChunkType*)
_cmsContextGetClientChunk(ContextID, TagTypePlugin);
-
-diff --git a/src/lcms2_internal.h b/src/lcms2_internal.h
-index 5b3f263..569ccfb 100644
---- a/src/lcms2_internal.h
-+++ b/src/lcms2_internal.h
-@@ -838,7 +838,7 @@ typedef struct _cms_iccprofile_struct {
- cmsUInt32Number TagOffsets[MAX_TABLE_TAG];
- cmsBool TagSaveAsRaw[MAX_TABLE_TAG]; // True to
write uncooked
- void * TagPtrs[MAX_TABLE_TAG];
-- cmsTagTypeHandler* TagTypeHandlers[MAX_TABLE_TAG]; // Same
structure may be serialized on different types
-+ const cmsTagTypeHandler* TagTypeHandlers[MAX_TABLE_TAG]; // Same
structure may be serialized on different types
- // depending
on profile version, so we keep track of the
- // type
handler for each tag in the list.
- // Special
-@@ -855,7 +855,7 @@ cmsBool _cmsWriteHeader(_cmsICCPROFILE* Icc,
cmsUInt32Number UsedSp
- int _cmsSearchTag(_cmsICCPROFILE* Icc, cmsTagSignature sig,
cmsBool lFollowLinks);
-
- // Tag types
--cmsTagTypeHandler* _cmsGetTagTypeHandler(cmsContext ContextID,
cmsTagTypeSignature sig);
-+const cmsTagTypeHandler* _cmsGetTagTypeHandler(cmsContext ContextID,
cmsTagTypeSignature sig);
- cmsTagTypeSignature _cmsGetTagTrueType(cmsHPROFILE hProfile, cmsTagSignature
sig);
- cmsTagDescriptor* _cmsGetTagDescriptor(cmsContext ContextID,
cmsTagSignature sig);
-
-@@ -995,8 +995,8 @@ CMSCHECKPOINT cmsUInt16Number CMSEXPORT
_cmsQuantizeVal(cmsFloat64Number i, cms
- CMSAPI cmsUInt32Number CMSEXPORT
_cmsReasonableGridpointsByColorspace(cmsColorSpaceSignature Colorspace,
cmsUInt32Number dwFlags);
-
- cmsBool _cmsEndPointsBySpace(cmsColorSpaceSignature Space,
-- cmsUInt16Number **White,
-- cmsUInt16Number **Black,
-+ const cmsUInt16Number **White,
-+ const cmsUInt16Number **Black,
- cmsUInt32Number *nOutputs);
-
- CMSAPI cmsBool CMSEXPORT _cmsOptimizePipeline(cmsContext ContextID,
---
-2.49.0
-
diff --git a/external/lcms2/UnpackedTarball_lcms2.mk
b/external/lcms2/UnpackedTarball_lcms2.mk
index b09b38c80f91..e6cf51f3911d 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -20,12 +20,12 @@ ifneq ($(MSYSTEM),)
$(eval $(call gb_UnpackedTarball_set_patchflags,lcms2,--binary))
endif
-# external/lcms2/0001-const-up-some-static-arrays.patch.1
+# external/lcms2/0001-Mark-some-tables-as-const.patch.1
# upstream effort at: https://github.com/mm2/Little-CMS/pull/501
$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
external/lcms2/lcms2-2.4-windows.patch \
- external/lcms2/0001-const-up-some-static-arrays.patch.1 \
+ external/lcms2/0001-Mark-some-tables-as-const.patch.1 \
))
# vim: set noet sw=4 ts=4:
