From 7d49165f780a3d1c6e7b5724bfed4741fbd77dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 10 Sep 2019 05:10:51 +0200
Subject: [PATCH] gnomeExtensions.gsconnect: 23 -> 26

---
 .../gnome-3/extensions/gsconnect/default.nix  |  6 +--
 .../extensions/gsconnect/fix-paths.patch      | 40 +++++++++++++------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index cef00513df1..cfd906a3d0c 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-gsconnect";
-  version = "23";
+  version = "26";
 
   src = fetchFromGitHub {
     owner = "andyholmes";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${version}";
-    sha256 = "011asrhkly9zhvnng2mh9v06yw39fx244pmqz5yk9rd9m4c32xid";
+    sha256 = "01p8b3blsnxi2i89nddkm51wbbw5irwii2qlvlrzfh8hhh37my0a";
   };
 
   patches = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     upower
     gnome3.caribou
     gnome3.gjs # for running daemon
-    gnome3.evolution-data-server # folks.py requires org.gnome.Evolution.DefaultSources gsettings; TODO: hardcode the schema path to the library (similarly to https://github.com/NixOS/nixpkgs/issues/47226)
+    gnome3.evolution-data-server # for libebook-contacts typelib
   ];
 
   mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
index b32d0af3272..097cde829ea 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
@@ -29,16 +29,32 @@
  const Gio = imports.gi.Gio;
  const GLib = imports.gi.GLib;
  const Gtk = imports.gi.Gtk;
---- a/src/service/__init__.js
-+++ b/src/service/__init__.js
-@@ -600,7 +600,9 @@
- /**
-  * Convenience functions for saving/restoring window geometry
-  */
--const _mutter = new Gio.Settings({schema_id: 'org.gnome.mutter'});
-+const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
-+const _schema = _schema_source.lookup('org.gnome.mutter', false);
-+const _mutter = new Gio.Settings({settings_schema: _schema});
+--- a/src/preferences/service.js
++++ b/src/preferences/service.js
+@@ -435,9 +435,9 @@ var Window = GObject.registerClass({
+ 
+     _restoreGeometry() {
+         if (this._mutterSettings === undefined) {
+-            this._mutterSettings = new Gio.Settings({
+-                schema_id: 'org.gnome.mutter'
+-            });
++            const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
++            const _schema = _schema_source.lookup('org.gnome.mutter', false);
++            this._mutterSettings = new Gio.Settings({settings_schema: _schema});
+         }
+ 
+         // Restore geometry, even if we're going to maximize
+--- a/src/service/ui/messaging.js
++++ b/src/service/ui/messaging.js
+@@ -891,9 +891,9 @@ var Window = GObject.registerClass({
+      */
+     _restoreGeometry() {
+         if (this._mutterSettings === undefined) {
+-            this._mutterSettings = new Gio.Settings({
+-                schema_id: 'org.gnome.mutter'
+-            });
++            const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
++            const _schema = _schema_source.lookup('org.gnome.mutter', false);
++            this._mutterSettings = new Gio.Settings({settings_schema: _schema});
+         }
  
- Gtk.Window.prototype.restore_geometry = function() {
-     let [width, height] = this.settings.get_value('window-size').deep_unpack();