diff --git a/0001-hide-button-Find-more-in-App-Store.patch b/0001-fix-bug-248411.patch similarity index 31% rename from 0001-hide-button-Find-more-in-App-Store.patch rename to 0001-fix-bug-248411.patch index 588f23f2cad67ae88f6f06e005f7cb35b08cddff..8fd91931bf5f05e983ec6b5b1d2d2b0d70721a38 100644 --- a/0001-hide-button-Find-more-in-App-Store.patch +++ b/0001-fix-bug-248411.patch @@ -1,25 +1,27 @@ -From dd1b9305a7479d8fe31e0870732949bac8d5ff80 Mon Sep 17 00:00:00 2001 -From: ut005731 -Date: Thu, 26 Jun 2025 13:35:42 +0800 -Subject: [PATCH] hide button Find more in App Store +From cd73d3033c67503d5e9acfb413a803c6dd901079 Mon Sep 17 00:00:00 2001 +From: liuzhilin +Date: Wed, 10 Apr 2024 13:22:12 +0800 +Subject: [PATCH] fix-bug-248411 --- - src/window/imaddwindow.cpp | 1 + - 1 file changed, 1 insertion(+) + src/window/imaddwindow.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/window/imaddwindow.cpp b/src/window/imaddwindow.cpp -index fcc5686..7863c34 100644 +index 61f97ce..28ad1a0 100644 --- a/src/window/imaddwindow.cpp +++ b/src/window/imaddwindow.cpp -@@ -79,6 +79,7 @@ void IMAddWindow::initUI() +@@ -77,8 +77,8 @@ void IMAddWindow::initUI() + //应用商店按钮 + QHBoxLayout *hlayout3 = new QHBoxLayout(this); hlayout3->addStretch(); - m_storeBtn = new DCommandLinkButton(tr("Find more in App Store"), this); - m_storeBtn->setAccessibleName("Find more in App Store"); -+ m_storeBtn->hide(); +- m_storeBtn = new DCommandLinkButton(tr("Find more in App Store"), this); +- m_storeBtn->setAccessibleName("Find more in App Store"); ++ m_storeBtn = new DCommandLinkButton(tr(""), this); ++ m_storeBtn->setAccessibleName(""); hlayout3->addWidget(m_storeBtn); hlayout3->addSpacing(10); //添加 取消按钮 -- -2.41.0 - +2.39.3 diff --git a/deepin-fcitxconfigtool-plugin-4.2.63.tar.xz b/deepin-fcitxconfigtool-plugin-4.2.63.tar.xz deleted file mode 100644 index 7f24e7c75131a63fc444eedb37cf1d0cf892219e..0000000000000000000000000000000000000000 Binary files a/deepin-fcitxconfigtool-plugin-4.2.63.tar.xz and /dev/null differ diff --git a/deepin-fcitxconfigtool-plugin.spec b/deepin-fcitxconfigtool-plugin.spec index 99b9c8213dfeee774fa1a100e22c76ea34bd6615..7a323cd97821b7b502b53bee859d25bee166ce55 100644 --- a/deepin-fcitxconfigtool-plugin.spec +++ b/deepin-fcitxconfigtool-plugin.spec @@ -1,6 +1,3 @@ -%define anolis_release 4 -%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} - %global _enable_debug_package 0 %global debug_package %{nil} %global __os_install_post /usr/lib/rpm/brp-compress %{nil} @@ -9,14 +6,15 @@ Name: deepin-fcitxconfigtool-plugin Summary: An input method framework -Version: 4.2.63 -Release: 1.%{anolis_release}%{?dist} -License: GPLv2+ +Version: 4.2.75.7 +Release: 1%{?dist} +License: GPL-3.0-or-later URL: https://fcitx-im.org/wiki/Fcitx -Source0: %{name}-%{version}.tar.xz +Source0: deepin-fcitxconfigtool-plugin_4.2.75.7.orig.tar.xz #add for uos Patch0: fix-195690-to-shield-partial-input_method.patch -Patch1: 0001-hide-button-Find-more-in-App-Store.patch +Patch1: 0001-fix-bug-248411.patch +Patch2: update-license.patch BuildRequires: gcc-c++ BuildRequires: pango-devel, dbus-devel @@ -52,6 +50,8 @@ BuildRequires: kf5-ki18n-devel BuildRequires: gsettings-qt-devel BuildRequires: dde-control-center +Requires: dde-common >= 2026 + %description Fcitx is an input method framework with extension support. Currently it supports Linux and Unix systems like FreeBSD. @@ -71,6 +71,7 @@ The %{name} package provides fcitx-config-tools and multilanguages translations %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i 's|"/usr/lib/dde-control-center"|#"/usr/lib/dde-control-center"|' src/CMakeLists.txt tests/CMakeLists.txt %build @@ -99,17 +100,17 @@ make %{?_smp_mflags} -C build/%{_vpath_builddir} %exclude %{_sysconfdir}/* %changelog -* Mon Jun 23 2025 zhuhongbo - 4.2.63-1.4 -- fix: hide button Find more in App Store +* Fri Dec 19 2025 liweigang - 4.2.75.7-1 +- update: update to version 4.2.75.7 -* Tue Nov 07 2023 yangxianzhao - 4.2.63-1.3 -- rebuild for qt +* Tue Aug 19 2025 lichao - 4.2.67-1.02 +- update: update license -* Thu Nov 02 2023 yangxianzhao - 4.2.63-1.02.2 -- fix build error +* Wed Apr 10 2024 liuzhilin - 4.2.67-1.01 +- fix: delete go to the app store to add fonts(bugid:248411) -* Mon Aug 28 2023 yangxianzhao - 4.2.63-1.02.1 -- Specification spec file +* Thu Aug 10 2023 liuzhilin - 4.2.67-1 +- update: update to 4.2.67 and sync fix bugid-195690 * Fri May 5 2023 zhangxianting - 4.2.63-1.02 - fix: shielded partial input_method(bugid:195690) diff --git a/deepin-fcitxconfigtool-plugin_4.2.75.7.orig.tar.xz b/deepin-fcitxconfigtool-plugin_4.2.75.7.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..f37c51eb917f4e9415b6c2f8fd3ccc70129a6ba8 Binary files /dev/null and b/deepin-fcitxconfigtool-plugin_4.2.75.7.orig.tar.xz differ diff --git a/update-license.patch b/update-license.patch new file mode 100644 index 0000000000000000000000000000000000000000..4d4a3781f5957b63040e5e5acc00e43ed6b4571f --- /dev/null +++ b/update-license.patch @@ -0,0 +1,12 @@ +diff -Nuar deepin-fcitxconfigtool-plugin-4.2.67/rpm/deepin-fcitxconfigtool-plugin.spec deepin-fcitxconfigtool-plugin-4.2.67.new/rpm/deepin-fcitxconfigtool-plugin.spec +--- deepin-fcitxconfigtool-plugin-4.2.67/rpm/deepin-fcitxconfigtool-plugin.spec 2023-08-10 14:37:12.000000000 +0800 ++++ deepin-fcitxconfigtool-plugin-4.2.67.new/rpm/deepin-fcitxconfigtool-plugin.spec 2025-08-19 15:28:13.532107301 +0800 +@@ -8,7 +8,7 @@ + Summary: An input method framework + Version: 0.1.17 + Release: 1%{?dist} +-License: GPLv2+ ++License: GPL-3.0-or-later + URL: https://fcitx-im.org/wiki/Fcitx + Source0: %{name}-%{version}.tar.xz + BuildRequires: gcc-c++