diff --git a/0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch b/0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch new file mode 100644 index 0000000..027ef56 --- /dev/null +++ b/0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch @@ -0,0 +1,33 @@ +From 40eb50bde3922f23cd071c1e8e0b2cce5ca2d747 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Wed, 11 Sep 2019 09:58:43 +0200 +Subject: [PATCH] Check for EMOJI content only on ICU 57 and newer + +The older ICU does not have the logic to work with there as it is +feature of the new icu only: + http://bugs.icu-project.org/trac/ticket/11802 + +Change-Id: Icd21be1e20b7cb988e94d107406a4f81d00116a7 +--- + vcl/unx/generic/fontmanager/fontconfig.cxx | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx +index c7bfbb47e9bd..a36dfc868329 100644 +--- a/vcl/unx/generic/fontmanager/fontconfig.cxx ++++ b/vcl/unx/generic/fontmanager/fontconfig.cxx +@@ -798,7 +798,11 @@ namespace + + bool isEmoji(sal_uInt32 nCurrentChar) + { ++#if U_ICU_VERSION_MAJOR_NUM >= 57 + return u_hasBinaryProperty(nCurrentChar, UCHAR_EMOJI); ++#else ++ return false; ++#endif + } + + //returns true if the given code-point couldn't possibly be in rLangTag. +-- +2.23.0 + diff --git a/libreoffice.changes b/libreoffice.changes index d1adc7e..42841d8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 11 08:03:08 UTC 2019 - Tomáš Chvátal + +- Add patch to fix building on SLE12: + * 0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch + ------------------------------------------------------------------- Mon Sep 9 08:17:52 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 4939c3f..d5667ab 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -101,6 +101,7 @@ Patch1: scp2-user-config-suse.diff Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff Patch5: mdds-1-5.patch +Patch6: 0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -118,7 +119,6 @@ BuildRequires: curl-devel # Needed for tests BuildRequires: dejavu-fonts BuildRequires: doxygen >= 1.8.4 -# Dot is used by doxygen BuildRequires: fdupes BuildRequires: flex >= 2.6.0 BuildRequires: flute @@ -226,10 +226,10 @@ BuildRequires: pkgconfig(serf-1) >= 1.1.0 BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24 BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xt) -# We need at least english to launch ourselves. Requires: liberation-fonts Requires: libreoffice-branding >= 6.0 Requires: libreoffice-icon-themes = %{version} +# We need at least english to launch ourselves Requires: libreoffice-l10n-en = %{version} Requires: python3 Recommends: dejavu-fonts @@ -986,6 +986,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch2 %patch3 %patch5 -p1 +%patch6 -p1 %patch990 -p1 %patch991 -p1