[libreoffice] 01/01: add (reverted) icu 60 support patch from master
Rene Engelhard
rene at moszumanska.debian.org
Sun Nov 19 23:34:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.
commit 4fceaff42a24c9489e48aa8574423d104aa666b7
Author: Rene Engelhard <rene at debian.org>
Date: Sun Nov 19 21:02:43 2017 +0100
add (reverted) icu 60 support patch from master
---
changelog | 1 +
patches/icu-60.diff | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 118 insertions(+)
diff --git a/changelog b/changelog
index 5ed1644..a76cc57 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,7 @@ libreoffice (1:6.0.0~beta1~git20171119-1) UNRELEASED; urgency=medium
* debian/patches/ww8export-HAVE_MORE_FONTS.diff: move ...
* debian/patches/disable-tests-somehow-needing-more-fonts.diff: ... here
and patch also ooxmlexport4
+ * debian/patches/icu-60.diff: add (reverted) icu 60 support patch from master
* debian/rules:
- use (dh_)dwz and (if enabled) install the multifile file into
diff --git a/patches/icu-60.diff b/patches/icu-60.diff
new file mode 100644
index 0000000..80e4065
--- /dev/null
+++ b/patches/icu-60.diff
@@ -0,0 +1,116 @@
+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 --git a/include/svx/strings.hrc b/include/svx/strings.hrc
+index bed776d..b9d2960 100644
+--- a/include/svx/strings.hrc
++++ b/include/svx/strings.hrc
+@@ -1645,6 +1645,13 @@
+ #define RID_SUBSETSTR_OSAGE NC_("RID_SUBSETMAP", "Osage")
+ #define RID_SUBSETSTR_TANGUT NC_("RID_SUBSETMAP", "Tangut")
+ #define RID_SUBSETSTR_TANGUT_COMPONENTS NC_("RID_SUBSETMAP", "Tangut Components")
++#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension F")
++#define RID_SUBSETSTR_KANA_EXTENDED_A NC_("RID_SUBSETMAP", "Kana Extended-A")
++#define RID_SUBSETSTR_MASARAM_GONDI NC_("RID_SUBSETMAP", "Masaram Gondi")
++#define RID_SUBSETSTR_NUSHU NC_("RID_SUBSETMAP", "Nushu")
++#define RID_SUBSETSTR_SOYOMBO NC_("RID_SUBSETMAP", "Soyombo")
++#define RID_SUBSETSTR_SYRIAC_SUPPLEMENT NC_("RID_SUBSETMAP", "Syriac Supplement")
++#define RID_SUBSETSTR_ZANABAZAR_SQUARE NC_("RID_SUBSETMAP", "Zanabazar Square")
+
+ // TSCP Classification
+ #define RID_CLASSIFICATION_CHANGE_CATEGORY NC_("RID_CLASSIFICATION_CHANGE_CATEGORY", "Do you really want to change the classification category?")
+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.emplace_back( 0x18800, 0x18AFF, SvxResId(RID_SUBSETSTR_TANGUT_COMPONENTS) );
+ break;
+ #endif
++#if (U_ICU_VERSION_MAJOR_NUM >= 60)
++ case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F:
++ aAllSubsets.emplace_back( 0x2CEB0, 0x2EBE0, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F) );
++ break;
++ case UBLOCK_KANA_EXTENDED_A:
++ aAllSubsets.emplace_back( 0x1B100, 0x1B12F, SvxResId(RID_SUBSETSTR_KANA_EXTENDED_A) );
++ break;
++ case UBLOCK_MASARAM_GONDI:
++ aAllSubsets.emplace_back( 0x11D00, 0x11D5F, SvxResId(RID_SUBSETSTR_MASARAM_GONDI) );
++ break;
++ case UBLOCK_NUSHU:
++ aAllSubsets.emplace_back( 0x1B170, 0x1B2FF, SvxResId(RID_SUBSETSTR_NUSHU) );
++ break;
++ case UBLOCK_SOYOMBO:
++ aAllSubsets.emplace_back( 0x11A50, 0x11AAF, SvxResId(RID_SUBSETSTR_SOYOMBO) );
++ break;
++ case UBLOCK_SYRIAC_SUPPLEMENT:
++ aAllSubsets.emplace_back( 0x0860, 0x086f, SvxResId(RID_SUBSETSTR_SYRIAC_SUPPLEMENT) );
++ break;
++ case UBLOCK_ZANABAZAR_SQUARE:
++ aAllSubsets.emplace_back( 0x11A00, 0x11A4F, SvxResId(RID_SUBSETSTR_ZANABAZAR_SQUARE) );
++ break;
++#endif
+
+ }
+
+--
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index e3d0b7f..7dafc97 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,4 @@ cppunit-optional.diff
disable-unused-test-programs.diff
disable-tests-somehow-needing-more-fonts.diff
tdf108963-test.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