From 2e6013cb4b53e3206d332a03e048b6c7d687ac59 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 9 Aug 2021 16:16:51 +0100 Subject: [PATCH] Patched and rebuilt for Boost 1.76 --- librime-boost176-exp.patch | 38 ++++++++++++++++++++++++++++++++++++++ librime.spec | 6 ++++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 librime-boost176-exp.patch diff --git a/librime-boost176-exp.patch b/librime-boost176-exp.patch new file mode 100644 index 0000000..975c41a --- /dev/null +++ b/librime-boost176-exp.patch @@ -0,0 +1,38 @@ +From 4bed1934d4f1c46af3f2e10199238bc5ab2a7649 Mon Sep 17 00:00:00 2001 +From: HanatoK +Date: Sat, 1 May 2021 01:04:38 -0500 +Subject: [PATCH] Fix FTBFS. + +Previous boost library (1.75) may implicitly include cmath, but the +latest version (1.76) does not, so the calls to exp are undefined. This +commit include cmath in script_translator.cc and table_translator.cc to +fix the issue (#462). +--- + src/rime/gear/script_translator.cc | 1 + + src/rime/gear/table_translator.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc +index 4a45f05e..25061659 100644 +--- a/src/rime/gear/script_translator.cc ++++ b/src/rime/gear/script_translator.cc +@@ -8,6 +8,7 @@ + // + #include + #include ++#include + #include + #include + #include +diff --git a/src/rime/gear/table_translator.cc b/src/rime/gear/table_translator.cc +index 162ac024..c95e5e24 100644 +--- a/src/rime/gear/table_translator.cc ++++ b/src/rime/gear/table_translator.cc +@@ -6,6 +6,7 @@ + // + #include + #include ++#include + #include + #include + #include diff --git a/librime.spec b/librime.spec index 18df247..bf066cf 100644 --- a/librime.spec +++ b/librime.spec @@ -6,6 +6,8 @@ Summary: Rime Input Method Engine Library License: GPLv3 URL: https://rime.im/ Source0: https://github.com/rime/librime/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://github.com/rime/librime/issues/462 +Patch0: librime-boost176-exp.patch BuildRequires: gcc-c++ BuildRequires: cmake, opencc-devel @@ -80,8 +82,8 @@ The %{name}-tools package contains tools for %{name}. %changelog -* Fri Aug 06 2021 Jonathan Wakely - 1.7.2-3 -- Rebuilt for Boost 1.76 +* Mon Aug 09 2021 Jonathan Wakely - 1.7.2-3 +- Patched and rebuilt for Boost 1.76 * Thu Jul 22 2021 Fedora Release Engineering - 1.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild