download.lst | 4 - external/lcms2/0001-Mark-some-tables-as-const.patch.1 | 40 ------------------ external/lcms2/ExternalPackage_lcms2.mk | 2 external/lcms2/UnpackedTarball_lcms2.mk | 1 4 files changed, 3 insertions(+), 44 deletions(-)
New commits: commit bc26192c66d5dfaa1e6ad880787e9515416b72a1 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jan 9 15:13:44 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Sat Jan 10 14:08:13 2026 +0100 lcms2: upgrade to 2.18 0001-Mark-some-tables-as-const.patch.1 has been fixed upstream Downloaded from https://sourceforge.net/projects/lcms/files/lcms/2.18/lcms2-2.18.tar.gz/download Change-Id: Ie2191419c63fd6fdb478f91d573630e745a16d2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196926 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index 9af5d852fa54..d557365f4ea8 100644 --- a/download.lst +++ b/download.lst @@ -400,8 +400,8 @@ LANGTAGREG_TARBALL := language-subtag-registry-2025-08-25.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts -LCMS2_SHA256SUM := d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074 -LCMS2_TARBALL := lcms2-2.17.tar.gz +LCMS2_SHA256SUM := ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347 +LCMS2_TARBALL := lcms2-2.18.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/lcms2/0001-Mark-some-tables-as-const.patch.1 b/external/lcms2/0001-Mark-some-tables-as-const.patch.1 deleted file mode 100644 index 6c00dd89faba..000000000000 --- a/external/lcms2/0001-Mark-some-tables-as-const.patch.1 +++ /dev/null @@ -1,40 +0,0 @@ -From 58affbcc90f060b6b34bad2ed508a2d159fd9320 Mon Sep 17 00:00:00 2001 -From: Marti Maria <[email protected]> -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/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk index a71b31ef7395..896af12ad31f 100644 --- a/external/lcms2/ExternalPackage_lcms2.mk +++ b/external/lcms2/ExternalPackage_lcms2.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.2.dy else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2.dll)) else -$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.17)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.18)) endif endif # $(DISABLE_DYNLOADING) diff --git a/external/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk index c3e818ce96d8..946b790d4978 100644 --- a/external/lcms2/UnpackedTarball_lcms2.mk +++ b/external/lcms2/UnpackedTarball_lcms2.mk @@ -25,7 +25,6 @@ endif $(eval $(call gb_UnpackedTarball_add_patches,lcms2,\ external/lcms2/lcms2-2.4-windows.patch \ - external/lcms2/0001-Mark-some-tables-as-const.patch.1 \ external/lcms2/0002-mark-more-const.patch.1 \ external/lcms2/0003-mark-more-const.patch.1 \ ))
