* [PR PATCH] Fcitx5: Update to 5.1.6
@ 2024-01-05 11:40 sgn
2024-01-05 15:24 ` [PR PATCH] [Updated] " sgn
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: sgn @ 2024-01-05 11:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fcitx5-update
https://github.com/void-linux/void-packages/pull/48073
Fcitx5: Update to 5.1.6
<!-- 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48073.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fcitx5-update-48073.patch --]
[-- Type: text/x-diff, Size: 20492 bytes --]
From ad55b0ae29656abaf8bfd3051e6c27aa56c8047c 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: Fri, 5 Jan 2024 16:10:45 +0700
Subject: [PATCH 01/13] fcitx5: update to 5.1.6.
---
srcpkgs/fcitx5/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
index c51378e310d56..0905f0b021786 100644
--- a/srcpkgs/fcitx5/template
+++ b/srcpkgs/fcitx5/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5'
pkgname=fcitx5
-version=5.1.5
+version=5.1.6
revision=1
build_style=cmake
build_helper=qemu
@@ -12,7 +12,7 @@ hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
makedepends="fmt-devel expat-devel iso-codes enchant2-devel libxkbfile-devel
dbus-devel pango-devel glib-devel libevent-devel xcb-util-wm-devel
xcb-util-keysyms-devel xcb-util-devel xcb-imdkit-devel libxkbcommon-devel
- wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel"
+ wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel libuv-devel"
depends="fcitx5-icons"
short_desc="Flexible Context-aware Input Tool with eXtension - v5"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx"
_en_dict_ver=20121020
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz
https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz"
-checksum="d529b7fef59f5415a6d22fb38616e22609c224e75c693f5b2c90384f2327c6ad
+checksum="24d090dd64e26417a78d3666dd726cefcd5115e943832be0b571afd52e6d2f67
c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
skip_extraction=en_dict-${_en_dict_ver}.tar.gz
lib32disabled=yes
From 8d5bdd5cf38af3e6968b6412eb1487149f858708 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: Fri, 5 Jan 2024 16:10:52 +0700
Subject: [PATCH 02/13] fcitx5-configtool: update to 5.1.3.
---
srcpkgs/fcitx5-configtool/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index 07fe5a480d1c1..af335d93bffa7 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-configtool'
pkgname=fcitx5-configtool
-version=5.1.2
+version=5.1.3
revision=1
build_style=cmake
configure_args="-DENABLE_KCM=ON -DENABLE_CONFIG_QT=ON -DENABLE_TEST=ON"
@@ -19,12 +19,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz"
-checksum=cc380dc966f81663d3323c00c900dcf0fcbd6c79e54872c2c249162a7900c1cc
+checksum=1feef31b1bb0f89016845a217e5f56b266b86c1a44b4ed640b49c1378dccdcde
lib32disabled=yes
post_install() {
# belongs to fcitx5-kcm
- rm ${DESTDIR}/usr/share/locale/*/*/org.fcitx.fcitx5.kcm.mo
+ rm ${DESTDIR}/usr/share/locale/*/*/kcm_fcitx5.mo
}
fcitx5-migrator_package() {
@@ -44,11 +44,10 @@ fcitx5-kcm_package() {
kde-cli-tools"
pkg_install() {
vmove usr/bin/fcitx5-plasma-theme-generator
- vmove usr/lib/qt5/plugins/kcms
+ vmove usr/lib/qt5/plugins
vmove usr/share/kpackage
- vmove usr/share/kservices5
- vmove usr/share/metainfo
+ vmove usr/share/applications/kcm_fcitx5.desktop
DESTDIR=${PKGDESTDIR} \
- ninja -C build po/org.fcitx.fcitx5.kcm/install
+ ninja -C build po/kcm_fcitx5/install
}
}
From f76839868f3e83afb6a30226258f60c9f7c818b3 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: Fri, 5 Jan 2024 16:11:00 +0700
Subject: [PATCH 03/13] fcitx5-chinese-addons: update to 5.1.3.
---
srcpkgs/fcitx5-chinese-addons/template | 31 +++++++++++++++++++++-----
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index bdf6cc9d42b39..97054a3943a81 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,12 +1,13 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
-version=5.1.2
+version=5.1.3
revision=1
build_style=cmake
-hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
- qt5-host-tools libime-utils"
+configure_args="-DENABLE_OPENCC=ON -DENABLE_GUI=ON -DENABLE_BROWSER=ON
+ -DENABLE_CLOUDPINYIN=ON -DENABLE_DATA=ON"
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libime-utils"
makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
- libcurl-devel qt5-webkit-devel boost-devel libime-devel fcitx5-qt5-devel"
+ libcurl-devel boost-devel libime-devel"
depends="fcitx5-chinese-addons-icons"
short_desc="Fcitx5 - Chinese related addon"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -17,7 +18,7 @@ _pystroke_version=20121124
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz
http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz
http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz"
-checksum="ffe2961619f91a67df700aed07c774d7aed354cf27675a8323727e87446bd81c
+checksum="4f0d56033593be12ccec9ee1a6a966048c7b0de3c88371f7fc5b3b49578cf22d
42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
skip_extraction="
@@ -25,6 +26,24 @@ skip_extraction="
py_stroke-${_pystroke_version}.tar.gz"
lib32disabled=yes
+_have_webengine=no
+if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ _have_webengine=yes
+fi
+if [ "$XBPS_WORDSIZE" = 32 ]; then
+ _have_webengine=no
+fi
+
+if [ "$_have_webengine" ]; then
+ configure_args+=" -DUSE_QT6=ON -DUSE_WEBKIT=OFF"
+ hostmakedepends+=" qt6-base"
+ makedepends+=" qt6-webengine-devel fcitx5-qt6-devel"
+else
+ configure_args+=" -DUSE_QT6=OFF -DUSE_WEBKIT=ON"
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qt5-webkit-devel fcitx5-qt5-devel"
+fi
+
post_extract() {
local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
local _file
@@ -52,7 +71,7 @@ fcitx5-chinese-addons-pinyin-dict-manager_package() {
short_desc+=" - Pinyin Dictionaries Manager"
depends="fcitx5-chinese-addons>=${version}_${revision}"
pkg_install() {
- vmove usr/lib/fcitx5/qt5
+ vmove usr/lib/fcitx5/qt6
}
}
From 4ede3b29557c9e7fa90c25be6de1f4dc04cbf7cc 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: Fri, 5 Jan 2024 16:11:07 +0700
Subject: [PATCH 04/13] fcitx5-qt: update to 5.1.4.
---
common/shlibs | 6 ++++++
srcpkgs/fcitx5-qt/template | 8 +++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9d46b9376971b..4dfde8ef49683 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2155,6 +2155,12 @@ libdruntime-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
libdruntime-ldc-shared.so.101 ldc-runtime-1.31.0_1
libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1
libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
+libFcitx5Qt6DBusAddons.so.1 fcitx5-qt6-5.1.4_1
+libFcitx5Qt6WidgetsAddons.so.2 fcitx5-qt6-5.1.4_1
+libdruntime-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libphobos2-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libdruntime-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
+libphobos2-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
libmarblewidget-qt5.so.28 marble5-17.12.2_1
libastro.so.2 marble5-17.12.2_1
libparrot.so.6.9.0 parrot-6.9.0_1
diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
index 345137ba87fa0..5c20a80584c8d 100644
--- a/srcpkgs/fcitx5-qt/template
+++ b/srcpkgs/fcitx5-qt/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-qt'
pkgname=fcitx5-qt
-version=5.1.3
+version=5.1.4
revision=1
build_style=cmake
configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz"
-checksum=c1f03ae44340aa5ece644fb24275312377206995ee43e94a311b62e642c2df73
+checksum=92526e4424d45900443b20f0f57500417b9b7dad54409b370a67166db7d2b149
lib32disabled=yes
post_patch() {
@@ -37,7 +37,6 @@ fcitx5-qt5_package() {
short_desc+="5"
pkg_install() {
vmove usr/bin/fcitx5-qt5-*
- vmove usr/lib/fcitx5/qt5
vmove usr/lib/qt5
vmove "usr/libexec/*qt5-*"
vmove "usr/lib/*Qt5*.so.*"
@@ -60,8 +59,11 @@ fcitx5-qt6_package() {
short_desc+="6"
pkg_install() {
vmove usr/bin/fcitx5-qt6-*
+ vmove usr/lib/fcitx5/qt6
vmove usr/lib/qt6
vmove "usr/lib/*Qt6*.so.*"
+ vmove "usr/libexec/*qt6-*"
+ vmove "usr/share/applications/org.fcitx.fcitx5-qt6-*"
}
}
From 339cb4dddd55657d2effdb872309f10bf14ac44d 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: Fri, 5 Jan 2024 16:11:12 +0700
Subject: [PATCH 05/13] fcitx5-rime: update to 5.1.4.
---
srcpkgs/fcitx5-rime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
index 23e726ec48d4b..484e36956ed8d 100644
--- a/srcpkgs/fcitx5-rime/template
+++ b/srcpkgs/fcitx5-rime/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-rime'
pkgname=fcitx5-rime
-version=5.1.3
+version=5.1.4
revision=1
build_style=cmake
configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz"
-checksum=a85a23030c11ea5a8fed12922772cf0310c4b1c8ca27ac0d645a5d970cfe4333
+checksum=b5b08859e9c7e5bac951522c98e8b0fc4fee217016c0ad726a780856591e380b
lib32disabled=yes
fcitx5-rime-icons_package() {
From b7c5a5ce1b5db06a80aa33772fa1a6f057f18d6b 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: Fri, 5 Jan 2024 16:11:19 +0700
Subject: [PATCH 06/13] libime: update to 1.1.4.
---
srcpkgs/libime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index 47a007c22efaf..3702da3eb6579 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,6 +1,6 @@
# Template file for 'libime'
pkgname=libime
-version=1.1.3
+version=1.1.4
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz
https://download.fcitx-im.org/data/${_lm_sc}
https://download.fcitx-im.org/data/${_dict}
https://download.fcitx-im.org/data/table.tar.gz"
-checksum="c2a3319b7912ca3c2019e6201b40045401c198721ac9535a6045472135d76a2c
+checksum="86f4be486b3c43db714e8f138ec93bba250dbb2533b3a8cd20bf491a574a10fe
badd62c16c6373787a0fda8f09cd452d12f60d5868856f651ceecf1a07baba32
f05fccaff9687900aac3d9ad5a81b20888b573201403fbcd9bbc7907d9e97507
6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7"
From 5bbf633c4fc319a9db2c702f0b6d006e525a65de 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: Fri, 5 Jan 2024 16:11:25 +0700
Subject: [PATCH 07/13] libime-jyutping: update to 1.0.9.
---
srcpkgs/libime-jyutping/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index b6b7a0849779b..487a64b4f9935 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,6 +1,6 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
-version=1.0.8
+version=1.0.9
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ _model_version=20180103
distfiles="https://download.fcitx-im.org/fcitx5/libime-jyutping/libime-jyutping-${version}.tar.xz
https://download.fcitx-im.org/data/jyutping-dict-${_dict_version}.tar.xz
https://download.fcitx-im.org/data/jyutping-model-${_model_version}.tar.xz"
-checksum="7d863c61caf4adb8b58c5f7c294c81e4b4d14c0a925577358f0eb675eda34346
+checksum="7c4a0f4108a757e121fe8e74377144c928317419915c125ae9baf0c0dac80b63
e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b
4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071"
skip_extraction="jyutping-dict-${_dict_version}.tar.xz
From 213e02f5fae159fcf7558cd0790bf423f90c958a 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: Fri, 5 Jan 2024 16:11:30 +0700
Subject: [PATCH 08/13] fcitx5-anthy: update to 5.1.3.
---
srcpkgs/fcitx5-anthy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
index 520b939e808a2..088114dcdebba 100644
--- a/srcpkgs/fcitx5-anthy/template
+++ b/srcpkgs/fcitx5-anthy/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-anthy'
pkgname=fcitx5-anthy
-version=5.1.1
+version=5.1.3
revision=1
build_style=cmake
hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz"
-checksum=9147a593356bd73382e1b6cd3f61053e786dca09099ca0857651de4a40462c6c
+checksum=a4e2587b9fbfd758fc626b890f201b14f16c9d46bd0d0a9b622ad2c03f7ddb36
fcitx5-anthy-icons_package() {
short_desc+=" - icons"
From 61f020767faac08a56590a28bdb899cb066f15ea 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: Fri, 5 Jan 2024 16:11:34 +0700
Subject: [PATCH 09/13] fcitx5-gtk: update to 5.1.1.
---
srcpkgs/fcitx5-gtk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index 254297e1a466b..8ca73c66eb021 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-gtk'
pkgname=fcitx5-gtk
-version=5.1.0
-revision=2
+version=5.1.1
+revision=1
build_style=cmake
build_helper=gir
configure_args="$(vopt_bool gir ENABLE_GIR)"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz"
-checksum=7c2227bb1b1b252b1980e1f1ee9819f3fb3d5173cc5e5c52d5bef9b3308f8465
+checksum=d6cda72de020031daf8da4dbc6c7923c8025edadec1a3acb9aa28e9efb78b013
lib32disabled=yes
build_options="gir"
From e16bd0210f8b06eb3b0c9eed37839e2a59c5da43 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: Fri, 5 Jan 2024 16:11:38 +0700
Subject: [PATCH 10/13] fcitx5-lua: update to 5.0.12.
---
srcpkgs/fcitx5-lua/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template
index 7883f9b11986a..bf96c04773c4b 100644
--- a/srcpkgs/fcitx5-lua/template
+++ b/srcpkgs/fcitx5-lua/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-lua'
pkgname=fcitx5-lua
-version=5.0.11
+version=5.0.12
revision=1
build_style=cmake
configure_args="-DUSE_DLOPEN=No"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/fcitx/fcitx5-lua"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-${version}.tar.xz"
-checksum=cc8390cc80991ed1305f5bf19dc1c835b657d4df191fc8b65ce93ae615dc81c1
+checksum=e41fd871bcefbe609cb161ddc42edf02e95fe29537d352a0b3dacd7f3f067002
lib32disabled=yes
fcitx5-lua-devel_package() {
From d1fd14c0d0dd101cc78d9b8be931787fe02ff1f5 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: Fri, 5 Jan 2024 16:11:43 +0700
Subject: [PATCH 11/13] fcitx5-unikey: update to 5.1.1.
---
srcpkgs/fcitx5-unikey/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template
index b237599a82d3b..6722333d504c1 100644
--- a/srcpkgs/fcitx5-unikey/template
+++ b/srcpkgs/fcitx5-unikey/template
@@ -1,28 +1,24 @@
# Template file for 'fcitx5-unikey'
pkgname=fcitx5-unikey
-version=5.1.1
+version=5.1.2
revision=1
build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
-hostmakedepends="pkg-config gettext extra-cmake-modules qt5-devel"
-makedepends="fcitx5 libfcitx5-devel fmt-devel fcitx5-qt5-devel"
+configure_args="-DENABLE_QT=On -DUSE_QT6=On"
+hostmakedepends="pkg-config gettext extra-cmake-modules qt6-base"
+makedepends="fcitx5 libfcitx5-devel fmt-devel fcitx5-qt6-devel"
depends="fcitx5"
short_desc="Fcitx5 - Unikey engine"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-unikey/fcitx5-unikey-${version}.tar.xz"
-checksum=616149b2594847b1563789114dc5af96194acac8540faaaa96966ffaa4bec761
+checksum=e56db4731f55615448328b07dc18cc7af518f2d8801ee516fadbdab36aac93c1
conflicts="fcitx-unikey>=0"
fcitx5-unikey-macro-editor_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - Macro Editor"
pkg_install() {
- vmove usr/lib/fcitx5/qt5
+ vmove usr/lib/fcitx5/qt6
}
}
From 6233780b7315db3a06718f44b81a5fee661281d1 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: Fri, 5 Jan 2024 16:12:01 +0700
Subject: [PATCH 12/13] fcitx5-table-extra: update to 5.1.1.
---
srcpkgs/fcitx5-table-extra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
index e166356258c3c..0c907a00788bf 100644
--- a/srcpkgs/fcitx5-table-extra/template
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-table-extra'
pkgname=fcitx5-table-extra
-version=5.1.0
+version=5.1.1
revision=1
build_style=cmake
hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="Public Domain"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz"
-checksum=9b95844559ff1b99c04cf798cee7602070bb30a46c8e11ba2b1792f54a38041c
+checksum=dc37188219548915e3cec391b8664586f5a72ade8736117ed8960e16d59ef0de
From 56ebd8c0f7128ea0d984200778350759b9241094 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: Fri, 5 Jan 2024 16:12:06 +0700
Subject: [PATCH 13/13] xcb-imdkit: update to 1.0.6.
---
srcpkgs/xcb-imdkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template
index 5700eec005676..296d9eb6de5b7 100644
--- a/srcpkgs/xcb-imdkit/template
+++ b/srcpkgs/xcb-imdkit/template
@@ -1,6 +1,6 @@
# Template file for 'xcb-imdkit'
pkgname=xcb-imdkit
-version=1.0.5
+version=1.0.6
revision=1
build_style=cmake
hostmakedepends="pkg-config extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-only"
homepage="https://github.com/fcitx/xcb-imdkit"
distfiles="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-${version}.tar.xz"
-checksum=373fcd26d99254b1260fd0254bcea1d346e1061cc5707f4d71b4a091418f03cc
+checksum=ee71353fd8f048c1cc85916cc79ac7ac442191108102085f0dc550d79d005230
post_install() {
sed -i '/prefix=/!s,/usr,${exec_prefix},' \
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Fcitx5: Update to 5.1.6
2024-01-05 11:40 [PR PATCH] Fcitx5: Update to 5.1.6 sgn
@ 2024-01-05 15:24 ` sgn
2024-01-05 15:39 ` sgn
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2024-01-05 15:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fcitx5-update
https://github.com/void-linux/void-packages/pull/48073
Fcitx5: Update to 5.1.6
<!-- 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48073.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fcitx5-update-48073.patch --]
[-- Type: text/x-diff, Size: 20711 bytes --]
From ad55b0ae29656abaf8bfd3051e6c27aa56c8047c 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: Fri, 5 Jan 2024 16:10:45 +0700
Subject: [PATCH 01/13] fcitx5: update to 5.1.6.
---
srcpkgs/fcitx5/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
index c51378e310d56..0905f0b021786 100644
--- a/srcpkgs/fcitx5/template
+++ b/srcpkgs/fcitx5/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5'
pkgname=fcitx5
-version=5.1.5
+version=5.1.6
revision=1
build_style=cmake
build_helper=qemu
@@ -12,7 +12,7 @@ hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
makedepends="fmt-devel expat-devel iso-codes enchant2-devel libxkbfile-devel
dbus-devel pango-devel glib-devel libevent-devel xcb-util-wm-devel
xcb-util-keysyms-devel xcb-util-devel xcb-imdkit-devel libxkbcommon-devel
- wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel"
+ wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel libuv-devel"
depends="fcitx5-icons"
short_desc="Flexible Context-aware Input Tool with eXtension - v5"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx"
_en_dict_ver=20121020
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz
https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz"
-checksum="d529b7fef59f5415a6d22fb38616e22609c224e75c693f5b2c90384f2327c6ad
+checksum="24d090dd64e26417a78d3666dd726cefcd5115e943832be0b571afd52e6d2f67
c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
skip_extraction=en_dict-${_en_dict_ver}.tar.gz
lib32disabled=yes
From 8d5bdd5cf38af3e6968b6412eb1487149f858708 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: Fri, 5 Jan 2024 16:10:52 +0700
Subject: [PATCH 02/13] fcitx5-configtool: update to 5.1.3.
---
srcpkgs/fcitx5-configtool/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index 07fe5a480d1c1..af335d93bffa7 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-configtool'
pkgname=fcitx5-configtool
-version=5.1.2
+version=5.1.3
revision=1
build_style=cmake
configure_args="-DENABLE_KCM=ON -DENABLE_CONFIG_QT=ON -DENABLE_TEST=ON"
@@ -19,12 +19,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz"
-checksum=cc380dc966f81663d3323c00c900dcf0fcbd6c79e54872c2c249162a7900c1cc
+checksum=1feef31b1bb0f89016845a217e5f56b266b86c1a44b4ed640b49c1378dccdcde
lib32disabled=yes
post_install() {
# belongs to fcitx5-kcm
- rm ${DESTDIR}/usr/share/locale/*/*/org.fcitx.fcitx5.kcm.mo
+ rm ${DESTDIR}/usr/share/locale/*/*/kcm_fcitx5.mo
}
fcitx5-migrator_package() {
@@ -44,11 +44,10 @@ fcitx5-kcm_package() {
kde-cli-tools"
pkg_install() {
vmove usr/bin/fcitx5-plasma-theme-generator
- vmove usr/lib/qt5/plugins/kcms
+ vmove usr/lib/qt5/plugins
vmove usr/share/kpackage
- vmove usr/share/kservices5
- vmove usr/share/metainfo
+ vmove usr/share/applications/kcm_fcitx5.desktop
DESTDIR=${PKGDESTDIR} \
- ninja -C build po/org.fcitx.fcitx5.kcm/install
+ ninja -C build po/kcm_fcitx5/install
}
}
From c3862f2ca9b79948ee521fba3b8be5dd7ef967b5 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: Fri, 5 Jan 2024 16:11:00 +0700
Subject: [PATCH 03/13] fcitx5-chinese-addons: update to 5.1.3.
---
srcpkgs/fcitx5-chinese-addons/template | 35 +++++++++++++++++++++-----
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index bdf6cc9d42b39..17d561e63cba8 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,12 +1,13 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
-version=5.1.2
+version=5.1.3
revision=1
build_style=cmake
-hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
- qt5-host-tools libime-utils"
+configure_args="-DENABLE_OPENCC=ON -DENABLE_GUI=ON -DENABLE_BROWSER=ON
+ -DENABLE_CLOUDPINYIN=ON -DENABLE_DATA=ON"
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libime-utils"
makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
- libcurl-devel qt5-webkit-devel boost-devel libime-devel fcitx5-qt5-devel"
+ libcurl-devel boost-devel libime-devel"
depends="fcitx5-chinese-addons-icons"
short_desc="Fcitx5 - Chinese related addon"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -17,7 +18,7 @@ _pystroke_version=20121124
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz
http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz
http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz"
-checksum="ffe2961619f91a67df700aed07c774d7aed354cf27675a8323727e87446bd81c
+checksum="4f0d56033593be12ccec9ee1a6a966048c7b0de3c88371f7fc5b3b49578cf22d
42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
skip_extraction="
@@ -25,6 +26,24 @@ skip_extraction="
py_stroke-${_pystroke_version}.tar.gz"
lib32disabled=yes
+_have_webengine=no
+if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ _have_webengine=yes
+fi
+if [ "$XBPS_WORDSIZE" = 32 ]; then
+ _have_webengine=no
+fi
+
+if [ "$_have_webengine" ]; then
+ configure_args+=" -DUSE_QT6=ON -DUSE_WEBKIT=OFF"
+ hostmakedepends+=" qt6-base"
+ makedepends+=" qt6-webengine-devel fcitx5-qt6-devel"
+else
+ configure_args+=" -DUSE_QT6=OFF -DUSE_WEBKIT=ON"
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qt5-webkit-devel fcitx5-qt5-devel"
+fi
+
post_extract() {
local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
local _file
@@ -33,6 +52,10 @@ post_extract() {
done
}
+post_configure() {
+ cp modules/punctuation/punc.mb.* build/modules/punctuation/
+}
+
fcitx5-chinese-addons-icons_package() {
short_desc+=" - icons"
pkg_install() {
@@ -52,7 +75,7 @@ fcitx5-chinese-addons-pinyin-dict-manager_package() {
short_desc+=" - Pinyin Dictionaries Manager"
depends="fcitx5-chinese-addons>=${version}_${revision}"
pkg_install() {
- vmove usr/lib/fcitx5/qt5
+ vmove usr/lib/fcitx5/qt6
}
}
From 57bf30605446ff0f9f34ef3306082c3292d84018 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: Fri, 5 Jan 2024 16:11:07 +0700
Subject: [PATCH 04/13] fcitx5-qt: update to 5.1.4.
---
common/shlibs | 6 ++++++
srcpkgs/fcitx5-qt/template | 8 +++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9d46b9376971b..4dfde8ef49683 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2155,6 +2155,12 @@ libdruntime-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
libdruntime-ldc-shared.so.101 ldc-runtime-1.31.0_1
libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1
libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
+libFcitx5Qt6DBusAddons.so.1 fcitx5-qt6-5.1.4_1
+libFcitx5Qt6WidgetsAddons.so.2 fcitx5-qt6-5.1.4_1
+libdruntime-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libphobos2-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libdruntime-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
+libphobos2-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
libmarblewidget-qt5.so.28 marble5-17.12.2_1
libastro.so.2 marble5-17.12.2_1
libparrot.so.6.9.0 parrot-6.9.0_1
diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
index 345137ba87fa0..5c20a80584c8d 100644
--- a/srcpkgs/fcitx5-qt/template
+++ b/srcpkgs/fcitx5-qt/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-qt'
pkgname=fcitx5-qt
-version=5.1.3
+version=5.1.4
revision=1
build_style=cmake
configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz"
-checksum=c1f03ae44340aa5ece644fb24275312377206995ee43e94a311b62e642c2df73
+checksum=92526e4424d45900443b20f0f57500417b9b7dad54409b370a67166db7d2b149
lib32disabled=yes
post_patch() {
@@ -37,7 +37,6 @@ fcitx5-qt5_package() {
short_desc+="5"
pkg_install() {
vmove usr/bin/fcitx5-qt5-*
- vmove usr/lib/fcitx5/qt5
vmove usr/lib/qt5
vmove "usr/libexec/*qt5-*"
vmove "usr/lib/*Qt5*.so.*"
@@ -60,8 +59,11 @@ fcitx5-qt6_package() {
short_desc+="6"
pkg_install() {
vmove usr/bin/fcitx5-qt6-*
+ vmove usr/lib/fcitx5/qt6
vmove usr/lib/qt6
vmove "usr/lib/*Qt6*.so.*"
+ vmove "usr/libexec/*qt6-*"
+ vmove "usr/share/applications/org.fcitx.fcitx5-qt6-*"
}
}
From 0d036032b34594cb3e393871a927cdd08833511c 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: Fri, 5 Jan 2024 16:11:12 +0700
Subject: [PATCH 05/13] fcitx5-rime: update to 5.1.4.
---
srcpkgs/fcitx5-rime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
index 23e726ec48d4b..484e36956ed8d 100644
--- a/srcpkgs/fcitx5-rime/template
+++ b/srcpkgs/fcitx5-rime/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-rime'
pkgname=fcitx5-rime
-version=5.1.3
+version=5.1.4
revision=1
build_style=cmake
configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz"
-checksum=a85a23030c11ea5a8fed12922772cf0310c4b1c8ca27ac0d645a5d970cfe4333
+checksum=b5b08859e9c7e5bac951522c98e8b0fc4fee217016c0ad726a780856591e380b
lib32disabled=yes
fcitx5-rime-icons_package() {
From 73cb24bc544515c4516b22452810f0d046baf2e2 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: Fri, 5 Jan 2024 16:11:19 +0700
Subject: [PATCH 06/13] libime: update to 1.1.4.
---
srcpkgs/libime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index 47a007c22efaf..3702da3eb6579 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,6 +1,6 @@
# Template file for 'libime'
pkgname=libime
-version=1.1.3
+version=1.1.4
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz
https://download.fcitx-im.org/data/${_lm_sc}
https://download.fcitx-im.org/data/${_dict}
https://download.fcitx-im.org/data/table.tar.gz"
-checksum="c2a3319b7912ca3c2019e6201b40045401c198721ac9535a6045472135d76a2c
+checksum="86f4be486b3c43db714e8f138ec93bba250dbb2533b3a8cd20bf491a574a10fe
badd62c16c6373787a0fda8f09cd452d12f60d5868856f651ceecf1a07baba32
f05fccaff9687900aac3d9ad5a81b20888b573201403fbcd9bbc7907d9e97507
6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7"
From 633f1dfc6f13c788d0f5197048620bd2bc3b00ac 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: Fri, 5 Jan 2024 16:11:25 +0700
Subject: [PATCH 07/13] libime-jyutping: update to 1.0.9.
---
srcpkgs/libime-jyutping/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index b6b7a0849779b..487a64b4f9935 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,6 +1,6 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
-version=1.0.8
+version=1.0.9
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ _model_version=20180103
distfiles="https://download.fcitx-im.org/fcitx5/libime-jyutping/libime-jyutping-${version}.tar.xz
https://download.fcitx-im.org/data/jyutping-dict-${_dict_version}.tar.xz
https://download.fcitx-im.org/data/jyutping-model-${_model_version}.tar.xz"
-checksum="7d863c61caf4adb8b58c5f7c294c81e4b4d14c0a925577358f0eb675eda34346
+checksum="7c4a0f4108a757e121fe8e74377144c928317419915c125ae9baf0c0dac80b63
e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b
4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071"
skip_extraction="jyutping-dict-${_dict_version}.tar.xz
From a8a1ee1da126fc2065aa6cdbc1ce83f00b675f37 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: Fri, 5 Jan 2024 16:11:30 +0700
Subject: [PATCH 08/13] fcitx5-anthy: update to 5.1.3.
---
srcpkgs/fcitx5-anthy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
index 520b939e808a2..088114dcdebba 100644
--- a/srcpkgs/fcitx5-anthy/template
+++ b/srcpkgs/fcitx5-anthy/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-anthy'
pkgname=fcitx5-anthy
-version=5.1.1
+version=5.1.3
revision=1
build_style=cmake
hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz"
-checksum=9147a593356bd73382e1b6cd3f61053e786dca09099ca0857651de4a40462c6c
+checksum=a4e2587b9fbfd758fc626b890f201b14f16c9d46bd0d0a9b622ad2c03f7ddb36
fcitx5-anthy-icons_package() {
short_desc+=" - icons"
From 4b75e251cf408a3a8c08dcb145b93c9dfb7ed915 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: Fri, 5 Jan 2024 16:11:34 +0700
Subject: [PATCH 09/13] fcitx5-gtk: update to 5.1.1.
---
srcpkgs/fcitx5-gtk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index 254297e1a466b..8ca73c66eb021 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-gtk'
pkgname=fcitx5-gtk
-version=5.1.0
-revision=2
+version=5.1.1
+revision=1
build_style=cmake
build_helper=gir
configure_args="$(vopt_bool gir ENABLE_GIR)"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz"
-checksum=7c2227bb1b1b252b1980e1f1ee9819f3fb3d5173cc5e5c52d5bef9b3308f8465
+checksum=d6cda72de020031daf8da4dbc6c7923c8025edadec1a3acb9aa28e9efb78b013
lib32disabled=yes
build_options="gir"
From 78ac2bb971efcdb21ae3ee60cec100d7d3462648 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: Fri, 5 Jan 2024 16:11:38 +0700
Subject: [PATCH 10/13] fcitx5-lua: update to 5.0.12.
---
srcpkgs/fcitx5-lua/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template
index 7883f9b11986a..bf96c04773c4b 100644
--- a/srcpkgs/fcitx5-lua/template
+++ b/srcpkgs/fcitx5-lua/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-lua'
pkgname=fcitx5-lua
-version=5.0.11
+version=5.0.12
revision=1
build_style=cmake
configure_args="-DUSE_DLOPEN=No"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/fcitx/fcitx5-lua"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-${version}.tar.xz"
-checksum=cc8390cc80991ed1305f5bf19dc1c835b657d4df191fc8b65ce93ae615dc81c1
+checksum=e41fd871bcefbe609cb161ddc42edf02e95fe29537d352a0b3dacd7f3f067002
lib32disabled=yes
fcitx5-lua-devel_package() {
From 8b236884699eafc14797860cf43b481e44e86ad2 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: Fri, 5 Jan 2024 16:11:43 +0700
Subject: [PATCH 11/13] fcitx5-unikey: update to 5.1.1.
---
srcpkgs/fcitx5-unikey/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template
index b237599a82d3b..6722333d504c1 100644
--- a/srcpkgs/fcitx5-unikey/template
+++ b/srcpkgs/fcitx5-unikey/template
@@ -1,28 +1,24 @@
# Template file for 'fcitx5-unikey'
pkgname=fcitx5-unikey
-version=5.1.1
+version=5.1.2
revision=1
build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
-hostmakedepends="pkg-config gettext extra-cmake-modules qt5-devel"
-makedepends="fcitx5 libfcitx5-devel fmt-devel fcitx5-qt5-devel"
+configure_args="-DENABLE_QT=On -DUSE_QT6=On"
+hostmakedepends="pkg-config gettext extra-cmake-modules qt6-base"
+makedepends="fcitx5 libfcitx5-devel fmt-devel fcitx5-qt6-devel"
depends="fcitx5"
short_desc="Fcitx5 - Unikey engine"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-unikey/fcitx5-unikey-${version}.tar.xz"
-checksum=616149b2594847b1563789114dc5af96194acac8540faaaa96966ffaa4bec761
+checksum=e56db4731f55615448328b07dc18cc7af518f2d8801ee516fadbdab36aac93c1
conflicts="fcitx-unikey>=0"
fcitx5-unikey-macro-editor_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - Macro Editor"
pkg_install() {
- vmove usr/lib/fcitx5/qt5
+ vmove usr/lib/fcitx5/qt6
}
}
From 45ee6dcf5e0d32666a995417e6ea7ee84eade3d3 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: Fri, 5 Jan 2024 16:12:01 +0700
Subject: [PATCH 12/13] fcitx5-table-extra: update to 5.1.1.
---
srcpkgs/fcitx5-table-extra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
index e166356258c3c..0c907a00788bf 100644
--- a/srcpkgs/fcitx5-table-extra/template
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-table-extra'
pkgname=fcitx5-table-extra
-version=5.1.0
+version=5.1.1
revision=1
build_style=cmake
hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="Public Domain"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz"
-checksum=9b95844559ff1b99c04cf798cee7602070bb30a46c8e11ba2b1792f54a38041c
+checksum=dc37188219548915e3cec391b8664586f5a72ade8736117ed8960e16d59ef0de
From 801bbfc2f2682c76e8aa874ed520a1f2ec42442f 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: Fri, 5 Jan 2024 16:12:06 +0700
Subject: [PATCH 13/13] xcb-imdkit: update to 1.0.6.
---
srcpkgs/xcb-imdkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template
index 5700eec005676..296d9eb6de5b7 100644
--- a/srcpkgs/xcb-imdkit/template
+++ b/srcpkgs/xcb-imdkit/template
@@ -1,6 +1,6 @@
# Template file for 'xcb-imdkit'
pkgname=xcb-imdkit
-version=1.0.5
+version=1.0.6
revision=1
build_style=cmake
hostmakedepends="pkg-config extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-only"
homepage="https://github.com/fcitx/xcb-imdkit"
distfiles="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-${version}.tar.xz"
-checksum=373fcd26d99254b1260fd0254bcea1d346e1061cc5707f4d71b4a091418f03cc
+checksum=ee71353fd8f048c1cc85916cc79ac7ac442191108102085f0dc550d79d005230
post_install() {
sed -i '/prefix=/!s,/usr,${exec_prefix},' \
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Fcitx5: Update to 5.1.6
2024-01-05 11:40 [PR PATCH] Fcitx5: Update to 5.1.6 sgn
2024-01-05 15:24 ` [PR PATCH] [Updated] " sgn
@ 2024-01-05 15:39 ` sgn
2024-01-05 16:09 ` sgn
2024-01-05 23:58 ` [PR PATCH] [Merged]: " sgn
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2024-01-05 15:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fcitx5-update
https://github.com/void-linux/void-packages/pull/48073
Fcitx5: Update to 5.1.6
<!-- 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48073.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fcitx5-update-48073.patch --]
[-- Type: text/x-diff, Size: 20717 bytes --]
From ad55b0ae29656abaf8bfd3051e6c27aa56c8047c 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: Fri, 5 Jan 2024 16:10:45 +0700
Subject: [PATCH 01/13] fcitx5: update to 5.1.6.
---
srcpkgs/fcitx5/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
index c51378e310d56..0905f0b021786 100644
--- a/srcpkgs/fcitx5/template
+++ b/srcpkgs/fcitx5/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5'
pkgname=fcitx5
-version=5.1.5
+version=5.1.6
revision=1
build_style=cmake
build_helper=qemu
@@ -12,7 +12,7 @@ hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
makedepends="fmt-devel expat-devel iso-codes enchant2-devel libxkbfile-devel
dbus-devel pango-devel glib-devel libevent-devel xcb-util-wm-devel
xcb-util-keysyms-devel xcb-util-devel xcb-imdkit-devel libxkbcommon-devel
- wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel"
+ wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel libuv-devel"
depends="fcitx5-icons"
short_desc="Flexible Context-aware Input Tool with eXtension - v5"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx"
_en_dict_ver=20121020
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz
https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz"
-checksum="d529b7fef59f5415a6d22fb38616e22609c224e75c693f5b2c90384f2327c6ad
+checksum="24d090dd64e26417a78d3666dd726cefcd5115e943832be0b571afd52e6d2f67
c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
skip_extraction=en_dict-${_en_dict_ver}.tar.gz
lib32disabled=yes
From 8d5bdd5cf38af3e6968b6412eb1487149f858708 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: Fri, 5 Jan 2024 16:10:52 +0700
Subject: [PATCH 02/13] fcitx5-configtool: update to 5.1.3.
---
srcpkgs/fcitx5-configtool/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index 07fe5a480d1c1..af335d93bffa7 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-configtool'
pkgname=fcitx5-configtool
-version=5.1.2
+version=5.1.3
revision=1
build_style=cmake
configure_args="-DENABLE_KCM=ON -DENABLE_CONFIG_QT=ON -DENABLE_TEST=ON"
@@ -19,12 +19,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz"
-checksum=cc380dc966f81663d3323c00c900dcf0fcbd6c79e54872c2c249162a7900c1cc
+checksum=1feef31b1bb0f89016845a217e5f56b266b86c1a44b4ed640b49c1378dccdcde
lib32disabled=yes
post_install() {
# belongs to fcitx5-kcm
- rm ${DESTDIR}/usr/share/locale/*/*/org.fcitx.fcitx5.kcm.mo
+ rm ${DESTDIR}/usr/share/locale/*/*/kcm_fcitx5.mo
}
fcitx5-migrator_package() {
@@ -44,11 +44,10 @@ fcitx5-kcm_package() {
kde-cli-tools"
pkg_install() {
vmove usr/bin/fcitx5-plasma-theme-generator
- vmove usr/lib/qt5/plugins/kcms
+ vmove usr/lib/qt5/plugins
vmove usr/share/kpackage
- vmove usr/share/kservices5
- vmove usr/share/metainfo
+ vmove usr/share/applications/kcm_fcitx5.desktop
DESTDIR=${PKGDESTDIR} \
- ninja -C build po/org.fcitx.fcitx5.kcm/install
+ ninja -C build po/kcm_fcitx5/install
}
}
From 4dcaea34b324c90491167608f786e980694ea1fa 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: Fri, 5 Jan 2024 16:11:00 +0700
Subject: [PATCH 03/13] fcitx5-chinese-addons: update to 5.1.3.
---
srcpkgs/fcitx5-chinese-addons/template | 35 +++++++++++++++++++++-----
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index bdf6cc9d42b39..7123c495e85f8 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,12 +1,13 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
-version=5.1.2
+version=5.1.3
revision=1
build_style=cmake
-hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
- qt5-host-tools libime-utils"
+configure_args="-DENABLE_OPENCC=ON -DENABLE_GUI=ON -DENABLE_BROWSER=ON
+ -DENABLE_CLOUDPINYIN=ON -DENABLE_DATA=ON"
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libime-utils"
makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
- libcurl-devel qt5-webkit-devel boost-devel libime-devel fcitx5-qt5-devel"
+ libcurl-devel boost-devel libime-devel"
depends="fcitx5-chinese-addons-icons"
short_desc="Fcitx5 - Chinese related addon"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -17,7 +18,7 @@ _pystroke_version=20121124
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz
http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz
http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz"
-checksum="ffe2961619f91a67df700aed07c774d7aed354cf27675a8323727e87446bd81c
+checksum="4f0d56033593be12ccec9ee1a6a966048c7b0de3c88371f7fc5b3b49578cf22d
42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
skip_extraction="
@@ -25,6 +26,24 @@ skip_extraction="
py_stroke-${_pystroke_version}.tar.gz"
lib32disabled=yes
+_have_webengine=no
+if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ _have_webengine=yes
+fi
+if [ "$XBPS_WORDSIZE" = 32 ]; then
+ _have_webengine=no
+fi
+
+if [ "$_have_webengine" = yes ]; then
+ configure_args+=" -DUSE_QT6=ON -DUSE_WEBKIT=OFF"
+ hostmakedepends+=" qt6-base"
+ makedepends+=" qt6-webengine-devel fcitx5-qt6-devel"
+else
+ configure_args+=" -DUSE_QT6=OFF -DUSE_WEBKIT=ON"
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qt5-webkit-devel fcitx5-qt5-devel"
+fi
+
post_extract() {
local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
local _file
@@ -33,6 +52,10 @@ post_extract() {
done
}
+post_configure() {
+ cp modules/punctuation/punc.mb.* build/modules/punctuation/
+}
+
fcitx5-chinese-addons-icons_package() {
short_desc+=" - icons"
pkg_install() {
@@ -52,7 +75,7 @@ fcitx5-chinese-addons-pinyin-dict-manager_package() {
short_desc+=" - Pinyin Dictionaries Manager"
depends="fcitx5-chinese-addons>=${version}_${revision}"
pkg_install() {
- vmove usr/lib/fcitx5/qt5
+ vmove usr/lib/fcitx5/qt6
}
}
From 755e19ee0aa49f148e2baae31024bc2726d735bd 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: Fri, 5 Jan 2024 16:11:07 +0700
Subject: [PATCH 04/13] fcitx5-qt: update to 5.1.4.
---
common/shlibs | 6 ++++++
srcpkgs/fcitx5-qt/template | 8 +++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9d46b9376971b..4dfde8ef49683 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2155,6 +2155,12 @@ libdruntime-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
libdruntime-ldc-shared.so.101 ldc-runtime-1.31.0_1
libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1
libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
+libFcitx5Qt6DBusAddons.so.1 fcitx5-qt6-5.1.4_1
+libFcitx5Qt6WidgetsAddons.so.2 fcitx5-qt6-5.1.4_1
+libdruntime-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libphobos2-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libdruntime-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
+libphobos2-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
libmarblewidget-qt5.so.28 marble5-17.12.2_1
libastro.so.2 marble5-17.12.2_1
libparrot.so.6.9.0 parrot-6.9.0_1
diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
index 345137ba87fa0..5c20a80584c8d 100644
--- a/srcpkgs/fcitx5-qt/template
+++ b/srcpkgs/fcitx5-qt/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-qt'
pkgname=fcitx5-qt
-version=5.1.3
+version=5.1.4
revision=1
build_style=cmake
configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz"
-checksum=c1f03ae44340aa5ece644fb24275312377206995ee43e94a311b62e642c2df73
+checksum=92526e4424d45900443b20f0f57500417b9b7dad54409b370a67166db7d2b149
lib32disabled=yes
post_patch() {
@@ -37,7 +37,6 @@ fcitx5-qt5_package() {
short_desc+="5"
pkg_install() {
vmove usr/bin/fcitx5-qt5-*
- vmove usr/lib/fcitx5/qt5
vmove usr/lib/qt5
vmove "usr/libexec/*qt5-*"
vmove "usr/lib/*Qt5*.so.*"
@@ -60,8 +59,11 @@ fcitx5-qt6_package() {
short_desc+="6"
pkg_install() {
vmove usr/bin/fcitx5-qt6-*
+ vmove usr/lib/fcitx5/qt6
vmove usr/lib/qt6
vmove "usr/lib/*Qt6*.so.*"
+ vmove "usr/libexec/*qt6-*"
+ vmove "usr/share/applications/org.fcitx.fcitx5-qt6-*"
}
}
From edcfad4a15d8066533d1d77947f6d1c8a89b776e 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: Fri, 5 Jan 2024 16:11:12 +0700
Subject: [PATCH 05/13] fcitx5-rime: update to 5.1.4.
---
srcpkgs/fcitx5-rime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
index 23e726ec48d4b..484e36956ed8d 100644
--- a/srcpkgs/fcitx5-rime/template
+++ b/srcpkgs/fcitx5-rime/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-rime'
pkgname=fcitx5-rime
-version=5.1.3
+version=5.1.4
revision=1
build_style=cmake
configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz"
-checksum=a85a23030c11ea5a8fed12922772cf0310c4b1c8ca27ac0d645a5d970cfe4333
+checksum=b5b08859e9c7e5bac951522c98e8b0fc4fee217016c0ad726a780856591e380b
lib32disabled=yes
fcitx5-rime-icons_package() {
From 7fffd3878533973f337c8071b418d78d894f1b64 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: Fri, 5 Jan 2024 16:11:19 +0700
Subject: [PATCH 06/13] libime: update to 1.1.4.
---
srcpkgs/libime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index 47a007c22efaf..3702da3eb6579 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,6 +1,6 @@
# Template file for 'libime'
pkgname=libime
-version=1.1.3
+version=1.1.4
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz
https://download.fcitx-im.org/data/${_lm_sc}
https://download.fcitx-im.org/data/${_dict}
https://download.fcitx-im.org/data/table.tar.gz"
-checksum="c2a3319b7912ca3c2019e6201b40045401c198721ac9535a6045472135d76a2c
+checksum="86f4be486b3c43db714e8f138ec93bba250dbb2533b3a8cd20bf491a574a10fe
badd62c16c6373787a0fda8f09cd452d12f60d5868856f651ceecf1a07baba32
f05fccaff9687900aac3d9ad5a81b20888b573201403fbcd9bbc7907d9e97507
6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7"
From e51ab3477ab27dbd834b62e58d6c7dbd8fae63f5 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: Fri, 5 Jan 2024 16:11:25 +0700
Subject: [PATCH 07/13] libime-jyutping: update to 1.0.9.
---
srcpkgs/libime-jyutping/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index b6b7a0849779b..487a64b4f9935 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,6 +1,6 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
-version=1.0.8
+version=1.0.9
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ _model_version=20180103
distfiles="https://download.fcitx-im.org/fcitx5/libime-jyutping/libime-jyutping-${version}.tar.xz
https://download.fcitx-im.org/data/jyutping-dict-${_dict_version}.tar.xz
https://download.fcitx-im.org/data/jyutping-model-${_model_version}.tar.xz"
-checksum="7d863c61caf4adb8b58c5f7c294c81e4b4d14c0a925577358f0eb675eda34346
+checksum="7c4a0f4108a757e121fe8e74377144c928317419915c125ae9baf0c0dac80b63
e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b
4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071"
skip_extraction="jyutping-dict-${_dict_version}.tar.xz
From c5cae02fb784f30ef756dcc7cf9576d68da845fc 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: Fri, 5 Jan 2024 16:11:30 +0700
Subject: [PATCH 08/13] fcitx5-anthy: update to 5.1.3.
---
srcpkgs/fcitx5-anthy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
index 520b939e808a2..088114dcdebba 100644
--- a/srcpkgs/fcitx5-anthy/template
+++ b/srcpkgs/fcitx5-anthy/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-anthy'
pkgname=fcitx5-anthy
-version=5.1.1
+version=5.1.3
revision=1
build_style=cmake
hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz"
-checksum=9147a593356bd73382e1b6cd3f61053e786dca09099ca0857651de4a40462c6c
+checksum=a4e2587b9fbfd758fc626b890f201b14f16c9d46bd0d0a9b622ad2c03f7ddb36
fcitx5-anthy-icons_package() {
short_desc+=" - icons"
From 99b42d52d7f4782241eb8dff113ea6a6127dc217 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: Fri, 5 Jan 2024 16:11:34 +0700
Subject: [PATCH 09/13] fcitx5-gtk: update to 5.1.1.
---
srcpkgs/fcitx5-gtk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index 254297e1a466b..8ca73c66eb021 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-gtk'
pkgname=fcitx5-gtk
-version=5.1.0
-revision=2
+version=5.1.1
+revision=1
build_style=cmake
build_helper=gir
configure_args="$(vopt_bool gir ENABLE_GIR)"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz"
-checksum=7c2227bb1b1b252b1980e1f1ee9819f3fb3d5173cc5e5c52d5bef9b3308f8465
+checksum=d6cda72de020031daf8da4dbc6c7923c8025edadec1a3acb9aa28e9efb78b013
lib32disabled=yes
build_options="gir"
From 7faae6c18e92c3e16e072a6e9eaf01bd79852df8 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: Fri, 5 Jan 2024 16:11:38 +0700
Subject: [PATCH 10/13] fcitx5-lua: update to 5.0.12.
---
srcpkgs/fcitx5-lua/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template
index 7883f9b11986a..bf96c04773c4b 100644
--- a/srcpkgs/fcitx5-lua/template
+++ b/srcpkgs/fcitx5-lua/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-lua'
pkgname=fcitx5-lua
-version=5.0.11
+version=5.0.12
revision=1
build_style=cmake
configure_args="-DUSE_DLOPEN=No"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/fcitx/fcitx5-lua"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-${version}.tar.xz"
-checksum=cc8390cc80991ed1305f5bf19dc1c835b657d4df191fc8b65ce93ae615dc81c1
+checksum=e41fd871bcefbe609cb161ddc42edf02e95fe29537d352a0b3dacd7f3f067002
lib32disabled=yes
fcitx5-lua-devel_package() {
From 81e922d0e235e1bf2519b6a1c9570c07c49a08c1 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: Fri, 5 Jan 2024 16:11:43 +0700
Subject: [PATCH 11/13] fcitx5-unikey: update to 5.1.1.
---
srcpkgs/fcitx5-unikey/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template
index b237599a82d3b..6722333d504c1 100644
--- a/srcpkgs/fcitx5-unikey/template
+++ b/srcpkgs/fcitx5-unikey/template
@@ -1,28 +1,24 @@
# Template file for 'fcitx5-unikey'
pkgname=fcitx5-unikey
-version=5.1.1
+version=5.1.2
revision=1
build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
-hostmakedepends="pkg-config gettext extra-cmake-modules qt5-devel"
-makedepends="fcitx5 libfcitx5-devel fmt-devel fcitx5-qt5-devel"
+configure_args="-DENABLE_QT=On -DUSE_QT6=On"
+hostmakedepends="pkg-config gettext extra-cmake-modules qt6-base"
+makedepends="fcitx5 libfcitx5-devel fmt-devel fcitx5-qt6-devel"
depends="fcitx5"
short_desc="Fcitx5 - Unikey engine"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-unikey/fcitx5-unikey-${version}.tar.xz"
-checksum=616149b2594847b1563789114dc5af96194acac8540faaaa96966ffaa4bec761
+checksum=e56db4731f55615448328b07dc18cc7af518f2d8801ee516fadbdab36aac93c1
conflicts="fcitx-unikey>=0"
fcitx5-unikey-macro-editor_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - Macro Editor"
pkg_install() {
- vmove usr/lib/fcitx5/qt5
+ vmove usr/lib/fcitx5/qt6
}
}
From 3f69502cfab6d1ff2fb6b35f1ede21f2e25def2e 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: Fri, 5 Jan 2024 16:12:01 +0700
Subject: [PATCH 12/13] fcitx5-table-extra: update to 5.1.1.
---
srcpkgs/fcitx5-table-extra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
index e166356258c3c..0c907a00788bf 100644
--- a/srcpkgs/fcitx5-table-extra/template
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-table-extra'
pkgname=fcitx5-table-extra
-version=5.1.0
+version=5.1.1
revision=1
build_style=cmake
hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="Public Domain"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz"
-checksum=9b95844559ff1b99c04cf798cee7602070bb30a46c8e11ba2b1792f54a38041c
+checksum=dc37188219548915e3cec391b8664586f5a72ade8736117ed8960e16d59ef0de
From 98fba3c8373e97b2b16111936a32c95a36c6eb17 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: Fri, 5 Jan 2024 16:12:06 +0700
Subject: [PATCH 13/13] xcb-imdkit: update to 1.0.6.
---
srcpkgs/xcb-imdkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template
index 5700eec005676..296d9eb6de5b7 100644
--- a/srcpkgs/xcb-imdkit/template
+++ b/srcpkgs/xcb-imdkit/template
@@ -1,6 +1,6 @@
# Template file for 'xcb-imdkit'
pkgname=xcb-imdkit
-version=1.0.5
+version=1.0.6
revision=1
build_style=cmake
hostmakedepends="pkg-config extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-only"
homepage="https://github.com/fcitx/xcb-imdkit"
distfiles="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-${version}.tar.xz"
-checksum=373fcd26d99254b1260fd0254bcea1d346e1061cc5707f4d71b4a091418f03cc
+checksum=ee71353fd8f048c1cc85916cc79ac7ac442191108102085f0dc550d79d005230
post_install() {
sed -i '/prefix=/!s,/usr,${exec_prefix},' \
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Fcitx5: Update to 5.1.6
2024-01-05 11:40 [PR PATCH] Fcitx5: Update to 5.1.6 sgn
2024-01-05 15:24 ` [PR PATCH] [Updated] " sgn
2024-01-05 15:39 ` sgn
@ 2024-01-05 16:09 ` sgn
2024-01-05 23:58 ` [PR PATCH] [Merged]: " sgn
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2024-01-05 16:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fcitx5-update
https://github.com/void-linux/void-packages/pull/48073
Fcitx5: Update to 5.1.6
<!-- 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48073.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fcitx5-update-48073.patch --]
[-- Type: text/x-diff, Size: 20719 bytes --]
From ad55b0ae29656abaf8bfd3051e6c27aa56c8047c 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: Fri, 5 Jan 2024 16:10:45 +0700
Subject: [PATCH 01/13] fcitx5: update to 5.1.6.
---
srcpkgs/fcitx5/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
index c51378e310d56..0905f0b021786 100644
--- a/srcpkgs/fcitx5/template
+++ b/srcpkgs/fcitx5/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5'
pkgname=fcitx5
-version=5.1.5
+version=5.1.6
revision=1
build_style=cmake
build_helper=qemu
@@ -12,7 +12,7 @@ hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
makedepends="fmt-devel expat-devel iso-codes enchant2-devel libxkbfile-devel
dbus-devel pango-devel glib-devel libevent-devel xcb-util-wm-devel
xcb-util-keysyms-devel xcb-util-devel xcb-imdkit-devel libxkbcommon-devel
- wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel"
+ wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel libuv-devel"
depends="fcitx5-icons"
short_desc="Flexible Context-aware Input Tool with eXtension - v5"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx"
_en_dict_ver=20121020
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz
https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz"
-checksum="d529b7fef59f5415a6d22fb38616e22609c224e75c693f5b2c90384f2327c6ad
+checksum="24d090dd64e26417a78d3666dd726cefcd5115e943832be0b571afd52e6d2f67
c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
skip_extraction=en_dict-${_en_dict_ver}.tar.gz
lib32disabled=yes
From 8d5bdd5cf38af3e6968b6412eb1487149f858708 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: Fri, 5 Jan 2024 16:10:52 +0700
Subject: [PATCH 02/13] fcitx5-configtool: update to 5.1.3.
---
srcpkgs/fcitx5-configtool/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index 07fe5a480d1c1..af335d93bffa7 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-configtool'
pkgname=fcitx5-configtool
-version=5.1.2
+version=5.1.3
revision=1
build_style=cmake
configure_args="-DENABLE_KCM=ON -DENABLE_CONFIG_QT=ON -DENABLE_TEST=ON"
@@ -19,12 +19,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz"
-checksum=cc380dc966f81663d3323c00c900dcf0fcbd6c79e54872c2c249162a7900c1cc
+checksum=1feef31b1bb0f89016845a217e5f56b266b86c1a44b4ed640b49c1378dccdcde
lib32disabled=yes
post_install() {
# belongs to fcitx5-kcm
- rm ${DESTDIR}/usr/share/locale/*/*/org.fcitx.fcitx5.kcm.mo
+ rm ${DESTDIR}/usr/share/locale/*/*/kcm_fcitx5.mo
}
fcitx5-migrator_package() {
@@ -44,11 +44,10 @@ fcitx5-kcm_package() {
kde-cli-tools"
pkg_install() {
vmove usr/bin/fcitx5-plasma-theme-generator
- vmove usr/lib/qt5/plugins/kcms
+ vmove usr/lib/qt5/plugins
vmove usr/share/kpackage
- vmove usr/share/kservices5
- vmove usr/share/metainfo
+ vmove usr/share/applications/kcm_fcitx5.desktop
DESTDIR=${PKGDESTDIR} \
- ninja -C build po/org.fcitx.fcitx5.kcm/install
+ ninja -C build po/kcm_fcitx5/install
}
}
From 40f62843eb939b6f8753dfcbc2e56095c895cd71 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: Fri, 5 Jan 2024 16:11:00 +0700
Subject: [PATCH 03/13] fcitx5-chinese-addons: update to 5.1.3.
---
srcpkgs/fcitx5-chinese-addons/template | 35 +++++++++++++++++++++-----
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index bdf6cc9d42b39..2df86a5e1b72b 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,12 +1,13 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
-version=5.1.2
+version=5.1.3
revision=1
build_style=cmake
-hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
- qt5-host-tools libime-utils"
+configure_args="-DENABLE_OPENCC=ON -DENABLE_GUI=ON -DENABLE_BROWSER=ON
+ -DENABLE_CLOUDPINYIN=ON -DENABLE_DATA=ON"
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libime-utils"
makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
- libcurl-devel qt5-webkit-devel boost-devel libime-devel fcitx5-qt5-devel"
+ libcurl-devel boost-devel libime-devel"
depends="fcitx5-chinese-addons-icons"
short_desc="Fcitx5 - Chinese related addon"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -17,7 +18,7 @@ _pystroke_version=20121124
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz
http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz
http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz"
-checksum="ffe2961619f91a67df700aed07c774d7aed354cf27675a8323727e87446bd81c
+checksum="4f0d56033593be12ccec9ee1a6a966048c7b0de3c88371f7fc5b3b49578cf22d
42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
skip_extraction="
@@ -25,6 +26,24 @@ skip_extraction="
py_stroke-${_pystroke_version}.tar.gz"
lib32disabled=yes
+_have_webengine=no
+if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ _have_webengine=yes
+fi
+if [ "$XBPS_WORDSIZE" = 32 ]; then
+ _have_webengine=no
+fi
+
+if [ "$_have_webengine" = yes ]; then
+ configure_args+=" -DUSE_QT6=ON -DUSE_WEBKIT=OFF"
+ hostmakedepends+=" qt6-base"
+ makedepends+=" qt6-webengine-devel fcitx5-qt6-devel"
+else
+ configure_args+=" -DUSE_QT6=OFF -DUSE_WEBKIT=ON"
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qt5-webkit-devel fcitx5-qt5-devel"
+fi
+
post_extract() {
local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
local _file
@@ -33,6 +52,10 @@ post_extract() {
done
}
+post_configure() {
+ cp modules/punctuation/punc.mb.* build/modules/punctuation/
+}
+
fcitx5-chinese-addons-icons_package() {
short_desc+=" - icons"
pkg_install() {
@@ -52,7 +75,7 @@ fcitx5-chinese-addons-pinyin-dict-manager_package() {
short_desc+=" - Pinyin Dictionaries Manager"
depends="fcitx5-chinese-addons>=${version}_${revision}"
pkg_install() {
- vmove usr/lib/fcitx5/qt5
+ vmove "usr/lib/fcitx5/qt*"
}
}
From 275224f9efd0ad178ab667f05b497a0a29b56ed5 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: Fri, 5 Jan 2024 16:11:07 +0700
Subject: [PATCH 04/13] fcitx5-qt: update to 5.1.4.
---
common/shlibs | 6 ++++++
srcpkgs/fcitx5-qt/template | 8 +++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9d46b9376971b..4dfde8ef49683 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2155,6 +2155,12 @@ libdruntime-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
libdruntime-ldc-shared.so.101 ldc-runtime-1.31.0_1
libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1
libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
+libFcitx5Qt6DBusAddons.so.1 fcitx5-qt6-5.1.4_1
+libFcitx5Qt6WidgetsAddons.so.2 fcitx5-qt6-5.1.4_1
+libdruntime-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libphobos2-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libdruntime-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
+libphobos2-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
libmarblewidget-qt5.so.28 marble5-17.12.2_1
libastro.so.2 marble5-17.12.2_1
libparrot.so.6.9.0 parrot-6.9.0_1
diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
index 345137ba87fa0..5c20a80584c8d 100644
--- a/srcpkgs/fcitx5-qt/template
+++ b/srcpkgs/fcitx5-qt/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-qt'
pkgname=fcitx5-qt
-version=5.1.3
+version=5.1.4
revision=1
build_style=cmake
configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz"
-checksum=c1f03ae44340aa5ece644fb24275312377206995ee43e94a311b62e642c2df73
+checksum=92526e4424d45900443b20f0f57500417b9b7dad54409b370a67166db7d2b149
lib32disabled=yes
post_patch() {
@@ -37,7 +37,6 @@ fcitx5-qt5_package() {
short_desc+="5"
pkg_install() {
vmove usr/bin/fcitx5-qt5-*
- vmove usr/lib/fcitx5/qt5
vmove usr/lib/qt5
vmove "usr/libexec/*qt5-*"
vmove "usr/lib/*Qt5*.so.*"
@@ -60,8 +59,11 @@ fcitx5-qt6_package() {
short_desc+="6"
pkg_install() {
vmove usr/bin/fcitx5-qt6-*
+ vmove usr/lib/fcitx5/qt6
vmove usr/lib/qt6
vmove "usr/lib/*Qt6*.so.*"
+ vmove "usr/libexec/*qt6-*"
+ vmove "usr/share/applications/org.fcitx.fcitx5-qt6-*"
}
}
From ea6f4dd85c8f948c465941f6a39eee1b6c30588b 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: Fri, 5 Jan 2024 16:11:12 +0700
Subject: [PATCH 05/13] fcitx5-rime: update to 5.1.4.
---
srcpkgs/fcitx5-rime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
index 23e726ec48d4b..484e36956ed8d 100644
--- a/srcpkgs/fcitx5-rime/template
+++ b/srcpkgs/fcitx5-rime/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-rime'
pkgname=fcitx5-rime
-version=5.1.3
+version=5.1.4
revision=1
build_style=cmake
configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz"
-checksum=a85a23030c11ea5a8fed12922772cf0310c4b1c8ca27ac0d645a5d970cfe4333
+checksum=b5b08859e9c7e5bac951522c98e8b0fc4fee217016c0ad726a780856591e380b
lib32disabled=yes
fcitx5-rime-icons_package() {
From cdc62bd12fc11680d7a5396702369f42227862b4 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: Fri, 5 Jan 2024 16:11:19 +0700
Subject: [PATCH 06/13] libime: update to 1.1.4.
---
srcpkgs/libime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index 47a007c22efaf..3702da3eb6579 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,6 +1,6 @@
# Template file for 'libime'
pkgname=libime
-version=1.1.3
+version=1.1.4
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz
https://download.fcitx-im.org/data/${_lm_sc}
https://download.fcitx-im.org/data/${_dict}
https://download.fcitx-im.org/data/table.tar.gz"
-checksum="c2a3319b7912ca3c2019e6201b40045401c198721ac9535a6045472135d76a2c
+checksum="86f4be486b3c43db714e8f138ec93bba250dbb2533b3a8cd20bf491a574a10fe
badd62c16c6373787a0fda8f09cd452d12f60d5868856f651ceecf1a07baba32
f05fccaff9687900aac3d9ad5a81b20888b573201403fbcd9bbc7907d9e97507
6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7"
From cc7f92470f648946b5710f27e7c27d05b6c2a738 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: Fri, 5 Jan 2024 16:11:25 +0700
Subject: [PATCH 07/13] libime-jyutping: update to 1.0.9.
---
srcpkgs/libime-jyutping/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index b6b7a0849779b..487a64b4f9935 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,6 +1,6 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
-version=1.0.8
+version=1.0.9
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ _model_version=20180103
distfiles="https://download.fcitx-im.org/fcitx5/libime-jyutping/libime-jyutping-${version}.tar.xz
https://download.fcitx-im.org/data/jyutping-dict-${_dict_version}.tar.xz
https://download.fcitx-im.org/data/jyutping-model-${_model_version}.tar.xz"
-checksum="7d863c61caf4adb8b58c5f7c294c81e4b4d14c0a925577358f0eb675eda34346
+checksum="7c4a0f4108a757e121fe8e74377144c928317419915c125ae9baf0c0dac80b63
e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b
4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071"
skip_extraction="jyutping-dict-${_dict_version}.tar.xz
From f55546aeb4228c6908af6629ccfb855de415afd5 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: Fri, 5 Jan 2024 16:11:30 +0700
Subject: [PATCH 08/13] fcitx5-anthy: update to 5.1.3.
---
srcpkgs/fcitx5-anthy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
index 520b939e808a2..088114dcdebba 100644
--- a/srcpkgs/fcitx5-anthy/template
+++ b/srcpkgs/fcitx5-anthy/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-anthy'
pkgname=fcitx5-anthy
-version=5.1.1
+version=5.1.3
revision=1
build_style=cmake
hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz"
-checksum=9147a593356bd73382e1b6cd3f61053e786dca09099ca0857651de4a40462c6c
+checksum=a4e2587b9fbfd758fc626b890f201b14f16c9d46bd0d0a9b622ad2c03f7ddb36
fcitx5-anthy-icons_package() {
short_desc+=" - icons"
From fad7ade534c60fda6f467ad2fe9bb8e6fe96dbb7 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: Fri, 5 Jan 2024 16:11:34 +0700
Subject: [PATCH 09/13] fcitx5-gtk: update to 5.1.1.
---
srcpkgs/fcitx5-gtk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index 254297e1a466b..8ca73c66eb021 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-gtk'
pkgname=fcitx5-gtk
-version=5.1.0
-revision=2
+version=5.1.1
+revision=1
build_style=cmake
build_helper=gir
configure_args="$(vopt_bool gir ENABLE_GIR)"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz"
-checksum=7c2227bb1b1b252b1980e1f1ee9819f3fb3d5173cc5e5c52d5bef9b3308f8465
+checksum=d6cda72de020031daf8da4dbc6c7923c8025edadec1a3acb9aa28e9efb78b013
lib32disabled=yes
build_options="gir"
From 86ea092591487d62bd812652fd9cc56dc730c628 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: Fri, 5 Jan 2024 16:11:38 +0700
Subject: [PATCH 10/13] fcitx5-lua: update to 5.0.12.
---
srcpkgs/fcitx5-lua/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template
index 7883f9b11986a..bf96c04773c4b 100644
--- a/srcpkgs/fcitx5-lua/template
+++ b/srcpkgs/fcitx5-lua/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-lua'
pkgname=fcitx5-lua
-version=5.0.11
+version=5.0.12
revision=1
build_style=cmake
configure_args="-DUSE_DLOPEN=No"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/fcitx/fcitx5-lua"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-${version}.tar.xz"
-checksum=cc8390cc80991ed1305f5bf19dc1c835b657d4df191fc8b65ce93ae615dc81c1
+checksum=e41fd871bcefbe609cb161ddc42edf02e95fe29537d352a0b3dacd7f3f067002
lib32disabled=yes
fcitx5-lua-devel_package() {
From 914cf4d34ceafbfa2cb5b9ca718f79517dd72f84 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: Fri, 5 Jan 2024 16:11:43 +0700
Subject: [PATCH 11/13] fcitx5-unikey: update to 5.1.1.
---
srcpkgs/fcitx5-unikey/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template
index b237599a82d3b..6722333d504c1 100644
--- a/srcpkgs/fcitx5-unikey/template
+++ b/srcpkgs/fcitx5-unikey/template
@@ -1,28 +1,24 @@
# Template file for 'fcitx5-unikey'
pkgname=fcitx5-unikey
-version=5.1.1
+version=5.1.2
revision=1
build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
-hostmakedepends="pkg-config gettext extra-cmake-modules qt5-devel"
-makedepends="fcitx5 libfcitx5-devel fmt-devel fcitx5-qt5-devel"
+configure_args="-DENABLE_QT=On -DUSE_QT6=On"
+hostmakedepends="pkg-config gettext extra-cmake-modules qt6-base"
+makedepends="fcitx5 libfcitx5-devel fmt-devel fcitx5-qt6-devel"
depends="fcitx5"
short_desc="Fcitx5 - Unikey engine"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-unikey/fcitx5-unikey-${version}.tar.xz"
-checksum=616149b2594847b1563789114dc5af96194acac8540faaaa96966ffaa4bec761
+checksum=e56db4731f55615448328b07dc18cc7af518f2d8801ee516fadbdab36aac93c1
conflicts="fcitx-unikey>=0"
fcitx5-unikey-macro-editor_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - Macro Editor"
pkg_install() {
- vmove usr/lib/fcitx5/qt5
+ vmove usr/lib/fcitx5/qt6
}
}
From 212b5aa79cfe097438a7ae444e4e6a20403e7e45 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: Fri, 5 Jan 2024 16:12:01 +0700
Subject: [PATCH 12/13] fcitx5-table-extra: update to 5.1.1.
---
srcpkgs/fcitx5-table-extra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
index e166356258c3c..0c907a00788bf 100644
--- a/srcpkgs/fcitx5-table-extra/template
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-table-extra'
pkgname=fcitx5-table-extra
-version=5.1.0
+version=5.1.1
revision=1
build_style=cmake
hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="Public Domain"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz"
-checksum=9b95844559ff1b99c04cf798cee7602070bb30a46c8e11ba2b1792f54a38041c
+checksum=dc37188219548915e3cec391b8664586f5a72ade8736117ed8960e16d59ef0de
From ecf652caaf33bcafc0f442decd33a3591494a7c4 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: Fri, 5 Jan 2024 16:12:06 +0700
Subject: [PATCH 13/13] xcb-imdkit: update to 1.0.6.
---
srcpkgs/xcb-imdkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template
index 5700eec005676..296d9eb6de5b7 100644
--- a/srcpkgs/xcb-imdkit/template
+++ b/srcpkgs/xcb-imdkit/template
@@ -1,6 +1,6 @@
# Template file for 'xcb-imdkit'
pkgname=xcb-imdkit
-version=1.0.5
+version=1.0.6
revision=1
build_style=cmake
hostmakedepends="pkg-config extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-only"
homepage="https://github.com/fcitx/xcb-imdkit"
distfiles="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-${version}.tar.xz"
-checksum=373fcd26d99254b1260fd0254bcea1d346e1061cc5707f4d71b4a091418f03cc
+checksum=ee71353fd8f048c1cc85916cc79ac7ac442191108102085f0dc550d79d005230
post_install() {
sed -i '/prefix=/!s,/usr,${exec_prefix},' \
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: Fcitx5: Update to 5.1.6
2024-01-05 11:40 [PR PATCH] Fcitx5: Update to 5.1.6 sgn
` (2 preceding siblings ...)
2024-01-05 16:09 ` sgn
@ 2024-01-05 23:58 ` sgn
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2024-01-05 23:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]
There's a merged pull request on the void-packages repository
Fcitx5: Update to 5.1.6
https://github.com/void-linux/void-packages/pull/48073
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-05 23:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-05 11:40 [PR PATCH] Fcitx5: Update to 5.1.6 sgn
2024-01-05 15:24 ` [PR PATCH] [Updated] " sgn
2024-01-05 15:39 ` sgn
2024-01-05 16:09 ` sgn
2024-01-05 23:58 ` [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).