From patchwork Wed Aug 30 04:22:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 53329 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 F3E6427BBEB; Thu, 31 Aug 2023 05:18:50 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 F18C527BBE2 for ; Thu, 31 Aug 2023 05:18:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbZ8D-0003SM-9L; Thu, 31 Aug 2023 00:18:09 -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 1qbZ82-0003Q4-WE for guix-patches@gnu.org; Thu, 31 Aug 2023 00:17:59 -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 1qbZ82-0005d5-5z for guix-patches@gnu.org; Thu, 31 Aug 2023 00:17:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbZ89-0008VP-IB; Thu, 31 Aug 2023 00:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65644] [PATCH gnome-team 8/9] gnu: gdm: Update to 44.1. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2023 04:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65644 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65644@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 65644-submit@debbugs.gnu.org id=B65644.169345546732603 (code B ref 65644); Thu, 31 Aug 2023 04:18:05 +0000 Received: (at 65644) by debbugs.gnu.org; 31 Aug 2023 04:17:47 +0000 Received: from localhost ([127.0.0.1]:54447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZ7q-0008Te-Oi for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:17:47 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:45120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZ7j-0008S7-Ro for 65644@debbugs.gnu.org; Thu, 31 Aug 2023 00:17:40 -0400 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-52a40cf952dso393542a12.2 for <65644@debbugs.gnu.org>; Wed, 30 Aug 2023 21:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693455446; x=1694060246; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=t0GqCz1pEKyELQ+0BZC+gepHZo9h0SQ4d+4MPbf3f10=; b=DveWDmRm7pZ2xHk4rvY3QAGcMovOx0+uNcbvMMyKgEilK/Y9CAP0pgX7yqtjpd6cAj ldhlOKKoi+PRkao0gJmpHXIc5Tt0mQPiL5btJTptTiNft53WbMpBAJJVQiDj7aEQS00a ysuEzdqKuiUTSVUTgmUep7FPajbzKz8zihsbz6A0N7Lu22KhzMHpKd7iVR5Cphi2zQVq FPTNEUaMRiNtLhB2xU4otm8FyQ15tILWHCZorNMWPrR0UGng3kCCE/S15wDTBo65EyYe CLCP8bf5xaQpfPWZHmR4QlqkHxtjjULJfHeLr5mWFoB0qRNU6ISjN8pY6gbLhgI2TfoA jtIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693455446; x=1694060246; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=t0GqCz1pEKyELQ+0BZC+gepHZo9h0SQ4d+4MPbf3f10=; b=EX8EwgdsbLSoQZwctp8SL98tbtupbxWVzXaxSPePxUUU0dQWVlBur5APKdUNLvWWLS ce3kINc8crSkVPty174+gI0KSlAeTVRooM7UYp/jz17ebX/ZRyz3pOTYvq1g17PsXbe1 K9MXctbcHf9UQB+MbvG9v4D1yLdwngTeiCJlCcMxcb45Gpqq6jNmYUlHQeGtt/nBEczI KJwRRYxGQBuMFeNVovc+Iw+hMA7yoK0gxccyMXnKLzHEzdamoFQ/yZtb5qCry5v8Y3PT 5hz04WYbkREnYd2zHDrh0+yCAMPjiaTyJMBJGI1KLRCNL5mq/p0kneJkn60U7c21RToR wH0w== X-Gm-Message-State: AOJu0YwUEknOhZffmpiWHeoyJ8TBOYHJG4Z2sj9oUGC4k/bvhOmpHIQS m1xXV9JUVyMntY7z1lIl/YNE5PaJvkgZdbAm X-Google-Smtp-Source: AGHT+IG0o73oSInKQ34Wlx/HnHNIJVzt4C6pzxdnef7TjaEPXS487EhyS410ipRJWfmGlOJh1wBPPQ== X-Received: by 2002:aa7:cf09:0:b0:522:3d36:ff27 with SMTP id a9-20020aa7cf09000000b005223d36ff27mr3242746edy.31.1693455446193; Wed, 30 Aug 2023 21:17:26 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d3-20020a056402516300b005256771db39sm313300ede.58.2023.08.30.21.17.25 for <65644@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 21:17:25 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Wed, 30 Aug 2023 06:22:28 +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 44.1. [inputs]: Add egl-wayland. * gnu/packages/patches/gdm-elogind-support.patch: Adjust accordingly. --- gnu/packages/gnome.scm | 5 +- .../patches/gdm-elogind-support.patch | 93 +++++++++---------- 2 files changed, 45 insertions(+), 53 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7341f58547..5e6a6df44c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8729,7 +8729,7 @@ (define-public libxml++-2 (define-public gdm (package (name "gdm") - (version "42.0") + (version "44.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8737,7 +8737,7 @@ (define-public gdm name "-" version ".tar.xz")) (sha256 (base32 - "0m9qmm3vm81jmqlc30a1fb79hsr4l4lpiw0zjxww3gipd6bsqa53")) + "03avvkrm2jd0731ggh9cjnkhrfysqp4slrq0km3gqa3xpqx6n9k8")) (patches (search-patches "gdm-default-session.patch" @@ -8930,6 +8930,7 @@ (define-public gdm (list accountsservice check ;for testing dbus + egl-wayland elogind eudev gnome-session diff --git a/gnu/packages/patches/gdm-elogind-support.patch b/gnu/packages/patches/gdm-elogind-support.patch index 5c8e3bd610..b27e000585 100644 --- a/gnu/packages/patches/gdm-elogind-support.patch +++ b/gnu/packages/patches/gdm-elogind-support.patch @@ -18,10 +18,10 @@ system and user units. meson_options.txt | 5 +- 6 files changed, 66 insertions(+), 42 deletions(-) -diff --git a/common/meson.build b/common/meson.build -index 074dd92e..bca58f7c 100644 ---- a/common/meson.build -+++ b/common/meson.build +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( ) @@ -31,10 +31,10 @@ index 074dd92e..bca58f7c 100644 gobject_dep, gio_dep, gio_unix_dep, -diff --git a/data/meson.build b/data/meson.build -index 2dec4c23..c3452e1c 100644 ---- a/data/meson.build -+++ b/data/meson.build +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 @@ -114,10 +114,10 @@ index 2dec4c23..c3452e1c 100644 # XSession if get_option('gdm-xsession') -diff --git a/libgdm/meson.build b/libgdm/meson.build -index 3f8cafbb..83e95151 100644 ---- a/libgdm/meson.build -+++ b/libgdm/meson.build +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, @@ -127,55 +127,46 @@ index 3f8cafbb..83e95151 100644 libgdmcommon_dep, ] -diff --git a/meson.build b/meson.build -index 845f673e..d0ca41ef 100644 ---- a/meson.build -+++ b/meson.build -@@ -96,21 +96,30 @@ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp')) - if xdmcp_dep.found() and get_option('tcp-wrappers') +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 -systemd_dep = dependency('systemd') -libsystemd_dep = dependency('libsystemd') --if meson.version().version_compare('>= 0.53') -- systemd_multiseat_x = find_program('systemd-multi-seat-x', -- required: false, -- dirs: [ -- systemd_dep.get_pkgconfig_variable('systemdutildir'), -- '/lib/systemd', -- '/usr/lib/systemd', -- ]) -+ +-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 -+ if meson.version().version_compare('>= 0.53') -+ systemd_multiseat_x = find_program('systemd-multi-seat-x', -+ required: false, -+ dirs: [ -+ systemd_dep.get_pkgconfig_variable('systemdutildir'), -+ '/lib/systemd', -+ '/usr/lib/systemd', -+ ]) -+ else -+ systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) -+ endif ++ 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 -- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) ++else + elogind_dep = dependency('libelogind') + logind_dep = elogind_dep + systemd_x_server = 'disabled' - endif --systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x' -+ ++endif # Plymouth plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth')) # Check for Solaris auditing API (ADT) -@@ -319,6 +328,7 @@ summary({ +@@ -319,6 +327,7 @@ summary({ 'PAM Syslog': have_pam_syslog, 'Supports PAM Extensions': pam_extensions_supported, 'SeLinux': libselinux_dep.found(), @@ -183,11 +174,11 @@ index 845f673e..d0ca41ef 100644 'Use GDM Xsession': get_option('gdm-xsession'), 'Use UserDisplayServer': get_option('user-display-server'), 'Use SystemdJournal': get_option('systemd-journal'), -diff --git a/meson_options.txt b/meson_options.txt -index 14e0b908..5135d7d6 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -12,6 +12,7 @@ option('initial-vt', type: 'integer', value: 1, description: 'Initial virtual te +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.') @@ -195,7 +186,7 @@ index 14e0b908..5135d7d6 100644 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: false, description: 'Build for Solaris +@@ -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.')