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 uDbYATqYc2cPIgAAqHPOHw:P1 (envelope-from ) for ; Tue, 31 Dec 2024 07:07:38 +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 uDbYATqYc2cPIgAAqHPOHw (envelope-from ) for ; Tue, 31 Dec 2024 08:07:38 +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=sQRgYAt7; 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=1735628857; 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=Ce1hBSJIwYh2wUMZN/jyi/0E0ZS1kt6Gd34NqSG4YVc=; b=U5Sp+q03TR2fejJ59fiQI8a8WvK0ACsnofFNYXVq6igGwmBWYXFY1LxbDS5Qpfj8p54uUm ew6AKZrfKShr7k36nfPmkLCfp060y3zRu2vC9QIgWxaJXd9Hgre+iMN2GMGyT+ipZjh64u 8pXqF6Wfkh541gEZiuSY8JopyClBPFHegHwjd7ckLtvSNf04yedi/S11Xjb3IpjR6Qgb72 9FVxrEVTlODNAzK2142tGLhNZW7Y3DYZBpJTgfv4IuB/KdtN+2teMMr32NGbLuEMHsXah8 tFwuSVrNodxscdNCfgp1tXjnzKBbJoP1hg8j15mXt+8pxVCsw7JDsVhjeUkSVQ== 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=sQRgYAt7; 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=1735628857; a=rsa-sha256; cv=none; b=fP96YabtpkzGPeTVSjr8Ar+2i6XiNFDHF9IUMjbH2JZl0OJumh7aDTK9W8gecUfx13zTSG RTfzwfnWdYTLGuRf1IV9kzy09NYxuLiAwGK+FAnX2+pPeCm4PqKGrOlj/+ljqOTBgkpNNC 66SCB5LXbNMeFH5cPRzLVxjcHLNflAUtQwTxMKvlLT39qWjHru7NGW3mNPX21XZvmcH4Yk UyLQ6aslGWeSE29SlJiloeOWbWoQ9TMgScxV3vSIz6vkJ54FHWk+9L7UO2BfRKVvd2EDyf KKIlNQH5JCmhH9VPy1ARiHgU/mknSx9nQX2mfVix4ScSTp5Qxunq6EJM/TYVZQ== 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 C808E1E8C2 for ; Tue, 31 Dec 2024 08:07:37 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSVzw-0005It-8v; Tue, 31 Dec 2024 01:45:00 -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 1tSVz7-0004LJ-OY for guix-patches@gnu.org; Tue, 31 Dec 2024 01:44: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 1tSVz7-0005Kr-F3 for guix-patches@gnu.org; Tue, 31 Dec 2024 01:44: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=Ce1hBSJIwYh2wUMZN/jyi/0E0ZS1kt6Gd34NqSG4YVc=; b=sQRgYAt73z3vRwAjThIWY4O66Lg3osvndKu/hE5GKG1UMzEK/wRAE0OYOesgJCiEgF088Wx5GtPaVBJvQSnM3EwhrItJ2Ijown0MqPdPf7+vLJLHB7duPohck8QfCPo1NXaK00jQtSiW0JTmDAQX69rVoWkBrV6Y0DgGlhQrUP4RFZvxZzTQVJLLNr4ZRVGI4xyPNa0/3C+6ce38OkkoP46bSP9e0qtdSrGpQB0BvaJfP5LbVkpdkds0w56yP8tvgIbD8JMXfE+AWx2ybChuY7NxPYmoCqi9s8s6NopYXRIRZJJJ8foYvh+V0X0nXQHLUc+82LUAfiK1tq4eRFXetQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSVz7-0000zp-5f; Tue, 31 Dec 2024 01:44:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75146] [PATCH v4 30/68] gnu: xfdesktop: 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:09 +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.17356274153502 (code B ref 75146); Tue, 31 Dec 2024 06:44:09 +0000 Received: (at 75146) by debbugs.gnu.org; 31 Dec 2024 06:43:35 +0000 Received: from localhost ([127.0.0.1]:32819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVyZ-0000uJ-Dv for submit@debbugs.gnu.org; Tue, 31 Dec 2024 01:43:35 -0500 Received: from mail.envs.net ([5.199.136.28]:43984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVxu-0000nr-Ji for 75146@debbugs.gnu.org; Tue, 31 Dec 2024 01:42:55 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 3348038A3E75; Tue, 31 Dec 2024 06:42:54 +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 1IavoLvBYyeT; Tue, 31 Dec 2024 06:42:50 +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:43 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id d6cbc19d; Tue, 31 Dec 2024 06:45:10 +0000 (UTC) Date: Tue, 31 Dec 2024 14:44:00 +0800 Message-ID: <92cce034e4d32780bb0f447a5e41d874168238b6.1735627083.git.iyzsong@member.fsf.org> 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: C808E1E8C2 X-TUID: 5WYHlype5yTc From: 宋文武 * gnu/packages/xfce.scm (xfdesktop)[source]: Switch to git-fetch. [arguments]: Remove 'patch-configure phase. [native-inputs]: Add xfce4-dev-tools. [home-page]: Set to docs.xfce.org. Change-Id: I6981395966bd54d2b42879df97e2317ada55ac5d --- gnu/packages/xfce.scm | 45 ++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 4ea06ba4a8..6bc29fc8c1 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1049,35 +1049,24 @@ (define-public xfdesktop (package (name "xfdesktop") (version "4.20.0") - (source (origin - (method url-fetch) - (uri (string-append "https://archive.xfce.org/src/xfce/" - "xfdesktop/" (version-major+minor version) "/" - "xfdesktop-" version ".tar.bz2")) - (sha256 - (base32 - "0cjnsrf7788vyq1mfcx4qypdhd9b2gqigj6yk6ffpwy7h2x42w12")) - (modules '((guix build utils))) - (snippet - #~(begin - (copy-file #$(file-append %artwork-repository "/logo/Guix.svg") - "backgrounds/guix-logo.svg") - #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 "0z3ps7n1ilsgx83phk46aqzfp96zxisxl7xngls054ak9nb3fj7k")) + (modules '((guix build utils))) + (snippet + #~(begin + (copy-file #$(file-append %artwork-repository "/logo/Guix.svg") + "backgrounds/guix-logo.svg") + #t)))) (build-system gnu-build-system) (arguments `(#: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") - (("\\$PKG_CONFIG --variable=glib_compile_resources gio-2.0") - "type -p glib-compile-resources") - (("\\$PKG_CONFIG --variable=glib_genmarshal glib-2.0") - "type -p glib-genmarshal") - (("\\$PKG_CONFIG --variable=glib_mkenums glib-2.0") - "type -p glib-mkenums")))) (add-before 'configure 'prepare-background-image (lambda _ ;; Stick a Guix logo in the background image. XXX: It @@ -1099,7 +1088,7 @@ (define-public xfdesktop #:disallowed-references (,inkscape/stable ,imagemagick))) (native-inputs - (list (list glib "bin") pkg-config intltool + (list xfce4-dev-tools ;; For our own ‘prepare-background-image’ phase. inkscape/stable imagemagick)) (inputs @@ -1112,7 +1101,7 @@ (define-public xfdesktop libxfce4windowing libyaml thunar)) - (home-page "https://www.xfce.org/") + (home-page "https://docs.xfce.org/xfce/xfdesktop/") (synopsis "Xfce desktop manager") (description "Desktop manager for Xfce, it sets the background color or image with -- 2.46.0