From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id wEGqHM7qZGfRHwAAqHPOHw:P1 (envelope-from ) for ; Fri, 20 Dec 2024 03:55:58 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id wEGqHM7qZGfRHwAAqHPOHw (envelope-from ) for ; Fri, 20 Dec 2024 04:55:58 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GTBPiV9p; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734666958; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=WbtmFnJYtq0GabMPBxtekEv5FWrDWC18RIY3DvX/cTs=; b=NjdMBe+EeIpFNWUg5DNm11ENFpbB9ekd0YCfmr35zYU6NQPL1nlNaYBqRoP6PMbeV9UEqo V1r6LvODO2OTBz3FRESZ4b6IPF/Gq1SAObtG7xRHDlQkWuqVCyMd2kgIIR9wrCXzPw7eO2 6XzRKwshmM7s4CNL5PMiD6F80/Yd4Iy4IvHvlbKCDxO8ZUry0kI+k+WMYQNmTt/phL0f5Y aL1YFYty5gzwCEgGpnj85D/ZGty1xmDGvoTldwV1ohkjC8YCU0NpqXOpkLKKLsQSarsyZX xgv67l9BQueb4TTlm+eereATlWKASHhcycObx5/FV7PWjBGh4fycsihmjKR/iA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734666958; a=rsa-sha256; cv=none; b=ua/CrmfjgyyeWDEy5pvXIM8BEdC1GBIduUZL22RGpukWf+V7CuL6hP5e6NuVzmJL+3Nd/5 akoT2YwtTjBELNqGKb6TlIGJf32WXTmWwlUzpgH707XmReEt09NfcuKRUaof6Xun2LnfYr kDpDp5QKbsulGsK7JH8NgQvA4kQOlSbUL+DMEKMPOLbecuXyN1ze55eQLK3oppwUlrv7jG LWljMIeXPFIDh87BAyNWPQjzrbnZYbd1tclc2Bsdq0xTDXrvkja2Hbi8EF9c+lXL1XqrHb BtlvtmoQBRNwPEkhE8w3domz6M8ztl66sQwKNp1vRiWBcaOeSy/ryNpU9Hu76g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GTBPiV9p; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 303F71E5D8 for ; Fri, 20 Dec 2024 04:55:58 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOU6b-0005sz-L3; Thu, 19 Dec 2024 22:55:13 -0500 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 1tOU6X-0005o4-OD for guix-patches@gnu.org; Thu, 19 Dec 2024 22:55:09 -0500 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 1tOU6X-0001XS-71 for guix-patches@gnu.org; Thu, 19 Dec 2024 22:55:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=WbtmFnJYtq0GabMPBxtekEv5FWrDWC18RIY3DvX/cTs=; b=GTBPiV9pSB4N6G5f8Wjz+9xHG36AakeYXhNYlD0BTNmwhUItLquec4df/RND0yxrmeQXHwsDgFUgetMd3KWT/TG/zvwTVOwJRuG88oHVxcKYsyeh390uQC/KgpXSKMZTOp1UAtgOXZkS62B5F9Q/bhARcaKV6ceHXYkByYHzGnJOBa0dyvxH+l/5BbRwiewToqNrf3sX0goInqGF1b32Ezu+2j2JECy3BSVDM3u9p653BYhI+BTsTU4UH6k5Ls/n4sZrj0YGeE4f3hEhbvU4KqlGcOfIET0ny5Cf5A1A9HvMjeCzZGPRUKuNDUstFWO9MeAXgaFqYYujxPqD9Waxhw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOU6X-0006hp-0N; Thu, 19 Dec 2024 22:55:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74989] [PATCH 12/23] gnu: xfce4-session: Update to 4.20.0. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2024 03:55:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74989@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 74989-submit@debbugs.gnu.org id=B74989.173466688225507 (code B ref 74989); Fri, 20 Dec 2024 03:55:08 +0000 Received: (at 74989) by debbugs.gnu.org; 20 Dec 2024 03:54:42 +0000 Received: from localhost ([127.0.0.1]:41038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOU66-0006d7-4e for submit@debbugs.gnu.org; Thu, 19 Dec 2024 22:54:42 -0500 Received: from mail.envs.net ([5.199.136.28]:35538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOU5y-0006cE-F5 for 74989@debbugs.gnu.org; Thu, 19 Dec 2024 22:54:34 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 132AA38A3E2D; Fri, 20 Dec 2024 03:54:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Q7d9aVcHNAi6; Fri, 20 Dec 2024 03:54:30 +0000 (UTC) Received: from localhost (unknown [112.44.101.251]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 20 Dec 2024 03:54:26 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id aaff6a74; Fri, 20 Dec 2024 03:57:09 +0000 (UTC) Date: Fri, 20 Dec 2024 11:56:43 +0800 Message-ID: <1c0553cc98ec7efaeab70940af27c594fe85aedf.1734666530.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches From: iyzsong--- via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.52 X-Spam-Score: -6.52 X-Migadu-Queue-Id: 303F71E5D8 X-TUID: dBXueEpfpfbh From: 宋文武 * gnu/packages/xfce.scm (xfce4-session): Update to 4.20.0. [source]: Adjust snippet. [arguments]: Remove 'patch-xflock phase. Add 'patch-configure phase. Pass "--with-wayland-session-prefix" to configure. [inputs]: Add gtk-layer-shell and libxfce4windowing. Remove xset. Change-Id: I0b33e30976ef44da5f505cd2cbd486fd025ec270 --- gnu/packages/xfce.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 4a502d75a4..925ea17d71 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -687,11 +687,11 @@ (define-public xfce4-session "xfce4-session-" version ".tar.bz2")) (sha256 (base32 - "05k5w3n3hyb93a74f0qc6q0lky4vc51vdlsra8d8i2rkqxs5174s")) + "11agss7x749i4wnw82czv0b053mhqn34hwi8rihj6sgfwqzj6aaj")) (modules '((guix build utils))) (snippet '(begin - (substitute* "xfsm-shutdown-helper/main.c" + (substitute* "libxfsm/xfsm-shutdown-common.h" (("/sbin/shutdown -h now") "halt") (("/sbin/shutdown -r now") "restart") (("/usr/sbin/pm-suspend") "pm-suspend") @@ -700,27 +700,30 @@ (define-public xfce4-session (build-system gnu-build-system) (arguments '(#:configure-flags - (list (string-append "--with-xsession-prefix=" %output)) + (list (string-append "--with-xsession-prefix=" %output) + (string-append "--with-wayland-session-prefix=" %output)) ;; Disable icon cache update. #:make-flags '("gtk_update_icon_cache=true") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-xflock - (lambda* (#:key inputs #:allow-other-keys) - (let ((xset (assoc-ref inputs "xset"))) - (substitute* "scripts/xflock4" - (("xset") (string-append xset "/bin/xset"))))))))) + (add-before 'configure 'patch-configure + (lambda _ + (substitute* "configure" + ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path. + (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0") + "type -p gdbus-codegen"))))))) (native-inputs - (list pkg-config intltool)) + (list (list glib "bin") pkg-config intltool)) (inputs (list iceauth + gtk-layer-shell upower polkit libsm libwnck libxfce4ui - xset)) + libxfce4windowing)) (home-page "https://www.xfce.org/") (synopsis "Xfce session manager") (description -- 2.46.0