From c234992d6dfbaa49573a4451a2f74127686cedbec388f16477c29904b8cbedd0 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Thu, 2 Mar 2017 00:37:12 +0000 Subject: [PATCH 1/3] Accepting request 461649 from home:dimstar:Factory - Add ibus-vala-0.36.patch: Fix build with vala 0.36, which is stricter in its binding usage. Patch only respective vala versions. OBS-URL: https://build.opensuse.org/request/show/461649 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=158 --- ibus-vala-0.36.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++ ibus.changes | 7 +++++ ibus.spec | 7 ++++- 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 ibus-vala-0.36.patch diff --git a/ibus-vala-0.36.patch b/ibus-vala-0.36.patch new file mode 100644 index 0000000..00fd895 --- /dev/null +++ b/ibus-vala-0.36.patch @@ -0,0 +1,62 @@ +diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala +index dac72b49..7da0fa92 100644 +--- a/ui/gtk3/indicator.vala ++++ b/ui/gtk3/indicator.vala +@@ -139,12 +139,17 @@ class Indicator : IBus.Service + m_watcher_interface_info = + m_watcher_node_info.lookup_interface( + NOTIFICATION_WATCHER_DBUS_IFACE); +- check_connect(); ++ try { ++ check_connect(); ++ } catch (GLib.IOError e) { ++ warning("Failed to call dbus proxy: " + e.message); ++ return; ++ } + } + +- private void check_connect() { ++ private async void check_connect() throws IOError { + if (m_proxy == null) { +- GLib.DBusProxy.new.begin( ++ m_proxy = yield new GLib.DBusProxy( + connection, + GLib.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES | + GLib.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, +@@ -152,23 +157,7 @@ class Indicator : IBus.Service + NOTIFICATION_WATCHER_DBUS_ADDR, + NOTIFICATION_WATCHER_DBUS_OBJ, + NOTIFICATION_WATCHER_DBUS_IFACE, +- null, +- (obj, res) => { +- bus_watcher_ready(obj, res); +- }); +- } else { +- bus_watcher_ready(null, null); +- } +- } +- +- private void bus_watcher_ready(GLib.Object? obj, GLib.AsyncResult? res) { +- if (res != null) { +- try { +- m_proxy = GLib.DBusProxy.new.end(res); +- } catch (GLib.IOError e) { +- warning("Failed to call dbus proxy: " + e.message); +- return; +- } ++ null); + + m_proxy.notify["g-name-owner"].connect((obj, pspec) => { + var name = m_proxy.get_name_owner(); +@@ -176,7 +165,10 @@ class Indicator : IBus.Service + check_connect(); + }); + } ++ bus_watcher_ready(); ++ } + ++ private void bus_watcher_ready() { + var name = m_proxy.get_name_owner(); + // KDE panel does not run yet if name == null + if (name == null) + diff --git a/ibus.changes b/ibus.changes index 05dd4aa..516a8e9 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 1 13:16:08 UTC 2017 - dimstar@opensuse.org + +- Add ibus-vala-0.36.patch: Fix build with vala 0.36, which is + stricter in its binding usage. Patch only respective vala + versions. + ------------------------------------------------------------------- Wed Dec 28 15:04:47 UTC 2016 - hillwood@opensuse.org diff --git a/ibus.spec b/ibus.spec index 31329e8..a7b7983 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,7 +1,7 @@ # # spec file for package ibus # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -73,6 +73,8 @@ Patch10: hide-setup-menu.patch # PATCH-FIX-SLE setup-switch-im.patch bnc#899259 qzhao@suse.com # switch to ibus when ibus not running. Patch11: setup-switch-im.patch +# PATCH-FIX-UPSTREAM ibus-vala-0.36.patch dimstar@opensuse.org -- Fix build with vala 0.36 +Patch12: ibus-vala-0.36.patch BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-python-devel >= 0.83.0 BuildRequires: dconf-devel >= 0.7.5 @@ -262,6 +264,9 @@ sed -i \ %patch10 -p1 %patch11 -p1 %endif +if pkg-config --atleast-version 0.35 vapigen; then +%patch12 -p1 +fi cp -r %{SOURCE2} . cp -r %{SOURCE3} . From 0f7652127924b060be5b5054e1467d2d980409e669625baae3fe5b42abe3cb3e Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Thu, 9 Mar 2017 12:05:55 +0000 Subject: [PATCH 2/3] Accepting request 477849 from home:Zaitor:branches:GNOME:Factory Drop obsolete patch, no current version of openSUSE are using that version of vala anymore. OBS-URL: https://build.opensuse.org/request/show/477849 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=159 --- ibus-vala-0.18.patch | 13 ------------- ibus.changes | 5 +++++ ibus.spec | 4 ---- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 ibus-vala-0.18.patch diff --git a/ibus-vala-0.18.patch b/ibus-vala-0.18.patch deleted file mode 100644 index 1f1f395..0000000 --- a/ibus-vala-0.18.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ibus-1.5.8/configure.ac -=================================================================== ---- ibus-1.5.8.orig/configure.ac -+++ ibus-1.5.8/configure.ac -@@ -125,7 +125,7 @@ AC_SUBST(DATE_DISPLAY) - AC_PROG_CC - AM_PROG_CC_C_O - AC_PROG_CC_STDC --AM_PROG_VALAC([0.20]) -+AM_PROG_VALAC([0.18]) - AC_PROG_INSTALL - AC_PROG_MAKE_SET - diff --git a/ibus.changes b/ibus.changes index 516a8e9..f4f03c1 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 1 14:25:29 UTC 2017 - zaitor@opensuse.org + +- Drop ibus-vala-0.18.patch: No longer needed. + ------------------------------------------------------------------- Wed Mar 1 13:16:08 UTC 2017 - dimstar@opensuse.org diff --git a/ibus.spec b/ibus.spec index a7b7983..8a1ddae 100644 --- a/ibus.spec +++ b/ibus.spec @@ -58,9 +58,6 @@ Patch4: ibus-xim-fix-re-focus-after-lock.patch # is enabled, and fix syntax errors in python-config.py Patch5: ibus-force-python3.patch # PATCH-FIX-UPSTREAM marguerite@opensuse.org -# lower vala version -Patch6: ibus-vala-0.18.patch -# PATCH-FIX-UPSTREAM marguerite@opensuse.org Patch7: ibus-python3-migration.patch # PATCH-FIX-UPSTREAM ftake@geeko.jp # Select an IM engine at the first login @@ -243,7 +240,6 @@ docs for ibus. # hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860) %if 0%{?suse_version} < 1310 -%patch6 -p1 sed -i \ -e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 > %{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \ -e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > %{_sysconfdir}/gtk-2.0/gtk.immodules@g' \ From 655095f7d313f471d2033093c62e7e1202b0e79878d5bbd73dba1994bb962b72 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Mon, 13 Mar 2017 13:17:53 +0000 Subject: [PATCH 3/3] Accepting request 478843 from GNOME:Next - Drop ibus-vala-0.36.patch: No longer needed, since vala 0.36 re-introduced the compatibility layer. OBS-URL: https://build.opensuse.org/request/show/478843 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=160 --- ibus-vala-0.36.patch | 62 -------------------------------------------- ibus.changes | 6 +++++ ibus.spec | 5 ---- 3 files changed, 6 insertions(+), 67 deletions(-) delete mode 100644 ibus-vala-0.36.patch diff --git a/ibus-vala-0.36.patch b/ibus-vala-0.36.patch deleted file mode 100644 index 00fd895..0000000 --- a/ibus-vala-0.36.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala -index dac72b49..7da0fa92 100644 ---- a/ui/gtk3/indicator.vala -+++ b/ui/gtk3/indicator.vala -@@ -139,12 +139,17 @@ class Indicator : IBus.Service - m_watcher_interface_info = - m_watcher_node_info.lookup_interface( - NOTIFICATION_WATCHER_DBUS_IFACE); -- check_connect(); -+ try { -+ check_connect(); -+ } catch (GLib.IOError e) { -+ warning("Failed to call dbus proxy: " + e.message); -+ return; -+ } - } - -- private void check_connect() { -+ private async void check_connect() throws IOError { - if (m_proxy == null) { -- GLib.DBusProxy.new.begin( -+ m_proxy = yield new GLib.DBusProxy( - connection, - GLib.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES | - GLib.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, -@@ -152,23 +157,7 @@ class Indicator : IBus.Service - NOTIFICATION_WATCHER_DBUS_ADDR, - NOTIFICATION_WATCHER_DBUS_OBJ, - NOTIFICATION_WATCHER_DBUS_IFACE, -- null, -- (obj, res) => { -- bus_watcher_ready(obj, res); -- }); -- } else { -- bus_watcher_ready(null, null); -- } -- } -- -- private void bus_watcher_ready(GLib.Object? obj, GLib.AsyncResult? res) { -- if (res != null) { -- try { -- m_proxy = GLib.DBusProxy.new.end(res); -- } catch (GLib.IOError e) { -- warning("Failed to call dbus proxy: " + e.message); -- return; -- } -+ null); - - m_proxy.notify["g-name-owner"].connect((obj, pspec) => { - var name = m_proxy.get_name_owner(); -@@ -176,7 +165,10 @@ class Indicator : IBus.Service - check_connect(); - }); - } -+ bus_watcher_ready(); -+ } - -+ private void bus_watcher_ready() { - var name = m_proxy.get_name_owner(); - // KDE panel does not run yet if name == null - if (name == null) - diff --git a/ibus.changes b/ibus.changes index f4f03c1..cfe41d8 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 12 14:41:40 UTC 2017 - dimstar@opensuse.org + +- Drop ibus-vala-0.36.patch: No longer needed, since vala 0.36 + re-introduced the compatibility layer. + ------------------------------------------------------------------- Wed Mar 1 14:25:29 UTC 2017 - zaitor@opensuse.org diff --git a/ibus.spec b/ibus.spec index 8a1ddae..928373f 100644 --- a/ibus.spec +++ b/ibus.spec @@ -70,8 +70,6 @@ Patch10: hide-setup-menu.patch # PATCH-FIX-SLE setup-switch-im.patch bnc#899259 qzhao@suse.com # switch to ibus when ibus not running. Patch11: setup-switch-im.patch -# PATCH-FIX-UPSTREAM ibus-vala-0.36.patch dimstar@opensuse.org -- Fix build with vala 0.36 -Patch12: ibus-vala-0.36.patch BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-python-devel >= 0.83.0 BuildRequires: dconf-devel >= 0.7.5 @@ -260,9 +258,6 @@ sed -i \ %patch10 -p1 %patch11 -p1 %endif -if pkg-config --atleast-version 0.35 vapigen; then -%patch12 -p1 -fi cp -r %{SOURCE2} . cp -r %{SOURCE3} .