VesperOS/gnome-shell-extensions
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop patches applied in new release

Browse Source
This commit is contained in:
Jeremy Bicha
2018-02-23 19:32:11 -05:00
parent cef1736de2
commit fbbcb058fa
4 changed files with 3 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@@ -1,6 +1,8 @@
gnome-shell-extensions (3.27.91-1) UNRELEASED; urgency=medium
* New upstream development release
* Drop places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch &
dont-require-nautilus-classic.patch: Applied in new release
-- Jeremy Bicha <jbicha@debian.org> Fri, 23 Feb 2018 19:30:21 -0500

18
debian/patches/dont-require-nautilus-classic.patch vendored
View File

@@ -1,18 +0,0 @@
From: Jeremy Bicha <jbicha@ubuntu.com>
Date: Tue, 30 Jan 2018 09:04:03 +0000
Subject: Don't use nautilus-classic since it forces desktop icons
Bug: https://bugzilla.gnome.org/695088
---
data/gnome-classic.session.desktop.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/gnome-classic.session.desktop.in b/data/gnome-classic.session.desktop.in
index 392ec37..258096e 100644
--- a/data/gnome-classic.session.desktop.in
+++ b/data/gnome-classic.session.desktop.in
@@ -1,3 +1,3 @@
[GNOME Session]
Name=GNOME Classic
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;

63
debian/patches/places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch vendored
View File

@@ -1,63 +0,0 @@
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 17 Jan 2018 21:57:49 +0100
Subject: places-menu: Don't force dispose() of uninitialized proxies
Trying to dispose a proxy object before it has been properly
initialized triggers an "uncatchable exception", which gjs
treats as a fatal error since commit c7bdcaab4. We only have
anything to clean up once the proxy is initialized anyway, so
don't force dispose() before that.
Origin: upstream, 3.26.2, commit:61594afd687bf5883cc39fa79c5fbdb0d4cc9eda
Bug: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/44
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888608
---
extensions/places-menu/placeDisplay.js | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js
index ba316bf..9647d63 100644
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -136,17 +136,18 @@ const RootInfo = new Lang.Class({
_init: function() {
this.parent('devices', Gio.File.new_for_path('/'), _("Computer"));
- this._proxy = new Hostname1(Gio.DBus.system,
- 'org.freedesktop.hostname1',
- '/org/freedesktop/hostname1',
- Lang.bind(this, function(obj, error) {
- if (error)
- return;
-
- this._proxy.connect('g-properties-changed',
- Lang.bind(this, this._propertiesChanged));
- this._propertiesChanged(obj);
- }));
+ new Hostname1(Gio.DBus.system,
+ 'org.freedesktop.hostname1',
+ '/org/freedesktop/hostname1',
+ Lang.bind(this, function(obj, error) {
+ if (error)
+ return;
+
+ this._proxy = obj;
+ this._proxy.connect('g-properties-changed',
+ Lang.bind(this, this._propertiesChanged));
+ this._propertiesChanged(obj);
+ }));
},
getIcon: function() {
@@ -163,7 +164,10 @@ const RootInfo = new Lang.Class({
},
destroy: function() {
- this._proxy.run_dispose();
+ if (this._proxy) {
+ this._proxy.run_dispose();
+ this._proxy = null;
+ }
this.parent();
}
});

3
debian/patches/series vendored
View File

@@ -1,3 +1,2 @@
places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch
dont-require-nautilus-classic.patch
#dont-require-nautilus-classic.patch
gnome-session-classic-wrapper-script.patch