Date: Thursday, February 2, 2023 @ 20:00:43
Author: felixonmars
Revision: 1391997
upgpkg: librime 1:1.8.0-1
Modified:
librime/trunk/PKGBUILD
Deleted:
librime/trunk/cmath-include.patch
---------------------+
PKGBUILD | 49 +++++++++++++++++++++++--------------------------
cmath-include.patch | 38 --------------------------------------
2 files changed, 23 insertions(+), 64 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-02 19:06:32 UTC (rev 1391996)
+++ PKGBUILD 2023-02-02 20:00:43 UTC (rev 1391997)
@@ -3,11 +3,12 @@
# Contributor: 網軍總司令
pkgname=librime
-pkgver=1.7.3
-_octagramcommit=f92e083052b9983ee3cbddcda5ed60bb3c068e24
-_luacommit=d45a41af2f9d731e3c1516a191cc3160e3cb8377
-_charcodecommit=b569184772b12965e3ebe1dfd431026951fed81c
-pkgrel=15
+pkgver=1.8.0
+_commit=647a3241ab144f180ee039b6d7df661a66e61381
+_octagramcommit=a6ced5a1d623afed17284fbaa395dd3a8b019a14
+_luacommit=03a2bd9e172549cb16c0718b2c9b68e8c5678085
+_charcodecommit=e8a49f503769427f9c0b14e40b2e1f02417515b2
+pkgrel=1
epoch=1
pkgdesc="Rime input method engine"
arch=('x86_64')
@@ -14,40 +15,36 @@
url="https://github.com/rime/librime";
license=('GPL3')
depends=('boost-libs' 'capnproto' 'opencc' 'yaml-cpp' 'leveldb' 'librime-data'
'lua' 'google-glog' 'marisa')
-makedepends=('cmake' 'boost' 'gtest' 'ninja')
-source=("https://github.com/rime/librime/archive/$pkgver/$pkgname-$pkgver.tar.gz";
-
"https://github.com/lotem/librime-octagram/archive/$_octagramcommit/librime-octagram-$_octagramcommit.tar.gz";
-
"https://github.com/hchunhui/librime-lua/archive/$_luacommit/librime-lua-$_luacommit.tar.gz";
-
"https://github.com/rime/librime-charcode/archive/$_charcodecommit/librime-lua-$_charcodecommit.tar.gz";
- cmath-include.patch)
-sha512sums=('8767d17c3d14a5a1bbb8269fab1627b907de72c288b362fdbc6191223937da21e8b18471b4ae8f83ce5afc0ec5c3ab12fbcb49930eb9969c1764c7390d9ee4b0'
-
'737d1c58982d2f79a6e8b2548eefa1dddc036dd6e6d5436e7d6b4f3adfa2e9d8e45b29a13c1b8207a93cb77f3b5dbd9d18436f44d4e8040eb95b962de582b386'
-
'2a3d3b49d53066fe96dd008e8064718082225e6bf185574a25b8e98175d9936abcfa1fdc56e48f9c72a2deb46f8157d6132fd119ff8e0a3d52fbe9e2ea21386c'
-
'6670a2b089479cf4fb23012e61675065d483ab6123f6dcad136b226dbe361a16bc8f33caece2e139c8d89161a73a2126afe2bed3759996153de6e4888a95a430'
-
'531b4143a7636e6f2cdb67ed2d9b6aa5d43c50dfbbad626757b435debf863f9d466a5923611d9213b0c897af919870d367e88889ea2bbc1037e11fa88a0c7602')
+makedepends=('git' 'cmake' 'boost' 'gtest' 'ninja')
+source=("git+https://github.com/rime/librime.git#commit=$_commit";
+
"git+https://github.com/lotem/librime-octagram.git#commit=$_octagramcommit";
+ "git+https://github.com/hchunhui/librime-lua.git#commit=$_luacommit";
+
"git+https://github.com/rime/librime-charcode.git#commit=$_charcodecommit";)
+sha512sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
prepare() {
- cd $pkgname-$pkgver/plugins
- ln -sf "$srcdir"/librime-octagram-$_octagramcommit librime-octagram
- ln -sf "$srcdir"/librime-lua-$_luacommit librime-lua
- ln -sf "$srcdir"/librime-charcode-$_charcodecommit librime-charcode
-
- patch -Np1 -d .. -i ../cmath-include.patch
+ cd librime/plugins
+ ln -sf "$srcdir"/librime-octagram
+ ln -sf "$srcdir"/librime-lua
+ ln -sf "$srcdir"/librime-charcode
}
build() {
- cd $pkgname-$pkgver
+ cd librime
export CXXFLAGS="$CXXFLAGS -DNDEBUG"
- cmake . -GNinja -Bbuild -DBUILD_TYPE=None -DCMAKE_INSTALL_PREFIX=/usr
-DBUILD_MERGED_PLUGINS=Off -DENABLE_EXTERNAL_PLUGINS=On -Wno-dev
+ cmake . -GNinja -Bbuild -DCMAKE_INSTALL_PREFIX=/usr
-DBUILD_MERGED_PLUGINS=Off -DENABLE_EXTERNAL_PLUGINS=On -Wno-dev
cmake --build build
}
check() {
- cd $pkgname-$pkgver/build
+ cd librime/build
ninja test
}
package() {
- cd $pkgname-$pkgver/build
+ cd librime/build
DESTDIR="$pkgdir" ninja install
}
Deleted: cmath-include.patch
===================================================================
--- cmath-include.patch 2023-02-02 19:06:32 UTC (rev 1391996)
+++ cmath-include.patch 2023-02-02 20:00:43 UTC (rev 1391997)
@@ -1,38 +0,0 @@
-From 57cffcd02ac70148e21ce982be834876b3df87db Mon Sep 17 00:00:00 2001
-From: HanatoK <[email protected]>
-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 <algorithm>
- #include <stack>
-+#include <cmath>
- #include <boost/algorithm/string/join.hpp>
- #include <boost/range/adaptor/reversed.hpp>
- #include <rime/composition.h>
-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 <boost/algorithm/string.hpp>
- #include <boost/range/adaptor/reversed.hpp>
-+#include <cmath>
- #include <utf8.h>
- #include <rime/candidate.h>
- #include <rime/common.h>
