Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0

[LMFuture-Me <LMFuture-Me@users.noreply.github.com>]

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

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

https://github.com/LMFuture-Me/void-packages libpinyin
https://github.com/void-linux/void-packages/pull/42031

ibus-libpinyin: update to 1.15.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)




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

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

From a45747f7fa6060fbce11bd1ae8de0ec59b57cbce Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:02:25 +0800
Subject: [PATCH 1/6] libpinyin: update to 2.8.1.

libpinyin: update to 2.8.1
---
 common/shlibs              |  4 ++--
 srcpkgs/libpinyin/template | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..eeddb3188d16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,8 +3588,8 @@ libcaf_io.so.0.18.0 zeek-4.0.0_1
 libcaf_openssl.so.0.18.0 zeek-4.0.0_1
 libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
-libpinyin.so.13 libpinyin-2.2.1_1
-libzhuyin.so.13 libzhuyin-2.6.0_3
+libpinyin.so.15 libpinyin-2.8.1_1
+libzhuyin.so.15 libzhuyin-2.8.1_1
 libuhd.so.4.0.0 uhd-4.0.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template
index 31811cac10f6..db04ef0264e1 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -1,7 +1,7 @@
 # Template file for 'libpinyin'
 pkgname=libpinyin
-version=2.6.0
-revision=3
+version=2.8.1
+revision=1
 build_style=gnu-configure
 configure_args="--enable-libzhuyin"
 hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake"
@@ -14,7 +14,7 @@ homepage="https://github.com/libpinyin/libpinyin"
 changelog="https://raw.githubusercontent.com/libpinyin/libpinyin/${version}/ChangeLog"
 distfiles="https://github.com/libpinyin/libpinyin/archive/${version}.tar.gz
  http://downloads.sourceforge.net/libpinyin/models/model19.text.tar.gz"
-checksum="2b52f617a99567a8ace478ee82ccc62d1761e3d1db2f1e05ba05b416708c35d2
+checksum="42c4f899f71fc26bcc57bb1e2a9309c2733212bb241a0008ba3c9b5ebd951443
  56422a4ee5966c2c809dd065692590ee8def934e52edbbe249b8488daaa1f50b"
 nocross="Requires data generators compiled against target system"
 skip_extraction="model19.text.tar.gz"
@@ -53,7 +53,7 @@ libpinyin-utils_package() {
 libpinyin-common-devel_package() {
 	short_desc="Common files for libpinyin and libzhuyin"
 	pkg_install() {
-		vmove "usr/include/libpinyin-2.6.0/novel*"
+		vmove "usr/include/libpinyin-${version}/novel*"
 	}
 }
 
@@ -62,7 +62,7 @@ libpinyin-devel_package() {
 	 libpinyin-common-devel-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove "usr/include/libpinyin-2.6.0/pinyin*"
+		vmove "usr/include/libpinyin-${version}/pinyin*"
 		vmove usr/lib/pkgconfig/libpinyin.pc
 		vmove "usr/lib/libpinyin.so"
 		vmove "usr/lib/libpinyin.a"
@@ -74,7 +74,7 @@ libzhuyin-devel_package() {
 	 libpinyin-devel-${version}_${revision}"
 	short_desc="${short_desc/PinYin/ZhuYin} - development files"
 	pkg_install() {
-		vmove "usr/include/libpinyin-2.6.0/zhuyin*"
+		vmove "usr/include/libpinyin-${version}/zhuyin*"
 		vmove usr/lib/pkgconfig/libzhuyin.pc
 		vmove usr/lib/libzhuyin.a
 		vmove usr/lib/libzhuyin.so

From 64443c793db321ef961049a55e000830215b40d1 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:04:47 +0800
Subject: [PATCH 2/6] ibus-libpinyin: update to 1.15.0.

ibus-libpinyin: update to 1.15.0
---
 srcpkgs/ibus-libpinyin/patches/python-3.11.patch | 12 ------------
 srcpkgs/ibus-libpinyin/template                  |  8 ++++----
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/ibus-libpinyin/patches/python-3.11.patch

diff --git a/srcpkgs/ibus-libpinyin/patches/python-3.11.patch b/srcpkgs/ibus-libpinyin/patches/python-3.11.patch
deleted file mode 100644
index 73739950b7f0..000000000000
--- a/srcpkgs/ibus-libpinyin/patches/python-3.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ibus-libpinyin-1.12.0/setup/main2.py
-===================================================================
---- ibus-libpinyin-1.12.0.orig/setup/main2.py
-+++ ibus-libpinyin-1.12.0/setup/main2.py
-@@ -63,7 +63,6 @@ except AttributeError:
-     pass
- 
- gettext.bindtextdomain(DOMAINNAME, localedir)
--gettext.bind_textdomain_codeset(DOMAINNAME, 'UTF-8')
- 
- gettext.install(DOMAINNAME, localedir)
- 
diff --git a/srcpkgs/ibus-libpinyin/template b/srcpkgs/ibus-libpinyin/template
index d2a884fdb6c8..7bd0d73a2b38 100644
--- a/srcpkgs/ibus-libpinyin/template
+++ b/srcpkgs/ibus-libpinyin/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-libpinyin'
 pkgname=ibus-libpinyin
-version=1.12.0
-revision=2
+version=1.15.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext intltool libtool pkg-config autoconf-archive
  automake gnome-common which"
@@ -10,8 +10,8 @@ short_desc="Intelligent Pinyin engine using libpinyin for IBus"
 maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libpinyin/ibus-libpinyin"
-distfiles="https://github.com/libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
-checksum=1fe023d3416f1be6284e23fd977cae58e3e5eddbc5582e6e8aa7bb82b3751ddd
+distfiles="https://github.com/libpinyin/ibus-libpinyin/archive/refs/tags/${version}.tar.gz"
+checksum=94ece1a2c0f04a0762228a1a0179d5c6b3d26c150a0d61260123052722c95f17
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

From 55189012ffa56ecb3aef5f8e659c6b8d05c2e31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 18:41:06 +0700
Subject: [PATCH 3/6] fcitx-libpinyin: rebuild for libpinyin-2.8.1

---
 srcpkgs/fcitx-libpinyin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fcitx-libpinyin/template b/srcpkgs/fcitx-libpinyin/template
index 5cb3d78d6ca7..1921145d1298 100644
--- a/srcpkgs/fcitx-libpinyin/template
+++ b/srcpkgs/fcitx-libpinyin/template
@@ -2,7 +2,7 @@
 pkgname=fcitx-libpinyin
 _mversion=20161206
 version=0.5.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_QT=OFF"
 hostmakedepends="pkg-config fcitx libpinyin gettext"

From 9accb36535370799d81c62b7971587014d81a746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 18:41:06 +0700
Subject: [PATCH 4/6] fcitx5-zhuyin: rebuild for libpinyin-2.8.1

---
 srcpkgs/fcitx5-zhuyin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template
index a5fd46aa614b..eb5695dff280 100644
--- a/srcpkgs/fcitx5-zhuyin/template
+++ b/srcpkgs/fcitx5-zhuyin/template
@@ -1,7 +1,7 @@
 # Template file for 'fcitx5-zhuyin'
 pkgname=fcitx5-zhuyin
 version=5.0.11
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin"
 makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel

From 5faad7ffb1f3e1e12c29060b6bf0e2532a46f377 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 20:31:30 +0800
Subject: [PATCH 5/6] ibus-libpinyin: update to 1.15.0.

ibus-libpinyin: set maintainer's email
---
 srcpkgs/ibus-libpinyin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-libpinyin/template b/srcpkgs/ibus-libpinyin/template
index 7bd0d73a2b38..9533f567b4e0 100644
--- a/srcpkgs/ibus-libpinyin/template
+++ b/srcpkgs/ibus-libpinyin/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext intltool libtool pkg-config autoconf-archive
  automake gnome-common which"
 makedepends="gettext-devel glib-devel ibus-devel sqlite-devel libpinyin-devel"
 short_desc="Intelligent Pinyin engine using libpinyin for IBus"
-maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
+maintainer="LMFuture <2835365572zty@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libpinyin/ibus-libpinyin"
 distfiles="https://github.com/libpinyin/ibus-libpinyin/archive/refs/tags/${version}.tar.gz"

From 6be843f6ee85d4b59864d57c21b436b37fe54caa Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 07:51:56 +0800
Subject: [PATCH 6/6] libpinyin: update to 2.8.1.

---
 srcpkgs/libpinyin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template
index db04ef0264e1..e73baeb2b35d 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -8,7 +8,7 @@ hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake"
 makedepends="db-devel libglib-devel"
 depends="libpinyin-common>=${version}_${revision}"
 short_desc="Support library for PinYin"
-maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
+maintainer="LMFuture <2835365572zty@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/libpinyin/libpinyin"
 changelog="https://raw.githubusercontent.com/libpinyin/libpinyin/${version}/ChangeLog"