From 7ad0d4c9d831a5dc807390af7be398444278546e Mon Sep 17 00:00:00 2001 From: Aoba 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 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 " 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?= 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?= 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?= 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) {