[libreoffice] 01/05: git update; remove upstream fix-xmlparse-with-icu55.diff and icu-56.diff
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit e8fe6cf483d20c4c1d37620b489916144d80561c
Author: Rene Engelhard <rene@debian.org>
Date: Thu Oct 22 07:56:53 2015 +0200
git update; remove upstream fix-xmlparse-with-icu55.diff and icu-56.diff
---
changelog | 6 ++
patches/fix-xmlparse-with-icu55.diff | 33 ---------
patches/icu-56.diff | 131 -----------------------------------
patches/series | 2 -
4 files changed, 6 insertions(+), 166 deletions(-)
diff --git a/changelog b/changelog
index 80c36b7..6de464f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.1.0~beta1~git20101024-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Mon, 19 Oct 2015 22:57:36 +0200
+
libreoffice (1:5.1.0~alpha1-4) experimental; urgency=medium
* debian/rules:
diff --git a/patches/fix-xmlparse-with-icu55.diff b/patches/fix-xmlparse-with-icu55.diff
deleted file mode 100644
index f028f51..0000000
--- a/patches/fix-xmlparse-with-icu55.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From 84017530bc5579e02fc4a2a9d31fe36a9ad28518 Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack@redhat.com>
-Date: Wed, 21 Oct 2015 01:48:17 +0200
-Subject: properly check for ICU status so known tags get actually recognized
-
-nIcuErr after the second RegexMatcher::find() call was
-U_STRING_NOT_TERMINATED_WARNING hence a check for U_ZERO_ERROR failed
-and a content string of "foo <emph>bar</emph> baz" became
-"foo <emph>bar</emph> baz" which later provoked a missing ending
-tag error.
-
-This should had used U_SUCCESS(nIcuErr) instead and only worked by
-chance. Apparently the warning wasn't issued in earlier ICU versions and
-only introduced with 55 or 56.
-
-Change-Id: I36482c928544fc6e8c0403997af33084a47d4bea
-
-diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
-index becad85..eae496a 100644
---- a/l10ntools/source/xmlparse.cxx
-+++ b/l10ntools/source/xmlparse.cxx
-@@ -1124,7 +1124,7 @@ OString XMLUtil::QuotHTML( const OString &rString )
- icu::UnicodeString sReturn;
- int32_t nEndPos = 0;
- int32_t nStartPos = 0;
-- while( aRegexMatcher.find(nStartPos, nIcuErr) && nIcuErr == U_ZERO_ERROR )
-+ while( aRegexMatcher.find(nStartPos, nIcuErr) && U_SUCCESS(nIcuErr) )
- {
- nStartPos = aRegexMatcher.start(nIcuErr);
- if ( nEndPos < nStartPos )
---
-cgit v0.10.2
-
diff --git a/patches/icu-56.diff b/patches/icu-56.diff
deleted file mode 100644
index 46ac8e0..0000000
--- a/patches/icu-56.diff
+++ /dev/null
@@ -1,131 +0,0 @@
-From 5b7e8efbf4d73e385c8fb3469a23c0b2592bfb57 Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack@redhat.com>
-Date: Tue, 20 Oct 2015 14:19:12 +0200
-Subject: Upgrade to ICU 56.1
-
-Change-Id: Icc3d66c16fca95aa890aee6c67c84674fef878fc
-
-From 2d636b56d8ae75140a1d972b52a0fdb7bffae8c3 Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack@redhat.com>
-Date: Wed, 21 Oct 2015 14:47:04 +0200
-Subject: add block/subset names new in Unicode Standard 8.0 / ICU 56
-
-Change-Id: I42685ff22f61f2c6c82439dd23393fd1ac17daa0
-
-From ddee0e30ec93da3b842ee6822980b0a99fa206ce Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack@redhat.com>
-Date: Wed, 21 Oct 2015 15:00:48 +0200
-Subject: add blocks to SubsetMap new in Unicode Standard 8.0 / ICU 56
-
-Change-Id: I08acd0f6bc1a00b9dbaa6711b09222eff388ad17
-
-diff -u b/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
---- b/svx/source/dialog/charmap.cxx
-+++ b/svx/source/dialog/charmap.cxx
-@@ -1582,6 +1582,38 @@
- aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, RID_SUBSETSTR_WARANG_CITI ) );
- break;
- #endif
-+#if U_ICU_VERSION_MAJOR_NUM >= 56
-+ case UBLOCK_AHOM:
-+ aAllSubsets.push_back( Subset( 0x11700, 0x1173F, RID_SUBSETSTR_AHOM ) );
-+ break;
-+ case UBLOCK_ANATOLIAN_HIEROGLYPHS:
-+ aAllSubsets.push_back( Subset( 0x14400, 0x1467F, RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS ) );
-+ break;
-+ case UBLOCK_CHEROKEE_SUPPLEMENT:
-+ aAllSubsets.push_back( Subset( 0xAB70, 0xABFF, RID_SUBSETSTR_CHEROKEE_SUPPLEMENT ) );
-+ break;
-+ case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E:
-+ aAllSubsets.push_back( Subset( 0x2B820, 0x2CEAF, RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E ) );
-+ break;
-+ case UBLOCK_EARLY_DYNASTIC_CUNEIFORM:
-+ aAllSubsets.push_back( Subset( 0x12480, 0x1254F, RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM ) );
-+ break;
-+ case UBLOCK_HATRAN:
-+ aAllSubsets.push_back( Subset( 0x108E0, 0x108FF, RID_SUBSETSTR_HATRAN ) );
-+ break;
-+ case UBLOCK_MULTANI:
-+ aAllSubsets.push_back( Subset( 0x11280, 0x112AF, RID_SUBSETSTR_MULTANI ) );
-+ break;
-+ case UBLOCK_OLD_HUNGARIAN:
-+ aAllSubsets.push_back( Subset( 0x10C80, 0x10CFF, RID_SUBSETSTR_OLD_HUNGARIAN ) );
-+ break;
-+ case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
-+ aAllSubsets.push_back( Subset( 0x1F900, 0x1F9FF, RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS ) );
-+ break;
-+ case UBLOCK_SUTTON_SIGNWRITING:
-+ aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, RID_SUBSETSTR_SUTTON_SIGNWRITING ) );
-+ break;
-+#endif
-
- }
-
---- a/include/svx/ucsubset.hrc
-+++ b/include/svx/ucsubset.hrc
-@@ -281,6 +281,16 @@
- #define RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C (RID_SUBSET_START + 253)
- #define RID_SUBSETSTR_TIRHUTA (RID_SUBSET_START + 254)
- #define RID_SUBSETSTR_WARANG_CITI (RID_SUBSET_START + 255)
-+#define RID_SUBSETSTR_AHOM (RID_SUBSET_START + 256)
-+#define RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS (RID_SUBSET_START + 257)
-+#define RID_SUBSETSTR_CHEROKEE_SUPPLEMENT (RID_SUBSET_START + 258)
-+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E (RID_SUBSET_START + 259)
-+#define RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM (RID_SUBSET_START + 260)
-+#define RID_SUBSETSTR_HATRAN (RID_SUBSET_START + 261)
-+#define RID_SUBSETSTR_MULTANI (RID_SUBSET_START + 262)
-+#define RID_SUBSETSTR_OLD_HUNGARIAN (RID_SUBSET_START + 263)
-+#define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 264)
-+#define RID_SUBSETSTR_SUTTON_SIGNWRITING (RID_SUBSET_START + 265)
-
- // RID_SUBSET_END (RID_SUBSET_START + 299)
-
---- a/svx/source/dialog/ucsubset.src
-+++ b/svx/source/dialog/ucsubset.src
-@@ -1039,6 +1039,46 @@ Resource RID_SUBSETMAP
- {
- Text [ en-US ] = "Warang Citi";
- };
-+ String RID_SUBSETSTR_AHOM
-+ {
-+ Text [ en-US ] = "Ahom";
-+ };
-+ String RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS
-+ {
-+ Text [ en-US ] = "Anatolian Hieroglyphs";
-+ };
-+ String RID_SUBSETSTR_CHEROKEE_SUPPLEMENT
-+ {
-+ Text [ en-US ] = "Cherokee Supplement";
-+ };
-+ String RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E
-+ {
-+ Text [ en-US ] = "CJK Unified Ideographs Extension E";
-+ };
-+ String RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM
-+ {
-+ Text [ en-US ] = "Early Dynastic Cuneiform";
-+ };
-+ String RID_SUBSETSTR_HATRAN
-+ {
-+ Text [ en-US ] = "Hatran";
-+ };
-+ String RID_SUBSETSTR_MULTANI
-+ {
-+ Text [ en-US ] = "Multani";
-+ };
-+ String RID_SUBSETSTR_OLD_HUNGARIAN
-+ {
-+ Text [ en-US ] = "Old Hungarian";
-+ };
-+ String RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS
-+ {
-+ Text [ en-US ] = "Supplemental Symbols And Pictographs";
-+ };
-+ String RID_SUBSETSTR_SUTTON_SIGNWRITING
-+ {
-+ Text [ en-US ] = "Sutton Signwriting";
-+ };
- };
-
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/patches/series b/patches/series
index 51c4b29..3ca3230 100644
--- a/patches/series
+++ b/patches/series
@@ -27,5 +27,3 @@ odk-no-dot.diff
hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
-fix-xmlparse-with-icu55.diff
-icu-56.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: