Unverified Commit 9c3661e7 authored by Maxine Aubrey's avatar Maxine Aubrey
Browse files

gnome.gdm: 45.0.1 → 46.0 

https://gitlab.gnome.org/GNOME/gdm/-/compare/45.0.1...46.0



Changelog-Reviewed-By: default avatarMaxine Aubrey <max@ine.dev>
parent c204c234

pkgs/desktops/gnome/core/gdm/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
, ninja

, pkg-config

, glib

, json-glib

, itstool

, xorg

, accountsservice
@@ -42,13 +43,13 @@ in 


stdenv.mkDerivation (finalAttrs: {

  pname = "gdm";

  version = "45.0.1";

  version = "46.0";



  outputs = [ "out" "dev" ];



  src = fetchurl {

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

    sha256 = "ZXJXjAXjxladbtJp994qrzoDVldlRYbYJDkHu3pv+oU=";

    hash = "sha256-jWy1IXbspItrvxz+L9rgjZZ3taDyvKYA3uRgTeDdHvw=";

  };



  mesonFlags = [
@@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { 
    accountsservice

    audit

    glib

    json-glib

    gtk3

    keyutils

    libX11
@@ -94,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { 
    # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch";

      sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q=";

      hash = "sha256-5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q=";

      revert = true;

    })

pkgs/desktops/gnome/core/gdm/fix-paths.patch

+10 −10
Original line number Diff line number Diff line 
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c

index 5fbbad68..739718ec 100644

index f2d8e155b..54b998826 100644

--- a/daemon/gdm-local-display-factory.c

+++ b/daemon/gdm-local-display-factory.c

@@ -233,9 +233,9 @@ struct GdmDisplayServerConfiguration {

@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {

         const char *session_type;

 } display_server_configuration[] = {

 #ifdef ENABLE_WAYLAND_SUPPORT
@@ -15,10 +15,10 @@ index 5fbbad68..739718ec 100644 
 };

 

diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c

index cc61efc9..4c9d15af 100644

index fc5aef6ac..c61e0046b 100644

--- a/daemon/gdm-manager.c

+++ b/daemon/gdm-manager.c

@@ -148,7 +148,7 @@ plymouth_is_running (void)

@@ -151,7 +151,7 @@ plymouth_is_running (void)

         GError  *error;

 

         error = NULL;
@@ -27,7 +27,7 @@ index cc61efc9..4c9d15af 100644 
                                          NULL, NULL, &status, &error);

         if (! res) {

                 g_debug ("Could not ping plymouth: %s", error->message);

@@ -166,7 +166,7 @@ plymouth_prepare_for_transition (void)

@@ -169,7 +169,7 @@ plymouth_prepare_for_transition (void)

         GError  *error;

 

         error = NULL;
@@ -36,7 +36,7 @@ index cc61efc9..4c9d15af 100644 
                                          NULL, NULL, NULL, &error);

         if (! res) {

                 g_warning ("Could not deactivate plymouth: %s", error->message);

@@ -181,7 +181,7 @@ plymouth_quit_with_transition (void)

@@ -184,7 +184,7 @@ plymouth_quit_with_transition (void)

         GError  *error;

 

         error = NULL;
@@ -45,7 +45,7 @@ index cc61efc9..4c9d15af 100644 
         if (! res) {

                 g_warning ("Could not quit plymouth: %s", error->message);

                 g_error_free (error);

@@ -197,7 +197,7 @@ plymouth_quit_without_transition (void)

@@ -200,7 +200,7 @@ plymouth_quit_without_transition (void)

         GError  *error;

 

         error = NULL;
@@ -55,10 +55,10 @@ index cc61efc9..4c9d15af 100644 
                 g_warning ("Could not quit plymouth: %s", error->message);

                 g_error_free (error);

diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c

index 4b709731..245ac0cf 100644

index a4c4b2dcf..67416b204 100644

--- a/daemon/gdm-session.c

+++ b/daemon/gdm-session.c

@@ -2972,16 +2972,16 @@ gdm_session_start_session (GdmSession *self,

@@ -3193,16 +3193,16 @@ gdm_session_start_session (GdmSession *self,

                  */

                 if (run_launcher) {

                         if (is_x11) {
@@ -79,7 +79,7 @@ index 4b709731..245ac0cf 100644 
                 }

         }

diff --git a/data/gdm.service.in b/data/gdm.service.in

index 17e8a8de..afc70977 100644

index 17e8a8de8..afc709778 100644

--- a/data/gdm.service.in

+++ b/data/gdm.service.in

@@ -26,7 +26,7 @@ Restart=always