From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id SAnUJfKfc2dRdwEAqHPOHw:P1 (envelope-from ) for ; Tue, 31 Dec 2024 07:40:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id SAnUJfKfc2dRdwEAqHPOHw (envelope-from ) for ; Tue, 31 Dec 2024 08:40:34 +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=nTKiZrxb; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735630834; 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=HkBWt5Vgmn1GHmkOzXDu/JHQL38f/TcrBLLiQBOEy2A=; b=Y8a7UzOa+7S8ARPTJGh1sOR4tn3fHq4LmoKGt4Ekwe+cO8Cten9tOanovLLU89DFxCV3Kx 48JMP8PxF6KXKSFQn2GhhICbIXegyS0X7LKjWvPkJA6rjBY1cwDsCC7N849/l2xXWJHz6O o4G31S5On+/Ka8pRWdawLBI9JXMGT3zckIucy22D1gXugOQ7lr4bkxt2VVgYNpir3I+FD2 aGJeqAkUEX7kSeKesrEamqBCpEPJQIemtFh1OjPdDItn1/t4PJVHRpwbxhXpexTk7XqcM/ q6DkENT789cHvZfPSZzAWNsMZO2gAUE5TDRgh7TsCVbxS/36hWHF04GkjCJ/2g== 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=nTKiZrxb; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735630834; a=rsa-sha256; cv=none; b=qFO2HQIEJsr/6TWlsthNDHeppFRd2vGltjIdKGblV8G55IQaFK1rcnBWakkVkrLNW/P+6X btz3y9f43GrrRbAnz2y9nnzrUE/rXp39AOmkY08s0M98quKqeaZ8fvWdvTSSBt6/EBg4a2 60GYIkevMmCBeXksJUIFywMOV5UwAOcnMJkVPVq49yrBSI/WjFN+mXr53uMe4SNtbahw+1 ZteVL2Cj7WJzgIceh734z1DIYb2iIVddxwP/FdMDsmHmqK8ZgRJgtpJ5qL2Bjwh7iybyfg SNmA0G5IW1lcWvWB1idKDcL8w0MKRI/FNbGMgbOWudjxmZn07JIg+AW5xflAWQ== 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 71A5C1F2FE for ; Tue, 31 Dec 2024 08:40:34 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSVz9-0004ND-33; Tue, 31 Dec 2024 01:44:11 -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 1tSVz4-0004Bw-6e for guix-patches@gnu.org; Tue, 31 Dec 2024 01:44:06 -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 1tSVz3-0005Hx-SX for guix-patches@gnu.org; Tue, 31 Dec 2024 01:44:05 -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=HkBWt5Vgmn1GHmkOzXDu/JHQL38f/TcrBLLiQBOEy2A=; b=nTKiZrxbOs8jgjGNmuDujLQzFtn0f4BbrvTb3wRt4ADRb2A3hwmEQpJYnGIOUtSjBj+jSAx9Vytl5KpmR4M5W+emv88akJKekeH8x68AuZyqI98r0qAE9NRGK7rFx9a+0EMvQclxpgyYZMfVjOTpB5AbnD/DECdtopED3ezIJvon8NBVVkK9v1WNWbco2V9Be7S2O+CUqaTbU6qNGmb0vKm66lPXxY0mI0D6+fYhoyXQ2/X4Q/rUkfgMyjuyAp80aFd7WJu6OVJgcnMPQ3uhGmF5fE4Ias+lGojFthx4YADCQ11Gw6KFBukeGKDCOmVnE6IWRzeMYwBrSe6pfA34nQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSVz0-0000yB-Sz; Tue, 31 Dec 2024 01:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75146] [PATCH v4 20/68] gnu: xfce4-session: Switch to git source. 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: Tue, 31 Dec 2024 06:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75146@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 75146-submit@debbugs.gnu.org id=B75146.17356274113427 (code B ref 75146); Tue, 31 Dec 2024 06:44:02 +0000 Received: (at 75146) by debbugs.gnu.org; 31 Dec 2024 06:43:31 +0000 Received: from localhost ([127.0.0.1]:32800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVyU-0000tC-RZ for submit@debbugs.gnu.org; Tue, 31 Dec 2024 01:43:31 -0500 Received: from mail.envs.net ([5.199.136.28]:47948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVxZ-0000lC-Sr for 75146@debbugs.gnu.org; Tue, 31 Dec 2024 01:42:38 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 7982938A3E72; Tue, 31 Dec 2024 06:42:33 +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 AhxySk3DNvZj; Tue, 31 Dec 2024 06:42:30 +0000 (UTC) Received: from localhost (unknown [112.44.106.216]) (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; Tue, 31 Dec 2024 06:42:25 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id aff17a7c; Tue, 31 Dec 2024 06:45:08 +0000 (UTC) Date: Tue, 31 Dec 2024 14:43:50 +0800 Message-ID: X-Mailer: git-send-email 2.47.1 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: mx12.migadu.com X-Migadu-Spam-Score: 0.80 X-Spam-Score: 0.80 X-Migadu-Queue-Id: 71A5C1F2FE X-TUID: kRPtvArX/5g8 From: 宋文武 * gnu/packages/xfce.scm (xfce4-session)[source]: Switch to git-fetch. [arguments]: Add "--enable-maintainer-mode" to configure-flags. Remove 'patch-configure phase. [native-inputs]: Add xfce4-dev-tools. [home-page]: Set to docs.xfce.org. Change-Id: Id234bc39d803f616d386771896347a7a8185fe81 --- gnu/packages/xfce.scm | 52 +++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 8fa5f3a0a3..235c4e69a8 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -684,41 +684,35 @@ (define-public xfce4-session (package (name "xfce4-session") (version "4.20.0") - (source (origin - (method url-fetch) - (uri (string-append "https://archive.xfce.org/src/xfce/" - "xfce4-session/" (version-major+minor version) "/" - "xfce4-session-" version ".tar.bz2")) - (sha256 - (base32 - "11agss7x749i4wnw82czv0b053mhqn34hwi8rihj6sgfwqzj6aaj")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "libxfsm/xfsm-shutdown-common.h" - (("/sbin/shutdown -h now") "halt") - (("/sbin/shutdown -r now") "restart") - (("/usr/sbin/pm-suspend") "pm-suspend") - (("/usr/sbin/pm-hibernate") "pm-hibernate")) - #t)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://gitlab.xfce.org/xfce/" name)) + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zzmszwm22nnwybagnvan62qbqcgcr7fnp288qcr9bkkag5y8zcs")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "libxfsm/xfsm-shutdown-common.h" + (("/sbin/shutdown -h now") "halt") + (("/sbin/shutdown -r now") "restart") + (("/usr/sbin/pm-suspend") "pm-suspend") + (("/usr/sbin/pm-hibernate") "pm-hibernate")) + #t)))) (build-system gnu-build-system) (arguments '(#:configure-flags - (list (string-append "--with-xsession-prefix=" %output) + (list "--enable-maintainer-mode" ;for xfce4-session-settings_ui.h + (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-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"))))))) + '("gtk_update_icon_cache=true"))) (native-inputs - (list (list glib "bin") pkg-config intltool)) + (list xfce4-dev-tools)) (inputs (list iceauth gtk-layer-shell @@ -728,7 +722,7 @@ (define-public xfce4-session libwnck libxfce4ui libxfce4windowing)) - (home-page "https://www.xfce.org/") + (home-page "https://docs.xfce.org/xfce/xfce4-session/") (synopsis "Xfce session manager") (description "Session manager for Xfce, it will restore your session on startup and -- 2.46.0