diff --git a/.SRCINFO b/.SRCINFO index 1c6cfc8..608b66d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = gnome-shell-performance pkgdesc = Next generation desktop shell - pkgver = 3.36.6 + pkgver = 3.38.1+9+g610db2703 pkgrel = 1 epoch = 1 url = https://wiki.gnome.org/Projects/GnomeShell @@ -39,15 +39,13 @@ pkgbase = gnome-shell-performance optdepends = gnome-control-center: System settings optdepends = evolution-data-server: Evolution calendar integration provides = gnome-shell - provides = gnome-shell=3.36.6 - provides = gnome-shell=1:3.36.6 + provides = gnome-shell=3.38.1+9+g610db2703 + provides = gnome-shell=1:3.38.1+9+g610db2703 conflicts = gnome-shell - source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=682d4588bc6b2c1826013f98c52cc0b5afccea29 + source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=610db2703e5495d468d9b9370c587d0bd9c8b7bc source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git - source = 1126.diff sha256sums = SKIP sha256sums = SKIP - sha256sums = 32661c22298d0c4af9b6b6bb718480ce192f528367f853d9709f74c146b2f8d4 pkgname = gnome-shell-performance depends = accountsservice @@ -69,5 +67,5 @@ pkgname = gnome-shell-performance depends = libibus depends = gnome-autoar depends = gnome-disk-utility - depends = libmutter-6.so + depends = libmutter-7.so diff --git a/1126.diff b/1126.diff deleted file mode 100644 index c7f0199..0000000 --- a/1126.diff +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/js/ui/calendar.js b/js/ui/calendar.js -index 99641841768fca6ef96bb41197fce1c75040fbc2..286aac1e10ee9bd966a98a86eb10cb7210ff3ff6 100644 ---- a/js/ui/calendar.js -+++ b/js/ui/calendar.js -@@ -199,46 +199,47 @@ class DBusEventSource extends EventSourceBase { - - this._initialized = false; - this._dbusProxy = new CalendarServer(); -- this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, (object, result) => { -- let loaded = false; -- -- try { -- this._dbusProxy.init_finish(result); -- loaded = true; -- } catch (e) { -- if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) { -- // Ignore timeouts and install signals as normal, because with high -- // probability the service will appear later on, and we will get a -- // NameOwnerChanged which will finish loading -- // -- // (But still _initialized to false, because the proxy does not know -- // about the HasCalendars property and would cause an exception trying -- // to read it) -- } else { -- log('Error loading calendars: %s'.format(e.message)); -- return; -- } -+ this._initProxy(); -+ } -+ -+ async _initProxy() { -+ let loaded = false; -+ -+ try { -+ await this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null); -+ loaded = true; -+ } catch (e) { -+ // Ignore timeouts and install signals as normal, because with high -+ // probability the service will appear later on, and we will get a -+ // NameOwnerChanged which will finish loading -+ // -+ // (But still _initialized to false, because the proxy does not know -+ // about the HasCalendars property and would cause an exception trying -+ // to read it) -+ if (!e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) { -+ log('Error loading calendars: %s'.format(e.message)); -+ return; - } -+ } - -- this._dbusProxy.connectSignal('Changed', this._onChanged.bind(this)); -- -- this._dbusProxy.connect('notify::g-name-owner', () => { -- if (this._dbusProxy.g_name_owner) -- this._onNameAppeared(); -- else -- this._onNameVanished(); -- }); -- -- this._dbusProxy.connect('g-properties-changed', () => { -- this.notify('has-calendars'); -- }); -+ this._dbusProxy.connectSignal('Changed', this._onChanged.bind(this)); - -- this._initialized = loaded; -- if (loaded) { -- this.notify('has-calendars'); -+ this._dbusProxy.connect('notify::g-name-owner', () => { -+ if (this._dbusProxy.g_name_owner) - this._onNameAppeared(); -- } -+ else -+ this._onNameVanished(); -+ }); -+ -+ this._dbusProxy.connect('g-properties-changed', () => { -+ this.notify('has-calendars'); - }); -+ -+ this._initialized = loaded; -+ if (loaded) { -+ this.notify('has-calendars'); -+ this._onNameAppeared(); -+ } - } - - destroy() { diff --git a/PKGBUILD b/PKGBUILD index aeaaf84..3e7c04a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Jan Alexander Steffens (heftig) +# Maintainer: Jan Alexander Steffens (heftig) # Patched package maintainer: Saren Arterius # Contributor: Ionut Biru # Contributor: Flamelab