From ad9dd051ca65c32b3ce27c209d1087d220ba0777 Mon Sep 17 00:00:00 2001 From: herengui Date: Fri, 27 Aug 2021 13:27:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=BD=B1=E5=93=8D=E8=BE=93=E5=85=A5=E6=B3=95=E5=8F=B3?= =?UTF-8?q?=E9=94=AE=E8=8F=9C=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: herengui --- ...nged_lang_in_dcc_not_affecting_fcitx.patch | 35 +++++++++++++++++++ imsettings.spec | 9 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 fix-changed_lang_in_dcc_not_affecting_fcitx.patch diff --git a/fix-changed_lang_in_dcc_not_affecting_fcitx.patch b/fix-changed_lang_in_dcc_not_affecting_fcitx.patch new file mode 100644 index 0000000..aa7eff3 --- /dev/null +++ b/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 +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 +--- + 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 + diff --git a/imsettings.spec b/imsettings.spec index 0213879..f5cf501 100644 --- a/imsettings.spec +++ b/imsettings.spec @@ -1,6 +1,6 @@ Name: imsettings Version: 1.7.3 -Release: 10 +Release: 11 License: LGPLv2.1 Summary: Delivery framework for general Input Method configuration URL: https://bitbucket.org/tagoh/imsettings/src/master/ @@ -13,6 +13,7 @@ Patch0004: imsettings-fix-unbound-var.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 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 @@ -145,8 +146,14 @@ fi %{_libdir}/imsettings/libimsettings-qt.so %changelog + +* Fri Aug 27 2021 herengui - 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 - 1.7.3-10 - fix issue that chinese characters missing in the journal +- Bug: #I47HD9 * Fri Aug 20 2021 tanyulong - 1.7.3-9 - fix compile error sinal multi defined