prepare to enable build with ICU 56

Excerpt of upstream 5b7e8efbf4d73e385c8fb3469a23c0b2592bfb57, remove
patch when upgrading to something later than 5.1.0.0.alpha1 that
includes that commit.
f41
Eike Rathke 9 years ago
parent a7092a3fc5
commit 7d67eb892f

@ -0,0 +1,70 @@
From b8cb34279feea2d6e8cc0f58f4478f068488f268 Mon Sep 17 00:00:00 2001
Message-Id: <b8cb34279feea2d6e8cc0f58f4478f068488f268.1445967354.git.erack@redhat.com>
From: Eike Rathke <erack@redhat.com>
Date: Tue, 27 Oct 2015 16:43:38 +0100
Subject: [PATCH] prepare to enable build with ICU 56
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
This is a multi-part message in MIME format.
--------------erAck-patch-parts
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
Accept new UBlockCode enum values.
Just make it compile, without adding resource strings and blocks.
Excerpt of 5b7e8efbf4d73e385c8fb3469a23c0b2592bfb57
Change-Id: Ia14e4c1c85f8be3e7bae0eb6f5bec1ae33f1a0bf
---
svx/source/dialog/charmap.cxx | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
--------------erAck-patch-parts
Content-Type: text/x-patch; name="0001-prepare-to-enable-build-with-ICU-56.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-prepare-to-enable-build-with-ICU-56.patch"
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 3d616e9..a65fefc 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1574,6 +1574,32 @@ void SubsetMap::InitList()
aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, RID_SUBSETSTR_WARANG_CITI ) );
break;
#endif
+#if U_ICU_VERSION_MAJOR_NUM >= 56
+ /* FIXME: add RID_... to include/svx/ucsubset.hrc and
+ * strings to svx/source/dialog/ucsubset.src and Unicode
+ * block ranges to aAllSubsets, for now this only
+ * compiles.. */
+ case UBLOCK_AHOM:
+ break;
+ case UBLOCK_ANATOLIAN_HIEROGLYPHS:
+ break;
+ case UBLOCK_CHEROKEE_SUPPLEMENT:
+ break;
+ case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E:
+ break;
+ case UBLOCK_EARLY_DYNASTIC_CUNEIFORM:
+ break;
+ case UBLOCK_HATRAN:
+ break;
+ case UBLOCK_MULTANI:
+ break;
+ case UBLOCK_OLD_HUNGARIAN:
+ break;
+ case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
+ break;
+ case UBLOCK_SUTTON_SIGNWRITING:
+ break;
+#endif
}
--------------erAck-patch-parts--

@ -53,7 +53,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.0 Version: %{libo_version}.0
Release: 1%{?libo_prerelease}%{?dist} Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
Group: Applications/Productivity Group: Applications/Productivity
URL: http://www.libreoffice.org/ URL: http://www.libreoffice.org/
@ -314,6 +314,7 @@ Patch15: 0001-add-X-TryExec-entries-to-desktop-files.patch
# not upstreamed # not upstreamed
Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch
Patch17: 0001-use-far-simpler-size-group.patch Patch17: 0001-use-far-simpler-size-group.patch
Patch18: 0001-prepare-to-enable-build-with-ICU-56.patch
%define instdir %{_libdir} %define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice %define baseinstdir %{instdir}/libreoffice
@ -2439,6 +2440,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Tue Oct 27 2015 Eike Rathke <erack@redhat.com> - 1:5.1.0.0-2.alpha1
- prepare to enable build with ICU 56
* Mon Oct 19 2015 David Tardon <dtardon@redhat.com> - 1:5.1.0.0-1.alpha1 * Mon Oct 19 2015 David Tardon <dtardon@redhat.com> - 1:5.1.0.0-1.alpha1
- update to 5.1.0 alpha1 - update to 5.1.0 alpha1

Loading…
Cancel
Save