* [PR PATCH] ibus-libpinyin: update to 1.15.0
@ 2023-02-02 11:25 LMFuture-Me
2023-02-02 11:37 ` [PR REVIEW] " sgn
` (30 more replies)
0 siblings, 31 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 11:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
There is a new 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: 5227 bytes --]
From ba0f100af39532048ee527a5b877bc93d9bb6446 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:02:25 +0800
Subject: [PATCH 1/2] libpinyin: update to 2.8.1.
libpinyin: update to 2.8.1
---
common/shlibs | 6 ++++--
srcpkgs/libpinyin/template | 12 ++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..537e499452f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,8 +3588,10 @@ 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.13 libpinyin-2.2.1_1
+libpinyin.so.15 libpinyin-2.8.1_1
+#libzhuyin.so.13 libzhuyin-2.6.0_3
+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..908a89765deb 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-2.8.1/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-2.8.1/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-2.8.1/zhuyin*"
vmove usr/lib/pkgconfig/libzhuyin.pc
vmove usr/lib/libzhuyin.a
vmove usr/lib/libzhuyin.so
From 03f8c11b66a791eb68dea67b5ad263e29cfb6714 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:04:47 +0800
Subject: [PATCH 2/2] 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
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
2023-02-02 11:37 ` [PR REVIEW] " sgn
@ 2023-02-02 11:37 ` sgn
2023-02-02 11:37 ` sgn
` (28 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 11:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#discussion_r1094403529
Comment:
```suggestion
libpinyin.so.15 libpinyin-2.8.1_1
libzhuyin.so.15 libzhuyin-2.8.1_1
```
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
@ 2023-02-02 11:37 ` sgn
2023-02-02 11:37 ` sgn
` (29 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 11:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#discussion_r1094404267
Comment:
```suggestion
vmove "usr/include/libpinyin-${version}/novel*"
```
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
2023-02-02 11:37 ` [PR REVIEW] " sgn
2023-02-02 11:37 ` sgn
@ 2023-02-02 11:37 ` sgn
2023-02-02 11:37 ` sgn
` (27 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 11:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#discussion_r1094404440
Comment:
```suggestion
vmove "usr/include/libpinyin-${version}/pinyin*"
```
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (2 preceding siblings ...)
2023-02-02 11:37 ` sgn
@ 2023-02-02 11:37 ` sgn
2023-02-02 11:38 ` [PR PATCH] [Updated] " sgn
` (26 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 11:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#discussion_r1094404631
Comment:
```suggestion
vmove "usr/include/libpinyin-${version}/zhuyin*"
```
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (3 preceding siblings ...)
2023-02-02 11:37 ` sgn
@ 2023-02-02 11:38 ` sgn
2023-02-02 11:38 ` sgn
` (25 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 11:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
There is an updated pull request by sgn 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: 6027 bytes --]
From ba0f100af39532048ee527a5b877bc93d9bb6446 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:02:25 +0800
Subject: [PATCH 1/3] libpinyin: update to 2.8.1.
libpinyin: update to 2.8.1
---
common/shlibs | 6 ++++--
srcpkgs/libpinyin/template | 12 ++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..537e499452f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,8 +3588,10 @@ 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.13 libpinyin-2.2.1_1
+libpinyin.so.15 libpinyin-2.8.1_1
+#libzhuyin.so.13 libzhuyin-2.6.0_3
+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..908a89765deb 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-2.8.1/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-2.8.1/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-2.8.1/zhuyin*"
vmove usr/lib/pkgconfig/libzhuyin.pc
vmove usr/lib/libzhuyin.a
vmove usr/lib/libzhuyin.so
From 03f8c11b66a791eb68dea67b5ad263e29cfb6714 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:04:47 +0800
Subject: [PATCH 2/3] 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 09eb47042d46df5d6308f3150c1ffe91d779bdb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:38:12 +0700
Subject: [PATCH 3/3] fixup! libpinyin: update to 2.8.1
---
common/shlibs | 2 --
1 file changed, 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 537e499452f6..eeddb3188d16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,9 +3588,7 @@ 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
libpinyin.so.15 libpinyin-2.8.1_1
-#libzhuyin.so.13 libzhuyin-2.6.0_3
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
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (4 preceding siblings ...)
2023-02-02 11:38 ` [PR PATCH] [Updated] " sgn
@ 2023-02-02 11:38 ` sgn
2023-02-02 11:39 ` sgn
` (24 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 11:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
There is an updated pull request by sgn 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: 6805 bytes --]
From ba0f100af39532048ee527a5b877bc93d9bb6446 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:02:25 +0800
Subject: [PATCH 1/4] libpinyin: update to 2.8.1.
libpinyin: update to 2.8.1
---
common/shlibs | 6 ++++--
srcpkgs/libpinyin/template | 12 ++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..537e499452f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,8 +3588,10 @@ 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.13 libpinyin-2.2.1_1
+libpinyin.so.15 libpinyin-2.8.1_1
+#libzhuyin.so.13 libzhuyin-2.6.0_3
+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..908a89765deb 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-2.8.1/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-2.8.1/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-2.8.1/zhuyin*"
vmove usr/lib/pkgconfig/libzhuyin.pc
vmove usr/lib/libzhuyin.a
vmove usr/lib/libzhuyin.so
From 03f8c11b66a791eb68dea67b5ad263e29cfb6714 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:04:47 +0800
Subject: [PATCH 2/4] 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 09eb47042d46df5d6308f3150c1ffe91d779bdb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:38:12 +0700
Subject: [PATCH 3/4] fixup! libpinyin: update to 2.8.1
---
common/shlibs | 2 --
1 file changed, 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 537e499452f6..eeddb3188d16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,9 +3588,7 @@ 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
libpinyin.so.15 libpinyin-2.8.1_1
-#libzhuyin.so.13 libzhuyin-2.6.0_3
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
From 0293bfe2862e4fe0303ec3437d8967e166c46807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:38:48 +0700
Subject: [PATCH 4/4] fixup! 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 908a89765deb..5db8ecaf8f1d 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -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.8.1/novel*"
+ vmove "usr/include/libpinyin-${version}/novel*"
}
}
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (5 preceding siblings ...)
2023-02-02 11:38 ` sgn
@ 2023-02-02 11:39 ` sgn
2023-02-02 11:39 ` sgn
` (23 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 11:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
There is an updated pull request by sgn 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: 7674 bytes --]
From ba0f100af39532048ee527a5b877bc93d9bb6446 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:02:25 +0800
Subject: [PATCH 1/5] libpinyin: update to 2.8.1.
libpinyin: update to 2.8.1
---
common/shlibs | 6 ++++--
srcpkgs/libpinyin/template | 12 ++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..537e499452f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,8 +3588,10 @@ 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.13 libpinyin-2.2.1_1
+libpinyin.so.15 libpinyin-2.8.1_1
+#libzhuyin.so.13 libzhuyin-2.6.0_3
+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..908a89765deb 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-2.8.1/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-2.8.1/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-2.8.1/zhuyin*"
vmove usr/lib/pkgconfig/libzhuyin.pc
vmove usr/lib/libzhuyin.a
vmove usr/lib/libzhuyin.so
From 03f8c11b66a791eb68dea67b5ad263e29cfb6714 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:04:47 +0800
Subject: [PATCH 2/5] 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 09eb47042d46df5d6308f3150c1ffe91d779bdb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:38:12 +0700
Subject: [PATCH 3/5] fixup! libpinyin: update to 2.8.1
---
common/shlibs | 2 --
1 file changed, 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 537e499452f6..eeddb3188d16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,9 +3588,7 @@ 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
libpinyin.so.15 libpinyin-2.8.1_1
-#libzhuyin.so.13 libzhuyin-2.6.0_3
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
From 0293bfe2862e4fe0303ec3437d8967e166c46807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:38:48 +0700
Subject: [PATCH 4/5] fixup! 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 908a89765deb..5db8ecaf8f1d 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -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.8.1/novel*"
+ vmove "usr/include/libpinyin-${version}/novel*"
}
}
From 9bcf0b35a7ef0b1bedd0a351142e738a18a304e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:38:59 +0700
Subject: [PATCH 5/5] fixup! 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 5db8ecaf8f1d..cd6bdf041be2 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -62,7 +62,7 @@ libpinyin-devel_package() {
libpinyin-common-devel-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/include/libpinyin-2.8.1/pinyin*"
+ vmove "usr/include/libpinyin-${version}/pinyin*"
vmove usr/lib/pkgconfig/libpinyin.pc
vmove "usr/lib/libpinyin.so"
vmove "usr/lib/libpinyin.a"
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (6 preceding siblings ...)
2023-02-02 11:39 ` sgn
@ 2023-02-02 11:39 ` sgn
2023-02-02 11:43 ` LMFuture-Me
` (22 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 11:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
There is an updated pull request by sgn 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: 8558 bytes --]
From ba0f100af39532048ee527a5b877bc93d9bb6446 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 | 6 ++++--
srcpkgs/libpinyin/template | 12 ++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..537e499452f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,8 +3588,10 @@ 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.13 libpinyin-2.2.1_1
+libpinyin.so.15 libpinyin-2.8.1_1
+#libzhuyin.so.13 libzhuyin-2.6.0_3
+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..908a89765deb 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-2.8.1/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-2.8.1/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-2.8.1/zhuyin*"
vmove usr/lib/pkgconfig/libzhuyin.pc
vmove usr/lib/libzhuyin.a
vmove usr/lib/libzhuyin.so
From 03f8c11b66a791eb68dea67b5ad263e29cfb6714 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 09eb47042d46df5d6308f3150c1ffe91d779bdb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:38:12 +0700
Subject: [PATCH 3/6] fixup! libpinyin: update to 2.8.1
---
common/shlibs | 2 --
1 file changed, 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 537e499452f6..eeddb3188d16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,9 +3588,7 @@ 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
libpinyin.so.15 libpinyin-2.8.1_1
-#libzhuyin.so.13 libzhuyin-2.6.0_3
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
From 0293bfe2862e4fe0303ec3437d8967e166c46807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:38:48 +0700
Subject: [PATCH 4/6] fixup! 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 908a89765deb..5db8ecaf8f1d 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -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.8.1/novel*"
+ vmove "usr/include/libpinyin-${version}/novel*"
}
}
From 9bcf0b35a7ef0b1bedd0a351142e738a18a304e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:38:59 +0700
Subject: [PATCH 5/6] fixup! 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 5db8ecaf8f1d..cd6bdf041be2 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -62,7 +62,7 @@ libpinyin-devel_package() {
libpinyin-common-devel-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/include/libpinyin-2.8.1/pinyin*"
+ vmove "usr/include/libpinyin-${version}/pinyin*"
vmove usr/lib/pkgconfig/libpinyin.pc
vmove "usr/lib/libpinyin.so"
vmove "usr/lib/libpinyin.a"
From 7fb54dd24a085e2366723a842e6deb47b7ebb15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Thu, 2 Feb 2023 18:39:12 +0700
Subject: [PATCH 6/6] fixup! 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 cd6bdf041be2..db04ef0264e1 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -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.8.1/zhuyin*"
+ vmove "usr/include/libpinyin-${version}/zhuyin*"
vmove usr/lib/pkgconfig/libzhuyin.pc
vmove usr/lib/libzhuyin.a
vmove usr/lib/libzhuyin.so
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (7 preceding siblings ...)
2023-02-02 11:39 ` sgn
@ 2023-02-02 11:43 ` LMFuture-Me
2023-02-02 11:49 ` LMFuture-Me
` (21 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 11:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by LMFuture-Me on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1413605484
Comment:
>
its the latest version of fcitx-libpinyin and fcitx5-libzhuyin
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (8 preceding siblings ...)
2023-02-02 11:43 ` LMFuture-Me
@ 2023-02-02 11:49 ` LMFuture-Me
2023-02-02 11:49 ` LMFuture-Me
` (20 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 11:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by LMFuture-Me on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1413605484
Comment:
>
its the latest version of fcitx-libpinyin and fcitx5-libzhuyin
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (9 preceding siblings ...)
2023-02-02 11:49 ` LMFuture-Me
@ 2023-02-02 11:49 ` LMFuture-Me
2023-02-02 12:10 ` [PR PATCH] [Updated] " sgn
` (19 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 11:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
New comment by LMFuture-Me on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1413613013
Comment:
> Please also revbump `fcitx-libpinyin`, `fcitx5-libzhuyin`
This is their latest version. Should they be deleted before they are updated?
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (10 preceding siblings ...)
2023-02-02 11:49 ` LMFuture-Me
@ 2023-02-02 12:10 ` sgn
2023-02-02 12:13 ` sgn
` (18 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 12:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
There is an updated pull request by sgn 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: 6784 bytes --]
From 7ad0d4c9d831a5dc807390af7be398444278546e Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:02:25 +0800
Subject: [PATCH 1/4] 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 5e3621359a28e6f4ec20715a3d3230b35aaa18f7 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:04:47 +0800
Subject: [PATCH 2/4] 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 6609df07c997e2f813fd0aa12106c8add8760eaf 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/4] 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 84b5264e1f702b1138cf88e8661a72e394763f46 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/4] 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
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (11 preceding siblings ...)
2023-02-02 12:10 ` [PR PATCH] [Updated] " sgn
@ 2023-02-02 12:13 ` sgn
2023-02-02 12:14 ` sgn
` (17 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
There is an updated pull request by sgn 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: 7665 bytes --]
From 7ad0d4c9d831a5dc807390af7be398444278546e Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:02:25 +0800
Subject: [PATCH 1/5] 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 5e3621359a28e6f4ec20715a3d3230b35aaa18f7 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 19:04:47 +0800
Subject: [PATCH 2/5] 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 6609df07c997e2f813fd0aa12106c8add8760eaf 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/5] 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 84b5264e1f702b1138cf88e8661a72e394763f46 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/5] 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 a1c37208ebf9550b21996e749c4de72180d27416 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 19:13:18 +0700
Subject: [PATCH 5/5] lint-commits: forbid localhost email, too
---
common/scripts/lint-commits | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits
index f4bb47c8f9f4..56f16ff194b3 100755
--- a/common/scripts/lint-commits
+++ b/common/scripts/lint-commits
@@ -36,6 +36,10 @@ do
print "::error title=Commit Lint::" C ": authored by noreply email";
ret=1;
}
+ /^author .*(localhost|localdomain|[(]none[)])/ && !msg {
+ print "::error title=Commit Lint::" C ": authored by localhost email";
+ ret=1;
+ }
!msg { next }
# 3: long-line-is-banned-except-footnote-like-this-for-url
(NF > 2) && (length > 80) {
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (12 preceding siblings ...)
2023-02-02 12:13 ` sgn
@ 2023-02-02 12:14 ` sgn
2023-02-02 12:16 ` [PR PATCH] [Updated] " sgn
` (16 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 12:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1413643990
Comment:
> This is their latest version. Should they be deleted before they are updated?
No, just increase their revision is enough (like I did for you).
Anyway, please make a commit with valid email.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (13 preceding siblings ...)
2023-02-02 12:14 ` sgn
@ 2023-02-02 12:16 ` sgn
2023-02-02 12:16 ` LMFuture-Me
` (15 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 12:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
There is an updated pull request by sgn 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: 6784 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/4] 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/4] 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/4] 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/4] 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
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (14 preceding siblings ...)
2023-02-02 12:16 ` [PR PATCH] [Updated] " sgn
@ 2023-02-02 12:16 ` LMFuture-Me
2023-02-02 12:16 ` [PR PATCH] [Closed]: " LMFuture-Me
` (14 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 12:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
New comment by LMFuture-Me on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1413645988
Comment:
>
> > This is their latest version. Should they be deleted before they are updated?
>
> No, just increase their revision is enough (like I did for you).
>
> Anyway, please make a commit with valid email.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Closed]: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (15 preceding siblings ...)
2023-02-02 12:16 ` LMFuture-Me
@ 2023-02-02 12:16 ` LMFuture-Me
2023-02-02 12:16 ` LMFuture-Me
` (13 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 12:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 959 bytes --]
There's a closed pull request on the void-packages repository
ibus-libpinyin: update to 1.15.0
https://github.com/void-linux/void-packages/pull/42031
Description:
<!-- 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)
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (16 preceding siblings ...)
2023-02-02 12:16 ` [PR PATCH] [Closed]: " LMFuture-Me
@ 2023-02-02 12:16 ` LMFuture-Me
2023-02-02 12:17 ` LMFuture-Me
` (12 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 12:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
New comment by LMFuture-Me on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1413645988
Comment:
>
> > This is their latest version. Should they be deleted before they are updated?
>
> No, just increase their revision is enough (like I did for you).
>
> Anyway, please make a commit with valid email.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (17 preceding siblings ...)
2023-02-02 12:16 ` LMFuture-Me
@ 2023-02-02 12:17 ` LMFuture-Me
2023-02-02 12:31 ` [PR PATCH] [Updated] " LMFuture-Me
` (11 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
New comment by LMFuture-Me on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1413647447
Comment:
> > This is their latest version. Should they be deleted before they are updated?
>
> No, just increase their revision is enough (like I did for you).
>
> Anyway, please make a commit with valid email.
thank you very much. i am new here
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (18 preceding siblings ...)
2023-02-02 12:17 ` LMFuture-Me
@ 2023-02-02 12:31 ` LMFuture-Me
2023-02-02 16:00 ` sgn
` (10 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 12:31 UTC (permalink / raw)
To: ml
[-- 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: 8854 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 ad40edbc6c9d32ab887f7b63e9985e44a25c5553 Mon Sep 17 00:00:00 2001
From: Aoba <aoba@localhost.localdomain>
Date: Thu, 2 Feb 2023 20:31:40 +0800
Subject: [PATCH 6/6] libpinyin: update to 2.8.1.
libpinyin: set maintainer's email
---
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"
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (19 preceding siblings ...)
2023-02-02 12:31 ` [PR PATCH] [Updated] " LMFuture-Me
@ 2023-02-02 16:00 ` sgn
2023-02-02 16:01 ` sgn
` (9 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 16:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 355 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1413977321
Comment:
Nope, I asked to make your git author email.
Please do it by:
```sh
git config --global user.name <put-your-name-here>
git config --global user.email <put-your-email-here>
git commit --amend --reset-author
```
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (20 preceding siblings ...)
2023-02-02 16:00 ` sgn
@ 2023-02-02 16:01 ` sgn
2023-02-02 23:45 ` [PR PATCH] [Updated] " LMFuture-Me
` (8 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-02 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1413977854
Comment:
btw, you missed two rev-bumped make by me :(
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (21 preceding siblings ...)
2023-02-02 16:01 ` sgn
@ 2023-02-02 23:45 ` LMFuture-Me
2023-02-02 23:51 ` LMFuture-Me
` (7 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 23:45 UTC (permalink / raw)
To: ml
[-- 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: 8855 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 1ff5f3ecaf32a342fd680643a6f95c2eda19ffb8 Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 07:44:36 +0800
Subject: [PATCH 6/6] libpinyin: update to 2.8.1.
libpinyin: set maintainer's email
---
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"
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (22 preceding siblings ...)
2023-02-02 23:45 ` [PR PATCH] [Updated] " LMFuture-Me
@ 2023-02-02 23:51 ` LMFuture-Me
2023-02-02 23:52 ` LMFuture-Me
` (6 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 23:51 UTC (permalink / raw)
To: ml
[-- 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: 8827 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 ea4ea638b2b5af10a9ea7b4ef3260dac752bd6f9 Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 07:50:54 +0800
Subject: [PATCH 6/6] ibus-libpinyin: update to 1.15.0.
---
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"
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (23 preceding siblings ...)
2023-02-02 23:51 ` LMFuture-Me
@ 2023-02-02 23:52 ` LMFuture-Me
2023-02-02 23:52 ` LMFuture-Me
` (5 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 23:52 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (24 preceding siblings ...)
2023-02-02 23:52 ` LMFuture-Me
@ 2023-02-02 23:52 ` LMFuture-Me
2023-02-02 23:54 ` LMFuture-Me
` (4 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 23:52 UTC (permalink / raw)
To: ml
[-- 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: 8827 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 dcbedf4e1ba7ebae51bfb10f4252949f6070dc28 Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 07:52:43 +0800
Subject: [PATCH 6/6] ibus-libpinyin: update to 1.15.0.
---
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"
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (25 preceding siblings ...)
2023-02-02 23:52 ` LMFuture-Me
@ 2023-02-02 23:54 ` LMFuture-Me
2023-02-03 0:09 ` LMFuture-Me
` (3 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-02 23:54 UTC (permalink / raw)
To: ml
[-- 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 7d62be5f13cadaf2319185c79be51670a754484b Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 07:52:43 +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"
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (26 preceding siblings ...)
2023-02-02 23:54 ` LMFuture-Me
@ 2023-02-03 0:09 ` LMFuture-Me
2023-02-03 1:49 ` LMFuture-Me
` (2 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-03 0:09 UTC (permalink / raw)
To: ml
[-- 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: 8822 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 bf9a241ed61767b2e7c029b842b19b1ff79be639 Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 08:09:20 +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 e58d975d98ff6b282d4831c8d0c7b08923815cc8 Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 08:09:20 +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"
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (27 preceding siblings ...)
2023-02-03 0:09 ` LMFuture-Me
@ 2023-02-03 1:49 ` LMFuture-Me
2023-02-03 4:05 ` [PR PATCH] [Updated] " sgn
2023-02-05 1:29 ` [PR PATCH] [Merged]: " sgn
30 siblings, 0 replies; 32+ messages in thread
From: LMFuture-Me @ 2023-02-03 1:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
New comment by LMFuture-Me on void-packages repository
https://github.com/void-linux/void-packages/pull/42031#issuecomment-1414611282
Comment:
> Nope, I asked to make your git author email.
>
> Please do it by:
> ```sh
> git config --global user.name <put-your-name-here>
> git config --global user.email <put-your-email-here>
> git commit --amend --reset-author
> ```
fixed
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (28 preceding siblings ...)
2023-02-03 1:49 ` LMFuture-Me
@ 2023-02-03 4:05 ` sgn
2023-02-05 1:29 ` [PR PATCH] [Merged]: " sgn
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-03 4:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
There is an updated pull request by sgn 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: 6786 bytes --]
From c1717e6f63e7356b7daeac658b377ceea8384851 Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 11:04:58 +0700
Subject: [PATCH 1/4] 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 8197d42a8d4a5a775cc10217a0cc1450a1ab1209 Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 11:04:59 +0700
Subject: [PATCH 2/4] 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 d09d7488e94e26249f3f9448b4df526f238bd883 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/4] 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 13ce21c21b09e6fe4e557166f3f6862609ca29f0 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/4] 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
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Merged]: ibus-libpinyin: update to 1.15.0
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
` (29 preceding siblings ...)
2023-02-03 4:05 ` [PR PATCH] [Updated] " sgn
@ 2023-02-05 1:29 ` sgn
30 siblings, 0 replies; 32+ messages in thread
From: sgn @ 2023-02-05 1:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 959 bytes --]
There's a merged pull request on the void-packages repository
ibus-libpinyin: update to 1.15.0
https://github.com/void-linux/void-packages/pull/42031
Description:
<!-- 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)
^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2023-02-05 1:29 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-02 11:25 [PR PATCH] ibus-libpinyin: update to 1.15.0 LMFuture-Me
2023-02-02 11:37 ` [PR REVIEW] " sgn
2023-02-02 11:37 ` sgn
2023-02-02 11:37 ` sgn
2023-02-02 11:37 ` sgn
2023-02-02 11:38 ` [PR PATCH] [Updated] " sgn
2023-02-02 11:38 ` sgn
2023-02-02 11:39 ` sgn
2023-02-02 11:39 ` sgn
2023-02-02 11:43 ` LMFuture-Me
2023-02-02 11:49 ` LMFuture-Me
2023-02-02 11:49 ` LMFuture-Me
2023-02-02 12:10 ` [PR PATCH] [Updated] " sgn
2023-02-02 12:13 ` sgn
2023-02-02 12:14 ` sgn
2023-02-02 12:16 ` [PR PATCH] [Updated] " sgn
2023-02-02 12:16 ` LMFuture-Me
2023-02-02 12:16 ` [PR PATCH] [Closed]: " LMFuture-Me
2023-02-02 12:16 ` LMFuture-Me
2023-02-02 12:17 ` LMFuture-Me
2023-02-02 12:31 ` [PR PATCH] [Updated] " LMFuture-Me
2023-02-02 16:00 ` sgn
2023-02-02 16:01 ` sgn
2023-02-02 23:45 ` [PR PATCH] [Updated] " LMFuture-Me
2023-02-02 23:51 ` LMFuture-Me
2023-02-02 23:52 ` LMFuture-Me
2023-02-02 23:52 ` LMFuture-Me
2023-02-02 23:54 ` LMFuture-Me
2023-02-03 0:09 ` LMFuture-Me
2023-02-03 1:49 ` LMFuture-Me
2023-02-03 4:05 ` [PR PATCH] [Updated] " sgn
2023-02-05 1:29 ` [PR PATCH] [Merged]: " sgn
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).