CVS commit: pkgsrc/misc/libreoffice

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov  9 07:37:12 UTC 2023

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
Added Files:
        pkgsrc/misc/libreoffice/patches:
            patch-i18npool_source_breakiterator_data_line.txt
            patch-include_svx_strings.hrc patch-svx_source_dialog_charmap.cxx

Log Message:
libreoffice: fix build with icu 74.1


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-i18npool_source_breakiterator_data_line.txt \
    pkgsrc/misc/libreoffice/patches/patch-include_svx_strings.hrc
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/misc/libreoffice/patches/patch-svx_source_dialog_charmap.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.144 pkgsrc/misc/libreoffice/distinfo:1.145
--- pkgsrc/misc/libreoffice/distinfo:1.144      Sun Oct 15 07:26:24 2023
+++ pkgsrc/misc/libreoffice/distinfo    Thu Nov  9 07:37:12 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.144 2023/10/15 07:26:24 ryoon Exp $
+$NetBSD: distinfo,v 1.145 2023/11/09 07:37:12 wiz Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -179,7 +179,9 @@ SHA1 (patch-external_pdfium_pkgsrc.patch
 SHA1 (patch-external_skia_Library__skia.mk) = c2f76786b56bb13f488d953e66b72c7c9a1cff47
 SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = f0ecbc295a43a7f76afaa7a29e528d86b7b0f6e0
 SHA1 (patch-external_skia_netbsd.patch.0) = 70d61c86d3e69e6dee1602bca8b860de4cc2405d
+SHA1 (patch-i18npool_source_breakiterator_data_line.txt) = 0efa71868b804342837475e8eb85276cb5bd2993
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = d60f5b5089c4358f4081648466662753393e4990
+SHA1 (patch-include_svx_strings.hrc) = 995efd0ce93c5493d1df50ad28cbabed773dbc33
 SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = 46b6948287c8d2354d9b9fd2fab7d685580650ee
 SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
 SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
@@ -187,6 +189,7 @@ SHA1 (patch-sc_source_core_tool_math.cxx
 SHA1 (patch-slideshow_source_engine_box2dtools.cxx) = b59a872552754af29ce6208fd9dd3e25633c9fba
 SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
 SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1
+SHA1 (patch-svx_source_dialog_charmap.cxx) = cd8c250ef6f6a410e02d3312b4c3a4aaec4601c9
 SHA1 (patch-sw_source_core_bastyp_calc.cxx) = 317f206500c88aea4a645a6f1dea8e0a837ad581
 SHA1 (patch-sw_source_uibase_config_usrpref.cxx) = 8f761c368e38435aea53bfcfcdc1f3aba0c73d03
 SHA1 (patch-vcl_source_window_window2.cxx) = b5898d10a6f65ddb06ca3b86efe525078d8efa2a

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-i18npool_source_breakiterator_data_line.txt
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-i18npool_source_breakiterator_data_line.txt:1.1
--- /dev/null   Thu Nov  9 07:37:12 2023
+++ pkgsrc/misc/libreoffice/patches/patch-i18npool_source_breakiterator_data_line.txt   Thu Nov  9 07:37:12 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-i18npool_source_breakiterator_data_line.txt,v 1.1 2023/11/09 07:37:12 wiz Exp $
+
+Fix build with icu 74.1.
+
+--- i18npool/source/breakiterator/data/line.txt.orig   2023-09-22 19:07:01.000000000 +0000
++++ i18npool/source/breakiterator/data/line.txt
+@@ -14,7 +14,6 @@
+ #
+ 
+ !!chain;
+-!!LBCMNoChain;
+ 
+ 
+ !!lookAheadHardBreak;
Index: pkgsrc/misc/libreoffice/patches/patch-include_svx_strings.hrc
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-include_svx_strings.hrc:1.1
--- /dev/null   Thu Nov  9 07:37:12 2023
+++ pkgsrc/misc/libreoffice/patches/patch-include_svx_strings.hrc       Thu Nov  9 07:37:12 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-include_svx_strings.hrc,v 1.1 2023/11/09 07:37:12 wiz Exp $
+
+Fix build with icu 74.1
+
+--- include/svx/strings.hrc.orig       2023-09-22 19:07:01.000000000 +0000
++++ include/svx/strings.hrc
+@@ -1799,6 +1799,7 @@
+ #define RID_SUBSETSTR_KAKTOVIK_NUMERALS                     NC_("RID_SUBSETMAP", "Kaktovik Numerals")
+ #define RID_SUBSETSTR_KAWI                                  NC_("RID_SUBSETMAP", "Kawi")
+ #define RID_SUBSETSTR_NAG_MUNDARI                           NC_("RID_SUBSETMAP", "Nag Mundari")
++#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I    NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension I")
+ 
+ #define RID_SVXSTR_FRAMEDIR_LTR                             NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)")
+ #define RID_SVXSTR_FRAMEDIR_RTL                             NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)")

Index: pkgsrc/misc/libreoffice/patches/patch-svx_source_dialog_charmap.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-svx_source_dialog_charmap.cxx:1.3
--- /dev/null   Thu Nov  9 07:37:12 2023
+++ pkgsrc/misc/libreoffice/patches/patch-svx_source_dialog_charmap.cxx Thu Nov  9 07:37:12 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-svx_source_dialog_charmap.cxx,v 1.3 2023/11/09 07:37:12 wiz Exp $
+
+Fix build with icu 74.1.
+
+--- svx/source/dialog/charmap.cxx.orig 2023-09-22 19:07:01.000000000 +0000
++++ svx/source/dialog/charmap.cxx
+@@ -1928,6 +1928,11 @@ void SubsetMap::InitList()
+                     aAllSubsets.emplace_back( 0x1E4D0, 0x1E4FF, SvxResId(RID_SUBSETSTR_NAG_MUNDARI) );
+                     break;
+ #endif
++#if (U_ICU_VERSION_MAJOR_NUM >= 74)
++                case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I:
++                    aAllSubsets.emplace_back( 0x2EBF0, 0x2EE5F, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I) );
++                    break;
++#endif
+             }
+ 
+ #if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG