From patchwork Sun Sep 8 15:01:06 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: 67782 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 444C527BBEA; Sun, 8 Sep 2024 22:15:42 +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 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 E16BB27BBE2 for ; Sun, 8 Sep 2024 22:15:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snPFU-0005tF-Ci; Sun, 08 Sep 2024 17:15: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 1snPFM-0005mR-Q0 for guix-patches@gnu.org; Sun, 08 Sep 2024 17:15:00 -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 1snPFM-00088O-GI for guix-patches@gnu.org; Sun, 08 Sep 2024 17:15:00 -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=ao1dCME4GHf5YZyu/NqJViW+2dT5bFt8dlfm3jUQ3Dc=; b=ZSRzDP0v8R7lt9KFpkEJXKH8ntEsRkoAG2Do8Yx5460q2rUKCHlOefYlKV4xu0t9dO1UxXBiLD6a7F4grLCCeydA1PXTX7UWL05hgOw0nk7iYa+YVvDik02R1KMF9S4MaWvDOyu9vgDqf9NocTzBZLttEg23dEniY1gRU6nUy1JuhPv9tGa1rB3XQgfeay/KiFStNLdhhjeH1cm3vAGCcSRe4QnVec7r27HRtmSRAOgWPnQFrmFtJm++iLUjOgK+AU+bKPgNGxynqTHslbvijMqAFM++RGg5j6eewbgKvmF24HY5VYCfbak4xw7M9yViqFO/Zzjcsx8HumAXNuyezg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snPFP-0004KK-2d; Sun, 08 Sep 2024 17:15:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73128] [PATCH gnome-team 03/12] gnu: gnome-session: Update to 46.0. 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: Sun, 08 Sep 2024 21:15: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.172583005116450 (code B ref 73128); Sun, 08 Sep 2024 21:15:03 +0000 Received: (at 73128) by debbugs.gnu.org; 8 Sep 2024 21:14:11 +0000 Received: from localhost ([127.0.0.1]:60163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snPEX-0004H3-P4 for submit@debbugs.gnu.org; Sun, 08 Sep 2024 17:14:10 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:57574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snPET-0004Fd-Sh for 73128@debbugs.gnu.org; Sun, 08 Sep 2024 17:14:06 -0400 Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-42cb5b3c57eso5063475e9.2 for <73128@debbugs.gnu.org>; Sun, 08 Sep 2024 14:14:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725829977; x=1726434777; 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=ao1dCME4GHf5YZyu/NqJViW+2dT5bFt8dlfm3jUQ3Dc=; b=b/ArVp61tPVV8BFZlG+bDvFE6kGngN9xkuC1KcsQew3zhrRkUIKE0Eh74y0bMRLOSm j1fUetgNoXNA9xm3g24U4/D+S6ZkrJkKTLsWs1fTNUFYxnJxxWsxXVYFWZdq02RWBn3l 8lDzLqxHGabgc0si24i1+Wyw1uZSy1GOvZaNYO1B8wz4EZ5m8mFftEza0jLYwXm+OEqk Blci6cgd+LTzx3wanbdsseXG8RjFvyNrUosi7GO5F37EJ7MlMaPhBJNLjSlK6ccwEv6b KjfrlUw5ftPMoIrqJk0juUqcDQ/FQ2xg9Is6nAmRYogZYKssSjcYGQgHznJk2HGiqWQR ZwzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725829977; x=1726434777; 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=ao1dCME4GHf5YZyu/NqJViW+2dT5bFt8dlfm3jUQ3Dc=; b=nfuyyUUvS7v92Vpkpvu1x4r9qehpX8WnsbWvl5mbBNsIkll4jMJwkRUDvVTQk4lk6D dCqayMKSfcib+lVanoM+UER5L0zjMi4kV4maz1VxF6w0g9zjYo6ElFNOSiZhrPoo/Pya Bv6sE85gT0EZ6Gka3GbS2FGyvrX0ZZTSXaw9srQ8tnjZchgoiUVObcGbiaiSUuKhX5d6 og4peDnH16zHJXLi8drkPJPR/Nqo1ho9q/CoVDmFqJVI1Y/HhLc8ynYDN5hxkdQw+dKm YSOuWNem7zcIkoPnzznN15S9p068bng8uU7N5j6KkLgExXHHw0wbPYf6LYtOhbHy97IY dzvw== X-Gm-Message-State: AOJu0YwBpYySY6ysi6XBIhnt9qCIalNm0BgtRvyqfZqXBUNUujXu/4Dw Bf32ffaWCVv4hLDPrGL6U9N7EVMksBwQjx+lpVtbeGNHrN9wpAxJMxnuaWtF X-Google-Smtp-Source: AGHT+IHIe5U1eJyzAAxmWksdtYLbhmZNKYQ4SCmyZrTebr7gg5Zv1ErwygcHvphh4KASXnFBHNsn7A== X-Received: by 2002:a05:600c:4e8b:b0:428:fb96:e94a with SMTP id 5b1f17b1804b1-42c9f979928mr59735285e9.9.1725829977526; Sun, 08 Sep 2024 14:12:57 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378956e8674sm4255411f8f.115.2024.09.08.14.12.57 for <73128@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Sep 2024 14:12:57 -0700 (PDT) Message-ID: <0c8c231cea5e33e006a08233b701c3608553562a.1725829379.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 8 Sep 2024 17:01:06 +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 (gnome-session): Update to 46.0. [arguments]: Change to list of G-Expressions. <#:configure-flags>: Move above #:phases. Drop “-Delogind=true”, “-Dsystemd=false”, “-Dsystemd_session=disable”, and “-Dsystemd_journal=false”. Add “-Dsystemduserunitdir=$output/share/systemd”. * gnu/packages/patches/gnome-session-support-elogind.patch: Adjust accordingly. --- gnu/packages/gnome.scm | 33 ++++---- .../gnome-session-support-elogind.patch | 84 ++++--------------- 2 files changed, 33 insertions(+), 84 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7889fac877..62e53c7789 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7764,7 +7764,7 @@ (define-public file-roller (define-public gnome-session (package (name "gnome-session") - (version "44.0") + (version "46.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7773,23 +7773,22 @@ (define-public gnome-session (patches (search-patches "gnome-session-support-elogind.patch")) (sha256 (base32 - "1ipjvcjabifqgmrz65m3vwmhk99nbm8jcxcikyg5w4r6cnljky6c")))) + "0m4sgfzpkrhpy9bpmjiig3h8sypsmdl25zlil7hw82q9yr565qf6")))) (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-gnome-session - (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) - ;; Make sure 'gnome-session' finds the 'gsettings' program. - (wrap-program (search-input-file outputs "bin/gnome-session") - `("PATH" ":" prefix - (,(dirname (search-input-file (or native-inputs inputs) - "bin/gdbus")))))))) - #:configure-flags - '("-Delogind=true" - "-Dsystemd=false" - "-Dsystemd_session=disable" - "-Dsystemd_journal=false"))) + (list + #:glib-or-gtk? #t + #:configure-flags + #~(list (string-append "-Dsystemduserunitdir=" + #$output "/share/systemd")) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-gnome-session + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + ;; Make sure 'gnome-session' finds the 'gsettings' program. + (wrap-program (search-input-file outputs "bin/gnome-session") + `("PATH" ":" prefix + (,(dirname (search-input-file (or native-inputs inputs) + "bin/gdbus")))))))))) (build-system meson-build-system) (native-inputs (list docbook-xml-4.1.2 diff --git a/gnu/packages/patches/gnome-session-support-elogind.patch b/gnu/packages/patches/gnome-session-support-elogind.patch index b52b4c6855..9b9fef3168 100644 --- a/gnu/packages/patches/gnome-session-support-elogind.patch +++ b/gnu/packages/patches/gnome-session-support-elogind.patch @@ -1,73 +1,23 @@ This patch, borrowed from Gentoo, allows configuring gnome-sesssion with elogind support. -https://gitweb.gentoo.org/repo/gentoo.git/plain/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch?id=5f7fe88af5f888aff58fa0c069c3fe07973c7cd2 +https://gitweb.gentoo.org/repo/gentoo.git/plain/gnome-base/gnome-session/files/gnome-session-46.0-meson-Support-elogind.patch?id=47aae21c1beeef930aa7e2125d93e52bf237d2b9 -From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 15 Mar 2020 14:34:39 +0200 -Subject: [PATCH] meson: Support elogind - ---- - meson.build | 12 +++++++++--- - meson_options.txt | 1 + - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index ef5132c6..7f68aaae 100644 ---- a/meson.build -+++ b/meson.build -@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd') - enable_systemd_session = get_option('systemd_session') != 'disable' - use_systemd_session = get_option('systemd_session') == 'default' - enable_systemd_journal = get_option('systemd_journal') -+enable_elogind = get_option('elogind') - enable_consolekit = get_option('consolekit') --if enable_systemd or enable_consolekit -+assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once') -+if enable_systemd or enable_elogind or enable_consolekit - session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version) - - # Check for systemd -@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit - endif - - session_tracking = 'systemd' -+ elif enable_elogind -+ libelogind_dep = dependency('libelogind', version: '>= 239.4') -+ session_bin_deps += libelogind_dep -+ session_tracking = 'elogind' - endif - - # Check for ConsoleKit -@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit +--- a/meson.build 2024-07-29 16:43:01.812864903 +0200 ++++ b/meson.build 2024-07-29 16:54:16.654741387 +0200 +@@ -113,8 +113,13 @@ + pkgconfig_define: ['prefix', session_prefix]) + endif - session_bin_deps += dbus_glib_dep +-libsystemd_dep = dependency('libsystemd', version: '>= 209', required: true) +-session_bin_deps += libsystemd_dep ++libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false) ++if libsystemd_dep.found() ++ session_bin_deps += libsystemd_dep ++else ++ elogind_dep = dependency('libelogind', version: '>=209', required: true) ++ session_bin_deps += elogind_dep ++endif -- if enable_systemd -+ if enable_systemd or enable_elogind - session_tracking += ' (with fallback to ConsoleKit)' - else - session_tracking = 'ConsoleKit' -@@ -171,7 +177,7 @@ endif - if enable_systemd_session - assert(enable_systemd, 'Systemd support must be enabled when using systemd session management') - endif --config_h.set('HAVE_SYSTEMD', enable_systemd) -+config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind) - config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session) - config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal) - config_h.set('HAVE_CONSOLEKIT', enable_consolekit) -diff --git a/meson_options.txt b/meson_options.txt -index 4c05dc6e..512d1528 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,4 +1,5 @@ - option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags') -+option('elogind', type: 'boolean', value: true, description: 'Use elogind') - option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog') - option('systemd', type: 'boolean', value: true, description: 'Use systemd') - option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default') --- -2.26.2 - + configure_file( + output: 'config.h', \ No newline at end of file