external/libwpg/0001-const-up-mimeTypesMap.patch.1 | 26 +++++++++++++++++++++
external/libwpg/UnpackedTarball_libwpg.mk | 5 ++++
2 files changed, 31 insertions(+)
New commits:
commit 4e3be0db74a6b1773a225154769f45164073d8b7
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jul 22 13:24:34 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jul 24 13:56:59 2025 +0200
const up libwpg
Change-Id: Ia8c2e689944052779b810d454d631a3e11481698
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188263
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/external/libwpg/0001-const-up-mimeTypesMap.patch.1
b/external/libwpg/0001-const-up-mimeTypesMap.patch.1
new file mode 100644
index 000000000000..76ad72755074
--- /dev/null
+++ b/external/libwpg/0001-const-up-mimeTypesMap.patch.1
@@ -0,0 +1,26 @@
+From 982c77da697b967ffed07fb01206698e7fd679d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
+Date: Thu, 24 Jul 2025 08:52:09 +0100
+Subject: [PATCH] const up mimeTypesMap
+
+and move it out of the .data section
+---
+ src/lib/WPG2Parser.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/WPG2Parser.cpp b/src/lib/WPG2Parser.cpp
+index 2adef02..96c1911 100644
+--- a/src/lib/WPG2Parser.cpp
++++ b/src/lib/WPG2Parser.cpp
+@@ -2218,7 +2218,7 @@ void WPG2Parser::handleObjectCapsule()
+ m_binaryData.mimeTypes.clear();
+ m_binaryData.mimeTypes.reserve(numDescriptions);
+
+- static const char *mimeTypesMap[] =
++ static const char* const mimeTypesMap[] =
+ {
+ "", // 0
+ "", // "image/x-wpg",
+--
+2.49.0
+
diff --git a/external/libwpg/UnpackedTarball_libwpg.mk
b/external/libwpg/UnpackedTarball_libwpg.mk
index 9ca55c669d72..06eb8c4dbca8 100644
--- a/external/libwpg/UnpackedTarball_libwpg.mk
+++ b/external/libwpg/UnpackedTarball_libwpg.mk
@@ -15,8 +15,13 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpg,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpg))
+# 0001-const-up-mimeTypesMap.patch.1
+# upstream attempt at:
+# https://sourceforge.net/p/libwpg/code/merge-requests/1/
+
$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
external/libwpg/rpath.patch \
+ external/libwpg/0001-const-up-mimeTypesMap.patch.1 \
))
ifneq ($(OS),MACOSX)
