Merge pull request #196511 from NixOS/pantheon

- `vim_configurable` has been renamed to `vim-full` to avoid confusion: `vim-full`'s build-time features are configurable, but both `vim` and `vim-full` are _customizable_ (in the sense of user configuration, like vimrc).

- Pantheon now defaults to Mutter 42 and GNOME settings daemon 42, all Pantheon packages are now tracking elementary OS 7 updates.

- The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules)

- The module `usbmuxd` now has the ability to change the package used by the daemon. In case you're experiencing issues with `usbmuxd` you can try an alternative program like `usbmuxd2`. Available as [services.usbmuxd.package](#opt-services.usbmuxd.package)

, nss

, gcr

, gnome-session-ctl

, pantheon

}:

stdenv.mkDerivation rec {

  pname = "gnome-settings-daemon";

  version = "3.38.2";

  version = "42.2";

  src = fetchurl {

    url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "136p3prdqvc0lvrcqs4h7crpnfqnimqklpzjivq5w4g1rhbdbhrj";

    url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";

    sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA=";

  };

  patches = [

      inherit tzdata;

    })

    # Adjust to libgweather changes.

    # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch";

      sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg=";

    })

    # Fix build with new meson

    # plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments.

    # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch";

      sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ=";

    })

    # meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True)

    # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff";

      sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY=";

    })

    # Port to gweather4

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/66cae69ad82cfc59435016fba737ce046ffb7e66.patch";

      sha256 = "zf8/rkKdQQFNV/qx/jo4kx1KoLl7SUSu4/T1OBGrZ4c=";

    })

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch";

      sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM=";

    })

    # Use geocode-glib_2 dependency

    # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300

    (fetchpatch {

From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>

Date: Sat, 19 Oct 2019 13:26:05 +0200

Subject: [PATCH] drop inheritable

Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01

We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell.

---

 config.h.meson    |  3 +++

 meson.build       |  5 +++++

 meson_options.txt |  6 ++++++

 src/core/main.c   | 11 +++++++++++

 src/meson.build   |  1 +

 5 files changed, 26 insertions(+)

diff --git a/config.h.meson b/config.h.meson

index 0bab71848..202fb7ed1 100644

--- a/config.h.meson

+++ b/config.h.meson

@@ -58,6 +58,9 @@

 /* Xwayland applications allowed to issue keyboard grabs */

 #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES

+/* Defined if libcap-ng is available */

+#mesondefine HAVE_LIBCAPNG

+

 /* XKB base prefix */

 #mesondefine XKB_BASE

diff --git a/meson.build b/meson.build

index 3322bd3b1..01c8020fa 100644

--- a/meson.build

+++ b/meson.build

@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7'

 libcanberra_req = '>= 0.26'

 libwacom_req = '>= 0.13'

 atk_req = '>= 2.5.3'

+libcapng_req = '>= 0.7.9'

 # optional version requirements

 udev_req = '>= 228'

@@ -131,6 +131,7 @@ ice_dep = dependency('ice')

 atk_dep = dependency('atk', version: atk_req)

 libcanberra_dep = dependency('libcanberra', version: libcanberra_req)

 dbus_dep = dependency('dbus-1')

+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng'))

 # For now always require X11 support

 have_x11 = true

@@ -256,6 +258,7 @@ have_core_tests = false

 have_cogl_tests = false

 have_clutter_tests = false

 have_installed_tests = false

+have_libcapng = libcapng_dep.found()

 if have_tests

   have_core_tests = get_option('core_tests')

@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom)

 cdata.set('HAVE_SM', have_sm)

 cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification)

 cdata.set('HAVE_INTROSPECTION', have_introspection)

+cdata.set('HAVE_LIBCAPNG', have_libcapng)

 cdata.set('HAVE_PROFILER', have_profiler)

 xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')

@@ -465,6 +465,7 @@ output = [

   '        Introspection............ ' + have_introspection.to_string(),

   '        Profiler................. ' + have_profiler.to_string(),

   '        Xwayland initfd.......... ' + have_xwayland_initfd.to_string(),

+  '        libcap-ng................ ' + have_libcapng.to_string(),

   '',

   '    Tests:',

   '',

diff --git a/meson_options.txt b/meson_options.txt

index 73aa7adde..8bfaacd9a 100644

--- a/meson_options.txt

+++ b/meson_options.txt

@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules',

   value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr',

   description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland'

 )

+

+option('libcapng',

+  type: 'feature',

+  value: 'auto',

+  description: 'Enable libcap-ng support'

+)

diff --git a/src/core/main.c b/src/core/main.c

index 7f4f666d2..b27968f13 100644

--- a/src/core/main.c

+++ b/src/core/main.c

@@ -66,6 +66,10 @@

 #include <girepository.h>

 #endif

+#ifdef HAVE_LIBCAPNG

+#include <cap-ng.h>

+#endif

+

 #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)

 #include <systemd/sd-login.h>

 #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */

@@ -670,5 +674,12 @@ int

 meta_run (void)

 {

   meta_start ();

+

+#ifdef HAVE_LIBCAPNG

+  capng_clear(CAPNG_SELECT_BOTH);

+  capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE);

+  capng_apply(CAPNG_SELECT_BOTH);

+#endif

+

   meta_run_main_loop ();

   meta_finalize ();

diff --git a/src/meson.build b/src/meson.build

index 90d80734f..a9fffa2c2 100644

--- a/src/meson.build

+++ b/src/meson.build

@@ -18,6 +18,7 @@ mutter_pkg_deps = [

   glib_dep,

   gsettings_desktop_schemas_dep,

   gtk3_dep,

+  libcapng_dep,

   pango_dep,

 ]

-- 

2.23.0

From a58ace29db48f98ad59f4f309d49b458c68a6eec Mon Sep 17 00:00:00 2001

From: Bobby Rong <rjl931189261@126.com>

Date: Wed, 28 Jul 2021 22:08:11 +0800

Subject: [PATCH] Fix glitches in gala

Co-Authored-By: WORLDofPEACE <worldofpeace@protonmail.ch>

This fixes issues for users of mutter like in gala[0].

Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536

[0]: https://github.com/elementary/gala/issues/605

---

 clutter/clutter/clutter-actor.c | 1 -

 1 file changed, 1 deletion(-)

diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c

index febfb31918..71906000c0 100644

--- a/clutter/clutter/clutter-actor.c

+++ b/clutter/clutter/clutter-actor.c

@@ -15926,7 +15926,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)

   if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))

     {

       priv->paint_volume_valid = TRUE;

-      priv->needs_paint_volume_update = FALSE;

       return &priv->paint_volume;

     }

   else