From 8d22d1f7c0ff5d0412de308e25474fb927eda3cf Mon Sep 17 00:00:00 2001 From: yeqinglong Date: Fri, 12 Mar 2021 13:36:54 +0800 Subject: [PATCH] fix can't input chinese in en environment --- ...-not-input-chinese-in-en-environment.patch | 25 +++++++++++++++++++ imsettings.spec | 8 ++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 9000-can-not-input-chinese-in-en-environment.patch diff --git a/9000-can-not-input-chinese-in-en-environment.patch b/9000-can-not-input-chinese-in-en-environment.patch new file mode 100644 index 0000000..335eda3 --- /dev/null +++ b/9000-can-not-input-chinese-in-en-environment.patch @@ -0,0 +1,25 @@ +From d4f871be3df2b9cd089aef78245d22d5ccce677b Mon Sep 17 00:00:00 2001 +From: yeqinglong +Date: Fri, 12 Mar 2021 13:53:30 +0800 +Subject: [PATCH] fix can't input chinese in en environment + +--- + data/xinput.sh.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/xinput.sh.in.in b/data/xinput.sh.in.in +index 379ca99..d918787 100755 +--- a/data/xinput.sh.in.in ++++ b/data/xinput.sh.in.in +@@ -54,7 +54,7 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then + elif [ -r "$SYS_XINPUTRC" ]; then + # FIXME: This hardcoded list has to be gone in the future. + # Locales that normally use input-method for native input +- _im_language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh" ++ _im_language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh en" + _sourced_xinputrc=0 + for i in $_im_language_list; do + if echo $tmplang | grep -q -E "^$i"; then +-- +2.27.0 + diff --git a/imsettings.spec b/imsettings.spec index 29b343d..2a3c6dc 100644 --- a/imsettings.spec +++ b/imsettings.spec @@ -1,7 +1,7 @@ Name: imsettings Version: 1.7.3 -Release: 7 -License: LGPLv2+ +Release: 8 +License: LGPLv2.1 Summary: Delivery framework for general Input Method configuration URL: https://bitbucket.org/tagoh/imsettings/src/master/ Source0: https://bitbucket.org/tagoh/imsettings/downloads/imsettings-%{version}.tar.bz2 @@ -10,6 +10,7 @@ Patch0001: imsettings-disable-xim.patch Patch0002: imsettings-xinput-xcompose.patch Patch0003: imsettings-force-enable-for-cinnamon.patch Patch0004: imsettings-fix-unbound-var.patch +Patch0005: 9000-can-not-input-chinese-in-en-environment.patch BuildRequires: desktop-file-utils intltool gettext libtool automake autoconf glib2 >= 2.32.0 gobject-introspection-devel BuildRequires: libnotify-devel libX11-devel libgxim-devel >= 0.5.0 gtk3-devel >= 3.3.3 Requires: xorg-x11-xinit >= 1.0.2-22 @@ -142,5 +143,8 @@ fi %{_libdir}/imsettings/libimsettings-qt.so %changelog +* Fri Mar 12 2021 weidong - 1.7.3-8 +- fix can't input chinese in en environment + * Sat Dec 21 2019 likexin - 1.7.3-6 - package init