Re: [PR PATCH] [Updated] ibus-rime: update to 1.5.0

[svenper <svenper@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1595 bytes --]

There is an updated pull request by svenper against master on the void-packages repository

https://github.com/svenper/void-packages ibus-rime
https://github.com/void-linux/void-packages/pull/28770

ibus-rime: update to 1.5.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28770.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ibus-rime-28770.patch --]
[-- Type: text/x-diff, Size: 5905 bytes --]

From 5880523a12355d01c6e93b6497f227044e9f6a53 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Mon, 15 Feb 2021 00:51:51 +0100
Subject: [PATCH 1/2] librime: update to 1.7.2

---
 srcpkgs/librime/patches/opencc-1.1.0.patch | 86 ----------------------
 srcpkgs/librime/template                   | 12 +--
 2 files changed, 7 insertions(+), 91 deletions(-)
 delete mode 100644 srcpkgs/librime/patches/opencc-1.1.0.patch

diff --git a/srcpkgs/librime/patches/opencc-1.1.0.patch b/srcpkgs/librime/patches/opencc-1.1.0.patch
deleted file mode 100644
index 219ddabec07..00000000000
--- a/srcpkgs/librime/patches/opencc-1.1.0.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From beae5b1d4e990aeb05eb86db5eefec50fa03750b Mon Sep 17 00:00:00 2001
-From: Chen Gong <chen.sst@gmail.com>
-Date: Fri, 15 May 2020 01:42:52 +0800
-Subject: [PATCH] fix(simplifier): opencc::DictEntry::Values() type change in
- opencc 1.1.0
-
-Closes #367
----
- src/rime/gear/simplifier.cc | 14 ++++++--------
- src/rime/gear/simplifier.h  |  5 +++--
- 2 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git src/rime/gear/simplifier.cc src/rime/gear/simplifier.cc
-index 98a1c5a9..feb7f50b 100644
---- src/rime/gear/simplifier.cc
-+++ src/rime/gear/simplifier.cc
-@@ -8,6 +8,7 @@
- #include <boost/filesystem.hpp>
- #include <stdint.h>
- #include <utf8.h>
-+#include <utility>
- #include <rime/candidate.h>
- #include <rime/common.h>
- #include <rime/config.h>
-@@ -45,8 +46,7 @@ class Opencc {
-     }
-   }
- 
--  bool ConvertWord(const string& text,
--                              vector<string>* forms) {
-+  bool ConvertWord(const string& text, vector<string>* forms) {
-     if (dict_ == nullptr) return false;
-     opencc::Optional<const opencc::DictEntry*> item = dict_->Match(text);
-     if (item.IsNull()) {
-@@ -54,15 +54,14 @@ class Opencc {
-       return false;
-     } else {
-       const opencc::DictEntry* entry = item.Get();
--      for (const char* value : entry->Values()) {
--        forms->push_back(value);
-+      for (auto&& value : entry->Values()) {
-+        forms->push_back(std::move(value));
-       }
-       return forms->size() > 0;
-     }
-   }
- 
--  bool RandomConvertText(const string& text,
--                   string* simplified) {
-+  bool RandomConvertText(const string& text, string* simplified) {
-     if (dict_ == nullptr) return false;
-     const char *phrase = text.c_str();
-     std::ostringstream buffer;
-@@ -83,8 +82,7 @@ class Opencc {
-     return *simplified != text;
-   }
- 
--  bool ConvertText(const string& text,
--                   string* simplified) {
-+  bool ConvertText(const string& text, string* simplified) {
-     if (converter_ == nullptr) return false;
-     *simplified = converter_->Convert(text);
-     return *simplified != text;
-diff --git src/rime/gear/simplifier.h src/rime/gear/simplifier.h
-index c68e4c7d..f70344e7 100644
---- src/rime/gear/simplifier.h
-+++ src/rime/gear/simplifier.h
-@@ -20,7 +20,7 @@ class Simplifier : public Filter, TagMatching {
-   explicit Simplifier(const Ticket& ticket);
- 
-   virtual an<Translation> Apply(an<Translation> translation,
--                                        CandidateList* candidates);
-+                                CandidateList* candidates);
- 
- 
-   virtual bool AppliesToSegment(Segment* segment) {
-@@ -35,7 +35,8 @@ class Simplifier : public Filter, TagMatching {
- 
-   void Initialize();
-   void PushBack(const an<Candidate>& original,
--                         CandidateQueue* result, const string& simplified);
-+                CandidateQueue* result,
-+                const string& simplified);
- 
-   bool initialized_ = false;
-   the<Opencc> opencc_;
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index e16c6861bd9..37cce1595ff 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,17 +1,19 @@
 # Template file for 'librime'
 pkgname=librime
-version=1.5.3
-revision=4
+version=1.7.3
+revision=1
 build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON"
+configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
+ -DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
+hostmakedepends="pkg-config capnproto"
 makedepends="boost-devel leveldb-devel marisa-devel opencc-devel
- yaml-cpp-devel gtest-devel"
+ yaml-cpp-devel gtest-devel capnproto-devel xorgproto"
 short_desc="Rime Input Method Engine"
 maintainer="Yuxuan Shui <yshuiv7@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/rime/librime"
 distfiles="https://github.com/rime/librime/archive/${version}.tar.gz"
-checksum=df4279df6bc0419c18d9325e7d76dfdab8f91f0ee00a954f19a27f66dd99f503
+checksum=c76b937a27d7b9352c3eea9eb3adaebf70c93457104c7d47d40c006009092c20
 
 post_install() {
 	vlicense LICENSE

From 782af3dacf33862ee8498a81d7864aa5e8403d5a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Mon, 15 Feb 2021 00:53:33 +0100
Subject: [PATCH 2/2] ibus-rime: update to 1.5.0

---
 srcpkgs/ibus-rime/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ibus-rime/template b/srcpkgs/ibus-rime/template
index f46c6a529a1..3563559304b 100644
--- a/srcpkgs/ibus-rime/template
+++ b/srcpkgs/ibus-rime/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-rime'
 pkgname=ibus-rime
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config brise"
@@ -11,9 +11,5 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://rime.im/"
 distfiles="https://github.com/rime/ibus-rime/archive/${version}.tar.gz"
-checksum=4f20b64cf01ced25eacba185cd1cc6855b373e0728cba4d406356b13a5ec3828
+checksum=e633bde71055b9298837c7fdd73c5694594633e08bf58b6e5cf17bac4959dacb
 CFLAGS="-fcommon"
-
-do_install() {
-	make ${makejobs} PREFIX=${DESTDIR}/usr install
-}