!12 fix fcitx change other language problem

Merge pull request !12 from 莫得感情的打包机器人/master

Fix-fcitx-change-other-language-problem.patch

@@ -0,0 +1,37 @@
+From 22e94b358cd8b84251c713f4ab1f68062e4f634d Mon Sep 17 00:00:00 2001
+From: panchenbo <panchenbo@uniontech.com>
+Date: Thu, 24 Jun 2021 18:11:19 +0800
+Subject: [PATCH] fix fcitx change other language problem
+
+---
+ data/none.in.in | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/data/none.in.in b/data/none.in.in
+index bc95ebe..7924e3e 100644
+--- a/data/none.in.in
++++ b/data/none.in.in
+@@ -1,6 +1,13 @@
+-XIM=none
+-XIM_PROGRAM=
+-XIM_ARGS=
+-GTK_IM_MODULE=gtk-im-context-simple
+-QT_IM_MODULE=xim
+-IMSETTINGS_IGNORE_ME=yes
++XIM=fcitx
++XIM_PROGRAM=/usr/bin/fcitx
++ICON="/usr/share/pixmaps/fcitx.png"
++XIM_ARGS="-D"
++PREFERENCE_PROGRAM=/usr/bin/fcitx-configtool
++SHORT_DESC="FCITX"
++GTK_IM_MODULE=fcitx
++if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx.so ||    test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx.so ||    test -f /usr/lib/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so ||    test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so;
++then
++    QT_IM_MODULE=fcitx
++else
++    QT_IM_MODULE=xim
++fi
+-- 
+2.20.1
+
+

imsettings.spec

@@ -1,6 +1,6 @@
 Name:             imsettings
 Version:          1.7.3
-Release:          11
+Release:          12
 License:          LGPLv2.1
 Summary:          Delivery framework for general Input Method configuration
 URL:              https://bitbucket.org/tagoh/imsettings/src/master/
@@ -14,6 +14,7 @@ Patch0005:        Fix-can-not-input-chinese-in-en-environment.patch
 Patch0006:        imsetting-fix-compile-error-sinal-multi-defined.patch
 Patch0007:        fix-journal_missing_chinese.patch
 Patch0008:        fix-changed_lang_in_dcc_not_affecting_fcitx.patch
+Patch0009:        Fix-fcitx-change-other-language-problem.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
@@ -146,6 +147,8 @@ fi
 %{_libdir}/imsettings/libimsettings-qt.so
 
 %changelog
+* Wed Dec 15 2021 herengui <herengui@uniontech.com> - 1.7.3-12
+- fix fcitx change other language problem
 
 * Fri Aug 27 2021 herengui <herengui@uniontech.com> - 1.7.3-11
 - Fix: fix issue that change language in deepin-control-center cannot affect the fcitx