!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
+
+

fix-changed_lang_in_dcc_not_affecting_fcitx.patch

@@ -0,0 +1,35 @@
+From 94e4b6dde1c1a4921d099f18ba23787c74ca3774 Mon Sep 17 00:00:00 2001
+From: He Rengui <herengui@uniontech.com>
+Date: Tue, 27 Jul 2021 19:33:29 +0800
+Subject: [PATCH] fix issue that changed language in dde-control-center but not
+ affecting fcitx process
+
+Signed-off-by: He Rengui <herengui@uniontech.com>
+---
+ imsettings-daemon/imsettings-proc.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c
+index b78fcff..b29fcd1 100644
+--- a/imsettings-daemon/imsettings-proc.c
++++ b/imsettings-daemon/imsettings-proc.c
+@@ -319,6 +320,8 @@ _start_process(IMSettingsProc     *proc,
+ 			"QT_IM_MODULE",
+ 			"XMODIFIERS",
+ 			"XDG_CURRENT_DESKTOP",
++			"LANGUAGE",
++			"LANG",
+ 			NULL
+ 		};
+ 		gsize len, i, j, k;
+@@ -348,6 +351,7 @@ _start_process(IMSettingsProc     *proc,
+ 		}
+ 		if (lang) {
+ 			envp[j++] = g_strdup_printf("LC_CTYPE=%s", lang);
++			envp[j++] = g_strdup_printf("LANG=%s", lang);
+ 		}
+ 		/* set environment variables explicitly to ensure
+ 		 * any processes being brought up from the IM process
+-- 
+2.20.1
+

fix-journal_missing_chinese.patch

@@ -0,0 +1,14 @@
+diff --git a/imsettings-daemon/main.c b/imsettings-daemon/main.c
+index f72b822..254e683 100644
+--- a/imsettings-daemon/main.c
++++ b/imsettings-daemon/main.c
+@@ -175,7 +175,8 @@ main(int argc, char **argv)
+ 		     NULL);
+ 	loop_in_object = g_quark_from_static_string("imsettings-daemon-loop");
+ 	g_object_set_qdata(G_OBJECT (server), loop_in_object, loop);
+-
++	// Set language
++	setlocale(LC_ALL, "");
+ 	imsettings_server_start(server, arg_replace);
+ 	g_main_loop_run(loop);
+ 

imsetting-fix-compile-error-sinal-multi-defined.patch

@@ -0,0 +1,39 @@
+From 2afb5e7516406d6147f5469e7f3482d61b6bb3df Mon Sep 17 00:00:00 2001
+From: root <root@localhost.localdomain>
+Date: Fri, 20 Aug 2021 14:43:12 +0800
+Subject: [PATCH] fix compile error sinal multi defined
+
+---
+ imsettings-daemon/imsettings-proc.c   | 2 +-
+ imsettings-daemon/imsettings-server.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c
+index b78fcff..25c461a 100644
+--- a/imsettings-daemon/imsettings-proc.c
++++ b/imsettings-daemon/imsettings-proc.c
+@@ -86,7 +86,7 @@ static gboolean _stop_process                (IMSettingsProc     *proc,
+ 
+ G_DEFINE_TYPE (IMSettingsProc, imsettings_proc, G_TYPE_OBJECT);
+ 
+-guint signals[LAST_SIGNAL] = { 0 };
++static guint signals[LAST_SIGNAL] = { 0 };
+ 
+ /*< private >*/
+ static gboolean
+diff --git a/imsettings-daemon/imsettings-server.c b/imsettings-daemon/imsettings-server.c
+index 1b97548..db9df37 100644
+--- a/imsettings-daemon/imsettings-server.c
++++ b/imsettings-daemon/imsettings-server.c
+@@ -93,7 +93,7 @@ GDBusInterfaceVTable __iface_vtable = {
+ 	NULL,
+ 	NULL,
+ };
+-guint signals[LAST_SIGNAL];
++static guint signals[LAST_SIGNAL];
+ 
+ G_DEFINE_TYPE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT);
+ G_LOCK_DEFINE_STATIC (logger);
+-- 
+2.27.0
+

imsettings.spec

@@ -1,6 +1,6 @@
 Name:             imsettings
 Version:          1.7.3
-Release:          8
+Release:          12
 License:          LGPLv2.1
 Summary:          Delivery framework for general Input Method configuration
 URL:              https://bitbucket.org/tagoh/imsettings/src/master/
@@ -10,7 +10,11 @@ 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
+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
@@ -143,6 +147,20 @@ 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
+- Bug: #I47HF0
+
+* Fri Aug 27 2021 herengui <herengui@uniontech.com> - 1.7.3-10
+- fix issue that chinese characters missing in the journal
+- Bug: #I47HD9
+
+* Fri Aug 20 2021 tanyulong <tanyulong@kylinos.cn> - 1.7.3-9
+-  fix compile error sinal multi defined
+
 * Fri Mar 12 2021 weidong <weidong@uniontech.com> - 1.7.3-8
 - fix can't input chinese in en environment