From 192fafe9e15f275dfa8658dfd7488d6674754cbb0d25cedd1e8c4e1283a19a7a Mon Sep 17 00:00:00 2001 From: Fuminobu Takeyama Date: Tue, 23 Aug 2022 14:27:26 +0000 Subject: [PATCH] Accepting request 998856 from home:ftake:branches:M17N - Fix ibus-setup to support python3 (boo#1202063) * Update setup-switch-im.patch - Remove X-GNOME-* from ibus-autostart.desktop (boo#1201421, boo#1201728) * ibus-autostart still does not work with systemd-xdg-autostart-generator OBS-URL: https://build.opensuse.org/request/show/998856 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=267 --- ibus-autostart.desktop | 3 --- ibus.changes | 10 ++++++++++ setup-switch-im.patch | 14 ++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ibus-autostart.desktop b/ibus-autostart.desktop index 572baec..9c10234 100644 --- a/ibus-autostart.desktop +++ b/ibus-autostart.desktop @@ -8,8 +8,5 @@ Terminal=false Type=Application StartupNotify=false NoDisplay=true -X-GNOME-Autostart-Phase=Applications -X-GNOME-AutoRestart=false -X-GNOME-Autostart-Notify=false X-KDE-autostart-after=panel X-KDE-StartupNotify=false diff --git a/ibus.changes b/ibus.changes index dd776bf..b045495 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 22 13:37:53 UTC 2022 - Fuminobu Takeyama + +- Fix ibus-setup to support python3 (boo#1202063) + * Update setup-switch-im.patch +- Remove X-GNOME-* from ibus-autostart.desktop + (boo#1201421, boo#1201728) + * ibus-autostart still does not work with + systemd-xdg-autostart-generator + ------------------------------------------------------------------- Tue Apr 19 03:36:44 UTC 2022 - Yifan Jiang diff --git a/setup-switch-im.patch b/setup-switch-im.patch index 72dc4f2..7474d65 100644 --- a/setup-switch-im.patch +++ b/setup-switch-im.patch @@ -1,6 +1,5 @@ -diff -Nur ibus-1.5.25/setup/main.py ibus-1.5.25-new/setup/main.py ---- ibus-1.5.25/setup/main.py 2021-08-20 08:48:40.000000000 +0800 -+++ ibus-1.5.25-new/setup/main.py 2021-09-06 20:54:06.205651597 +0800 +--- ibus-1.5.26/setup/main.py.org 2022-03-14 14:15:48.000000000 +0900 ++++ ibus-1.5.26/setup/main.py 2022-08-21 23:04:59.698814168 +0900 @@ -508,11 +508,16 @@ self.__engine_setup_exec_list[name] = os.spawnl(os.P_NOWAIT, *args) @@ -19,7 +18,7 @@ diff -Nur ibus-1.5.25/setup/main.py ibus-1.5.25-new/setup/main.py dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.QUESTION, buttons = Gtk.ButtonsType.YES_NO, text = message) -@@ -522,39 +527,12 @@ +@@ -522,39 +527,11 @@ if id != Gtk.ResponseType.YES: sys.exit(0) @@ -57,10 +56,9 @@ diff -Nur ibus-1.5.25/setup/main.py ibus-1.5.25-new/setup/main.py - self.__flush_gtk_events() - sys.exit(0) + filename = os.path.join(usr_home, filename) -+ f=file(filename,"w+") -+ cmd = 'export INPUT_METHOD=\"' + method_name + '\"' -+ f.writelines(cmd) -+ f.close() ++ with open(filename, "w+") as f: ++ cmd = 'export INPUT_METHOD=\"' + method_name + '\"' ++ f.writelines(cmd) + sys.exit(0) def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):