This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit 2121d3c4e4f95f89294af645bb51b482bfe33aa9 Author: Rene Engelhard <[email protected]> Date: Sat Oct 24 18:48:42 2015 +0200 prepare for ICU 56... --- changelog | 5 +- patches/icu-56.diff | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 136 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index d352620..2bca92a 100644 --- a/changelog +++ b/changelog @@ -2,10 +2,13 @@ libreoffice (1:5.0.3~rc2-1) UNRELEASED; urgency=medium * New upstream release candidate + * debian/patches/icu-56.diff: prepare for ICU 56; fix FTBFS with new + charmaps; backported from master + * debian/rules: - remove l10ntools build hack again, now obsolete - -- Rene Engelhard <[email protected]> Thu, 22 Oct 2015 07:25:32 +0200 + -- Rene Engelhard <[email protected]> Sat, 24 Oct 2015 18:48:10 +0200 libreoffice (1:5.0.3~rc1-2) unstable; urgency=medium diff --git a/patches/icu-56.diff b/patches/icu-56.diff new file mode 100644 index 0000000..46ac8e0 --- /dev/null +++ b/patches/icu-56.diff @@ -0,0 +1,131 @@ +From 5b7e8efbf4d73e385c8fb3469a23c0b2592bfb57 Mon Sep 17 00:00:00 2001 +From: Eike Rathke <[email protected]> +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 <[email protected]> +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 <[email protected]> +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 8f72f93..2815a9b 100644 --- a/patches/series +++ b/patches/series @@ -31,3 +31,4 @@ rsc-no-error-about-unknown-switch.diff liborcus-0.9.1.diff disable-tiledrendering-test.diff debian-branding.diff +icu-56.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
