external/liblangtag/0001-const-up-__lt_localealias_tables.patch.1 | 24
++++++++++
external/liblangtag/UnpackedTarball_liblangtag.mk | 5 ++
hwpfilter/source/drawing.h | 2
3 files changed, 30 insertions(+), 1 deletion(-)
New commits:
commit 3ccceaec59b621aae106b20eefbc6fecfb3a4a85
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jul 22 12:21:07 2025 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jul 25 19:06:40 2025 +0200
const up liblangtag
Change-Id: I58782998762912f990765273eba4c13f5962688a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188353
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/external/liblangtag/0001-const-up-__lt_localealias_tables.patch.1
b/external/liblangtag/0001-const-up-__lt_localealias_tables.patch.1
new file mode 100644
index 000000000000..699e4d11fff4
--- /dev/null
+++ b/external/liblangtag/0001-const-up-__lt_localealias_tables.patch.1
@@ -0,0 +1,24 @@
+diff -ru liblangtag.orig/liblangtag/buildaliastbl.sh
liblangtag/liblangtag/buildaliastbl.sh
+--- liblangtag.orig/liblangtag/buildaliastbl.sh 2025-07-22
12:19:49.716993437 +0100
++++ liblangtag/liblangtag/buildaliastbl.sh 2025-07-22 12:22:16.548661384
+0100
+@@ -48,7 +48,7 @@
+ const char *locale;
+ };
+
+-static lt_localealias_t __lt_localealias_tables[] = {
++static const lt_localealias_t __lt_localealias_tables[] = {
+ EOF
+
+ iconv -f iso8859-1 -t utf-8 $1 | awk '{ if ($0 !~ /^(#.*)?$/) printf("
{\"%s\", \"%s\"},
", $1, $2); }'
+diff -ru liblangtag.orig/liblangtag/lt-localealias.h
liblangtag/liblangtag/lt-localealias.h
+--- liblangtag.orig/liblangtag/lt-localealias.h 2025-07-22
12:19:49.715993433 +0100
++++ liblangtag/liblangtag/lt-localealias.h 2025-07-22 12:22:10.627634449
+0100
+@@ -27,7 +27,7 @@
+ const char *locale;
+ };
+
+-static lt_localealias_t __lt_localealias_tables[] = {
++static const lt_localealias_t __lt_localealias_tables[] = {
+ {"bokmal", "nb_NO.ISO-8859-1"},
+ {"catalan", "ca_ES.ISO-8859-1"},
+ {"croatian", "hr_HR.ISO-8859-2"},
diff --git a/external/liblangtag/UnpackedTarball_liblangtag.mk
b/external/liblangtag/UnpackedTarball_liblangtag.mk
index a6a1e97ab6f7..acc0a77047d3 100644
--- a/external/liblangtag/UnpackedTarball_liblangtag.mk
+++ b/external/liblangtag/UnpackedTarball_liblangtag.mk
@@ -19,6 +19,10 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,liblangtag))
$(eval $(call gb_UnpackedTarball_set_patchlevel,liblangtag,0))
+# 0001-const-up-__lt_localealias_tables.patch
+# upstreaming attempt at:
+# https://bitbucket.org/tagoh/liblangtag/pull-requests/14
+
ifneq ($(OS),MACOSX)
ifneq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,liblangtag,\
@@ -30,6 +34,7 @@ endif
$(eval $(call gb_UnpackedTarball_add_patches,liblangtag, \
$(if
$(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \
external/liblangtag/clang-cl.patch.0 \
+ external/liblangtag/0001-const-up-__lt_localealias_tables.patch.1 \
))
# vim: set noet sw=4 ts=4:
commit 14a12c8babd1273e6cea55ccddef9939a5dbacca
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Jul 20 20:31:15 2025 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jul 25 19:06:28 2025 +0200
const up HWPDOFuncTbl
Change-Id: Iabc84aa1524d9fa2cce8bda389d004ece4a174b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188094
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit f6be328e0adc93f6d089848b53da589c90f9d357)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188340
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index e549896a5eed..29ec90b8f49a 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -69,7 +69,7 @@ static int HWPDOArc2Func(int, HWPDrawingObject *, int, void
*, int);
static int HWPDOContainerFunc(int, HWPDrawingObject *, int, void *, int);
static HWPPara *LoadParaList();
-HWPDOFuncType HWPDOFuncTbl[] =
+const HWPDOFuncType HWPDOFuncTbl[] =
{
HWPDOContainerFunc,
HWPDOLineFunc,
