diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 08:07:11 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 08:07:11 +0100 |
| commit | 3d4fc910f73220f47e5f2459853333a7c83c5d1d (patch) | |
| tree | d3178f93b78b3629dc7067cef69cf2a95490966d /gnu/packages/patches/librime-fix-build-with-gcc10.patch | |
| parent | 9160cccd767cdfa55f7a460750c6b0f7544c12eb (diff) | |
| parent | 4a0549be52f3f46fbce61342d8de30f7b83130c5 (diff) | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/patches/librime-fix-build-with-gcc10.patch')
| -rw-r--r-- | gnu/packages/patches/librime-fix-build-with-gcc10.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/gnu/packages/patches/librime-fix-build-with-gcc10.patch b/gnu/packages/patches/librime-fix-build-with-gcc10.patch deleted file mode 100644 index 49ad011b57..0000000000 --- a/gnu/packages/patches/librime-fix-build-with-gcc10.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Felix Gruber <felgru@posteo.net> -Date: Mon, 6 Sep 2021 19:38:17 +0200 -Subject: [PATCH] Add missing <cmath> includes - -Fix a build failure with GCC 10 that manifests like this: - ------- -/tmp/guix-build-librime-1.7.3.drv-0/source/src/rime/gear/script_translator.cc: In member function ‘void rime::ScriptTranslation::PrepareCandidate()’: -/tmp/guix-build-librime-1.7.3.drv-0/source/src/rime/gear/script_translator.cc:490:23: error: ‘exp’ was not declared in this scope - 490 | cand->set_quality(exp(entry->weight) + - | ^~~ -/tmp/guix-build-librime-1.7.3.drv-0/source/src/rime/gear/script_translator.cc:504:23: error: ‘exp’ was not declared in this scope - 504 | cand->set_quality(exp(entry->weight) + - | ^~~ -make[2]: *** [src/CMakeFiles/rime.dir/build.make:1241: src/CMakeFiles/rime.dir/rime/gear/script_translator.cc.o] Error 1 ------- - -diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc -index 4a45f05..515c8db 100644 ---- a/src/rime/gear/script_translator.cc -+++ b/src/rime/gear/script_translator.cc -@@ -7,6 +7,7 @@ - // 2011-07-10 GONG Chen <chen.sst@gmail.com> - // - #include <algorithm> -+#include <cmath> - #include <stack> - #include <boost/algorithm/string/join.hpp> - #include <boost/range/adaptor/reversed.hpp> -diff --git a/src/rime/gear/table_translator.cc b/src/rime/gear/table_translator.cc -index 162ac02..dbea76a 100644 ---- a/src/rime/gear/table_translator.cc -+++ b/src/rime/gear/table_translator.cc -@@ -4,6 +4,7 @@ - // - // 2011-07-10 GONG Chen <chen.sst@gmail.com> - // -+#include <cmath> - #include <boost/algorithm/string.hpp> - #include <boost/range/adaptor/reversed.hpp> - #include <utf8.h> |