fcitx5: update to 5.0.11.
This commit is contained in:
Đoàn Trần Công Danh
Đoàn Trần Công Danh
parent
a4463d4fab
commit
7c63ba7f05
2 changed files with 24 additions and 30 deletions
|
|
@ -1,7 +1,5 @@
|
|||
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
|
||||
--- a/data/fcitx5-configtool.sh
|
||||
+++ b/data/fcitx5-configtool.sh
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
export TEXTDOMAIN=fcitx5
|
||||
|
|
@ -28,7 +26,7 @@ Index: fcitx5-5.0.6/data/fcitx5-configtool.sh
|
|||
_() {
|
||||
gettext "$@"
|
||||
}
|
||||
@@ -101,7 +101,7 @@ detectDE() {
|
||||
@@ -108,7 +108,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
|
||||
|
|
@ -37,16 +35,16 @@ Index: fcitx5-5.0.6/data/fcitx5-configtool.sh
|
|||
fi
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@ run_kde() {
|
||||
@@ -119,7 +119,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"
|
||||
exec fcitx5-config-qt
|
||||
fi
|
||||
return 1
|
||||
@@ -132,13 +132,13 @@ run_xdg() {
|
||||
@@ -135,13 +135,13 @@ run_xdg() {
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -62,10 +60,8 @@ Index: fcitx5-5.0.6/data/fcitx5-configtool.sh
|
|||
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
|
||||
--- a/data/fcitx5-diagnose.sh
|
||||
+++ b/data/fcitx5-diagnose.sh
|
||||
@@ -123,7 +123,7 @@ __get_pretty_name() {
|
||||
fi
|
||||
}
|
||||
|
|
@ -75,9 +71,9 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
|
||||
__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##* }"
|
||||
@@ -214,9 +214,9 @@ if type dbus-send &> /dev/null; then
|
||||
/controller org.fcitx.Fcitx.Controller1.DebugInfo 2> /dev/null) || return 1
|
||||
echo -n "${debuginfo}"
|
||||
}
|
||||
-elif qdbus_exe=$(which qdbus 2> /dev/null) || \
|
||||
- qdbus_exe=$(which qdbus-qt4 2> /dev/null) || \
|
||||
|
|
@ -88,7 +84,7 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
dbus_exe=${qdbus_exe}
|
||||
dbus_get_name_owner() {
|
||||
"${qdbus_exe}" org.freedesktop.DBus /org/freedesktop/DBus \
|
||||
@@ -324,15 +324,15 @@ detectDE() {
|
||||
@@ -345,15 +345,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
|
||||
|
|
@ -107,7 +103,7 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
return 1
|
||||
}
|
||||
|
||||
@@ -341,7 +341,7 @@ detectDE
|
||||
@@ -362,7 +362,7 @@ detectDE
|
||||
# user and uid
|
||||
|
||||
detect_user() {
|
||||
|
|
@ -116,7 +112,7 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
cur_user=$(id -un)
|
||||
cur_uid=$(id -u)
|
||||
else
|
||||
@@ -352,7 +352,7 @@ detect_user() {
|
||||
@@ -373,7 +373,7 @@ detect_user() {
|
||||
else
|
||||
cur_uid=""
|
||||
fi
|
||||
|
|
@ -125,7 +121,7 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
cur_user=$(whoami)
|
||||
elif [[ -d /proc/$$/ ]]; then
|
||||
cur_user=$(stat -c %U /proc/$$/)
|
||||
@@ -374,7 +374,7 @@ _check_open_root() {
|
||||
@@ -395,7 +395,7 @@ _check_open_root() {
|
||||
for f in /proc/1/environ /proc/1/mem /proc/kcore /proc/kmem; do
|
||||
try_open "$f" && return 0
|
||||
done
|
||||
|
|
@ -134,7 +130,7 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
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() {
|
||||
@@ -992,7 +992,7 @@ _find_config_gtk() {
|
||||
return 0
|
||||
}
|
||||
local config_gtk
|
||||
|
|
@ -143,7 +139,7 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
echo "${config_gtk}"
|
||||
_config_tool_gtk_exe="${config_gtk}"
|
||||
}
|
||||
@@ -993,7 +993,7 @@ _check_config_gtk() {
|
||||
@@ -1019,7 +1019,7 @@ _check_config_gtk() {
|
||||
local version=$1
|
||||
local config_gtk config_gtk_name
|
||||
write_order_list_eval "$(_ 'Config GUI for gtk${1}:')" "${version}"
|
||||
|
|
@ -152,7 +148,7 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
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() {
|
||||
@@ -1040,7 +1040,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}"
|
||||
|
|
@ -161,7 +157,7 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
write_error "$(_ 'Config GUI for qt not found.')"
|
||||
return 1
|
||||
fi
|
||||
@@ -1027,7 +1027,7 @@ _check_config_kcm() {
|
||||
@@ -1053,7 +1053,7 @@ _check_config_kcm() {
|
||||
local version=$1
|
||||
local kcm_shell config_kcm
|
||||
write_order_list "$(_ 'Config GUI for kde:')"
|
||||
|
|
@ -170,7 +166,7 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
write_error "$(print_not_found "kcmshell${version}")"
|
||||
return 1
|
||||
fi
|
||||
@@ -1043,7 +1043,7 @@ check_config_ui() {
|
||||
@@ -1069,7 +1069,7 @@ check_config_ui() {
|
||||
local IFS=$'\n'
|
||||
write_title 1 "$(_ 'Fcitx Configure UI:')"
|
||||
write_order_list "$(_ 'Config Tool Wrapper:')"
|
||||
|
|
@ -179,10 +175,8 @@ Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
|
|||
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
|
||||
--- a/test/xvfb_wrapper.sh
|
||||
+++ b/test/xvfb_wrapper.sh
|
||||
@@ -20,7 +20,7 @@ finish()
|
||||
|
||||
trap finish EXIT
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'fcitx5'
|
||||
pkgname=fcitx5
|
||||
version=5.0.10
|
||||
version=5.0.11
|
||||
revision=1
|
||||
build_style=cmake
|
||||
build_helper=qemu
|
||||
|
|
@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx"
|
|||
_en_dict_ver=20121020
|
||||
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz
|
||||
https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz"
|
||||
checksum="e24c39260f5a42ad4c3b5d19fb0b3ec06c0922a10c2dbb0606d9ef28ebb9116b
|
||||
checksum="f5523dbf8a03f7f7e1a20e5a242554bf2f128d593374c63d6956f596be0a30b9
|
||||
c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
|
||||
skip_extraction=en_dict-${_en_dict_ver}.tar.gz
|
||||
lib32disabled=yes
|
||||
|
|
|
|||
Loading…
Reference in a new issue