pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 998856 from home:ftake:branches:M17N

Browse Source 
- 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
This commit is contained in:
Fuminobu Takeyama 2022-08-23 14:27:26 +00:00 committed by Git OBS Bridge
parent c0acfe2979
commit 192fafe9e1
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ibus-autostart.desktop
View File

@ -8,8 +8,5 @@ Terminal=false
Type=Application Type=Application
StartupNotify=false StartupNotify=false
NoDisplay=true NoDisplay=true
X-GNOME-Autostart-Phase=Applications
X-GNOME-AutoRestart=false
X-GNOME-Autostart-Notify=false
X-KDE-autostart-after=panel X-KDE-autostart-after=panel
X-KDE-StartupNotify=false X-KDE-StartupNotify=false

10
ibus.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Aug 22 13:37:53 UTC 2022 - Fuminobu Takeyama <ftake@geeko.jp>
- 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 <yfjiang@suse.com> Tue Apr 19 03:36:44 UTC 2022 - Yifan Jiang <yfjiang@suse.com>

10
setup-switch-im.patch
View File

@ -1,6 +1,5 @@
diff -Nur ibus-1.5.25/setup/main.py ibus-1.5.25-new/setup/main.py --- ibus-1.5.26/setup/main.py.org 2022-03-14 14:15:48.000000000 +0900
--- ibus-1.5.25/setup/main.py 2021-08-20 08:48:40.000000000 +0800 +++ ibus-1.5.26/setup/main.py 2022-08-21 23:04:59.698814168 +0900
+++ ibus-1.5.25-new/setup/main.py 2021-09-06 20:54:06.205651597 +0800
@@ -508,11 +508,16 @@ @@ -508,11 +508,16 @@
self.__engine_setup_exec_list[name] = os.spawnl(os.P_NOWAIT, *args) 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, dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.QUESTION,
buttons = Gtk.ButtonsType.YES_NO, buttons = Gtk.ButtonsType.YES_NO,
text = message) text = message)
@@ -522,39 +527,12 @@ @@ -522,39 +527,11 @@
if id != Gtk.ResponseType.YES: if id != Gtk.ResponseType.YES:
sys.exit(0) 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() - self.__flush_gtk_events()
- sys.exit(0) - sys.exit(0)
+ filename = os.path.join(usr_home, filename) + filename = os.path.join(usr_home, filename)
+ f=file(filename,"w+") + with open(filename, "w+") as f:
+ cmd = 'export INPUT_METHOD=\"' + method_name + '\"' + cmd = 'export INPUT_METHOD=\"' + method_name + '\"'
+ f.writelines(cmd) + f.writelines(cmd)
+ f.close()
+ sys.exit(0) + sys.exit(0)
def __shortcut_button_clicked_cb(self, button, name, section, _name, entry): def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):