From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] WIP: fcitx5
Date: Fri, 26 Mar 2021 12:42:12 +0100 [thread overview]
Message-ID: <20210326114212.MOarm1oOqtA6A357TrVMt1ilRWH3sUfxaVSri78BEsU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29664@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1584 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fcitx5
https://github.com/void-linux/void-packages/pull/29664
WIP: fcitx5
Close #29499
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/29664.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fcitx5-29664.patch --]
[-- Type: text/x-diff, Size: 57690 bytes --]
From 41f4ea7cd492ff12713f26fb44fc57fcb70598f4 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/20] 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 7319cc8d20cb..3d0e41d9f3fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -256,6 +256,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 dbcac07ed65a493f3605f8c43d7f55381f27f03e 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/20] New package: fcitx5-5.0.6
---
common/shlibs | 3 +
srcpkgs/fcitx5-icons | 1 +
.../patches/cross-config-template.patch | 45 ++++
srcpkgs/fcitx5/patches/no-which.patch | 194 ++++++++++++++++++
srcpkgs/fcitx5/template | 69 +++++++
srcpkgs/libfcitx5 | 1 +
srcpkgs/libfcitx5-devel | 1 +
7 files changed, 314 insertions(+)
create mode 120000 srcpkgs/fcitx5-icons
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 3d0e41d9f3fa..a1e493c04505 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,6 +2121,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-icons b/srcpkgs/fcitx5-icons
new file mode 120000
index 000000000000..99ac64afc615
--- /dev/null
+++ b/srcpkgs/fcitx5-icons
@@ -0,0 +1 @@
+fcitx5
\ No newline at end of file
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..8263e9be3f18
--- /dev/null
+++ b/srcpkgs/fcitx5/template
@@ -0,0 +1,69 @@
+# 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"
+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"
+depends="fcitx5-icons"
+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
+lib32disabled=yes
+
+# 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
+}
+
+fcitx5-icons_package() {
+ short_desc+=" - icons"
+ conflicts="fcitx<=4.2.9.8_3"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
+
+libfcitx5_package() {
+ short_desc+=" - libraries"
+ lib32disabled=yes
+ 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 d35bbd2603f70527b0dd62dd3125ea8d57f22f16 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/20] New package: fcitx5-gtk-5.0.5
---
common/shlibs | 1 +
srcpkgs/fcitx5-gtk+2 | 1 +
srcpkgs/fcitx5-gtk+3 | 1 +
srcpkgs/fcitx5-gtk-devel | 1 +
srcpkgs/fcitx5-gtk/template | 69 +++++++++++++++++++++++++++++++++++++
srcpkgs/fcitx5-gtk4 | 1 +
6 files changed, 74 insertions(+)
create mode 120000 srcpkgs/fcitx5-gtk+2
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 a1e493c04505..30db51e34873 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2124,6 +2124,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+2 b/srcpkgs/fcitx5-gtk+2
new file mode 120000
index 000000000000..de83ca580801
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk+2
@@ -0,0 +1 @@
+fcitx5-gtk
\ No newline at end of file
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..32d5f58e5c9a
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk/template
@@ -0,0 +1,69 @@
+# Template file for 'fcitx5-gtk'
+pkgname=fcitx5-gtk
+version=5.0.5
+revision=1
+build_style=cmake
+build_helper=gir
+configure_args="$(vopt_bool gir ENABLE_GIR)"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules glib-devel"
+makedepends="libfcitx5-devel libglib-devel fmt-devel
+ gtk+-devel gtk+3-devel gtk4-devel"
+short_desc="Fcitx v5 - GTK common"
+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=bf30f91db0c3809a0354b5cdf0be46ad5da9dc06e2c72e2cc24c4b180dc1f162
+lib32disabled=yes
+
+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+2_package() {
+ short_desc="${short_desc/common/+2 IM Modules}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove usr/lib/gtk-2.0
+ }
+}
+
+fcitx5-gtk+3_package() {
+ short_desc="${short_desc/common/+3 IM Modules}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove usr/lib/gtk-3.0
+ }
+}
+
+fcitx5-gtk4_package() {
+ short_desc="${short_desc/common/4 IM Modules}"
+ lib32disabled=yes
+ 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 d59e3015ce457108c9954c9c38176039ef1b7439 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/20] New package: fcitx5-qt5-5.0.4
---
common/shlibs | 2 ++
srcpkgs/fcitx5-qt5-devel | 1 +
srcpkgs/fcitx5-qt5/template | 33 +++++++++++++++++++++++++++++++++
srcpkgs/fcitx5-qt5/update | 1 +
4 files changed, 37 insertions(+)
create mode 120000 srcpkgs/fcitx5-qt5-devel
create mode 100644 srcpkgs/fcitx5-qt5/template
create mode 100644 srcpkgs/fcitx5-qt5/update
diff --git a/common/shlibs b/common/shlibs
index 30db51e34873..ac9be6aa1b1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2125,6 +2125,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..a9c3b5ec58e1
--- /dev/null
+++ b/srcpkgs/fcitx5-qt5/template
@@ -0,0 +1,33 @@
+# Template file for 'fcitx5-qt5'
+pkgname=fcitx5-qt5
+version=5.0.4
+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=1686d3508b21bb38133ff3a8528652d75c3fe4bd8eb1dbe5df573ed78038a021
+lib32disabled=yes
+
+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"
+ }
+}
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 ac2862b9c7ab467f8b0f568f73dd213dc1048993 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/20] New package: fcitx5-rime-5.0.5
---
srcpkgs/fcitx5-rime-icons | 1 +
srcpkgs/fcitx5-rime/template | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 120000 srcpkgs/fcitx5-rime-icons
create mode 100644 srcpkgs/fcitx5-rime/template
diff --git a/srcpkgs/fcitx5-rime-icons b/srcpkgs/fcitx5-rime-icons
new file mode 120000
index 000000000000..2de077b5f2e3
--- /dev/null
+++ b/srcpkgs/fcitx5-rime-icons
@@ -0,0 +1 @@
+fcitx5-rime
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
new file mode 100644
index 000000000000..216df93b017e
--- /dev/null
+++ b/srcpkgs/fcitx5-rime/template
@@ -0,0 +1,24 @@
+# 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 fcitx5-rime-icons"
+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
+lib32disabled=yes
+
+fcitx5-rime-icons_package() {
+ short_desc+=" - icons"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
From cd0439e21e7d7c32abc75b7a36db44082cd15816 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/20] New package: fcitx5-lua-5.0.4
---
srcpkgs/fcitx5-lua-devel | 1 +
srcpkgs/fcitx5-lua/template | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 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..30f51aa1c42e
--- /dev/null
+++ b/srcpkgs/fcitx5-lua/template
@@ -0,0 +1,33 @@
+# 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"
+depends="fcitx5"
+checkdepends="fcitx5"
+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
+lib32disabled=yes
+
+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 9348959d6950de372f72965277a72ce16b01f761 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 07/20] New package: fcitx5-configtool-5.0.4
---
srcpkgs/fcitx5-configtool/template | 30 ++++++++++++++++++++++++++++++
srcpkgs/fcitx5-migrator | 1 +
2 files changed, 31 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..15507872e601
--- /dev/null
+++ b/srcpkgs/fcitx5-configtool/template
@@ -0,0 +1,30 @@
+# 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
+lib32disabled=yes
+
+fcitx5-migrator_package() {
+ short_desc="${short_desc/config/migration}"
+ lib32disabled=yes
+ 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 397cd88e12256d40c80ff049fc2eb9e408fea97f 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 08/20] New package: fcitx5-m17n-5.0.4
---
srcpkgs/fcitx5-m17n/template | 15 +++++++++++++++
1 file changed, 15 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..d6a8a9c9c732
--- /dev/null
+++ b/srcpkgs/fcitx5-m17n/template
@@ -0,0 +1,15 @@
+# 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
+lib32disabled=yes
From e2be385f86b1abd339752fb803ad0575aa0df1a0 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: Tue, 23 Mar 2021 18:02:57 +0700
Subject: [PATCH 09/20] New package: fcitx5-chewing-5.0.5
---
srcpkgs/fcitx5-chewing-icons | 1 +
srcpkgs/fcitx5-chewing/template | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 120000 srcpkgs/fcitx5-chewing-icons
create mode 100644 srcpkgs/fcitx5-chewing/template
diff --git a/srcpkgs/fcitx5-chewing-icons b/srcpkgs/fcitx5-chewing-icons
new file mode 120000
index 000000000000..88c258a7ebb9
--- /dev/null
+++ b/srcpkgs/fcitx5-chewing-icons
@@ -0,0 +1 @@
+fcitx5-chewing
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template
new file mode 100644
index 000000000000..83dadccc2b3a
--- /dev/null
+++ b/srcpkgs/fcitx5-chewing/template
@@ -0,0 +1,22 @@
+# Template file for 'fcitx5-chewing'
+pkgname=fcitx5-chewing
+version=5.0.5
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
+makedepends="libfcitx5-devel fmt-devel libchewing-devel"
+short_desc="Fcitx5 - chewing 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-chewing/fcitx5-chewing-${version}.tar.xz"
+checksum=9c2f208796198daa6c37d9918929f0301792c1611afbc14155ef4dd69d699163
+lib32disabled=yes
+
+fcitx5-chewing-icons_package() {
+ short_desc+=" - icons"
+ conflicts="fcitx-chewing<=0.2.3_1"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
From 834a8109ae25b4386445cc22b5321afcd090cf4a 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: Tue, 23 Mar 2021 22:46:14 +0700
Subject: [PATCH 10/20] New package: libime-1.0.5
---
common/shlibs | 3 ++
srcpkgs/libime-devel | 1 +
srcpkgs/libime-migration | 1 +
srcpkgs/libime-utils | 1 +
srcpkgs/libime/template | 64 ++++++++++++++++++++++++++++++++++++++++
5 files changed, 70 insertions(+)
create mode 120000 srcpkgs/libime-devel
create mode 120000 srcpkgs/libime-migration
create mode 120000 srcpkgs/libime-utils
create mode 100644 srcpkgs/libime/template
diff --git a/common/shlibs b/common/shlibs
index ac9be6aa1b1e..e9b056acc679 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3111,6 +3111,9 @@ libi2c.so.0 i2c-tools-4.0_1
libmarisa.so.0 marisa-0.2.5_1
libopencc.so.1.1 opencc-1.1.1_1
librime.so.1 librime-1.2.9_1
+libIMECore.so.0 libime-1.0.5_1
+libIMEPinyin.so.0 libime-1.0.5_1
+libIMETable.so.0 libime-1.0.5_1
libairspy.so.0 libairspy-1.0.9_1
libKF5KDcraw.so.5 libkdcraw5-17.04.3_1
libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1
diff --git a/srcpkgs/libime-devel b/srcpkgs/libime-devel
new file mode 120000
index 000000000000..0e6317ec164c
--- /dev/null
+++ b/srcpkgs/libime-devel
@@ -0,0 +1 @@
+libime
\ No newline at end of file
diff --git a/srcpkgs/libime-migration b/srcpkgs/libime-migration
new file mode 120000
index 000000000000..0e6317ec164c
--- /dev/null
+++ b/srcpkgs/libime-migration
@@ -0,0 +1 @@
+libime
\ No newline at end of file
diff --git a/srcpkgs/libime-utils b/srcpkgs/libime-utils
new file mode 120000
index 000000000000..0e6317ec164c
--- /dev/null
+++ b/srcpkgs/libime-utils
@@ -0,0 +1 @@
+libime
\ No newline at end of file
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
new file mode 100644
index 000000000000..dbc2fd35c7b2
--- /dev/null
+++ b/srcpkgs/libime/template
@@ -0,0 +1,64 @@
+# Template file for 'libime'
+pkgname=libime
+version=1.0.5
+revision=1
+build_style=cmake
+build_helper=qemu
+hostmakedepends="pkg-config gettext extra-cmake-modules python3"
+makedepends="libfcitx5-devel boost-devel"
+short_desc="Library to support generic input method implementation"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+_lm_sc_version=20140820
+_dict_version=20210302
+distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz
+ https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2
+ https://download.fcitx-im.org/data/dict.utf8-${_dict_version}.tar.xz
+ https://download.fcitx-im.org/data/table.tar.gz"
+checksum="212ea28dbca96372e67a31e4b70eb6c98528dcfd64d8b581074005d94fe5b254
+ 751bab7c55ea93a2cedfb0fbb7eb09f67d4da9c2c55496e5f31eb8580f1d1e2f
+ cd43f97749f38e65fc1f706b981a3c1991599770268932dbb11b2ab90c087646
+ 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7"
+skip_extraction="
+ lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2
+ dict.utf8-${_dict_version}.tar.xz
+ table.tar.gz"
+
+post_extract() {
+ local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+ local _file
+ for _file in ${skip_extraction}; do
+ cp ${_srcdistdir}/${_file} data
+ done
+}
+
+post_install() {
+ sed -i '/INTERFACE_INCLUDE_DIRECTORIES/s,"/usr,"${_IMPORT_PREFIX},' \
+ "${DESTDIR}/usr/lib/cmake"/*/*Targets.cmake
+}
+
+libime-migration_package() {
+ short_desc+=" - migration tools"
+ pkg_install() {
+ vmove "usr/bin/libime_migrate_*"
+ }
+}
+
+libime-utils_package() {
+ short_desc+=" - utilities"
+ pkg_install() {
+ vmove usr/bin
+ }
+}
+
+libime-devel_package() {
+ short_desc+=" - development files"
+ depends="boost-devel libime-utils>=${version}_${revision}
+ libime>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From a43a2f3ffffabe3c85a98b73ac2868c8e235ff27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Mar 2021 18:17:34 +0700
Subject: [PATCH 11/20] fcitx-chewing: use shared icons with fcitx5
---
srcpkgs/fcitx-chewing/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx-chewing/template b/srcpkgs/fcitx-chewing/template
index 65c99624edfc..ea1c4b65a38d 100644
--- a/srcpkgs/fcitx-chewing/template
+++ b/srcpkgs/fcitx-chewing/template
@@ -1,13 +1,18 @@
# Template file for 'fcitx-chewing'
pkgname=fcitx-chewing
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fcitx-devel libchewing-devel"
+depends="fcitx-chewing-icons"
short_desc="Fcitx wrapper for Chewing IM engine"
maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
license="GPL-2.0-only"
homepage="https://www.fcitx-im.org/wiki/Chewing"
distfiles="https://github.com/fcitx/fcitx-chewing/archive/${version}.tar.gz"
checksum=ad20eb7b4911cdfb88224f4883d1778253e30180a84898dfcbf8ece36b1182fc
+
+post_install() {
+ rm -rf ${DESTDIR}/usr/share/icons
+}
From 83a853d84b7506f398501d05b97da6bbbf378096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Mar 2021 18:32:12 +0700
Subject: [PATCH 12/20] New package: fcitx5-chinese-addons-5.0.5
---
srcpkgs/fcitx5-chinese-addons-devel | 1 +
srcpkgs/fcitx5-chinese-addons-icons | 1 +
srcpkgs/fcitx5-chinese-addons-qt5 | 1 +
srcpkgs/fcitx5-chinese-addons/template | 57 ++++++++++++++++++++++++++
4 files changed, 60 insertions(+)
create mode 120000 srcpkgs/fcitx5-chinese-addons-devel
create mode 120000 srcpkgs/fcitx5-chinese-addons-icons
create mode 120000 srcpkgs/fcitx5-chinese-addons-qt5
create mode 100644 srcpkgs/fcitx5-chinese-addons/template
diff --git a/srcpkgs/fcitx5-chinese-addons-devel b/srcpkgs/fcitx5-chinese-addons-devel
new file mode 120000
index 000000000000..20d63bef8026
--- /dev/null
+++ b/srcpkgs/fcitx5-chinese-addons-devel
@@ -0,0 +1 @@
+fcitx5-chinese-addons
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-chinese-addons-icons b/srcpkgs/fcitx5-chinese-addons-icons
new file mode 120000
index 000000000000..20d63bef8026
--- /dev/null
+++ b/srcpkgs/fcitx5-chinese-addons-icons
@@ -0,0 +1 @@
+fcitx5-chinese-addons
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-chinese-addons-qt5 b/srcpkgs/fcitx5-chinese-addons-qt5
new file mode 120000
index 000000000000..20d63bef8026
--- /dev/null
+++ b/srcpkgs/fcitx5-chinese-addons-qt5
@@ -0,0 +1 @@
+fcitx5-chinese-addons
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
new file mode 100644
index 000000000000..7b011e276695
--- /dev/null
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -0,0 +1,57 @@
+# Template file for 'fcitx5-chinese-addons'
+pkgname=fcitx5-chinese-addons
+version=5.0.5
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
+ qt5-host-tools libime-utils"
+makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
+ libcurl-devel qt5-webkit-devel boost-devel libime-devel qt5-devel
+ fcitx5-qt5-devel"
+depends="fcitx5-chinese-addons-icons"
+short_desc="Fcitx5 - Chinese related addon"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+_pytable_version=20121124
+_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="7917c29643d0bfe489cda2f75201059b8e52cc3c06f86b3059ee0844b33a2048
+ 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
+ 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
+skip_extraction="
+ py_table-${_pytable_version}.tar.gz
+ py_stroke-${_pystroke_version}.tar.gz"
+lib32disabled=yes
+
+post_extract() {
+ local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+ local _file
+ for _file in ${skip_extraction}; do
+ cp ${_srcdistdir}/$_file modules/pinyinhelper
+ done
+}
+
+fcitx5-chinese-addons-icons_package() {
+ short_desc+=" - icons"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
+
+fcitx5-chinese-addons-qt5_package() {
+ short_desc+=" - Qt5"
+ pkg_install() {
+ vmove usr/lib/fcitx5/qt5
+ }
+}
+
+fcitx5-chinese-addons-devel_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From 45621d721758a801d8094c84956f9588d9c57689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Mar 2021 18:21:50 +0700
Subject: [PATCH 13/20] fcitx: use shared icons with fcitx5
---
srcpkgs/fcitx/template | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 8163dee0ca5e..00675b1fedc0 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx'
pkgname=fcitx
version=4.2.9.8
-revision=3
+revision=4
build_style=cmake
build_helper=gir
short_desc="Flexible Context-aware Input Tool with eXtension"
@@ -15,6 +15,7 @@ hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel"
makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
json-c-devel opencc-devel
libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel"
+depends="fcitx5-icons fcitx5-chinese-addons-icons"
lib32disabled=yes
configure_args="-DCMAKE_BUILD_TYPE=None
-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
@@ -54,6 +55,14 @@ pre_build() {
LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/lib/fcitx-utils"
}
+post_install() {
+ find $DESTDIR/usr/share/icons -depth \
+ -name 'fcitx-kbd.*' -prune -o \
+ -name 'fcitx-vk-active.*' -prune -o \
+ -name 'fcitx-vk-inactive.*' -prune -o \
+ -type f -delete
+}
+
libfcitx_package() {
short_desc+=" - shared libraries"
pkg_install() {
@@ -68,7 +77,7 @@ libfcitx_package() {
}
}
fcitx-devel_package() {
- depends="libfcitx-${version}_${revision} glib-devel"
+ depends="libfcitx>=${version}_${revision} glib-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/fcitx4-config
From a76ef626944944b8df6d0e1c7a3935dab6543279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Mar 2021 19:41:51 +0700
Subject: [PATCH 14/20] New package: libime-jyutping-1.0.2
---
common/shlibs | 1 +
srcpkgs/libime-jyutping-devel | 1 +
srcpkgs/libime-jyutping-tools | 1 +
srcpkgs/libime-jyutping/template | 47 ++++++++++++++++++++++++++++++++
4 files changed, 50 insertions(+)
create mode 120000 srcpkgs/libime-jyutping-devel
create mode 120000 srcpkgs/libime-jyutping-tools
create mode 100644 srcpkgs/libime-jyutping/template
diff --git a/common/shlibs b/common/shlibs
index e9b056acc679..7c35868d85b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3114,6 +3114,7 @@ librime.so.1 librime-1.2.9_1
libIMECore.so.0 libime-1.0.5_1
libIMEPinyin.so.0 libime-1.0.5_1
libIMETable.so.0 libime-1.0.5_1
+libIMEJyutping.so.1 libime-jyutping-1.0.2_1
libairspy.so.0 libairspy-1.0.9_1
libKF5KDcraw.so.5 libkdcraw5-17.04.3_1
libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1
diff --git a/srcpkgs/libime-jyutping-devel b/srcpkgs/libime-jyutping-devel
new file mode 120000
index 000000000000..6f00a5aa5460
--- /dev/null
+++ b/srcpkgs/libime-jyutping-devel
@@ -0,0 +1 @@
+libime-jyutping
\ No newline at end of file
diff --git a/srcpkgs/libime-jyutping-tools b/srcpkgs/libime-jyutping-tools
new file mode 120000
index 000000000000..6f00a5aa5460
--- /dev/null
+++ b/srcpkgs/libime-jyutping-tools
@@ -0,0 +1 @@
+libime-jyutping
\ No newline at end of file
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
new file mode 100644
index 000000000000..20f493800cba
--- /dev/null
+++ b/srcpkgs/libime-jyutping/template
@@ -0,0 +1,47 @@
+# Template file for 'libime-jyutping'
+pkgname=libime-jyutping
+version=1.0.2
+revision=1
+build_style=cmake
+build_helper=qemu
+hostmakedepends="pkg-config gettext extra-cmake-modules python3"
+makedepends="libfcitx5-devel boost-devel libime-devel
+ fcitx5-chinese-addons-devel fmt-devel"
+short_desc="Libraries for jyutping 粵拼 by libime"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+_dict_version=20180104
+_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="8e948b4d1a1c1586c7e7c2b61e2d4d3d4e83996a791ef685388bed6f681433b3
+ e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b
+ 4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071"
+skip_extraction="jyutping-dict-${_dict_version}.tar.xz
+ jyutping-model-${_model_version}.tar.xz"
+
+post_extract() {
+ local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+ local _file
+ for _file in ${skip_extraction}; do
+ cp ${_srcdistdir}/$_file data
+ done
+}
+
+libime-jyutping-tools_package() {
+ short_desc+=" - tools"
+ pkg_install() {
+ vmove usr/bin
+ }
+}
+
+libime-jyutping-devel_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From 20aefe2e94fa45ddec2d1b195fe922c16e6b7533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Mar 2021 20:18:25 +0700
Subject: [PATCH 15/20] libpinyin: split libzhuyin
---
common/shlibs | 1 +
srcpkgs/libpinyin-common | 1 +
srcpkgs/libpinyin-common-devel | 1 +
srcpkgs/libpinyin-utils | 1 +
srcpkgs/libpinyin/template | 58 ++++++++++++++++++++++++++++++----
srcpkgs/libzhuyin | 1 +
srcpkgs/libzhuyin-devel | 1 +
7 files changed, 57 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/libpinyin-common
create mode 120000 srcpkgs/libpinyin-common-devel
create mode 120000 srcpkgs/libpinyin-utils
create mode 120000 srcpkgs/libzhuyin
create mode 120000 srcpkgs/libzhuyin-devel
diff --git a/common/shlibs b/common/shlibs
index 7c35868d85b8..fd4606fb7786 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3549,6 +3549,7 @@ libcaf_openssl.so.0.17.6 zeek-3.2.4_2
libbinpac.so.0 zeek-3.2.4_2
libllhttp.so.1 llhttp-1.0.1_1
libpinyin.so.13 libpinyin-2.2.1_1
+libzhuyin.so.13 libzhuyin-2.6.0_3
libuhd.so.4.0.0 uhd-4.0.0.0_1
libeditline.so.1 editline-1.16.0_1
libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
diff --git a/srcpkgs/libpinyin-common b/srcpkgs/libpinyin-common
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libpinyin-common
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libpinyin-common-devel b/srcpkgs/libpinyin-common-devel
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libpinyin-common-devel
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libpinyin-utils b/srcpkgs/libpinyin-utils
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libpinyin-utils
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template
index 7d141b6a086b..31811cac10f6 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -1,12 +1,13 @@
# Template file for 'libpinyin'
pkgname=libpinyin
version=2.6.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-libzhuyin"
hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake"
makedepends="db-devel libglib-devel"
-short_desc="Support library for PinYin and ZhuYin (Bopofomo)"
+depends="libpinyin-common>=${version}_${revision}"
+short_desc="Support library for PinYin"
maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/libpinyin/libpinyin"
@@ -26,13 +27,56 @@ pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+libpinyin-common_package() {
+ short_desc="Common files for libpinyin and libzhuyin"
+ pkg_install() {
+ vmove usr/lib/libpinyin
+ }
+}
+
+libzhuyin_package() {
+ short_desc="${short_desc/PinYin/ZhuYin}"
+ depends="libpinyin-common>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/libzhuyin.so.*"
+ }
+}
+
+libpinyin-utils_package() {
+ short_desc="Support utilities for libpinyin and libzhuyin"
+ pkg_install() {
+ vmove usr/bin
+ vmove usr/share/man/man1
+ }
+}
+
+libpinyin-common-devel_package() {
+ short_desc="Common files for libpinyin and libzhuyin"
+ pkg_install() {
+ vmove "usr/include/libpinyin-2.6.0/novel*"
+ }
+}
+
libpinyin-devel_package() {
- depends="libglib-devel libpinyin-${version}_${revision}"
+ depends="libglib-devel libpinyin-${version}_${revision}
+ libpinyin-common-devel-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
+ vmove "usr/include/libpinyin-2.6.0/pinyin*"
+ vmove usr/lib/pkgconfig/libpinyin.pc
+ vmove "usr/lib/libpinyin.so"
+ vmove "usr/lib/libpinyin.a"
+ }
+}
+
+libzhuyin-devel_package() {
+ depends="libglib-devel libzhuyin-${version}_${revision}
+ libpinyin-devel-${version}_${revision}"
+ short_desc="${short_desc/PinYin/ZhuYin} - development files"
+ pkg_install() {
+ vmove "usr/include/libpinyin-2.6.0/zhuyin*"
+ vmove usr/lib/pkgconfig/libzhuyin.pc
+ vmove usr/lib/libzhuyin.a
+ vmove usr/lib/libzhuyin.so
}
}
diff --git a/srcpkgs/libzhuyin b/srcpkgs/libzhuyin
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libzhuyin
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libzhuyin-devel b/srcpkgs/libzhuyin-devel
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libzhuyin-devel
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
From 2cf82d4102051076e1ecdf57f1de56c82ed07bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Mar 2021 22:34:18 +0700
Subject: [PATCH 16/20] New package: fcitx5-zhuyin-5.0.4
---
srcpkgs/fcitx5-zhuyin/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/fcitx5-zhuyin/template
diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template
new file mode 100644
index 000000000000..4e55fb1bec5d
--- /dev/null
+++ b/srcpkgs/fcitx5-zhuyin/template
@@ -0,0 +1,24 @@
+# Template file for 'fcitx5-zhuyin'
+pkgname=fcitx5-zhuyin
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin"
+makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
+ libzhuyin-devel libpinyin-utils"
+short_desc="Fcitx5 - zhuyin IME"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+_model_version=20161206
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-zhuyin/fcitx5-zhuyin-${version}.tar.xz
+ https://download.fcitx-im.org/data/model.text.${_model_version}.tar.gz"
+checksum="3b692408bcbd816fec84c7ad73ec4e4816b686a072eb9d671aaa8be079fc3728
+ 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704"
+skip_extraction="model.text.${_model_version}.tar.gz"
+lib32disabled=yes
+
+post_extract() {
+ local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+ cp ${_srcdistdir}/$skip_extraction data
+}
From 59b8fd3c7b1632ff829da1dcbf7b36c4fe0693b2 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, 26 Mar 2021 18:19:17 +0700
Subject: [PATCH 17/20] New package: fcitx5-table-extra-5.0.3
---
srcpkgs/fcitx5-table-extra/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/fcitx5-table-extra/template
diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
new file mode 100644
index 000000000000..200b8eec5d5c
--- /dev/null
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -0,0 +1,14 @@
+# Template file for 'fcitx5-table-extra'
+pkgname=fcitx5-table-extra
+version=5.0.3
+revision=1
+build_style=cmake
+hostmakedepends="gettext libime-utils extra-cmake-modules"
+makedepends="libfcitx5-devel libime-devel"
+depends="fcitx5"
+short_desc="Fcitx5 - Boshiamy, Zhengma, Cangjie, and Quick table"
+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=2cecbd235623cb803befb3550d5b520f972f5b3ea8044c27d3786e5d59e3fb5d
From 1210ddeb73c92439e81c1135c860cec426fcdd23 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, 26 Mar 2021 18:31:31 +0700
Subject: [PATCH 18/20] New package: fcitx5-table-other-5.0.4
---
srcpkgs/fcitx5-table-other/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/fcitx5-table-other/template
diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template
new file mode 100644
index 000000000000..6ba05d834a23
--- /dev/null
+++ b/srcpkgs/fcitx5-table-other/template
@@ -0,0 +1,14 @@
+# Template file for 'fcitx5-table-other'
+pkgname=fcitx5-table-other
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="gettext libime-utils extra-cmake-modules"
+makedepends="libfcitx5-devel libime-devel"
+depends="fcitx5"
+short_desc="Fcitx5 - non-Chinese table"
+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-table-other/fcitx5-table-other-${version}.tar.xz"
+checksum=a0f6747ad78cd5d113cdcb14d56d11579ba1b425741a532a6b904042be176b41
From 8554826e15c6a36dbe5626740b4a599902e3d982 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, 26 Mar 2021 18:39:14 +0700
Subject: [PATCH 19/20] New package: fcitx5-hangul-5.0.3
---
srcpkgs/fcitx5-hangul-icons | 1 +
srcpkgs/fcitx5-hangul/template | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+)
create mode 120000 srcpkgs/fcitx5-hangul-icons
create mode 100644 srcpkgs/fcitx5-hangul/template
diff --git a/srcpkgs/fcitx5-hangul-icons b/srcpkgs/fcitx5-hangul-icons
new file mode 120000
index 000000000000..aeca5d0f662c
--- /dev/null
+++ b/srcpkgs/fcitx5-hangul-icons
@@ -0,0 +1 @@
+fcitx5-hangul
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template
new file mode 100644
index 000000000000..0e8116ae535d
--- /dev/null
+++ b/srcpkgs/fcitx5-hangul/template
@@ -0,0 +1,23 @@
+# Template file for 'fcitx5-hangul'
+pkgname=fcitx5-hangul
+version=5.0.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext extra-cmake-modules"
+makedepends="libhangul-devel libfcitx5-devel"
+depends="fcitx5-hangul-icons"
+short_desc="Fcitx5 - Hangul support"
+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-hangul/fcitx5-hangul-${version}.tar.xz"
+checksum=e02d3d59e22a60e65099eaa0e5e394481a770a401c83b9979f754678c100f1e6
+lib32disabled=yes
+
+fcitx5-hangul-icons_package() {
+ short_desc+=" - icons"
+ conflicts="fcitx-hangul<=0.3.1_1"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
From 20a24b5f885ca0508fa1c4e1096857ee4f5a15b6 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, 26 Mar 2021 18:39:25 +0700
Subject: [PATCH 20/20] fcitx-hangul: use shared icons with fcitx5
---
srcpkgs/fcitx-hangul/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx-hangul/template b/srcpkgs/fcitx-hangul/template
index 3c65ec6a5f4e..e761a192aefd 100644
--- a/srcpkgs/fcitx-hangul/template
+++ b/srcpkgs/fcitx-hangul/template
@@ -1,11 +1,11 @@
# Template file for 'fcitx-hangul'
pkgname=fcitx-hangul
version=0.3.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="intltool pkg-config libfcitx"
makedepends="libhangul-devel fcitx-devel"
-depends="fcitx>=4.2.9"
+depends="fcitx>=4.2.9 fcitx5-hangul-icons"
short_desc="Hangul (Korean) support for fcitx"
homepage="https://github.com/fcitx/fcitx-hangul"
license="GPL-2.0-only"
@@ -13,3 +13,7 @@ distfiles="https://download.fcitx-im.org/fcitx-hangul/fcitx-hangul-${version}.ta
checksum=6dd5fd5956924c85af92ebefaef1e113e38fa814355fbb0f07c26049c3014437
CXXFLAGS='-D_GNU_SOURCE'
+
+post_install() {
+ rm -rf ${DESTDIR}/usr/share/icons
+}
next prev parent reply other threads:[~2021-03-26 11:42 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-21 18:04 [PR PATCH] " sgn
2021-03-22 15:38 ` [PR PATCH] [Updated] " sgn
2021-03-22 15:38 ` sgn
2021-03-25 15:36 ` sgn
2021-03-26 11:42 ` sgn [this message]
2021-03-26 12:06 ` sgn
2021-03-26 12:07 ` sgn
2021-03-26 12:11 ` [PR PATCH] [Updated] " sgn
2021-03-26 12:15 ` sgn
2021-03-26 12:15 ` sgn
2021-03-26 13:59 ` [PR PATCH] [Updated] fcitx5 sgn
2021-03-26 15:11 ` sgn
2021-03-26 15:47 ` fcitx5 sgn
2021-03-27 20:18 ` fcitx5 noarchwastaken
2021-03-27 21:54 ` fcitx5 noarchwastaken
2021-03-27 22:05 ` fcitx5 noarchwastaken
2021-03-28 0:40 ` fcitx5 sgn
2021-03-28 16:27 ` fcitx5 noarchwastaken
2021-03-28 16:28 ` fcitx5 noarchwastaken
2021-03-28 17:00 ` fcitx5 noarchwastaken
2021-03-29 1:08 ` fcitx5 noarchwastaken
2021-03-30 15:44 ` [PR PATCH] [Updated] fcitx5 sgn
2021-03-30 15:46 ` sgn
2021-03-30 15:48 ` sgn
2021-03-31 0:40 ` sgn
2021-03-31 16:18 ` sgn
2021-04-01 0:09 ` sgn
2021-04-06 20:45 ` fcitx5 noarchwastaken
2021-04-07 0:11 ` fcitx5 sgn
2021-04-08 0:13 ` [PR PATCH] [Updated] fcitx5 sgn
2021-04-08 15:19 ` sgn
2021-04-08 21:44 ` fcitx5 noarchwastaken
2021-04-08 23:04 ` fcitx5 sgn
2021-04-18 23:58 ` [PR PATCH] [Updated] fcitx5 sgn
2021-04-21 3:02 ` sgn
2021-04-21 3:03 ` sgn
2021-04-21 9:20 ` [PR PATCH] [Merged]: fcitx5 sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210326114212.MOarm1oOqtA6A357TrVMt1ilRWH3sUfxaVSri78BEsU@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).