* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/chrome-gnome-shell/files/, gnome-extra/chrome-gnome-shell/
@ 2017-01-26 22:46 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-01-26 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 60ef078452baefdcd4df087ced1ecac9965e4dc6
Author: Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Thu Jan 26 14:38:56 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 22:45:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60ef0784
gnome-extra/chrome-gnome-shell: added patches to fix various issues.
Closes: https://github.com/gentoo/gentoo/pull/3660
...ell-8.ebuild => chrome-gnome-shell-8-r1.ebuild} | 8 +-
...me-gnome-shell-8-enabled-extensions-array.patch | 32 ++++++++
.../chrome-gnome-shell-8-get_dbus_connection.patch | 91 ++++++++++++++++++++++
.../chrome-gnome-shell-8-metadata-version.patch | 28 +++++++
4 files changed, 158 insertions(+), 1 deletion(-)
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
similarity index 92%
rename from gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.ebuild
rename to gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
index 5eed8d8..495e02e 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
@@ -24,11 +24,17 @@ DEPEND="${PYTHON_DEPS}
sys-apps/coreutils
"
RDEPEND="${PYTHON_DEPS}
- dev-python/requests[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
gnome-base/gnome-shell
"
+PATCHES=(
+ "${FILESDIR}/${P}"-enabled-extensions-array.patch
+ "${FILESDIR}/${P}"-metadata-version.patch
+ "${FILESDIR}/${P}"-get_dbus_connection.patch
+)
+
src_configure() {
local mycmakeargs=( -DBUILD_EXTENSION=OFF )
cmake-utils_src_configure
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
new file mode 100644
index 00000000..7a56ca0
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
@@ -0,0 +1,32 @@
+From 1de3c56c636adfdb74970bf9d7a5424af3830d92 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Mon, 23 Jan 2017 19:43:30 +0400
+Subject: [PATCH 3/6] connector: assume that "enabled-extensions" array can
+ contains duplicates
+
+See-Also: https://bugzilla.gnome.org/show_bug.cgi?id=777650
+Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/26
+---
+ connector/chrome-gnome-shell.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
+index 719a347..0b92d83 100755
+--- a/connector/chrome-gnome-shell.py
++++ b/connector/chrome-gnome-shell.py
+@@ -424,9 +424,10 @@ class ChromeGNOMEShell(Gio.Application):
+ continue
+
+ if extension['enable']:
+- uuids.append(extension['uuid'])
++ if not extension['uuid'] in uuids:
++ uuids.append(extension['uuid'])
+ elif extension['uuid'] in uuids:
+- uuids.remove(extension['uuid'])
++ uuids = [value for value in uuids if value != extension['uuid']]
+
+ settings.set_strv(ENABLED_EXTENSIONS_KEY, uuids)
+
+--
+2.10.2
+
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
new file mode 100644
index 00000000..be5f6c4
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
@@ -0,0 +1,91 @@
+From dca4a3538f86d8e2e957945a691430573192716d Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Tue, 24 Jan 2017 19:42:19 +0400
+Subject: [PATCH 6/6] connector: do not use get_dbus_connection after
+ GApplication was released.
+
+Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
+---
+ connector/chrome-gnome-shell.py | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+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')
+--
+2.10.2
+
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
new file mode 100644
index 00000000..238d1fc
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
@@ -0,0 +1,28 @@
+From 48ded6911e60fb8415190b252ca420b994e6c525 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Mon, 23 Jan 2017 22:29:12 +0400
+Subject: [PATCH 4/6] connector: assume version 1 for extensions without
+ version in metadata
+
+Bug: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
+See-Also: https://git.gnome.org/browse/extensions-web/commit/?id=214f03ee90f0f391d3d4fdec23feedf45e3d0507
+---
+ connector/chrome-gnome-shell.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
+index 0b92d83..0f6e5f1 100755
+--- a/connector/chrome-gnome-shell.py
++++ b/connector/chrome-gnome-shell.py
+@@ -506,7 +506,7 @@ class ChromeGNOMEShell(Gio.Application):
+ http_request['installed'][uuid] = {
+ 'version': int(extensions[uuid]['version'])
+ }
+- except ValueError:
++ except (ValueError, KeyError):
+ http_request['installed'][uuid] = {
+ 'version': 1
+ }
+--
+2.10.2
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/chrome-gnome-shell/files/, gnome-extra/chrome-gnome-shell/
@ 2018-11-24 16:00 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2018-11-24 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 4bcd7b65842b9664f5d8f2882bab1079e5994821
Author: Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Mon Nov 12 16:19:06 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Nov 24 15:47:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bcd7b65
gnome-extra/chrome-gnome-shell: drop old
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 2 -
.../chrome-gnome-shell-8-r1.ebuild | 69 ----------------
.../chrome-gnome-shell/chrome-gnome-shell-9.ebuild | 60 --------------
...me-gnome-shell-8-enabled-extensions-array.patch | 32 --------
.../chrome-gnome-shell-8-get_dbus_connection.patch | 91 ----------------------
.../chrome-gnome-shell-8-metadata-version.patch | 28 -------
6 files changed, 282 deletions(-)
--git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index ea2790636d5..12fb12f3deb 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,3 +1 @@
DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-DIST chrome-gnome-shell-8.tar.xz 143224 BLAKE2B 9dcb94f7dcc263c6cc332c476bd652b0ea62443ffb154f67ba869ddc970e892a28ef96be13732d49dfbf5c3db9c4c8fed18918359f240e6b1b6218fa3a2bd462 SHA512 61acd4b0564892667bd1468430ddfff4c0cfbe92b573d8b7e4c5448c25266bd0ee6e89e9bebe08553de4f9661ceeea46f5af38d980051491c40ed7deb24e3277
-DIST chrome-gnome-shell-9.tar.xz 151984 BLAKE2B 884906a308d864893664f499172c130b6ab7cc3ae7a5746f7430f3d779f43320de723c9757fc4c8a9328704b2b5c40c8a829d74280ac78d4f09e000f593c3805 SHA512 b9b5f913a74bdfa641ce35c62f15aa1ceff37e6e0fef43c127ff8ba31933ba2d9c93ee50809b013336ec63ae1020d4e1cacd56d9a86204e1ba4c0bd1d8ed50cf
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
deleted file mode 100644
index 0ddf6116f70..00000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- app-misc/jq
- sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- gnome-base/gnome-shell
-"
-
-PATCHES=(
- "${FILESDIR}/${P}"-enabled-extensions-array.patch
- "${FILESDIR}/${P}"-metadata-version.patch
- "${FILESDIR}/${P}"-get_dbus_connection.patch
-)
-
-src_configure() {
- local mycmakeargs=( -DBUILD_EXTENSION=OFF )
- cmake-utils_src_configure
-}
-
-src_install() {
- # Chrome policy files should be removed with package.
- # Otherwise it will not be possible to uninstall web extension
- # from browser.
- echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
- echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
- echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
- doenvd 50"${PN}"
-
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- elog "If you are installing ${PN} for the first time then you should"
- elog "restart or reload dbus service before starting your browser."
- elog
- elog "Please note that this package provides native messaging connector only."
- elog
- elog "Managed policy was installed to force web extension installation"
- elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
- elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
- elog
- elog "For Mozilla Firefox you should manualy install web extension from"
- elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
- elog
- elog "For Opera you should manualy install web extension from"
- elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
-}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
deleted file mode 100644
index 599855c9cf5..00000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- app-misc/jq
- sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- gnome-base/gnome-shell
-"
-
-src_configure() {
- local mycmakeargs=( -DBUILD_EXTENSION=OFF )
- cmake-utils_src_configure
-}
-
-src_install() {
- # Chrome policy files should be removed with package.
- # Otherwise it will not be possible to uninstall web extension
- # from browser.
- echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
- echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
- echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
- doenvd 50"${PN}"
-
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- elog "Please note that this package provides native messaging connector only."
- elog
- elog "Managed policy was installed to force browser extension installation"
- elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
- elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
- elog
- elog "For Mozilla Firefox you should manualy install browser extension from"
- elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
- elog
- elog "For Opera you should manualy install browser extension from"
- elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
-}
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
deleted file mode 100644
index 7a56ca0256b..00000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1de3c56c636adfdb74970bf9d7a5424af3830d92 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 23 Jan 2017 19:43:30 +0400
-Subject: [PATCH 3/6] connector: assume that "enabled-extensions" array can
- contains duplicates
-
-See-Also: https://bugzilla.gnome.org/show_bug.cgi?id=777650
-Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/26
----
- connector/chrome-gnome-shell.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 719a347..0b92d83 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -424,9 +424,10 @@ class ChromeGNOMEShell(Gio.Application):
- continue
-
- if extension['enable']:
-- uuids.append(extension['uuid'])
-+ if not extension['uuid'] in uuids:
-+ uuids.append(extension['uuid'])
- elif extension['uuid'] in uuids:
-- uuids.remove(extension['uuid'])
-+ uuids = [value for value in uuids if value != extension['uuid']]
-
- settings.set_strv(ENABLED_EXTENSIONS_KEY, uuids)
-
---
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
deleted file mode 100644
index be5f6c4e51d..00000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From dca4a3538f86d8e2e957945a691430573192716d Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Tue, 24 Jan 2017 19:42:19 +0400
-Subject: [PATCH 6/6] connector: do not use get_dbus_connection after
- GApplication was released.
-
-Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
----
- connector/chrome-gnome-shell.py | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-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')
---
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
deleted file mode 100644
index 238d1fcd1df..00000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 48ded6911e60fb8415190b252ca420b994e6c525 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 23 Jan 2017 22:29:12 +0400
-Subject: [PATCH 4/6] connector: assume version 1 for extensions without
- version in metadata
-
-Bug: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
-See-Also: https://git.gnome.org/browse/extensions-web/commit/?id=214f03ee90f0f391d3d4fdec23feedf45e3d0507
----
- connector/chrome-gnome-shell.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 0b92d83..0f6e5f1 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -506,7 +506,7 @@ class ChromeGNOMEShell(Gio.Application):
- http_request['installed'][uuid] = {
- 'version': int(extensions[uuid]['version'])
- }
-- except ValueError:
-+ except (ValueError, KeyError):
- http_request['installed'][uuid] = {
- 'version': 1
- }
---
-2.10.2
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-24 16:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-24 16:00 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/chrome-gnome-shell/files/, gnome-extra/chrome-gnome-shell/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2017-01-26 22:46 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox