download.lst | 4 +--
external/lcms2/0001-Added-missing-export.patch.1 | 25 -------------------
external/lcms2/ExternalPackage_lcms2.mk | 2 -
external/lcms2/UnpackedTarball_lcms2.mk | 4 ---
external/lcms2/lcms2-windows_aarch64_outdir.patch.1 | 26 --------------------
5 files changed, 3 insertions(+), 58 deletions(-)
New commits:
commit e52899ed08405f67ea755271a2592ed0df516c77
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Feb 10 10:52:43 2025 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Feb 11 11:09:52 2025 +0100
lcms2: upgrade to 2.17
* external/lcms2/0001-Added-missing-export.patch.1 has been
fixed uptream
* external/lcms2/lcms2-windows_aarch64_outdir.patch.1 has been
fixed upstream
Downloaded from
https://sourceforge.net/projects/lcms/files/lcms/2.17/lcms2-2.17.tar.gz/download
Change-Id: Iae97a557f153279582878c8eb94dc2fab75b658d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181340
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index c18cd6d64a7d..9fa191045967 100644
--- a/download.lst
+++ b/download.lst
@@ -399,8 +399,8 @@ LANGTAGREG_TARBALL :=
language-subtag-registry-2025-02-06.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LCMS2_SHA256SUM :=
d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51
-LCMS2_TARBALL := lcms2-2.16.tar.gz
+LCMS2_SHA256SUM :=
d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074
+LCMS2_TARBALL := lcms2-2.17.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/lcms2/0001-Added-missing-export.patch.1
b/external/lcms2/0001-Added-missing-export.patch.1
deleted file mode 100644
index ad131e9533d3..000000000000
--- a/external/lcms2/0001-Added-missing-export.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From f7b3c637c20508655f8b49935a4b556d52937b69 Mon Sep 17 00:00:00 2001
-From: Dirk Lemstra <d...@lemstra.org>
-Date: Sun, 10 Dec 2023 20:31:32 +0100
-Subject: [PATCH] Added missing export.
-
----
- src/cmsvirt.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cmsvirt.c b/src/cmsvirt.c
-index 3d662b2..6615604 100644
---- a/src/cmsvirt.c
-+++ b/src/cmsvirt.c
-@@ -676,7 +676,7 @@ cmsHPROFILE CMSEXPORT cmsCreate_sRGBProfile(void)
- *
- * This virtual profile cannot be saved as an ICC file
- */
--cmsHPROFILE cmsCreate_OkLabProfile(cmsContext ctx)
-+cmsHPROFILE CMSEXPORT cmsCreate_OkLabProfile(cmsContext ctx)
- {
- cmsStage* XYZPCS = _cmsStageNormalizeFromXyzFloat(ctx);
- cmsStage* PCSXYZ = _cmsStageNormalizeToXyzFloat(ctx);
---
-2.44.0.windows.1
-
diff --git a/external/lcms2/ExternalPackage_lcms2.mk
b/external/lcms2/ExternalPackage_lcms2.mk
index 62e2ebad8981..a71b31ef7395 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.16))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.17))
endif
endif # $(DISABLE_DYNLOADING)
diff --git a/external/lcms2/UnpackedTarball_lcms2.mk
b/external/lcms2/UnpackedTarball_lcms2.mk
index f44683e03809..f99fc708a33e 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -20,12 +20,8 @@ ifneq ($(MSYSTEM),)
$(eval $(call gb_UnpackedTarball_set_patchflags,lcms2,--binary))
endif
-# external/lcms2/0001-Added-missing-export.patch.1:
-# backport of
https://github.com/mm2/Little-CMS/commit/f7b3c637c20508655f8b49935a4b556d52937b69
$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
- external/lcms2/0001-Added-missing-export.patch.1 \
external/lcms2/lcms2-2.4-windows.patch \
- external/lcms2/lcms2-windows_aarch64_outdir.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/lcms2/lcms2-windows_aarch64_outdir.patch.1
b/external/lcms2/lcms2-windows_aarch64_outdir.patch.1
deleted file mode 100644
index aa27b1b77923..000000000000
--- a/external/lcms2/lcms2-windows_aarch64_outdir.patch.1
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur lcms2.org/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj
lcms2/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj
---- lcms2.org/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj 2023-12-08
18:49:59.819483000 +0100
-+++ lcms2/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj 2023-12-08
18:50:59.460115500 +0100
-@@ -92,6 +92,7 @@
- <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..in\</OutDir>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..in\</OutDir>
-+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\..in\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)_$(Platform)\</IntDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Configuration)_$(Platform)\</IntDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)_$(Platform)\</IntDir>
-@@ -100,6 +101,7 @@
- <LinkIncremental
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..in\</OutDir>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..in\</OutDir>
-+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\..in\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)_$(Platform)\</IntDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Configuration)_$(Platform)\</IntDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)_$(Platform)\</IntDir>
-@@ -340,4 +342,4 @@
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
--</Project>
-\ No newline at end of file
-+</Project>
