git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #139981 from bobby285271/gala

pantheon.gala: 6.2.0 -> 6.2.1

commit1f70bb329716aedc98644aada3e31f79c83ad6cf authorBobby Rong <rjl931189261@126.com> dateThu 30 Sep 2021, 21:15 (5 years ago) parent8346dc0e5b3f17
2 files changed+2−57
pkgs/desktops/pantheon/desktop/gala/default.nix+2−7 pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch−50
pkgs/desktops/pantheon/desktop/gala/default.nix+2−7
@@ -29,13 +29,13 @@
2929
3030stdenv.mkDerivation rec {
3131 pname = "gala";
32− version = "6.2.0";
32+ version = "6.2.1";
3333
3434 src = fetchFromGitHub {
3535 owner = "elementary";
3636 repo = pname;
3737 rev = version;
38− sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g";
38+ sha256 = "1phnhj731kvk8ykmm33ypcxk8fkfny9k6kdapl582qh4d47wcy6f";
3939 };
4040
4141 passthru = {
@@ -75,11 +75,6 @@ stdenv.mkDerivation rec {
7575
7676 patches = [
7777 ./plugins-dir.patch
78− # https://github.com/elementary/gala/pull/1259
79− # https://github.com/NixOS/nixpkgs/issues/139404
80− # Remove this patch when it is included in a new release
81− # of gala OR when we no longer use mutter 3.38 for pantheon
82− ./fix-session-crash-when-taking-screenshots.patch
8378 ];
8479
8580 postPatch = ''
pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patchdeleted−50
@@ -1,50 +0,0 @@
1−From fa3c39331d4ef56a13019f45d811bde1fc755c21 Mon Sep 17 00:00:00 2001
2−From: Bobby Rong <rjl931189261@126.com>
3−Date: Sat, 25 Sep 2021 23:21:01 +0800
4−Subject: [PATCH] Fix session crash when taking screenshots with mutter 3.38
5−
6−---
7− src/ScreenshotManager.vala | 5 ++---
8− vapi/mutter-clutter.vapi | 2 +-
9− 2 files changed, 3 insertions(+), 4 deletions(-)
10−
11−diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala
12−index 3ffb0123..388fee1a 100644
13−--- a/src/ScreenshotManager.vala
14−+++ b/src/ScreenshotManager.vala
15−@@ -354,12 +354,11 @@ namespace Gala {
16− paint_flags |= Clutter.PaintFlag.FORCE_CURSORS;
17− }
18−
19−- unowned var data = image.get_data ();
20− if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) {
21− wm.stage.paint_to_buffer (
22− {x, y, width, height},
23− scale,
24−- ref data,
25−+ image.get_data (),
26− image.get_stride (),
27− Cogl.PixelFormat.BGRA_8888_PRE,
28− paint_flags
29−@@ -368,7 +367,7 @@ namespace Gala {
30− wm.stage.paint_to_buffer (
31− {x, y, width, height},
32− scale,
33−- ref data,
34−+ image.get_data (),
35− image.get_stride (),
36− Cogl.PixelFormat.ARGB_8888_PRE,
37− paint_flags
38−diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi
39−index 5b778cb2..95de24be 100644
40−--- a/vapi/mutter-clutter.vapi
41−+++ b/vapi/mutter-clutter.vapi
42−@@ -7336,7 +7336,7 @@ namespace Clutter {
43− [Version (since = "1.2")]
44− public bool get_use_alpha ();
45− #if HAS_MUTTER338
46−- 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;
47−+ 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;
48− public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
49− #else
50− [Version (since = "0.4")]