diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/lcms2/0001-Added-missing-export.patch.1 | 25 | ||||
| -rw-r--r-- | external/lcms2/ExternalPackage_lcms2.mk | 2 | ||||
| -rw-r--r-- | external/lcms2/UnpackedTarball_lcms2.mk | 4 | ||||
| -rw-r--r-- | external/lcms2/c++17.patch.1 | 13 | ||||
| -rw-r--r-- | external/libassuan/ExternalPackage_libassuan.mk | 2 | ||||
| -rw-r--r-- | external/libgpg-error/ExternalPackage_libgpg-error.mk | 2 |
6 files changed, 31 insertions, 17 deletions
diff --git a/external/lcms2/0001-Added-missing-export.patch.1 b/external/lcms2/0001-Added-missing-export.patch.1 new file mode 100644 index 0000000000..ad131e9533 --- /dev/null +++ b/external/lcms2/0001-Added-missing-export.patch.1 @@ -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 + diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk index a2c051f6eb..62e2ebad89 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.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) diff --git a/external/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk index 28b30ef3ac..745da1a0a7 100644 --- a/external/lcms2/UnpackedTarball_lcms2.mk +++ b/external/lcms2/UnpackedTarball_lcms2.mk @@ -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: diff --git a/external/lcms2/c++17.patch.1 b/external/lcms2/c++17.patch.1 deleted file mode 100644 index dc5b2ccde4..0000000000 --- a/external/lcms2/c++17.patch.1 +++ /dev/null @@ -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 ****************************** - diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk index 2df7b562d5..77dc05a665 100644 --- a/external/libassuan/ExternalPackage_libassuan.mk +++ b/external/libassuan/ExternalPackage_libassuan.mk @@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),LINUX) -$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.6)) +$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.7)) else ifeq ($(OS),MACOSX) diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk index fd887fb577..2c64ba3b5c 100644 --- a/external/libgpg-error/ExternalPackage_libgpg-error.mk +++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk @@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),LINUX) -$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.34.0)) +$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.35.0)) else ifeq ($(OS),MACOSX) |