Hello community, here is the log from the commit of package onboard for openSUSE:Factory checked in at 2019-05-03 22:43:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/onboard (Old) and /work/SRC/openSUSE:Factory/.onboard.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "onboard" Fri May 3 22:43:47 2019 rev:3 rq:693280 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/onboard/onboard.changes 2019-03-13 16:42:34.778630990 +0100 +++ /work/SRC/openSUSE:Factory/.onboard.new.5148/onboard.changes 2019-05-03 22:43:48.887416826 +0200 @@ -1,0 +2,15 @@ +Wed Apr 10 06:55:26 UTC 2019 - Yifan Jiang <[email protected]> + +- Remove required python3-virtkey which has been not used since + 0.99: + + https://bazaar.launchpad.net/~onboard/onboard/0.99/revision/1537.1.2 + +------------------------------------------------------------------- +Tue Apr 9 09:32:27 UTC 2019 - Yifan Jiang <[email protected]> + +- Add patch onboard-remove-dep-typelib-appindicator3.patch: Remove + the typelib(Appindicator3) dependency because SLE does not ship + it (fate#326794). + +------------------------------------------------------------------- New: ---- onboard-remove-dep-typelib-appindicator3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ onboard.spec ++++++ --- /var/tmp/diff_new_pack.wm0oue/_old 2019-05-03 22:43:49.495418106 +0200 +++ /var/tmp/diff_new_pack.wm0oue/_new 2019-05-03 22:43:49.495418106 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,6 +26,8 @@ URL: https://launchpad.net/onboard Source: http://launchpad.net/%{name}/%{series}/%{version}/+download/%{name}-%{version}.tar.gz Source1: onboard-defaults.conf +# PATCH-FIX-SLE onboard-remove-dep-typelib-appindicator3.patch fate#326794 [email protected] -- remove the typelib(Appindicator3) dependency because SLE does not ship it +Patch0: onboard-remove-dep-typelib-appindicator3.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: python3-devel @@ -55,7 +57,6 @@ Requires: python3-cairo Requires: python3-gobject-Gdk Requires: python3-gobject-cairo -Requires: python3-virtkey Recommends: %{name}-data Recommends: %{name}-lang %glib2_gsettings_schema_requires @@ -89,6 +90,9 @@ %prep %setup -q +%if !0%{?is_opensuse} +%patch0 -p1 +%endif %build python3 setup.py build ++++++ onboard-remove-dep-typelib-appindicator3.patch ++++++ Index: onboard-1.4.1/Onboard/Indicator.py =================================================================== --- onboard-1.4.1.orig/Onboard/Indicator.py +++ onboard-1.4.1/Onboard/Indicator.py @@ -174,15 +174,10 @@ class Indicator(): # auto-detection sip = config.get_preferred_statusicon_provider() - if sip == StatusIconProviderEnum.GtkStatusIcon: - backends = [BackendGtkStatusIcon] - elif sip == StatusIconProviderEnum.AppIndicator: - backends = [BackendAppIndicator, BackendGtkStatusIcon] - elif sip is None: + if sip is None: backends = [] else: # sip == StatusIconProviderEnum.auto - backends = [BackendAppIndicator, - BackendGtkStatusIcon] + backends = [BackendGtkStatusIcon] self._backend = None for backend in backends: @@ -280,85 +275,3 @@ class BackendGtkStatusIcon(BackendBase): elif len(args) == 3: # in <=Xenial? x, y, status_icon = args return Gtk.StatusIcon.position_menu(gtk_menu, x, y, status_icon) - - -class BackendAppIndicator(BackendBase): - - _indicator = None - - STATUSNOTIFIER_OBJECT = "/org/ayatana/NotificationItem/Onboard" - STATUSNOTIFIER_IFACE = "org.kde.StatusNotifierItem" - ACTIVATE_METHOD = "Activate" - - def __init__(self, menu): - BackendBase.__init__(self, menu) - - try: - from gi.repository import AppIndicator3 as AppIndicator - except ImportError as ex: - raise RuntimeError(ex) - - self._indicator = AppIndicator.Indicator.new( - self.id, - self.icon_name, - AppIndicator.IndicatorCategory.APPLICATION_STATUS) - self._indicator.set_icon_full(self.icon_name, - self.icon_desc) - - self._indicator.set_menu(menu._menu) - self._indicator.set_secondary_activate_target( - menu._menu.get_children()[0]) - - if "dbus" in globals(): - # Watch left-click Activate() calls on desktops that send them - # (KDE Plasma). There is still "No such method 'Activate'" in - # AppIndicator. - try: - self._bus = dbus.SessionBus() - except dbus.exceptions.DBusException as ex: - _logger.warning("D-Bus session bus unavailable, " - "no left-click Activate() for AppIndicator: " + - unicode_str(ex)) - else: - try: - self._bus.add_match_string( - "type='method_call'," - "eavesdrop=true," - "path='{}'," - "interface='{}'," - "member='{}'" - .format(self.STATUSNOTIFIER_OBJECT, - self.STATUSNOTIFIER_IFACE, - self.ACTIVATE_METHOD)) - self._bus.add_message_filter(self._on_activate_method) - except dbus.exceptions.DBusException as ex: - _logger.warning("Failed to setup D-Bus match rule, " - "no left-click Activate() for AppIndicator: " + - unicode_str(ex)) - - def cleanup(self): - pass - - def _on_activate_method(self, bus, message): - if message.get_path() == self.STATUSNOTIFIER_OBJECT and \ - message.get_member() == self.ACTIVATE_METHOD: - self._menu.on_show_keyboard_toggle() - return dbus.connection.HANDLER_RESULT_NOT_YET_HANDLED - - def set_visible(self, visible): - self._set_indicator_active(visible) - - def _set_indicator_active(self, active): - try: - from gi.repository import AppIndicator3 as AppIndicator - except ImportError: - pass - else: - if active: - self._indicator.set_status( - AppIndicator.IndicatorStatus.ACTIVE) - else: - self._indicator.set_status( - AppIndicator.IndicatorStatus.PASSIVE) - - Index: onboard-1.4.1/Onboard/Version.py =================================================================== --- onboard-1.4.1.orig/Onboard/Version.py +++ onboard-1.4.1/Onboard/Version.py @@ -32,10 +32,3 @@ def require_gi_versions(): gi.require_version('Atspi', '2.0') except ValueError: pass - - # AppIndicator3 is not required - try: - gi.require_version('AppIndicator3', '0.1') - except ValueError: - pass -
