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: 67910 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 99E0E27BBEA; Fri, 13 Sep 2024 08:49:43 +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 E088E27BBE2 for ; Fri, 13 Sep 2024 08:49:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sp132-0000n3-BE; Fri, 13 Sep 2024 03:48:56 -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 1sp130-0000mP-63 for guix-patches@gnu.org; Fri, 13 Sep 2024 03:48:54 -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 1sp12z-0002lW-TV for guix-patches@gnu.org; Fri, 13 Sep 2024 03:48:53 -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=Rc26AW0zmcXfhrAgnKnDurLKqxiWq4QELzbRZ1IU0Ps=; b=Mn5s5dKe0FugbDcwTcljlAItWRF6LlI7jciuXHW9sAeYaW7slMDJdSJv9QqDimWagD/l5SI3lDDddNn6ApN08s+5uo/JmVT2gwUtY+KG8S3F9hGGunwQLauGnuj/H/Hw53f0M9+4f7RQRPw6CGAB7RuytGD5zIJ2LsOyuUMGYDrg+SbjuyvyEoIgaAIAHEQ5HgNOlKMWyz0HsglfQYKh28yZZ5XvlvUBLb0d39un0wvjox/2eKyt5ebJZ236rlCmVYNpLOHCkxP7aj0d9brgN8q6SGi4C2f0enjyIoDC/15CoteIu1d4QufYQFWz9MNMpYyPMLRSiD3mnKio/pwOxg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sp138-0003f6-8x; Fri, 13 Sep 2024 03:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73128] [PATCH gnome-team v2 03/13] 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: Fri, 13 Sep 2024 07:49:02 +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.172621373013939 (code B ref 73128); Fri, 13 Sep 2024 07:49:02 +0000 Received: (at 73128) by debbugs.gnu.org; 13 Sep 2024 07:48:50 +0000 Received: from localhost ([127.0.0.1]:42383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp12u-0003ca-Dl for submit@debbugs.gnu.org; Fri, 13 Sep 2024 03:48:49 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:58771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp12q-0003bc-KR for 73128@debbugs.gnu.org; Fri, 13 Sep 2024 03:48:45 -0400 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-a8ce5db8668so287732766b.1 for <73128@debbugs.gnu.org>; Fri, 13 Sep 2024 00:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726213650; x=1726818450; 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=Rc26AW0zmcXfhrAgnKnDurLKqxiWq4QELzbRZ1IU0Ps=; b=NJSMFdNxmz2OC0wcPYxQyyvKi43oR0o2e/bddtH/VoBEl4crZ7KG+iTn2RFFdI+oad eXwIw3blIB6cIzWJ/pJ4+wAwZ2jQ4D63+fWGZmURfEmsP7yYP3HS3y5Pd3ZlRuvVytbb Z1Q9Lv664VGZl0R7CZtvFuArc4CE+B33GWadcvAmJVJIUBXf5CR14b0y6Q8zNicVmmtp pQahy2uZtcJWy2KzTEmt7XqY7IIW20KdsxyW9zEhADe2/lGtdfMa0nnYCwhOZlXdYJzr 5fu1FjjtsQ6+vRb5iYRYarEvc8wqfB+xFsAVRvN/Aor640z1nmifwxvImUR0b9hvzJGq tPHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726213650; x=1726818450; 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=Rc26AW0zmcXfhrAgnKnDurLKqxiWq4QELzbRZ1IU0Ps=; b=IhfMhv7x5UGFRubni5iZYzKUHLnr9YYyiJYDH/+29zHLbWfh9v8abCfeWVSCWe6+8G TSmEBZP4avgH/AkIz3lbFOekLKTBwXeLpgqTiiHFdyAlTB5TfyDqH/2lOMRQxMI/hxSH Se0SktihnK9WYxBp9TAQidH9/NTJ/lLdjMvKitkGkLTYsyE/ETzlBFrR+VT7L8EXSJmK +hzvjfsejmhV1F1LhwvWJJMJX2TeFYO7iIvKjh8ak3+YFObQN50xexLBoWzdLlNpHuK4 sikN5byxAvYPYcJsrEiZGFFAZxvOnarVuEO1+yUxUvZffewEfsYvBcCPinLQ9cw66vWm tVUg== X-Gm-Message-State: AOJu0Yxk/vtUDbau0c2Ak3nRfgW/GEB0aqQcz7FvUhBfH6vjoiPKjbiI aAEITk9ckiuF9LYa9JJnDLpQ5WAof+g0bYxyLjdHqoVgAVFC5Z2fhkSwayEI X-Google-Smtp-Source: AGHT+IEbLYULAOHknXTXfR8yPNk2kRicdZfwQNr2WqbFAT1e0KP79Wasnqqjv/uVaADPfDlDW4v/xA== X-Received: by 2002:a17:907:6e9f:b0:a86:b64e:bc4d with SMTP id a640c23a62f3a-a902961d618mr509124466b.44.1726213649968; Fri, 13 Sep 2024 00:47:29 -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.29 for <73128@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 00:47:29 -0700 (PDT) Message-ID: <0c8c231cea5e33e006a08233b701c3608553562a.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 (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: Fri, 13 Sep 2024 09:37:01 +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