From patchwork Fri Sep 13 07:37:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 67913 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6788927BBE2; Fri, 13 Sep 2024 08:49:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2BB1627BBEA for ; Fri, 13 Sep 2024 08:49:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sp133-0000nu-SW; Fri, 13 Sep 2024 03:48:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sp131-0000mv-CP for guix-patches@gnu.org; Fri, 13 Sep 2024 03:48:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sp130-0002lr-WE for guix-patches@gnu.org; Fri, 13 Sep 2024 03:48:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=zSWK+t5RcmhnsuA+FMmkbAT68lu0yltsuDT0KhnE9tc=; b=gTaZm5nnsmEi/TjuDFsV50MjGMZdJ2GV39qnTN0CgoHtsZ4iVk2SXcjyDGgdFLjJcbxJS6/YX3DhmuxmzBPRUETrpp4a2SDioxtlO+S7O8wrUIQTDSJnlF2rN041BXOF7y4WWZqH7k7IWOUqpzon6Uwjn0ohicb2O+QMFzl2Z8PoCfQwnkOIn6/9PsXf0dfe2iZvk8Y4PLgex4PjurYVEA71UbkhlbdA0CovVACg+ftlLO8cZ352Aw+3X//pTx9hT7krkzo/EY5Zsb/oMRRYixj5LrHGedaz6cEM0rpIaAqaybR7yA9vmsUCLM2pfxrwcnKMfGY72VYRlv41d3at+w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sp139-0003fZ-Oz; Fri, 13 Sep 2024 03:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73128] [PATCH gnome-team v2 05/13] gnu: gdm: Update to 46.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 13 Sep 2024 07:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73128 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73128@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 73128-submit@debbugs.gnu.org id=B73128.172621373513999 (code B ref 73128); Fri, 13 Sep 2024 07:49:03 +0000 Received: (at 73128) by debbugs.gnu.org; 13 Sep 2024 07:48:55 +0000 Received: from localhost ([127.0.0.1]:42395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp130-0003dZ-Uc for submit@debbugs.gnu.org; Fri, 13 Sep 2024 03:48:55 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:57576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp12s-0003bg-Jo for 73128@debbugs.gnu.org; Fri, 13 Sep 2024 03:48:47 -0400 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-5c4136f7f1fso1979776a12.2 for <73128@debbugs.gnu.org>; Fri, 13 Sep 2024 00:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726213652; x=1726818452; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=zSWK+t5RcmhnsuA+FMmkbAT68lu0yltsuDT0KhnE9tc=; b=hqW10M8KLjQu6Zw/4Q9V68pRBGQyfL3J+6j+LTTafm1ed1yZ/YxUIw+1ZXfDSJqlQK zpCQPv1MMKURX6EwgtRH005HtizjU5ST60Q/I3SusEA8X9zoUHEMkaufZCWFQ0GRT+uy fpAjX/YfOsorXOKsMfHG0Tr+NQA8oCSN+GJRGMnbm7A0fs61uA8sYOTzw15E5LW//qcH EMYMeA6LGyMxy+PiJuDhRq435xKt1z7q9kos18myPRCkRL+oXoRpFg842f42XP+z+kzt QWKRBxAX+7QsnBduWF6hwQdrWdeVfXpQn/jA8s+77ngu/7AfSeU7Gydm7BwwVLnvlZCT 2YJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726213652; x=1726818452; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zSWK+t5RcmhnsuA+FMmkbAT68lu0yltsuDT0KhnE9tc=; b=Mz13bqb4jVP6woPjJ4UWsWRnejl4q9k12UCcUNBH5r25rpH0Yq7+RuS1QAKu3lCFxT D0sSa0qJlbG1tTvsQ5tRv9QdL3bp8vmI0PebzkEZurpM2je0lcZxoKF9vJxeUP7P5+Jr W18HtaPpkhH5hoGl4RJLDT6qxA000shgmrJSEzu24jTtkiiv4HAbhbkdUjpncdrGFDmJ 4+91lW2kZ6h81Hd/O4xACoPZ0g824An9s/NwsmaCEhDogYbJ9H15MoVSyKHgdD8HyWkz O9MT4UxxQkbjCq/qH6BLXm7rqhVzOlMk1ys0VZpCgEpR7gzAEyZr/YbF+AwnT5nEWje3 e9Yg== X-Gm-Message-State: AOJu0YyRawanidHh6azGpv0lKi9oVeO89FNwoFDqe/dwsdI93Bu9jnHg cg71R+N8+GipDo0hag/pG0LKP9EnzD8BVtMwVOMj38oQsm7QrVh5Q5TCTgxk X-Google-Smtp-Source: AGHT+IHaOtYIvli29/uxIPQEg7gzyakNUz1RW3dS+sT+epBCi1e54iiZw+0+ERJ2RRvzVpO2scfhQg== X-Received: by 2002:a17:907:f712:b0:a7a:9ca6:527 with SMTP id a640c23a62f3a-a90293fc2camr470060566b.8.1726213651815; Fri, 13 Sep 2024 00:47:31 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25c61279sm836767466b.108.2024.09.13.00.47.31 for <73128@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 00:47:31 -0700 (PDT) Message-ID: <1f9b9384737eacf3a2b6edddb8a10a4879c55e14.1726213021.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Fri, 13 Sep 2024 09:37:01 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (gdm): Update to 46.2. [source]: Drop “gdm-elogind-support.patch”. [#:phases]: Fix handling of dconf. [inputs]: Sort. Ad json-glib. * gnu/packages/patches/gdm-elogind-support.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 22 +- .../patches/gdm-elogind-support.patch | 199 ------------------ 3 files changed, 12 insertions(+), 210 deletions(-) delete mode 100644 gnu/packages/patches/gdm-elogind-support.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5e100ea756..bbf342119c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1356,7 +1356,6 @@ dist_patch_DATA = \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ %D%/packages/patches/gdm-default-session.patch \ - %D%/packages/patches/gdm-elogind-support.patch \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ %D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch \ %D%/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6bebd03c06..16ace031ad 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8974,7 +8974,7 @@ (define-public libxml++-2 (define-public gdm (package (name "gdm") - (version "44.1") + (version "46.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8982,11 +8982,10 @@ (define-public gdm name "-" version ".tar.xz")) (sha256 (base32 - "03avvkrm2jd0731ggh9cjnkhrfysqp4slrq0km3gqa3xpqx6n9k8")) + "12r6ppsdq9f0rlhfwldwhilshb1blp6m0944rm872lqn5914bqsf")) (patches (search-patches "gdm-default-session.patch" - "gdm-elogind-support.patch" "gdm-remove-hardcoded-xwayland-path.patch" "gdm-wayland-session-wrapper-from-env.patch" "gdm-pass-gdk-pixbuf-loader-env.patch")))) @@ -9033,6 +9032,10 @@ (define-public gdm (search-input-file inputs "bin/dbus-run-session"))))) (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) + ;; We don't want to write to other packages. + (substitute* "meson.build" + (("if dconf_dep\\.found\\(\\)" all) + (string-append all " and false"))) ;; We don't have . (substitute* '("common/gdm-log.c" "daemon/gdm-server.c" @@ -9184,23 +9187,22 @@ (define-public gdm pkg-config)) (inputs (list accountsservice - check ;for testing + at-spi2-core + check ; for testing dbus + dconf ; for wrap-accessibility-dependencies egl-wayland elogind eudev gnome-session + gnome-control-center gnome-settings-daemon gtk+ iso-codes + json-glib libcanberra libgudev - linux-pam - - ;; accessibility dependencies - at-spi2-core - dconf - gnome-control-center)) + linux-pam)) (synopsis "Display manager for GNOME") (home-page "https://wiki.gnome.org/Projects/GDM/") (description diff --git a/gnu/packages/patches/gdm-elogind-support.patch b/gnu/packages/patches/gdm-elogind-support.patch deleted file mode 100644 index b27e000585..0000000000 --- a/gnu/packages/patches/gdm-elogind-support.patch +++ /dev/null @@ -1,199 +0,0 @@ -https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/113 - -From 462cc0f5346f5913cf7151044f1c232c5d21c1c3 Mon Sep 17 00:00:00 2001 -From: Dudemanguy -Date: Fri, 13 Sep 2024 09:37:01 +0200 -Subject: [PATCH] meson: allow building with elogind - -Currently, the GDM meson build has a hard dependency on systemd. -However, GDM can function just fine if one is using elogind. This allows -a user to build GDM against libelogind and also disable the systemd -system and user units. ---- - common/meson.build | 2 +- - data/meson.build | 62 ++++++++++++++---------- - data/pam-arch/gdm-launch-environment.pam | 1 + - libgdm/meson.build | 2 +- - meson.build | 36 +++++++++----- - meson_options.txt | 5 +- - 6 files changed, 66 insertions(+), 42 deletions(-) - -Index: gdm-44.1/common/meson.build -=================================================================== ---- gdm-44.1.orig/common/meson.build -+++ gdm-44.1/common/meson.build -@@ -11,7 +11,7 @@ libgdmcommon_src = files( - ) - - libgdmcommon_deps = [ -- libsystemd_dep, -+ logind_dep, - gobject_dep, - gio_dep, - gio_unix_dep, -Index: gdm-44.1/data/meson.build -=================================================================== ---- gdm-44.1.orig/data/meson.build -+++ gdm-44.1/data/meson.build -@@ -164,41 +164,53 @@ else - service_config.set('PLYMOUTH_QUIT_SERVICE', '') - endif - --if get_option('systemdsystemunitdir') != '' -- systemd_systemunitdir = get_option('systemdsystemunitdir') --else -- systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -+systemdsystemunitdir = get_option('systemdsystemunitdir') -+if systemdsystemunitdir != 'no' -+ assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd system unit dir or disable it') -+ if get_option('systemdsystemunitdir') != '' -+ systemd_systemunitdir = get_option('systemdsystemunitdir') -+ else -+ systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -+ endif - endif - --if get_option('systemduserunitdir') != '' -- systemd_userunitdir = get_option('systemduserunitdir') --else -- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', -- define_variable: ['prefix', get_option('prefix')]) -+systemduserunitdir = get_option('systemduserunitdir') -+if systemduserunitdir != 'no' -+ assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -+ if get_option('systemduserunitdir') != '' -+ systemd_userunitdir = get_option('systemduserunitdir') -+ else -+ systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', -+ define_variable: ['prefix', get_option('prefix')]) -+ endif - endif - --configure_file( -- input: 'gdm.service.in', -- output: '@BASENAME@', -- configuration: service_config, -- install_dir: systemd_systemunitdir, -- format: 'cmake' --) -+if systemdsystemunitdir != 'no' -+ configure_file( -+ input: 'gdm.service.in', -+ output: '@BASENAME@', -+ configuration: service_config, -+ install_dir: systemd_systemunitdir, -+ format: 'cmake' -+ ) -+endif - - gdm_gnome_session_wanted_targets = [] - foreach component: gdm_gnome_user_session_wanted_components - gdm_gnome_session_wanted_targets += 'Wants=@0@.target'.format(component) - endforeach - --configure_file( -- input: 'session.conf.in', -- output: 'session.conf', -- configuration: { -- 'requires_component': gdm_gnome_shell_component, -- 'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets), -- }, -- install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d', --) -+if systemduserunitdir != 'no' -+ configure_file( -+ input: 'session.conf.in', -+ output: 'session.conf', -+ configuration: { -+ 'requires_component': gdm_gnome_shell_component, -+ 'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets), -+ }, -+ install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d', -+ ) -+endif - - # XSession - if get_option('gdm-xsession') -Index: gdm-44.1/libgdm/meson.build -=================================================================== ---- gdm-44.1.orig/libgdm/meson.build -+++ gdm-44.1/libgdm/meson.build -@@ -56,7 +56,7 @@ libgdm_deps = [ - glib_dep, - gio_dep, - gio_unix_dep, -- libsystemd_dep, -+ logind_dep, - libgdmcommon_dep, - ] - -Index: gdm-44.1/meson.build -=================================================================== ---- gdm-44.1.orig/meson.build -+++ gdm-44.1/meson.build -@@ -100,16 +100,24 @@ if xdmcp_dep.found() and get_option('tcp - libwrap_dep = cc.find_library('wrap') - endif - # systemd --systemd_dep = dependency('systemd') --libsystemd_dep = dependency('libsystemd') --systemd_multiseat_x = find_program('systemd-multi-seat-x', -- required: false, -- dirs: [ -- systemd_dep.get_pkgconfig_variable('systemdutildir'), -- '/lib/systemd', -- '/usr/lib/systemd', -- ]) --systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x' -+logind_provider = get_option('logind-provider') -+systemd_dep = dependency('systemd', required: false) -+if logind_provider == 'systemd' -+ libsystemd_dep = dependency('libsystemd') -+ logind_dep = libsystemd_dep -+ systemd_multiseat_x = find_program('systemd-multi-seat-x', -+ required: false, -+ dirs: [ -+ systemd_dep.get_pkgconfig_variable('systemdutildir'), -+ '/lib/systemd', -+ '/usr/lib/systemd', -+ ]) -+ systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x' -+else -+ elogind_dep = dependency('libelogind') -+ logind_dep = elogind_dep -+ systemd_x_server = 'disabled' -+endif - # Plymouth - plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth')) - # Check for Solaris auditing API (ADT) -@@ -319,6 +327,7 @@ summary({ - 'PAM Syslog': have_pam_syslog, - 'Supports PAM Extensions': pam_extensions_supported, - 'SeLinux': libselinux_dep.found(), -+ 'Logind Provider': get_option('logind-provider'), - 'Use GDM Xsession': get_option('gdm-xsession'), - 'Use UserDisplayServer': get_option('user-display-server'), - 'Use SystemdJournal': get_option('systemd-journal'), -Index: gdm-44.1/meson_options.txt -=================================================================== ---- gdm-44.1.orig/meson_options.txt -+++ gdm-44.1/meson_options.txt -@@ -12,6 +12,7 @@ option('initial-vt', type: 'integer', va - option('ipv6', type: 'boolean', value: false, description: 'Enables compilation of IPv6 code.') - option('lang-file', type: 'string', value: '', description: 'File containing default language settings.') - option('libaudit', type: 'feature', value: 'auto', description: 'Add Linux audit support.') -+option('logind-provider', type: 'combo', choices: ['systemd', 'elogind'], value: 'systemd', description: 'Which logind library to use.') - option('log-dir', type: 'string', value: '/var/log/gdm', description: 'Log directory.') - option('pam-mod-dir', type: 'string', value: '', description: 'Directory to install PAM modules in.') - option('pam-prefix', type: 'string', value: '', description: 'Specify where PAM files go.') -@@ -27,8 +28,8 @@ option('solaris', type: 'boolean', value - option('split-authentication', type: 'boolean', value: true, description: 'Enable multiple simultaneous PAM conversations during login.') - option('sysconfsubdir', type: 'string', value: 'gdm', description: 'Directory name used under sysconfdir.') - option('systemd-journal', type: 'boolean', value: true, description: 'Use journald support.') --option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files.') --option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files.') -+option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files, or \'no\' to disable.') -+option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files, or \'no\' to disable.') - option('tcp-wrappers', type: 'boolean', value: false, description: 'Use TCP wrappers.') - option('udev-dir', type: 'string', value: '', description: 'Directory for udev rules file.') - option('user', type: 'string', value: 'gdm', description: 'GDM\'s username.')