[libreoffice] 01/01: complete patches/icu-60.diff
Rene Engelhard
rene at moszumanska.debian.org
Mon Nov 20 19:43:34 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 e34fa3fe6ae3a144b573db23f7999bfe567ed06a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Mon Nov 20 19:50:36 2017 +0100
complete patches/icu-60.diff
---
changelog | 2 +-
patches/icu-60.diff | 123 ++++++++++++++++++++++++++++++----------------------
2 files changed, 71 insertions(+), 54 deletions(-)
diff --git a/changelog b/changelog
index 4a3461a..90b7848 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,7 @@ libreoffice (1:5.4.3-3) UNRELEASED; urgency=medium
* debian/patches/icu-60.diff: backport icu 60 support patch from master
- -- Rene Engelhard <rene at debian.org> Fri, 17 Nov 2017 11:13:36 +0100
+ -- Rene Engelhard <rene at debian.org> Mon, 20 Nov 2017 19:50:09 +0100
libreoffice (1:5.4.3-2) unstable; urgency=medium
diff --git a/patches/icu-60.diff b/patches/icu-60.diff
index 279d0b4..582488b 100644
--- a/patches/icu-60.diff
+++ b/patches/icu-60.diff
@@ -59,57 +59,74 @@ index 94abe52..0173a4a 100644
}
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 -urN include-old/svx/ucsubset.hrc include/svx/ucsubset.hrc
+--- a/include/svx/ucsubset.hrc 2017-11-03 15:12:31.000000000 +0100
++++ b/include/svx/ucsubset.hrc 2017-11-20 11:28:52.086347474 +0100
+@@ -302,6 +302,13 @@
+ #define RID_SUBSETSTR_OSAGE (RID_SUBSET_START + 274)
+ #define RID_SUBSETSTR_TANGUT (RID_SUBSET_START + 275)
+ #define RID_SUBSETSTR_TANGUT_COMPONENTS (RID_SUBSET_START + 276)
++#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F (RID_SUBSET_START + 277)
++#define RID_SUBSETSTR_KANA_EXTENDED_A (RID_SUBSET_START + 278)
++#define RID_SUBSETSTR_MASARAM_GONDI (RID_SUBSET_START + 279)
++#define RID_SUBSETSTR_NUSHU (RID_SUBSET_START + 280)
++#define RID_SUBSETSTR_SOYOMBO (RID_SUBSET_START + 281)
++#define RID_SUBSETSTR_SYRIAC_SUPPLEMENT (RID_SUBSET_START + 282)
++#define RID_SUBSETSTR_ZANABAZAR_SQUARE (RID_SUBSET_START + 283)
+
+ // RID_SUBSET_END (RID_SUBSET_START + 299)
+
+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
--
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