[libreoffice] 01/01: backport (reverted) icu 60 support patch from master; disable the UI parts for now
Rene Engelhard
rene at moszumanska.debian.org
Mon Nov 20 05:35:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit b045a02354e003762b02c42b00fecd31a4fcdc53
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Sat Nov 18 13:59:53 2017 +0100
backport (reverted) icu 60 support patch from master; disable the UI parts for now
---
changelog | 6 +++
patches/icu-60.diff | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 122 insertions(+)
diff --git a/changelog b/changelog
index 8c08132..b8644d1 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.4.3-3) UNRELEASED; urgency=medium
+
+ * debian/patches/icu-6.0.diff: backport icu 60 support patch from master
+
+ -- Rene Engelhard <rene at debian.org> Fri, 17 Nov 2017 11:13:36 +0100
+
libreoffice (1:5.4.3-2) unstable; urgency=medium
* debian/patches/java9-*: remove ...
diff --git a/patches/icu-60.diff b/patches/icu-60.diff
new file mode 100644
index 0000000..279d0b4
--- /dev/null
+++ b/patches/icu-60.diff
@@ -0,0 +1,115 @@
+From f643e1f687e27e7f46c53d7298772d4dddb3e660 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 12 Nov 2017 18:46:48 +0100
+Subject: Upgrade to ICU 60.1
+
+Change-Id: I07837be7faac0b2238b0cba8fb981e4c4d24c498
+
+diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
+index bd9d09a..b4ca111 100644
+--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
++++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
+@@ -544,6 +544,27 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
+ } else { //word boundary break
+ lbr.breakIndex = pLineBI->preceding(nStartPos);
+ lbr.breakType = BreakType::WORDBOUNDARY;
++
++ // Special case for Slash U+002F SOLIDUS in URI and path names.
++ // TR14 defines that as SY: Symbols Allowing Break After (A).
++ // This is unwanted in paths, see also i#17155
++ if (lbr.breakIndex > 0 && Text[lbr.breakIndex-1] == '/')
++ {
++ // Look backward and take any whitespace before as a break
++ // opportunity. This also glues something like "w/o".
++ // Avoid an overly long path and break it as was indicated.
++ // Overly long here is arbitrarily defined.
++ const sal_Int32 nOverlyLong = 66;
++ sal_Int32 nPos = lbr.breakIndex - 1;
++ while (nPos > 0 && lbr.breakIndex - nPos < nOverlyLong)
++ {
++ if (u_isWhitespace(Text.iterateCodePoints( &nPos, -1)))
++ {
++ lbr.breakIndex = nPos + 1;
++ break;
++ }
++ }
++ }
+ }
+
+ #define WJ 0x2060 // Word Joiner
+diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
+index 94abe52..0173a4a 100644
+--- a/i18nutil/source/utility/unicode.cxx
++++ b/i18nutil/source/utility/unicode.cxx
+@@ -716,6 +716,17 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
+ sRet = "mis"; // Zsye - Emoji variant
+ break;
+ #endif
++#if (U_ICU_VERSION_MAJOR_NUM >= 60)
++ case USCRIPT_MASARAM_GONDI:
++ sRet = "gon-Gonm"; // macro language code, could be wsg,esg,gno
++ break;
++ case USCRIPT_SOYOMBO:
++ sRet = "mn-Soyo"; // abugida to write Mongolian, also Tibetan and Sanskrit
++ break;
++ case USCRIPT_ZANABAZAR_SQUARE:
++ sRet = "mn-Zanb"; // abugida to write Mongolian
++ break;
++#endif
+ }
+ return sRet;
+ }
+#diff -urN svx-old/source/dialog/ucsubset.src svx/source/dialog/ucsubset.src
+#--- a/svx/source/dialog/ucsubset.src 2017-11-03 15:12:31.000000000 +0100
+#+++ b/svx/source/dialog/ucsubset.src 2017-11-17 10:55:54.044690772 +0100
+#@@ -302,6 +302,13 @@
+# < "Osage"; RID_SUBSETSTR_OSAGE ; > ;
+# < "Tangut"; RID_SUBSETSTR_TANGUT ; > ;
+# < "Tangut Components"; RID_SUBSETSTR_TANGUT_COMPONENTS ; > ;
+#+ < "CJK Unified Ideographs Extension F"; RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F ; > ;
+#+ < "Kana Extended-A"; RID_SUBSETSTR_KANA_EXTENDED_A ; > ;
+#+ < "Masaram Gondi"; RID_SUBSETSTR_MASARAM_GONDI ; > ;
+#+ < "Nushu"; RID_SUBSETSTR_NUSHU ; > ;
+#+ < "Soyombo"; RID_SUBSETSTR_SOYOMBO ; > ;
+#+ < "Syriac Supplement"; RID_SUBSETSTR_SYRIAC_SUPPLEMENT ; > ;
+#+ < "Zanabazar Square"; RID_SUBSETSTR_ZANABAZAR_SQUARE ; > ;
+# };
+# };
+#
+#diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
+#index 510ca60..9fc4f3f 100644
+#--- a/svx/source/dialog/charmap.cxx
+#+++ b/svx/source/dialog/charmap.cxx
+#@@ -1822,6 +1822,29 @@ void SubsetMap::InitList()
+# aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TANGUT_COMPONENTS)) ) );
+# break;
+# #endif
+#+#if (U_ICU_VERSION_MAJOR_NUM >= 60)
+#+ case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F:
+#+ aAllSubsets.push_back( Subset( 0x2CEB0, 0x2EBE0, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F)) ) );
+#+ break;
+#+ case UBLOCK_KANA_EXTENDED_A:
+#+ aAllSubsets.push_back( Subset( 0x1B100, 0x1B12F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KANA_EXTENDED_A)) ) );
+#+ break;
+#+ case UBLOCK_MASARAM_GONDI:
+#+ aAllSubsets.push_back( Subset( 0x11D00, 0x11D5F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MASARAM_GONDI)) ) );
+#+ break;
+#+ case UBLOCK_NUSHU:
+#+ aAllSubsets.push_back( Subset( 0x1B170, 0x1B2FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NUSHU)) ) );
+#+ break;
+#+ case UBLOCK_SOYOMBO:
+#+ aAllSubsets.push_back( Subset( 0x11A50, 0x11AAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SOYOMBO)) ) );
+#+ break;
+#+ case UBLOCK_SYRIAC_SUPPLEMENT:
+#+ aAllSubsets.push_back( Subset( 0x0860, 0x086f, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SYRIAC_SUPPLEMENT)) ) );
+#+ break;
+#+ case UBLOCK_ZANABAZAR_SQUARE:
+#+ aAllSubsets.push_back( Subset( 0x11A00, 0x11A4F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ZANABAZAR_SQUARE)) ) );
+#+ break;
+#+#endif
+#
+# }
+#
+#--
+#cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index 94f9acd..b4e1f79 100644
--- a/patches/series
+++ b/patches/series
@@ -36,3 +36,4 @@ stop-shipping-mimelnk-desktop-files.diff
icu-no-icu-config.diff
ww8export-HAVE_MORE_FONTS.diff
java9.diff
+icu-60.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list