Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ibus-rime: update to 1.5.0
@ 2021-02-14 23:56 svenper
  2021-02-16 16:07 ` [PR REVIEW] " ericonr
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: svenper @ 2021-02-14 23:56 UTC (permalink / raw)
  To: ml

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

There is a new 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: 5726 bytes --]

From 763cdb109ebd375d8aec47e15d6f982ceee17224 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                   |  9 ++-
 2 files changed, 5 insertions(+), 90 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..4deaa8f81be 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,17 +1,18 @@
 # Template file for 'librime'
 pkgname=librime
-version=1.5.3
-revision=4
+version=1.7.2
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON"
 makedepends="boost-devel leveldb-devel marisa-devel opencc-devel
- yaml-cpp-devel gtest-devel"
+ yaml-cpp-devel gtest-devel capnproto-devel"
+hostmakedepends="pkg-config"
 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=341df211520d44409dfef07401246076f750e82a94e8d60bc2f583e70d7fd6a8
 
 post_install() {
 	vlicense LICENSE

From dc64df287edb22adb0ccb63ad16746569c54eee4 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
-}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
@ 2021-02-16 16:07 ` ericonr
  2021-02-16 22:16 ` [PR PATCH] [Updated] " svenper
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-02-16 16:07 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28770#discussion_r576942594

Comment:
You probably need `capnproto` in `hostmakedepends` as well. And they should go above `makedepends`

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
  2021-02-16 16:07 ` [PR REVIEW] " ericonr
@ 2021-02-16 22:16 ` svenper
  2021-02-16 22:26 ` [PR REVIEW] " svenper
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: svenper @ 2021-02-16 22:16 UTC (permalink / raw)
  To: ml

[-- 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: 5736 bytes --]

From 322e0697bffbc0320096c3a8f5862cd83d084725 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                   |  9 ++-
 2 files changed, 5 insertions(+), 90 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..4f1a4b25dd9 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,17 +1,18 @@
 # Template file for 'librime'
 pkgname=librime
-version=1.5.3
-revision=4
+version=1.7.2
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON"
+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"
 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=341df211520d44409dfef07401246076f750e82a94e8d60bc2f583e70d7fd6a8
 
 post_install() {
 	vlicense LICENSE

From 492c005588b65b0dc8f5eaef4a23dd828e3cfda7 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
-}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
  2021-02-16 16:07 ` [PR REVIEW] " ericonr
  2021-02-16 22:16 ` [PR PATCH] [Updated] " svenper
@ 2021-02-16 22:26 ` svenper
  2021-02-16 22:33 ` ericonr
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: svenper @ 2021-02-16 22:26 UTC (permalink / raw)
  To: ml

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

New review comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/28770#discussion_r577182220

Comment:
Hmm, ARM still fails with those changes?

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (2 preceding siblings ...)
  2021-02-16 22:26 ` [PR REVIEW] " svenper
@ 2021-02-16 22:33 ` ericonr
  2021-02-17  8:17 ` svenper
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-02-16 22:33 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28770#issuecomment-780160709

Comment:
They are using the target's capnproto binary :(

`/usr/aarch64-linux-gnu/usr/bin/capnp`

If it doesn't actually need `capnproto-devel` in `makedepends`, that might solve the issue handily, I think.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (3 preceding siblings ...)
  2021-02-16 22:33 ` ericonr
@ 2021-02-17  8:17 ` svenper
  2021-02-21  1:46 ` sgn
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: svenper @ 2021-02-17  8:17 UTC (permalink / raw)
  To: ml

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/28770#issuecomment-780385746

Comment:
It does unfortunately require -devel too.

```text
=> librime-1.7.2_1: running post-install hook: 06-strip-and-debug-pkgs ...
/usr/bin/aarch64-linux-musl-strip: Unable to recognise the format of the input file `/destdir/aarch64-linux-musl/librime-1.7.2/usr/lib/librime.so.1.7.2'
=> ERROR: librime-1.7.2_1: post-install_06-strip-and-debug-pkgs: '$STRIPCMD --strip-unneeded "$f"' exited with 1
```

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (4 preceding siblings ...)
  2021-02-17  8:17 ` svenper
@ 2021-02-21  1:46 ` sgn
  2021-02-21 10:33 ` [PR PATCH] [Updated] " svenper
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: sgn @ 2021-02-21  1:46 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28770#issuecomment-782779520

Comment:
This diff makes package cross-compilable, but I didn't test the result (64bit cross to 32 bit)
```diff
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index 4f1a4b25dd..08ad94ca21 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -3,10 +3,11 @@ pkgname=librime
 version=1.7.2
 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 capnproto-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"
```

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (5 preceding siblings ...)
  2021-02-21  1:46 ` sgn
@ 2021-02-21 10:33 ` svenper
  2021-02-24  4:25 ` [PR REVIEW] " ericonr
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: svenper @ 2021-02-21 10:33 UTC (permalink / raw)
  To: ml

[-- 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 1678591aedca24cbf7cebea16ee99025ce9cd776 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..08ad94ca214 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.2
+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=341df211520d44409dfef07401246076f750e82a94e8d60bc2f583e70d7fd6a8
 
 post_install() {
 	vlicense LICENSE

From 0e882a1f83faa2798983ee19510a2ec5e42941c8 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
-}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (6 preceding siblings ...)
  2021-02-21 10:33 ` [PR PATCH] [Updated] " svenper
@ 2021-02-24  4:25 ` ericonr
  2021-02-24 11:37 ` svenper
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-02-24  4:25 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28770#discussion_r581614486

Comment:
1.7.3 is out

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (7 preceding siblings ...)
  2021-02-24  4:25 ` [PR REVIEW] " ericonr
@ 2021-02-24 11:37 ` svenper
  2021-02-24 14:55 ` ericonr
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: svenper @ 2021-02-24 11:37 UTC (permalink / raw)
  To: ml

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

New review comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/28770#discussion_r581886451

Comment:
Is that not a pre-release version?  
https://github.com/rime/librime/releases/tag/1.7.3

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (8 preceding siblings ...)
  2021-02-24 11:37 ` svenper
@ 2021-02-24 14:55 ` ericonr
  2021-02-24 19:48 ` [PR PATCH] [Updated] " svenper
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-02-24 14:55 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28770#discussion_r582027377

Comment:
It says pre-release, but it also includes only two commits fixing undefined behavior. So I'd prefer that we move to it. Might make sense to ask upstream why they tagged it that way.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (9 preceding siblings ...)
  2021-02-24 14:55 ` ericonr
@ 2021-02-24 19:48 ` svenper
  2021-02-24 22:57 ` svenper
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: svenper @ 2021-02-24 19:48 UTC (permalink / raw)
  To: ml

[-- 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
-}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (10 preceding siblings ...)
  2021-02-24 19:48 ` [PR PATCH] [Updated] " svenper
@ 2021-02-24 22:57 ` svenper
  2021-02-25  0:06 ` [PR REVIEW] " sgn
  2021-02-26  4:55 ` [PR PATCH] [Merged]: " ericonr
  13 siblings, 0 replies; 15+ messages in thread
From: svenper @ 2021-02-24 22:57 UTC (permalink / raw)
  To: ml

[-- 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 dee038293c3d77782738ba845ab0a71f5a9690ee 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.3

---
 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 c4b9a496c3f81bc2b6f3c3cefa31849c6c920267 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
-}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (11 preceding siblings ...)
  2021-02-24 22:57 ` svenper
@ 2021-02-25  0:06 ` sgn
  2021-02-26  4:55 ` [PR PATCH] [Merged]: " ericonr
  13 siblings, 0 replies; 15+ messages in thread
From: sgn @ 2021-02-25  0:06 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28770#discussion_r582395134

Comment:
The second one (buffer overflow) was in a plugin that we don't have. (do we in anyway pull that plugin in?)
The first one is near-null-pointer dereference, I think.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Merged]: ibus-rime: update to 1.5.0
  2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
                   ` (12 preceding siblings ...)
  2021-02-25  0:06 ` [PR REVIEW] " sgn
@ 2021-02-26  4:55 ` ericonr
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-02-26  4:55 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

ibus-rime: update to 1.5.0
https://github.com/void-linux/void-packages/pull/28770

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2021-02-26  4:55 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-14 23:56 [PR PATCH] ibus-rime: update to 1.5.0 svenper
2021-02-16 16:07 ` [PR REVIEW] " ericonr
2021-02-16 22:16 ` [PR PATCH] [Updated] " svenper
2021-02-16 22:26 ` [PR REVIEW] " svenper
2021-02-16 22:33 ` ericonr
2021-02-17  8:17 ` svenper
2021-02-21  1:46 ` sgn
2021-02-21 10:33 ` [PR PATCH] [Updated] " svenper
2021-02-24  4:25 ` [PR REVIEW] " ericonr
2021-02-24 11:37 ` svenper
2021-02-24 14:55 ` ericonr
2021-02-24 19:48 ` [PR PATCH] [Updated] " svenper
2021-02-24 22:57 ` svenper
2021-02-25  0:06 ` [PR REVIEW] " sgn
2021-02-26  4:55 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).