From 33cb22179266ae5d6c6b63e3bcb2606a5a9acc7d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 8 Sep 2023 20:53:10 +0200
Subject: [PATCH] =?UTF-8?q?gnome.gpaste:=2044.1=20=E2=86=92=2045?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.imagination-land.org/posts/2023-09-16-gpaste-45-released.html
https://github.com/Keruspe/GPaste/compare/v44.1...v45

Stopped looking for mutter-clutter explicitely:
https://github.com/Keruspe/GPaste/commit/beb08f386c11f1969eb0c719055c28d8567ba3be
https://github.com/Keruspe/GPaste/blob/v45/src/gnome-shell/dependencies.js

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/desktops/gnome/misc/gpaste/default.nix   |  6 +--
 .../gnome/misc/gpaste/fix-paths.patch         | 41 +++++++++++--------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix
index 9c85e3d19383..2051f19a37be 100644
--- a/pkgs/desktops/gnome/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome/misc/gpaste/default.nix
@@ -9,7 +9,6 @@
 , gcr_4
 , libadwaita
 , meson
-, mutter
 , ninja
 , pango
 , pkg-config
@@ -19,14 +18,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "44.1";
+  version = "45";
   pname = "gpaste";
 
   src = fetchFromGitHub {
     owner = "Keruspe";
     repo = "GPaste";
     rev = "v${version}";
-    sha256 = "sha256-c/q8VTzFOz8nzidPB3qnYw9+AkdKfTdUD4AcxyHKrqo=";
+    sha256 = "sha256-MpoeLXGdLfas/E3x5ojJW5Dd3H8XZORtFaBHgRGJXxg=";
   };
 
   patches = [
@@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
     gtk4
     gcr_4
     libadwaita
-    mutter
     pango
   ];
 
diff --git a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch
index 2ec807b61c05..0d73c5560a07 100644
--- a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch
+++ b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch
@@ -1,42 +1,47 @@
 diff --git a/src/gnome-shell/extension.js b/src/gnome-shell/extension.js
-index c8773fd6..9efbed67 100644
+index cb862a30..2bd41363 100644
 --- a/src/gnome-shell/extension.js
 +++ b/src/gnome-shell/extension.js
-@@ -6,6 +6,8 @@
+@@ -10,6 +10,10 @@ import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/ex
+ import checkerBypass from './checkerBypass.js';
+ import { GPasteIndicator } from './indicator.js';
  
- const Config = imports.misc.config;
- 
-+imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@');
++import GIRepository from 'gi://GIRepository';
 +
- imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
- imports.gi.versions.GLib = '2.0';
- imports.gi.versions.GPaste = '2';
++GIRepository.Repository.prepend_search_path('@typelibDir@');
++
+ export default class GPasteExtension extends Extension {
+     enable() {
+         checkerBypass();
 diff --git a/src/gnome-shell/prefs.js b/src/gnome-shell/prefs.js
-index 32244ab2..74b85572 100644
+index 4c0d9bde..5740d8f6 100644
 --- a/src/gnome-shell/prefs.js
 +++ b/src/gnome-shell/prefs.js
-@@ -6,6 +6,8 @@
+@@ -5,8 +5,11 @@
+  */
  
- imports.gi.versions.GPasteGtk = '4';
+ import { ExtensionPreferences, gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
++import GIRepository from 'gi://GIRepository';
  
-+imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@');
+-import GPasteGtk from 'gi://GPasteGtk?version=4';
++GIRepository.Repository.prepend_search_path('@typelibDir@');
 +
- const ExtensionUtils = imports.misc.extensionUtils;
++const {default: GPasteGtk} = await import('gi://GPasteGtk?version=4');
  
- const { GPasteGtk } = imports.gi;
+ export default class GPastePreferences extends ExtensionPreferences {
+     getPreferencesWidget() {
 diff --git a/src/libgpaste/gpaste/gpaste-settings.c b/src/libgpaste/gpaste/gpaste-settings.c
-index 7e53eb64..57c399fc 100644
+index 7e53eb64..ee620070 100644
 --- a/src/libgpaste/gpaste/gpaste-settings.c
 +++ b/src/libgpaste/gpaste/gpaste-settings.c
-@@ -1013,7 +1013,11 @@ create_g_settings (void)
+@@ -1013,7 +1013,10 @@ create_g_settings (void)
      }
      else
      {
 -        return g_settings_new (G_PASTE_SETTINGS_NAME);
 +        // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library
-+        GSettingsSchemaSource *schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL);
++        g_autoptr (GSettingsSchemaSource) schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL);
 +        g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE);
-+        g_settings_schema_source_unref (schema_source);
 +        return g_settings_new_full (schema, NULL, NULL);
      }
  }