Hello community,
here is the log from the commit of package chrome-gnome-shell for
openSUSE:Factory checked in at 2017-02-07 12:09:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chrome-gnome-shell (Old)
and /work/SRC/openSUSE:Factory/.chrome-gnome-shell.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chrome-gnome-shell"
Changes:
--------
--- /work/SRC/openSUSE:Factory/chrome-gnome-shell/chrome-gnome-shell.changes
2017-02-05 16:32:05.216679976 +0100
+++
/work/SRC/openSUSE:Factory/.chrome-gnome-shell.new/chrome-gnome-shell.changes
2017-02-07 12:09:55.418815302 +0100
@@ -1,0 +2,7 @@
+Sat Feb 4 22:17:34 UTC 2017 - [email protected]
+
+- Added chrome-gnome-shell-commit-dca4a35.patch: Fix connector: do
+ not use get_dbus_connection after GApplication was released
+ (gh#nE0sIghT/chrome-gnome-shell-mirror#27).
+
+-------------------------------------------------------------------
New:
----
chrome-gnome-shell-commit-dca4a35.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chrome-gnome-shell.spec ++++++
--- /var/tmp/diff_new_pack.dEjz9B/_old 2017-02-07 12:09:55.922743996 +0100
+++ /var/tmp/diff_new_pack.dEjz9B/_new 2017-02-07 12:09:55.926743430 +0100
@@ -24,6 +24,8 @@
Group: Productivity/Networking/Web/Browsers
Url: https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
Source: %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM chrome-gnome-shell-commit-dca4a35.patch
gh#nE0sIghT/chrome-gnome-shell-mirror#27 [email protected] -- Do not use
get_dbus_connection after GApplication was released.
+Patch1: chrome-gnome-shell-commit-dca4a35.patch
BuildRequires: cmake
BuildRequires: hicolor-icon-theme
BuildRequires: jq
@@ -38,13 +40,14 @@
%py_requires
%description
-Bowser extension for Google Chrome/Chromium, Firefox, Vivaldi, Opera (and other
+Browser extension for Google Chrome/Chromium, Firefox, Vivaldi, Opera (and
other
Browser Extension, Chrome Extension or WebExtensions capable browsers) and
native
host messaging connector that provides integration with GNOME Shell and the
corresponding extensions repository https://extensions.gnome.org.
%prep
%setup -q
+%patch1 -p1
%build
%cmake
++++++ chrome-gnome-shell-commit-dca4a35.patch ++++++
>From dca4a3538f86d8e2e957945a691430573192716d Mon Sep 17 00:00:00 2001
From: Yuri Konotopov <[email protected]>
Date: Tue, 24 Jan 2017 19:42:19 +0400
Subject: connector: do not use get_dbus_connection after GApplication was
released.
Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
index 0f6e5f1..ac6740a 100755
--- a/connector/chrome-gnome-shell.py
+++ b/connector/chrome-gnome-shell.py
@@ -106,21 +106,26 @@ class ChromeGNOMEShell(Gio.Application):
self.hold()
# Is there any way to hook this to shutdown?
- def cleanup(self):
- debug('Cleanup')
+ def clean_release(self):
+ debug('Release')
if self.shellAppearedId:
Gio.bus_unwatch_name(self.shellAppearedId)
if self.shellSignalId:
- self.get_dbus_connection().signal_unsubscribe(self.shellSignalId)
+ dbus_connection = self.get_dbus_connection()
+
+ if dbus_connection is not None:
+ dbus_connection.signal_unsubscribe(self.shellSignalId)
+
+ self.release()
def default_exception_hook(self, exception_type, value, tb):
log_error("Uncaught exception of type %s occured" % exception_type)
traceback.print_tb(tb)
log_error("Exception: %s" % value)
- self.release()
+ self.clean_release()
def add_simple_action(self, name, callback, parameter_type):
action = Gio.SimpleAction.new(
@@ -191,7 +196,7 @@ class ChromeGNOMEShell(Gio.Application):
# noinspection PyUnusedLocal
def on_service_timeout(self, data):
debug('On service timeout')
- self.release()
+ self.clean_release()
return False
@@ -203,7 +208,7 @@ class ChromeGNOMEShell(Gio.Application):
if len(text_length_bytes) == 0:
debug('Release condition: %s' % str(condition))
- self.release()
+ self.clean_release()
return
# Unpack message length as 4 byte integer.
@@ -255,14 +260,14 @@ class ChromeGNOMEShell(Gio.Application):
# noinspection PyUnusedLocal
def on_hup(self, source, condition, data):
debug('On hup: %s' % str(condition))
- self.release()
+ self.clean_release()
return False
# noinspection PyUnusedLocal
def on_sigint(self, data):
debug('On sigint')
- self.release()
+ self.clean_release()
return False
@@ -545,6 +550,5 @@ if __name__ == '__main__':
app = ChromeGNOMEShell('--gapplication-service' in sys.argv)
app.run(sys.argv)
- app.cleanup()
debug('Quit')
