From 15b9f1ab4b6c263ecf18195f9bf62e0f9496a59c 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: Sun, 21 Mar 2021 20:05:16 +0700
Subject: [PATCH 01/10] New package: xcb-imdkit-1.0.2

---
 common/shlibs               |  1 +
 srcpkgs/xcb-imdkit-devel    |  1 +
 srcpkgs/xcb-imdkit/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/xcb-imdkit-devel
 create mode 100644 srcpkgs/xcb-imdkit/template

diff --git a/common/shlibs b/common/shlibs
index 4b82c3ced654..664df6856561 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -257,6 +257,7 @@ libxcb-xkb.so.1 libxcb-1.10_1
 libxcb-xinput.so.0 libxcb-1.10_1
 libxcb-dri3.so.0 libxcb-1.10_1
 libxcb-present.so.0 libxcb-1.10_1
+libxcb-imdkit.so.1 xcb-imdkit-1.0.2_1
 libXdmcp.so.6 libXdmcp-1.0.2_1
 libpolkit-gobject-1.so.0 polkit-0.99_1
 libpolkit-agent-1.so.0 polkit-0.99_1
diff --git a/srcpkgs/xcb-imdkit-devel b/srcpkgs/xcb-imdkit-devel
new file mode 120000
index 000000000000..0044a6a371b3
--- /dev/null
+++ b/srcpkgs/xcb-imdkit-devel
@@ -0,0 +1 @@
+xcb-imdkit
\ No newline at end of file
diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template
new file mode 100644
index 000000000000..3f1a99e9d3ce
--- /dev/null
+++ b/srcpkgs/xcb-imdkit/template
@@ -0,0 +1,29 @@
+# Template file for 'xcb-imdkit'
+pkgname=xcb-imdkit
+version=1.0.2
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config extra-cmake-modules"
+makedepends="xcb-util-keysyms-devel xcb-util-devel uthash"
+short_desc="Implementation of xim protocol in xcb"
+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=801f9da5adc286fb42e43931ed5a2cf67dfe067c40da8d0fa599a29c6d93c799
+
+post_install() {
+	sed -i '/prefix=/!s,/usr,${exec_prefix},' \
+		"${DESTDIR}/usr/lib/pkgconfig"/*.pc
+}
+
+xcb-imdkit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From fa9fbfb29a00f64454f216f8209c8f1b67b9249e 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: Sun, 21 Mar 2021 22:12:45 +0700
Subject: [PATCH 02/10] New package: fcitx5-5.0.6

---
 common/shlibs                                 |   3 +
 .../patches/cross-config-template.patch       |  45 ++++
 srcpkgs/fcitx5/patches/no-which.patch         | 194 ++++++++++++++++++
 srcpkgs/fcitx5/template                       |  61 ++++++
 srcpkgs/libfcitx5                             |   1 +
 srcpkgs/libfcitx5-devel                       |   1 +
 6 files changed, 305 insertions(+)
 create mode 100644 srcpkgs/fcitx5/patches/cross-config-template.patch
 create mode 100644 srcpkgs/fcitx5/patches/no-which.patch
 create mode 100644 srcpkgs/fcitx5/template
 create mode 120000 srcpkgs/libfcitx5
 create mode 120000 srcpkgs/libfcitx5-devel

diff --git a/common/shlibs b/common/shlibs
index 664df6856561..c1a2eb8acba6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2122,6 +2122,9 @@ libfcitx-config.so.4 libfcitx-4.2.8_1
 libFcitxQt5DBusAddons.so.1 libfcitx-qt5-1.2.1_1
 libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1
 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
+libFcitx5Utils.so.2 libfcitx5-5.0.5_1
+libFcitx5Core.so.7 libfcitx5-5.0.5_1
+libFcitx5Config.so.6 libfcitx5-5.0.5_1
 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1
 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1
 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1
diff --git a/srcpkgs/fcitx5/patches/cross-config-template.patch b/srcpkgs/fcitx5/patches/cross-config-template.patch
new file mode 100644
index 000000000000..69a988f3c877
--- /dev/null
+++ b/srcpkgs/fcitx5/patches/cross-config-template.patch
@@ -0,0 +1,45 @@
+Index: fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5ModuleTemplate.cmake.in
+===================================================================
+--- fcitx5-5.0.6.orig/src/lib/fcitx-utils/Fcitx5ModuleTemplate.cmake.in
++++ fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5ModuleTemplate.cmake.in
+@@ -2,6 +2,16 @@ if (TARGET Fcitx5::Module::@FEM_EXPORTNA
+     return()
+ endif()
+ 
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
+ add_library(@FEM_TARGET@-interface INTERFACE)
+ add_library(Fcitx5::Module::@FEM_EXPORTNAME@ ALIAS @FEM_TARGET@-interface)
+-set_target_properties(@FEM_TARGET@-interface PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@_MODULE_HEADER_DIR@")
++set_target_properties(@FEM_TARGET@-interface PROPERTIES
++	INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../@_MODULE_HEADER_DIR@")
+Index: fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in
+===================================================================
+--- fcitx5-5.0.6.orig/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in
++++ fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in
+@@ -3,8 +3,17 @@
+ include("${CMAKE_CURRENT_LIST_DIR}/Fcitx5UtilsTargets.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/Fcitx5Macros.cmake")
+ 
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
+ set(FCITX_SYS_INSTALL_PREFIX "@FCITX_INSTALL_PREFIX@")
+-set(FCITX_INSTALL_CMAKECONFIG_DIR "@FCITX_INSTALL_CMAKECONFIG_DIR@")
++set(FCITX_INSTALL_CMAKECONFIG_DIR "${_IMPORT_PREFIX}/../@FCITX_INSTALL_CMAKECONFIG_DIR@")
+ 
+ set(_default_FCITX_INSTALL_USE_FCITX_SYS_PATHS Off)
+ if (NOT DEFINED FCITX_INSTALL_USE_FCITX_SYS_PATHS)
diff --git a/srcpkgs/fcitx5/patches/no-which.patch b/srcpkgs/fcitx5/patches/no-which.patch
new file mode 100644
index 000000000000..ae553dd1535c
--- /dev/null
+++ b/srcpkgs/fcitx5/patches/no-which.patch
@@ -0,0 +1,194 @@
+Index: fcitx5-5.0.6/data/fcitx5-configtool.sh
+===================================================================
+--- fcitx5-5.0.6.orig/data/fcitx5-configtool.sh
++++ fcitx5-5.0.6/data/fcitx5-configtool.sh
+@@ -5,14 +5,14 @@
+ 
+ export TEXTDOMAIN=fcitx5
+ 
+-if which kdialog > /dev/null 2>&1; then
++if command -v kdialog > /dev/null 2>&1; then
+     message() {
+         kdialog --msgbox "$1"
+     }
+     error() {
+         kdialog --error "$1"
+     }
+-elif which zenity > /dev/null 2>&1; then
++elif command -v zenity > /dev/null 2>&1; then
+     message() {
+         zenity --info --text="$1"
+     }
+@@ -28,7 +28,7 @@ else
+     }
+ fi
+ 
+-if which gettext > /dev/null 2>&1; then
++if command -v gettext > /dev/null 2>&1; then
+     _() {
+         gettext "$@"
+     }
+@@ -101,7 +101,7 @@ detectDE() {
+     if [ x"$DE" = x"gnome" ]; then
+       # gnome-default-applications-properties is only available in GNOME 2.x
+       # but not in GNOME 3.x
+-      which gnome-default-applications-properties > /dev/null 2>&1  || DE="gnome3"
++      command -v gnome-default-applications-properties > /dev/null 2>&1  || DE="gnome3"
+     fi
+ }
+ 
+@@ -116,7 +116,7 @@ run_kde() {
+ }
+ 
+ run_qt() {
+-    if which fcitx5-config-qt > /dev/null 2>&1; then
++    if command -v fcitx5-config-qt > /dev/null 2>&1; then
+         exec fcitx5-config-qt "$1"
+     fi
+     return 1
+@@ -132,13 +132,13 @@ run_xdg() {
+             ;;
+     esac
+ 
+-    if command="$(which xdg-open 2>/dev/null)"; then
++    if command="$(command -v xdg-open 2>/dev/null)"; then
+         exec "$command" "$HOME/.config/fcitx5"
+     fi
+ }
+ 
+ _which_cmdline() {
+-    cmd="$(which "$1")" || return 1
++    cmd="$(command -v "$1")" || return 1
+     shift
+     echo "$cmd $*"
+ }
+Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
+===================================================================
+--- fcitx5-5.0.6.orig/data/fcitx5-diagnose.sh
++++ fcitx5-5.0.6/data/fcitx5-diagnose.sh
+@@ -123,7 +123,7 @@ __get_pretty_name() {
+     fi
+ }
+ 
+-fcitx_exe="$(which fcitx5 2> /dev/null)"
++fcitx_exe="$(command -v fcitx5 2> /dev/null)"
+ 
+ __conf_dir_init() {
+     # Don't do any fancy check here, it's the user's fault, which we should detect
+@@ -208,9 +208,9 @@ if type dbus-send &> /dev/null; then
+             "string:$1" 2> /dev/null) || return 1
+         echo -n "${pid##* }"
+     }
+-elif qdbus_exe=$(which qdbus 2> /dev/null) || \
+-        qdbus_exe=$(which qdbus-qt4 2> /dev/null) || \
+-        qdbus_exe=$(which qdbus-qt5 2> /dev/null); then
++elif qdbus_exe=$(command -v qdbus 2> /dev/null) || \
++        qdbus_exe=$(command -v qdbus-qt4 2> /dev/null) || \
++        qdbus_exe=$(command -v qdbus-qt5 2> /dev/null); then
+     dbus_exe=${qdbus_exe}
+     dbus_get_name_owner() {
+         "${qdbus_exe}" org.freedesktop.DBus /org/freedesktop/DBus \
+@@ -324,15 +324,15 @@ detectDE() {
+     if [ x"$DE" = x"gnome" ]; then
+         # gnome-default-applications-properties is only available in GNOME 2.x
+         # but not in GNOME 3.x
+-        which gnome-default-applications-properties > /dev/null 2>&1 || \
++        command -v gnome-default-applications-properties > /dev/null 2>&1 || \
+             DE="gnome3"
+-        which gnome-shell &> /dev/null && DE="gnome3"
++        command -v gnome-shell &> /dev/null && DE="gnome3"
+     fi
+ }
+ 
+ maybe_gnome3() {
+     [[ $DE = gnome3 ]] && return 0
+-    [[ $DE = generic ]] && which gnome-shell &> /dev/null && return 0
++    [[ $DE = generic ]] && command -v gnome-shell &> /dev/null && return 0
+     return 1
+ }
+ 
+@@ -341,7 +341,7 @@ detectDE
+ # user and uid
+ 
+ detect_user() {
+-    if which id &> /dev/null; then
++    if command -v id &> /dev/null; then
+         cur_user=$(id -un)
+         cur_uid=$(id -u)
+     else
+@@ -352,7 +352,7 @@ detect_user() {
+         else
+             cur_uid=""
+         fi
+-        if which whoami &> /dev/null; then
++        if command -v whoami &> /dev/null; then
+             cur_user=$(whoami)
+         elif [[ -d /proc/$$/ ]]; then
+             cur_user=$(stat -c %U /proc/$$/)
+@@ -374,7 +374,7 @@ _check_open_root() {
+     for f in /proc/1/environ /proc/1/mem /proc/kcore /proc/kmem; do
+         try_open "$f" && return 0
+     done
+-    if which readlink &> /dev/null; then
++    if command -v readlink &> /dev/null; then
+         for f in /proc/1/exe /proc/1/cwd /proc/1/root; do
+             readlink "$f" &> /dev/null && return 0
+         done
+@@ -966,7 +966,7 @@ _find_config_gtk() {
+         return 0
+     }
+     local config_gtk
+-    config_gtk="$(which "fcitx5-config-gtk" 2> /dev/null)" || return 1
++    config_gtk="$(command -v "fcitx5-config-gtk" 2> /dev/null)" || return 1
+     echo "${config_gtk}"
+     _config_tool_gtk_exe="${config_gtk}"
+ }
+@@ -993,7 +993,7 @@ _check_config_gtk() {
+     local version=$1
+     local config_gtk config_gtk_name
+     write_order_list_eval "$(_ 'Config GUI for gtk${1}:')" "${version}"
+-    if ! config_gtk="$(which "fcitx5-config-gtk${version}" 2> /dev/null)"; then
++    if ! config_gtk="$(command -v "fcitx5-config-gtk${version}" 2> /dev/null)"; then
+         if ! _check_config_gtk_version "${version}"; then
+             write_error_eval \
+                 "$(_ 'Config GUI for gtk${1} not found.')" "${version}"
+@@ -1014,7 +1014,7 @@ _check_config_qt() {
+     local config_qt config_qt_name
+     config_qt_name="fcitx5-config-qt"
+     write_order_list_eval "$(_ 'Config GUI for qt:')" "${version}"
+-    if ! config_qt="$(which "${config_qt_name}" 2> /dev/null)"; then
++    if ! config_qt="$(command -v "${config_qt_name}" 2> /dev/null)"; then
+         write_error "$(_ 'Config GUI for qt not found.')"
+         return 1
+     fi
+@@ -1027,7 +1027,7 @@ _check_config_kcm() {
+     local version=$1
+     local kcm_shell config_kcm
+     write_order_list "$(_ 'Config GUI for kde:')"
+-    if ! kcm_shell="$(which "kcmshell${version}" 2> /dev/null)"; then
++    if ! kcm_shell="$(command -v "kcmshell${version}" 2> /dev/null)"; then
+         write_error "$(print_not_found "kcmshell${version}")"
+         return 1
+     fi
+@@ -1043,7 +1043,7 @@ check_config_ui() {
+     local IFS=$'\n'
+     write_title 1 "$(_ 'Fcitx Configure UI:')"
+     write_order_list "$(_ 'Config Tool Wrapper:')"
+-    if ! fcitx_configtool="$(which fcitx5-configtool 2> /dev/null)"; then
++    if ! fcitx_configtool="$(command -v fcitx5-configtool 2> /dev/null)"; then
+         write_error_eval "$(_ 'Cannot find ${1} executable!')" fcitx5-configtool
+     else
+         write_eval "$(_ 'Found ${1} at ${2}.')" \
+Index: fcitx5-5.0.6/test/xvfb_wrapper.sh
+===================================================================
+--- fcitx5-5.0.6.orig/test/xvfb_wrapper.sh
++++ fcitx5-5.0.6/test/xvfb_wrapper.sh
+@@ -20,7 +20,7 @@ finish()
+ 
+ trap finish EXIT
+ 
+-if which xprop >/dev/null 2>&1; then
++if command -v xprop >/dev/null 2>&1; then
+     i=1
+     while [ "$i" -lt 5 ]; do
+         if xprop -root >/dev/null 2>&1; then
diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
new file mode 100644
index 000000000000..093adda3bf58
--- /dev/null
+++ b/srcpkgs/fcitx5/template
@@ -0,0 +1,61 @@
+# Template file for 'fcitx5'
+pkgname=fcitx5
+version=5.0.6
+revision=1
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DCMAKE_INSTALL_LIBDATADIR=/usr/lib${XBPS_TARGET_WORDSIZE}
+ -DUSE_SYSTEMD=OFF -DUSE_FLATPAK_ICON=ON"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules xkeyboard-config wayland-devel"
+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"
+short_desc="Flexible Context-aware Input Tool with eXtension - v5"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+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="47a454da8b7a2b6c983a69e2f501f402eb54a732a01b17ff6f49b915c7d20b9f
+ c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
+patch_args=-Np1
+
+skip_extraction=en_dict-${_en_dict_ver}.tar.gz
+
+# Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel
+
+post_extract() {
+	local _distdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+	cp ${_distdir}/en_dict-${_en_dict_ver}.tar.gz src/modules/spell/dict
+}
+
+post_install() {
+	sed -i '/prefix=/!s,/usr,${exec_prefix},' \
+		"${DESTDIR}/usr/lib/pkgconfig"/*.pc
+	sed -i '/INTERFACE_INCLUDE_DIRECTORIES/s,"/usr,"${_IMPORT_PREFIX},' \
+		"${DESTDIR}/usr/lib/cmake"/*/*Targets.cmake
+	find ${DESTDIR}/usr/share/icons -name 'fcitx.png' -delete
+	rm -f ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/fcitx.svg
+}
+
+libfcitx5_package() {
+	short_desc+=" - libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libfcitx5-devel_package() {
+	depends="libfcitx5>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libfcitx5 b/srcpkgs/libfcitx5
new file mode 120000
index 000000000000..99ac64afc615
--- /dev/null
+++ b/srcpkgs/libfcitx5
@@ -0,0 +1 @@
+fcitx5
\ No newline at end of file
diff --git a/srcpkgs/libfcitx5-devel b/srcpkgs/libfcitx5-devel
new file mode 120000
index 000000000000..99ac64afc615
--- /dev/null
+++ b/srcpkgs/libfcitx5-devel
@@ -0,0 +1 @@
+fcitx5
\ No newline at end of file

From 82a0d1cac670b0ddf137abafd51631056092c541 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: Mon, 22 Mar 2021 00:21:37 +0700
Subject: [PATCH 03/10] New package: fcitx5-gtk-5.0.4

---
 common/shlibs               |  1 +
 srcpkgs/fcitx5-gtk+3        |  1 +
 srcpkgs/fcitx5-gtk-devel    |  1 +
 srcpkgs/fcitx5-gtk/template | 57 +++++++++++++++++++++++++++++++++++++
 srcpkgs/fcitx5-gtk4         |  1 +
 5 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/fcitx5-gtk+3
 create mode 120000 srcpkgs/fcitx5-gtk-devel
 create mode 100644 srcpkgs/fcitx5-gtk/template
 create mode 120000 srcpkgs/fcitx5-gtk4

diff --git a/common/shlibs b/common/shlibs
index c1a2eb8acba6..51a23ad3870e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2125,6 +2125,7 @@ libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
 libFcitx5Utils.so.2 libfcitx5-5.0.5_1
 libFcitx5Core.so.7 libfcitx5-5.0.5_1
 libFcitx5Config.so.6 libfcitx5-5.0.5_1
+libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1
 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1
 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1
 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1
diff --git a/srcpkgs/fcitx5-gtk+3 b/srcpkgs/fcitx5-gtk+3
new file mode 120000
index 000000000000..de83ca580801
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk+3
@@ -0,0 +1 @@
+fcitx5-gtk
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-gtk-devel b/srcpkgs/fcitx5-gtk-devel
new file mode 120000
index 000000000000..de83ca580801
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk-devel
@@ -0,0 +1 @@
+fcitx5-gtk
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
new file mode 100644
index 000000000000..74b3c3611ab1
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk/template
@@ -0,0 +1,57 @@
+# Template file for 'fcitx5-gtk'
+pkgname=fcitx5-gtk
+version=5.0.4
+revision=1
+build_style=cmake
+build_helper=gir
+configure_args="-DENABLE_GTK2_IM_MODULE=OFF $(vopt_bool gir ENABLE_GIR)"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules glib-devel"
+makedepends="libfcitx5-devel libglib-devel gtk+3-devel gtk4-devel fmt-devel"
+short_desc="Flexible Context-aware Input Tool with eXtension v5 - GTK"
+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=9a491f6c77e796a3d47fbae052b0d8778b3728dc10326fc90d819109bbcdaccc
+
+build_options="gir"
+build_options_default="gir"
+
+post_configure() {
+	find build -name cmake_install.cmake -exec \
+		sed -i -e 's,"//\+usr,"/usr,' {} +
+}
+
+post_install() {
+	sed -i '/prefix=/!s,/usr,${exec_prefix},' \
+		"${DESTDIR}/usr/lib/pkgconfig"/*.pc
+}
+
+fcitx5-gtk+3_package() {
+	short_desc+="+3 IM Modules"
+	pkg_install() {
+		vmove usr/lib/gtk-3.0
+	}
+}
+
+fcitx5-gtk4_package() {
+	short_desc+="4 IM Modules"
+	pkg_install() {
+		vmove usr/lib/gtk-4.0
+	}
+}
+
+fcitx5-gtk-devel_package() {
+	short_desc+=" - development files"
+	depends="fcitx5-gtk>=${version}_${revision} libglib-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
+	}
+}
diff --git a/srcpkgs/fcitx5-gtk4 b/srcpkgs/fcitx5-gtk4
new file mode 120000
index 000000000000..de83ca580801
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk4
@@ -0,0 +1 @@
+fcitx5-gtk
\ No newline at end of file

From 261a44c3350d4dadd762807b89100af2bd297c17 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: Mon, 22 Mar 2021 01:00:18 +0700
Subject: [PATCH 04/10] New package: fcitx5-qt5-5.0.3

---
 common/shlibs               |  2 ++
 srcpkgs/fcitx5-qt5-devel    |  1 +
 srcpkgs/fcitx5-qt5/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/fcitx5-qt5-devel
 create mode 100644 srcpkgs/fcitx5-qt5/template

diff --git a/common/shlibs b/common/shlibs
index 51a23ad3870e..6f584d5d81ee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2126,6 +2126,8 @@ libFcitx5Utils.so.2 libfcitx5-5.0.5_1
 libFcitx5Core.so.7 libfcitx5-5.0.5_1
 libFcitx5Config.so.6 libfcitx5-5.0.5_1
 libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1
+libFcitx5Qt5DBusAddons.so.1 fcitx5-qt5-5.0.3_1
+libFcitx5Qt5WidgetsAddons.so.2 fcitx5-qt5-5.0.3_1
 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1
 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1
 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1
diff --git a/srcpkgs/fcitx5-qt5-devel b/srcpkgs/fcitx5-qt5-devel
new file mode 120000
index 000000000000..b06bf33725d5
--- /dev/null
+++ b/srcpkgs/fcitx5-qt5-devel
@@ -0,0 +1 @@
+fcitx5-qt5
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-qt5/template b/srcpkgs/fcitx5-qt5/template
new file mode 100644
index 000000000000..f6ca5fe8bbec
--- /dev/null
+++ b/srcpkgs/fcitx5-qt5/template
@@ -0,0 +1,32 @@
+# Template file for 'fcitx5-qt5'
+pkgname=fcitx5-qt5
+version=5.0.3
+revision=1
+wrksrc=fcitx5-qt-$version
+build_style=cmake
+configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=OFF"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="libfcitx5-devel fmt-devel qt5-devel libxkbcommon-devel"
+short_desc="Flexible Context-aware Input Tool with eXtension v5 - Qt5"
+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=169e13341fc4c88e5201cda4eff656fa89dcc5d973b68c1c8d57b21d1f9439e3
+
+post_install() {
+	sed -e 's/<year.*owner>/2012-2021 CSSlayer <wengxt@gmail.com>/' \
+		LICENSES/BSD-3-Clause.txt >LICENSE
+	vlicense LICENSE
+}
+
+fcitx5-qt5-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From e3d352cd87cae0f93569a3bb3ec21b0a03083a03 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: Mon, 22 Mar 2021 09:18:21 +0700
Subject: [PATCH 05/10] New package: fcitx5-rime-5.0.5

---
 srcpkgs/fcitx5-rime/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/fcitx5-rime/template

diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
new file mode 100644
index 000000000000..70d3abb58cdd
--- /dev/null
+++ b/srcpkgs/fcitx5-rime/template
@@ -0,0 +1,16 @@
+# Template file for 'fcitx5-rime'
+pkgname=fcitx5-rime
+version=5.0.5
+revision=1
+build_style=cmake
+configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules"
+makedepends="libfcitx5-devel fmt-devel librime-devel"
+depends="brise"
+short_desc="Fcitx v5 - RIME engine"
+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=7845893c572bfe0e3f19df91a8f25cfcc733990e6da7609850f89bc02907220a

From f56522fb93f3feb015d47da223044515d21b7ec8 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: Mon, 22 Mar 2021 09:31:33 +0700
Subject: [PATCH 06/10] New package: fcitx5-lua-5.0.4

---
 srcpkgs/fcitx5-lua-devel    |  1 +
 srcpkgs/fcitx5-lua/template | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/fcitx5-lua-devel
 create mode 100644 srcpkgs/fcitx5-lua/template

diff --git a/srcpkgs/fcitx5-lua-devel b/srcpkgs/fcitx5-lua-devel
new file mode 120000
index 000000000000..afec5c01e1e0
--- /dev/null
+++ b/srcpkgs/fcitx5-lua-devel
@@ -0,0 +1 @@
+fcitx5-lua
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template
new file mode 100644
index 000000000000..91083a5c5ea8
--- /dev/null
+++ b/srcpkgs/fcitx5-lua/template
@@ -0,0 +1,30 @@
+# Template file for 'fcitx5-lua'
+pkgname=fcitx5-lua
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules"
+makedepends="libfcitx5-devel fmt-devel lua53-devel"
+short_desc="Lua scripting support for fcitx5"
+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=7c8899cb6f05074263e66b95a8717594f9d5c5c1e693bfe9cf4660bbba1f9336
+
+pre_build() {
+	mkdir -p native
+	$CXX_FOR_BUILD $CXXFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD \
+		-o native/file2cstring src/file2cstring/file2cstring.cpp
+	PATH="${wrksrc}/native:$PATH"
+}
+
+fcitx5-lua-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

From 32e2b28491b6a7ea5a350bc7b97b67894e30b8b1 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: Mon, 22 Mar 2021 21:37:16 +0700
Subject: [PATCH 07/10] fcitx5-qt5: update to 5.0.4.

---
 srcpkgs/fcitx5-qt5/template | 4 ++--
 srcpkgs/fcitx5-qt5/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/fcitx5-qt5/update

diff --git a/srcpkgs/fcitx5-qt5/template b/srcpkgs/fcitx5-qt5/template
index f6ca5fe8bbec..0a148cbce4d9 100644
--- a/srcpkgs/fcitx5-qt5/template
+++ b/srcpkgs/fcitx5-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-qt5'
 pkgname=fcitx5-qt5
-version=5.0.3
+version=5.0.4
 revision=1
 wrksrc=fcitx5-qt-$version
 build_style=cmake
@@ -13,7 +13,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=169e13341fc4c88e5201cda4eff656fa89dcc5d973b68c1c8d57b21d1f9439e3
+checksum=1686d3508b21bb38133ff3a8528652d75c3fe4bd8eb1dbe5df573ed78038a021
 
 post_install() {
 	sed -e 's/<year.*owner>/2012-2021 CSSlayer <wengxt@gmail.com>/' \
diff --git a/srcpkgs/fcitx5-qt5/update b/srcpkgs/fcitx5-qt5/update
new file mode 100644
index 000000000000..92b65ebc90e4
--- /dev/null
+++ b/srcpkgs/fcitx5-qt5/update
@@ -0,0 +1 @@
+pkgname=fcitx5-qt

From caeb4702722756a2e9074969bd8dd62e16c2d86c 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: Mon, 22 Mar 2021 21:37:52 +0700
Subject: [PATCH 08/10] fcitx5-gtk: update to 5.0.5.

---
 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 74b3c3611ab1..d14c55559e1f 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-gtk'
 pkgname=fcitx5-gtk
-version=5.0.4
+version=5.0.5
 revision=1
 build_style=cmake
 build_helper=gir
@@ -8,12 +8,12 @@ configure_args="-DENABLE_GTK2_IM_MODULE=OFF $(vopt_bool gir ENABLE_GIR)"
 hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
  extra-cmake-modules glib-devel"
 makedepends="libfcitx5-devel libglib-devel gtk+3-devel gtk4-devel fmt-devel"
-short_desc="Flexible Context-aware Input Tool with eXtension v5 - GTK"
+short_desc="Fcitx v5 - GTK"
 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=9a491f6c77e796a3d47fbae052b0d8778b3728dc10326fc90d819109bbcdaccc
+checksum=bf30f91db0c3809a0354b5cdf0be46ad5da9dc06e2c72e2cc24c4b180dc1f162
 
 build_options="gir"
 build_options_default="gir"

From f6e0586e7f131a88fa39c199d357f2f9b95b093c 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: Mon, 22 Mar 2021 22:02:20 +0700
Subject: [PATCH 09/10] New package: fcitx5-configtool-5.0.4

---
 srcpkgs/fcitx5-configtool/template | 28 ++++++++++++++++++++++++++++
 srcpkgs/fcitx5-migrator            |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 srcpkgs/fcitx5-configtool/template
 create mode 120000 srcpkgs/fcitx5-migrator

diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
new file mode 100644
index 000000000000..254826ec8013
--- /dev/null
+++ b/srcpkgs/fcitx5-configtool/template
@@ -0,0 +1,28 @@
+# Template file for 'fcitx5-configtool'
+pkgname=fcitx5-configtool
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules glib-devel qt5-qmake qt5-host-tools xkeyboard-config
+ AppStream kcoreaddons"
+makedepends="libfcitx5-devel fcitx5-gtk-devel fcitx5-qt5-devel
+ libglib-devel qt5-devel qt5-x11extras-devel kitemviews-devel
+ qt5-quickcontrols2-devel qt5-declarative-devel kcoreaddons-devel
+ ki18n-devel kpackage-devel kdeclarative-devel kirigami2-devel
+ libxkbcommon-devel iso-codes libX11-devel libxkbfile-devel"
+short_desc="Fcitx v5 - config tool"
+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=1c835e236d013e84c88ff442332003fc69531191d4b3cbf54e85e29fc57d9d11
+
+fcitx5-migrator_package() {
+	short_desc="${short_desc/config/migration}"
+	pkg_install() {
+		vmove usr/bin/fcitx5-migrator
+		vmove "usr/lib/libFcitx5Migrator.so*"
+		vmove usr/share/applications/org.fcitx.fcitx5-migrator.desktop
+	}
+}
diff --git a/srcpkgs/fcitx5-migrator b/srcpkgs/fcitx5-migrator
new file mode 120000
index 000000000000..e54fa5c62107
--- /dev/null
+++ b/srcpkgs/fcitx5-migrator
@@ -0,0 +1 @@
+fcitx5-configtool
\ No newline at end of file

From b5fddcf9135d7af565fdd3824f6f38d5a7307761 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: Mon, 22 Mar 2021 22:25:14 +0700
Subject: [PATCH 10/10] New package: fcitx5-m17n-5.0.4

---
 srcpkgs/fcitx5-m17n/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/fcitx5-m17n/template

diff --git a/srcpkgs/fcitx5-m17n/template b/srcpkgs/fcitx5-m17n/template
new file mode 100644
index 000000000000..df7ad5a3e34c
--- /dev/null
+++ b/srcpkgs/fcitx5-m17n/template
@@ -0,0 +1,14 @@
+# Template file for 'fcitx5-m17n'
+pkgname=fcitx5-m17n
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
+makedepends="libfcitx5-devel fmt-devel m17n-lib-devel"
+depends="m17n-db"
+short_desc="Fcitx v5 - m17n engine"
+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-m17n/fcitx5-m17n-${version}.tar.xz"
+checksum=f687f3f398e5d4be34e3ec70962f009ad6b9eb9b1dc33f7c2a868aca6ba3c3c2