diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/desktop')
5 files changed, 8 insertions, 75 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix index 665007fcd634..db757b1aa4ae 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g"; + sha256 = "1phnhj731kvk8ykmm33ypcxk8fkfny9k6kdapl582qh4d47wcy6f"; }; passthru = { @@ -75,11 +75,6 @@ stdenv.mkDerivation rec { patches = [ ./plugins-dir.patch - # https://github.com/elementary/gala/pull/1259 - # https://github.com/NixOS/nixpkgs/issues/139404 - # Remove this patch when it is included in a new release - # of gala OR when we no longer use mutter 3.38 for pantheon - ./fix-session-crash-when-taking-screenshots.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch deleted file mode 100644 index f2393a804bcf..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fa3c39331d4ef56a13019f45d811bde1fc755c21 Mon Sep 17 00:00:00 2001 -From: Bobby Rong <rjl931189261@126.com> -Date: Sat, 25 Sep 2021 23:21:01 +0800 -Subject: [PATCH] Fix session crash when taking screenshots with mutter 3.38 - ---- - src/ScreenshotManager.vala | 5 ++--- - vapi/mutter-clutter.vapi | 2 +- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala -index 3ffb0123..388fee1a 100644 ---- a/src/ScreenshotManager.vala -+++ b/src/ScreenshotManager.vala -@@ -354,12 +354,11 @@ namespace Gala { - paint_flags |= Clutter.PaintFlag.FORCE_CURSORS; - } - -- unowned var data = image.get_data (); - if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) { - wm.stage.paint_to_buffer ( - {x, y, width, height}, - scale, -- ref data, -+ image.get_data (), - image.get_stride (), - Cogl.PixelFormat.BGRA_8888_PRE, - paint_flags -@@ -368,7 +367,7 @@ namespace Gala { - wm.stage.paint_to_buffer ( - {x, y, width, height}, - scale, -- ref data, -+ image.get_data (), - image.get_stride (), - Cogl.PixelFormat.ARGB_8888_PRE, - paint_flags -diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi -index 5b778cb2..95de24be 100644 ---- a/vapi/mutter-clutter.vapi -+++ b/vapi/mutter-clutter.vapi -@@ -7336,7 +7336,7 @@ namespace Clutter { - [Version (since = "1.2")] - public bool get_use_alpha (); - #if HAS_MUTTER338 -- public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref unowned uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; -+ public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; - public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags); - #else - [Version (since = "0.4")] diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 29432bf19656..6799887247d8 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -12,7 +12,6 @@ , libgee , gettext , gtk3 -, appstream , gnome-menus , json-glib , elementary-dock @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.8.2"; + version = "2.9.0"; repoName = "applications-menu"; @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1pm3dnq35vbvyxqapmfy4frfwhc1l2zh634annlmbjiyfp5mzk0q"; + sha256 = "0mwjw2ghbdj336ax5srxbqnjprdhj1if7sm9k9idqkmifpzccs7i"; }; passthru = { @@ -45,7 +44,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - appstream gettext meson ninja diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 1a101a8a886d..46d90e4acc31 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -3,7 +3,6 @@ , nix-update-script , pantheon , pkg-config -, fetchpatch , meson , ninja , vala @@ -17,24 +16,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1pvcpk1d2zh9pvw0clv3bhf2plcww6nbxs6j7xjbvnaqs7d6i1k2"; + sha256 = "1qrbg8l3ifz09jx6v5j7hmgw0hmirj6mh3z634yl1cadz45p8fc9"; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/wingpanel-indicator-notifications/pull/218 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-notifications/commit/c7e73f0683561345935a959dafa2083b7e22fe99.patch"; - sha256 = "10xiyq42bqfmih1jgqpq64nha3n0y7ra3j7j0q27rn5hhhgbyjs7"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 1ae9f9f4aaa5..4529b519bb02 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0ycys24y1rrz0ydpvs4mc89p4k986q1ziwbvziinxr1wsli9v1dj"; + sha256 = "078yi36r452sc33mv2ck8z0icya1lhzhickllrlhc60rdri36sb8"; }; passthru = { |