From a77306838c21b65224329b191f195d8c62783281 Mon Sep 17 00:00:00 2001 From: caixiangrong Date: Thu, 5 Dec 2024 16:42:54 +0800 Subject: [PATCH] fix: Processing Deepin25 Jump Control Center Processing Deepin25 Jump Control Center Log: pms: TASK-361721 --- debian/changelog | 6 ++++++ ...ens-dde-control-center-when-using-deepin25.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 20 insertions(+) create mode 100644 debian/patches/0009-configtool-opens-dde-control-center-when-using-deepin25.patch diff --git a/debian/changelog b/debian/changelog index 1f468936..dbd13f45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fcitx5 (5.1.10-1deepin7) unstable; urgency=medium + + * Processing Deepin25 Jump Control Center + + -- caixiangrong Thu, 05 Dec 2024 16:35:43 +0800 + fcitx5 (5.1.10-1deepin6) unstable; urgency=medium * add enable autostart diff --git a/debian/patches/0009-configtool-opens-dde-control-center-when-using-deepin25.patch b/debian/patches/0009-configtool-opens-dde-control-center-when-using-deepin25.patch new file mode 100644 index 00000000..7f28afd8 --- /dev/null +++ b/debian/patches/0009-configtool-opens-dde-control-center-when-using-deepin25.patch @@ -0,0 +1,13 @@ +Index: fc/data/fcitx5-configtool.sh +=================================================================== +--- fc.orig/data/fcitx5-configtool.sh ++++ fc/data/fcitx5-configtool.sh +@@ -135,7 +135,7 @@ run_dde() { + local dbus_interface="org.deepin.dde.ControlCenter1" + local dcc_module="keyboard/Manage Input Methods" + +- if dbus-send --print-reply=literal --dest=$dbus_service $dbus_path $dbus_interface.GetAllModule 2>> /dev/null | jq --arg url "$dcc_module" -Rse 'fromjson? // error("Bad input") | any(.url == $url)' >> /dev/null 2>&1; then ++ if dbus-send --print-reply=literal --dest=$dbus_service $dbus_path $dbus_interface.GetAllModule 2>> /dev/null | grep -q "$dcc_module" >> /dev/null 2>&1; then + exec dbus-send --print-reply=literal --dest=$dbus_service $dbus_path $dbus_interface.ShowPage string:"$dcc_module" + fi + return 1 diff --git a/debian/patches/series b/debian/patches/series index d2bdefc2..fe73b06f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0006-Revert-disable-ctrl-shift-enumerate-key-by-default.patch 0007-Add-Sogou-to-the-default-zh_CN-input-method-list.patch 0008-fix-remove-the-restart-icon.patch +0009-configtool-opens-dde-control-center-when-using-deepin25.patch