strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lcms2: upgrade to 2.16

Browse source 
* backport 0001-Added-missing-export.patch to fix the Windows build.
* drop c++17.patch.1, which fixed uptream.

Change-Id: Ib658ba3067c35ca5cd1ccb7b3f0f2f3bc9f82a43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165350
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
This commit is contained in:
Taichi Haradaguchi 2024-03-26 16:49:26 +01:00
parent b7d6f7e2ef
commit c2db961ee6
5 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.lst
View file

@ -364,8 +364,8 @@ LANGTAGREG_TARBALL := language-subtag-registry-2023-08-02.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
LCMS2_SHA256SUM := b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39
LCMS2_TARBALL := lcms2-2.15.tar.gz
LCMS2_SHA256SUM := d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51
LCMS2_TARBALL := lcms2-2.16.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts

25
external/lcms2/0001-Added-missing-export.patch.1 vendored Normal file
View file

@ -0,0 +1,25 @@
From f7b3c637c20508655f8b49935a4b556d52937b69 Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@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

2
external/lcms2/ExternalPackage_lcms2.mk vendored
View file

@ -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.15))
$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.16))
endif
endif # $(DISABLE_DYNLOADING)

4
external/lcms2/UnpackedTarball_lcms2.mk vendored
View file

@ -15,10 +15,12 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,lcms2))
$(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
# 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 \
external/lcms2/c++17.patch.1 \
))
# vim: set noet sw=4 ts=4:

13
external/lcms2/c++17.patch.1 vendored
View file

@ -1,13 +0,0 @@
diff --git a/include/lcms2.h b/include/lcms2.h
index cf52014..926e2a0 100644
--- a/include/lcms2.h
+++ b/include/lcms2.h
@@ -62,7 +62,7 @@
// #define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT
// Uncomment this to remove the "register" storage class
-// #define CMS_NO_REGISTER_KEYWORD 1
+#define CMS_NO_REGISTER_KEYWORD 1
// ********** End of configuration toggles ******************************