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: 53603 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 A8F6727BBE2; Wed, 6 Sep 2023 21:24:17 +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 EBFF527BBE9 for ; Wed, 6 Sep 2023 21:24:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdz4I-0007ka-6o; Wed, 06 Sep 2023 16:24:08 -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 1qdz4G-0007jQ-4i for guix-patches@gnu.org; Wed, 06 Sep 2023 16:24:04 -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 1qdz4F-0006lb-Sz for guix-patches@gnu.org; Wed, 06 Sep 2023 16:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdz4G-00049R-V3; Wed, 06 Sep 2023 16:24:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65644] [PATCH gnome-team v2 8/9] gnu: gdm: Update to 44.1. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 20:24:04 +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: Maxim Cournoyer , liliana.prikler@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, rg@raghavgururajan.name Received: via spool by 65644-submit@debbugs.gnu.org id=B65644.169403182515871 (code B ref 65644); Wed, 06 Sep 2023 20:24:04 +0000 Received: (at 65644) by debbugs.gnu.org; 6 Sep 2023 20:23:45 +0000 Received: from localhost ([127.0.0.1]:37858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdz3w-00047o-JZ for submit@debbugs.gnu.org; Wed, 06 Sep 2023 16:23:45 -0400 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:50604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdz3n-000469-Si for 65644@debbugs.gnu.org; Wed, 06 Sep 2023 16:23:36 -0400 Received: by mail-lj1-x244.google.com with SMTP id 38308e7fff4ca-2bcbfb3705dso4766451fa.1 for <65644@debbugs.gnu.org>; Wed, 06 Sep 2023 13:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694031808; x=1694636608; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=Eu5yRl/6eIai+u+GIt7FktJNdustMVArMA2H83hkfpk=; b=OMUEu7lCjW/bpmMgMRVXi31s0SZr43eEAq1xlza3TrzSd8Abn+WEyApoRMnw4dCLW5 rB5J1kFx7Rquu2Xu3pw6mkNbXBSHkHZq0D4LDgyekkFKhqGuStmnWXW9TkTGLOcNnMok 8pKaP6Tiztn6fbTEXl38SBrRRCpJCBxsjExs6Zaf1SRm0fUcebMKQ0UQU+yBeIneQAM/ 1VzqzuODy6+aF5r56KaHgo1+wFoi0GYIDVl+mQQMU0UlbiGhbJ77bVrDIkrUKMtVs40b 1WIdHJKjyhHFjwsmXiXvIufcmbs1TBc4BhHUTRlY+L110rbrdmjcK4846sLmQDTSblNk 9J/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694031808; x=1694636608; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Eu5yRl/6eIai+u+GIt7FktJNdustMVArMA2H83hkfpk=; b=JTXx0MoVdj2vLUPsyvpQz8cqREez4Ypr8snvHv8HR1Y65a9YVMtYEsslemHitkdRJi MVKj3Tv0caE3GT/i1Y0gWbkLZtPixmO2MwkWttlG/CX4T5FF6h5HtN7mamSlGpUcsm69 95Ps0v4OynQPIN19TnmPSnnjpDjzQsUiU85p+QhYj6FtJEr5/RzK4z6WPcR3GqP84g/N i7V9wYwBJKIW2Cokw1WUDs65FWGBJJfY+iG9oo0/JGhdIzPP55itE3I0tsYzhkg8+PjU IXGMboUmE2lUgerw6EGZ/nqtCDo+0UyB6TKoDtxCLbGciTJlL2WRHj4jyuothIhlEe0c nbJA== X-Gm-Message-State: AOJu0YzrPOWtqcranHqVCpChsCsu56YcA8yma6Aob4i2A42FSpUMbWo/ qfPaR5jU4EE06O4jLfVuR+Ej6o8V8mBkLwuz X-Google-Smtp-Source: AGHT+IEwjYw5II6Ii2a9yOXnCQ5lDpodFnd6MIMnsHZzsyWcpd/AS0Z1qbCvz9s7Mf8t4ABu23hH0Q== X-Received: by 2002:a2e:9586:0:b0:2bb:a28b:58e1 with SMTP id w6-20020a2e9586000000b002bba28b58e1mr3242552ljh.41.1694031808330; Wed, 06 Sep 2023 13:23:28 -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 um16-20020a170906cf9000b00992d70f8078sm9429602ejb.106.2023.09.06.13.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 13:23:27 -0700 (PDT) Message-ID: <9c28ee9daf0927905916e2102830b958b20a164c.1694031712.git.liliana.prikler@gmail.com> In-Reply-To: <35a9ebf83ef1063dfdda255b5a670d19747564f7.1694031712.git.liliana.prikler@gmail.com> References: <35a9ebf83ef1063dfdda255b5a670d19747564f7.1694031712.git.liliana.prikler@gmail.com> 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 049a6df8da..81e3e0cd65 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8728,7 +8728,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 "/" @@ -8736,7 +8736,7 @@ (define-public gdm name "-" version ".tar.xz")) (sha256 (base32 - "0m9qmm3vm81jmqlc30a1fb79hsr4l4lpiw0zjxww3gipd6bsqa53")) + "03avvkrm2jd0731ggh9cjnkhrfysqp4slrq0km3gqa3xpqx6n9k8")) (patches (search-patches "gdm-default-session.patch" @@ -8929,6 +8929,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.')