external/libwpd/0001-const-up-tibetanMap1-to-move-out-of-data-section.patch.1 | 25 ++++++++++ external/libwpd/UnpackedTarball_libwpd.mk | 4 + 2 files changed, 29 insertions(+)
New commits: commit 53bc460b9b09ef4b1f14e0580c7b30d7d58cc0d7 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Fri Jul 18 20:45:09 2025 +0100 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Sat Jul 19 11:20:35 2025 +0200 const up libwpd Change-Id: Icd8dd62f43fcd54a3eb485aac82375b15a1153c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188055 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/external/libwpd/0001-const-up-tibetanMap1-to-move-out-of-data-section.patch.1 b/external/libwpd/0001-const-up-tibetanMap1-to-move-out-of-data-section.patch.1 new file mode 100644 index 000000000000..b72f6b48da81 --- /dev/null +++ b/external/libwpd/0001-const-up-tibetanMap1-to-move-out-of-data-section.patch.1 @@ -0,0 +1,25 @@ +From 25b5652b66fb7db429e5a5b4c6d484c96b37c532 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com> +Date: Fri, 18 Jul 2025 20:37:15 +0100 +Subject: [PATCH] const up tibetanMap1 to move out of data section + +--- + src/lib/WP6TibetanMap.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/WP6TibetanMap.h b/src/lib/WP6TibetanMap.h +index 6d4545de..39038cfc 100644 +--- a/src/lib/WP6TibetanMap.h ++++ b/src/lib/WP6TibetanMap.h +@@ -228,7 +228,7 @@ const unsigned tibetan_1_250[] = { 0x0F7C, 0x0F7E, 0 }; + const unsigned tibetan_1_251[] = { 0x0F7D, 0x0F7E, 0 }; + const unsigned tibetan_1_252[] = { 0x0F84, 0 }; + +-const unsigned *tibetanMap1[] = ++const unsigned* const tibetanMap1[] = + { + nullptr, + nullptr, +-- +2.49.0 + diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index c72baa515d09..3e8cea767584 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -15,11 +15,15 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpd,0)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpd)) +# external/libwpd/0001-const-up-tibetanMap1-to-move-out-of-data-section.patch.1 +# upstream effort as: https://sourceforge.net/p/libwpd/code/merge-requests/1/ + $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ external/libwpd/libwpd-vs2013.patch.1 \ external/libwpd/tdf153034_3_WrongGreekCharactersWP5Import.patch \ $(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \ external/libwpd/include.patch \ + external/libwpd/0001-const-up-tibetanMap1-to-move-out-of-data-section.patch.1 \ )) ifneq ($(OS),MACOSX)