diff --git a/deepin-fcitxconfigtool-plugin-4.2.3.tar.xz b/deepin-fcitxconfigtool-plugin-4.2.3.tar.xz deleted file mode 100644 index 716c48f8a304094bbfd29bcac24dcfdcaa3430f9..0000000000000000000000000000000000000000 Binary files a/deepin-fcitxconfigtool-plugin-4.2.3.tar.xz and /dev/null differ diff --git a/deepin-fcitxconfigtool-plugin-4.2.63.tar.xz b/deepin-fcitxconfigtool-plugin-4.2.63.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..7f24e7c75131a63fc444eedb37cf1d0cf892219e Binary files /dev/null and b/deepin-fcitxconfigtool-plugin-4.2.63.tar.xz differ diff --git a/deepin-fcitxconfigtool-plugin.spec b/deepin-fcitxconfigtool-plugin.spec index 204b44a94a1786e913da4146ca788777a770a178..5acf05e7081f09fdeff03ee93a3080a3234a9810 100644 --- a/deepin-fcitxconfigtool-plugin.spec +++ b/deepin-fcitxconfigtool-plugin.spec @@ -4,14 +4,16 @@ %{!?gtk2_binary_version: %global gtk2_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)} %{!?gtk3_binary_version: %global gtk3_binary_version %(pkg-config --variable=gtk_binary_version gtk+-3.0)} -Name: deepin-fcitxconfigtool-plugin -Summary: An input method framework -Version: 4.2.3 -Release: 3%{?dist} -License: GPLv2+ -URL: https://fcitx-im.org/wiki/Fcitx -Source0: %{name}-%{version}.tar.xz -Patch0: 0001-fix-195690-to-shield-partial-input_method.patch +Name: deepin-fcitxconfigtool-plugin +Summary: An input method framework +Version: 4.2.63 +Release: 1%{?dist}.02 +License: GPLv2+ +URL: https://fcitx-im.org/wiki/Fcitx +Source0: %{name}-%{version}.tar.xz +#add for uos +Patch0: fix-195690-to-shield-partial-input_method.patch + BuildRequires: gcc-c++ BuildRequires: pango-devel, dbus-devel %if 0%{?rhel} < 8 @@ -41,6 +43,10 @@ BuildRequires: qt5-qtbase-gui BuildRequires: qt5-qtbase BuildRequires: dde-qt-dbus-factory-devel BuildRequires: dtkcommon-devel +BuildRequires: extra-cmake-modules +BuildRequires: kf5-ki18n-devel +BuildRequires: gsettings-qt-devel +BuildRequires: dde-control-center %description Fcitx is an input method framework with extension support. Currently it @@ -58,8 +64,9 @@ Requires: fcitx The %{name} package provides fcitx-config-tools and multilanguages translations %prep - %setup -q +%patch0 -p1 +sed -i 's|"/usr/lib/dde-control-center"|#"/usr/lib/dde-control-center"|' src/CMakeLists.txt tests/CMakeLists.txt %build mkdir -p build @@ -78,17 +85,24 @@ make %{?_smp_mflags} -C build %files %doc README.md %license -%{_exec_prefix}/* +#%%{_exec_prefix}/* +%{_bindir}/fcitx-helper +%{_datadir}/%{name}/translations/*.qm +%{_datadir}/glib-2.0/schemas/com.deepin.fcitx-config.gschema.xml /lib/* %exclude %{_sysconfdir}/* %changelog -* Tue May 09 2023 leeffo - 4.2.3-3 -- fix 195690 to shield partial input_method +* Fri May 5 2023 zhangxianting - 4.2.63-1.02 +- fix: shielded partial input_method(bugid:195690) + +* Tue Jan 17 2023 liweiganga - 4.2.63-1.01 +- spec: modify bin path + +* Wed Jan 11 2023 liweiganga - 4.2.63-1 +- update: update to 4.2.63 -* Thu Jul 21 2022 liuxingwei liuxingwei@uniontech.com - 4.2.3-2 -- rebuild for an8.6 +* Mon Jun 13 2022 uoser - 4.2.3-1.01 +- update: update to 4.2.3-1.01 -* Mon Oct 25 2021 mahailiang - 4.2.3-1 -- init 4.2.3 diff --git a/0001-fix-195690-to-shield-partial-input_method.patch b/fix-195690-to-shield-partial-input_method.patch similarity index 32% rename from 0001-fix-195690-to-shield-partial-input_method.patch rename to fix-195690-to-shield-partial-input_method.patch index a35debd065120a44e4586a55afe05284c81d49a1..23da18b29cf48632fa2ea377d5e528c33ab65148 100644 --- a/0001-fix-195690-to-shield-partial-input_method.patch +++ b/fix-195690-to-shield-partial-input_method.patch @@ -1,28 +1,29 @@ -From 602732d54aa3ae6311f853b887bad29647b390e1 Mon Sep 17 00:00:00 2001 -From: leeffo -Date: Tue, 9 May 2023 15:21:34 +0800 +From 88c4b0d4daf2337f31ae42e8ca498b2cb444d808 Mon Sep 17 00:00:00 2001 +From: zhangxianting +Date: Fri, 5 May 2023 13:31:51 +0800 Subject: [PATCH] fix 195690 to shield partial input_method +Change-Id: Iba53cb5ddc2ce1fcebb73bff41bdaff6972475df --- - src/window/immodel/immodel.cpp | 5 ++++- + .../src/window/immodel/immodel.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/src/window/immodel/immodel.cpp b/src/window/immodel/immodel.cpp -index bf48fa6..ba60e73 100644 +diff --git a/BUILD/deepin-fcitxconfigtool-plugin-4.2.63/src/window/immodel/immodel.cpp b/BUILD/deepin-fcitxconfigtool-plugin-4.2.63/src/window/immodel/immodel.cpp +index e845aa8..d5b3e0a 100644 --- a/src/window/immodel/immodel.cpp +++ b/src/window/immodel/immodel.cpp -@@ -117,7 +117,10 @@ void IMModel::onUpdateIMList() - // } - // } +@@ -115,7 +115,10 @@ void IMModel::onUpdateIMList() + qDebug() << "input method proxy exist:" << Global::instance()->inputMethodProxy(); + qDebug() << "fcitx return IM list size:" << list.size(); - Q_FOREACH (const FcitxQtInputMethodItem &im, list) { + Q_FOREACH (FcitxQtInputMethodItem im, list) { -+ if(im.langCode() == "xsy" || im.langCode == "ami"){ -+ continue; ++ if(im.langCode() == "xsy" || im.langCode() == "ami"){ ++ continue; + } im.enabled() ? curList.append(im) : availList.append(im); + if (im.enabled()) qDebug() << __FUNCTION__ << ": add im to current list:" << im.name(); } - -- -2.20.1 +2.31.1