From 75226481d13c9ffb7fc77dd4d41488be7c1e7d484fd67458e0d7f9f1ead638d0 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sun, 23 Feb 2020 05:11:15 +0000 Subject: [PATCH] Accepting request 778468 from home:hillwood:branches:M17N * Fix boo#1149065 - Add ibus-fix-Signal-does-not-exist.patch. Fix build on Leap 15.1 and below OBS-URL: https://build.opensuse.org/request/show/778468 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=220 --- ibus-fix-Signal-does-not-exist.patch | 12 ++++++++++++ ibus.changes | 2 ++ ibus.spec | 6 ++++++ 3 files changed, 20 insertions(+) create mode 100644 ibus-fix-Signal-does-not-exist.patch diff --git a/ibus-fix-Signal-does-not-exist.patch b/ibus-fix-Signal-does-not-exist.patch new file mode 100644 index 0000000..1cf4639 --- /dev/null +++ b/ibus-fix-Signal-does-not-exist.patch @@ -0,0 +1,12 @@ +diff -Nur ibus-1.5.22/ui/gtk3/panel.vala ibus-1.5.22-new/ui/gtk3/panel.vala +--- ibus-1.5.22/ui/gtk3/panel.vala 2020-02-21 20:46:17.000000000 +0800 ++++ ibus-1.5.22-new/ui/gtk3/panel.vala 2020-02-23 12:20:07.087489993 +0800 +@@ -1053,8 +1053,6 @@ + + private void show_setup_dialog() { + if (m_setup_pid != 0) { +- if (Posix.kill(m_setup_pid, Posix.Signal.USR1) == 0) +- return; + m_setup_pid = 0; + } + diff --git a/ibus.changes b/ibus.changes index 12e7b3d..b063468 100644 --- a/ibus.changes +++ b/ibus.changes @@ -8,12 +8,14 @@ Sat Feb 22 12:30:37 UTC 2020 - Hillwood Yang * Hangul button press handling * Fix deprecated APIs * Bug fixes + * Fix boo#1149065 * Fix restart crash with inotify read() (Robert Hoffmann) * Make session file header comment more clear (Jason) * Amend typos (Jason) * Add NotShowIn and Keywords keys to the desktop entry (Changwoo Ryu) * Handle small final sigma in ibus_keyval_convert_case (Alex Henrie) * Update translations. +- Add ibus-fix-Signal-does-not-exist.patch. Fix build on Leap 15.1 and below ------------------------------------------------------------------- Wed Feb 19 14:57:10 UTC 2020 - Fuminobu Takeyama diff --git a/ibus.spec b/ibus.spec index 81ddaac..fcab041 100644 --- a/ibus.spec +++ b/ibus.spec @@ -51,6 +51,9 @@ Patch4: ibus-xim-fix-re-focus-after-lock.patch # PATCH-FIX-UPSTREAM ftake@geeko.jp # Select an IM engine at the first login Patch8: im-engines-precede-xkb.patch +# PATFH-FIX-OPENSUSE ibus-fix-Signal-does-not-exist.patch hillwood@opensuse.org +# panel.vala: The name `Signal' does not exist in the context of `Posix' in Leap 15.1 and below +Patch9: ibus-fix-Signal-does-not-exist.patch # PATCH-FIX-SLE hide-setup-menu.patch bnc#899259 qzhao@suse.com # ibus-setup should not launch from main menu. Patch10: hide-setup-menu.patch @@ -188,6 +191,9 @@ docs for ibus. %patch0 -p1 %patch4 -p1 %patch8 -p1 +%if 0%{?sle_version} < 150200 && 0%{?suse_version} <=1500 +%patch9 -p1 +%endif cp -r %{SOURCE2} . cp -r %{SOURCE3} .