From cc19d3716ad8c1b08ad22f0e773d5eea31e585c0 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 29 Oct 2015 13:49:05 +0100 Subject: [PATCH] fix build with ICU 56.1 --- pyicu-1.5-fix-build-with-icu-56.1.patch | 16 ++++++++++++++++ pyicu.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pyicu-1.5-fix-build-with-icu-56.1.patch diff --git a/pyicu-1.5-fix-build-with-icu-56.1.patch b/pyicu-1.5-fix-build-with-icu-56.1.patch new file mode 100644 index 0000000..749f3e1 --- /dev/null +++ b/pyicu-1.5-fix-build-with-icu-56.1.patch @@ -0,0 +1,16 @@ +diff -ur old.PyICU-1.5/layoutengine.cpp PyICU-1.5/layoutengine.cpp +--- old.PyICU-1.5/layoutengine.cpp 2012-11-23 21:39:01.000000000 +0100 ++++ PyICU-1.5/layoutengine.cpp 2015-10-29 13:44:15.610882520 +0100 +@@ -118,6 +118,12 @@ + * LEFontInstance API. + */ + ++ virtual const void *getFontTable(LETag tableTag, size_t &length) const ++ { ++ length = -1; ++ return getFontTable(tableTag); ++ } ++ + virtual const void *getFontTable(LETag tag) const + { + #if PY_MAJOR_VERSION >= 3 diff --git a/pyicu.spec b/pyicu.spec index 97b05ad..df8ddd0 100644 --- a/pyicu.spec +++ b/pyicu.spec @@ -4,7 +4,7 @@ %define realname PyICU Name: pyicu Version: 1.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Python extension wrapping IBM's ICU C++ libraries Group: Development/Tools License: MIT @@ -21,6 +21,7 @@ BuildRequires: gcc-c++ Patch0: 0001-fix-build-with-icu-53.1.patch Patch1: 0001-disable-failing-test.patch +Patch2: pyicu-1.5-fix-build-with-icu-56.1.patch %description PyICU is Python extension wrapping IBM's International Components @@ -39,6 +40,7 @@ Summary: Python3 extension wrapping IBM's ICU C++ libraries %patch0 -p1 %patch1 -p1 +%patch2 -p1 rm -rf %{py3dir} cp -a . %{py3dir} @@ -84,6 +86,9 @@ rm -rf %{buildroot}%{python2_sitearch}/tests %{buildroot}%{python3_sitearch}/tes %{python3_sitearch}/* %changelog +* Thu Oct 29 2015 Eike Rathke - 1.5-13 +- fix build with ICU 56.1 + * Wed Oct 28 2015 David Tardon - 1.5-12 - rebuild for ICU 56.1