Merge pull request #270142: gnomeExtensions.arcmenu: 44 -> 52

This commit is contained in:
piegames 2023-11-29 12:34:48 +01:00 committed by GitHub
commit 8bdcb69782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 12 deletions

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-arcmenu"; pname = "gnome-shell-extension-arcmenu";
version = "44"; version = "52";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "arcmenu"; owner = "arcmenu";
repo = "ArcMenu"; repo = "ArcMenu";
rev = "v44.1"; rev = "v${version}";
sha256 = "sha256-+aPBRxjL5lgdm96SbRZnp+9o9nl2N8Rb3dehMAv883c="; sha256 = "sha256-nZRdNkS4JfSwtqQsROKa1+eqcgwMQwVsqgeWVPpZIi0=";
}; };
patches = [ patches = [

View file

@ -1,10 +1,31 @@
--- a/extension.js --- a/menuWidgets.js
+++ b/extension.js +++ b/menuWidgets.js
@@ -20,6 +20,8 @@ @@ -3,7 +3,11 @@
const ExtensionUtils = imports.misc.extensionUtils; import Atk from 'gi://Atk';
const Me = ExtensionUtils.getCurrentExtension(); import Clutter from 'gi://Clutter';
import Gio from 'gi://Gio';
+imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); import GLib from 'gi://GLib';
-import GMenu from 'gi://GMenu';
+ +
const Constants = Me.imports.constants; +import GIRepository from 'gi://GIRepository';
const Controller = Me.imports.controller; +GIRepository.Repository.prepend_search_path('@gmenu_path@');
+const {default: GMenu} = await import('gi://GMenu');
+
import GObject from 'gi://GObject';
import Graphene from 'gi://Graphene';
import Pango from 'gi://Pango';
--- a/menulayouts/baseMenuLayout.js
+++ b/menulayouts/baseMenuLayout.js
@@ -1,7 +1,11 @@
import Clutter from 'gi://Clutter';
import Gio from 'gi://Gio';
import GLib from 'gi://GLib';
-import GMenu from 'gi://GMenu';
+
+import GIRepository from 'gi://GIRepository';
+GIRepository.Repository.prepend_search_path('@gmenu_path@');
+const {default: GMenu} = await import('gi://GMenu');
+
import GObject from 'gi://GObject';
import Shell from 'gi://Shell';
import St from 'gi://St';