From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 sIPFH1Kscmfz+QAAe85BDQ:P1 (envelope-from ) for ; Mon, 30 Dec 2024 14:21:06 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sIPFH1Kscmfz+QAAe85BDQ (envelope-from ) for ; Mon, 30 Dec 2024 15:21:06 +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=FnZRIS19; 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=1735568465; 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-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=NCT9KGvqjbaHRfQf/oO2pvciUz2Ih437MzR+4vnI+Lk=; b=SMtvVMpJ2DYqZ4pVXZ1d5vwEV31EOfK2gDxqLpa2PWfTXitLO2ySbmCwD29AKTdczAYBiE ws8YE6PiOnbchMhq3ndHioIEevp+6Fivq6Vbj+ESfw+Z3pGywzMXhFL0TjCJ5+MfthXKLQ LdZnJcwrysh0wB1EcPJpNl3piFdQY7JmdpQ2ndK9c6vFf2wjrEq968eaXQpSomUPooiBuv O3eVZTNIcoHaAtTiElZiGTCIiqlvXYZo9H8VquKSKSddR/E1lbUdZcdcFgWy0h0YNhBYxY 9Ay3qsH6FTLxG9qS1n+ockwz+MjlVkDf1vAatNjeAYVTL+XfZO9cnIOasNrF6A== 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=FnZRIS19; 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=1735568465; a=rsa-sha256; cv=none; b=lzFjVzkuCSlRoPs7EHctw/nzf5nwbWADOyHKfuJo1qnfcR4tK0xfzL7kCGHSr0ZzFZYDmO zHm6vYZ65OhaNFe9dyIJcds43QOMDCRw28bdhcIoSZj8pB+hkeqPMmQ/3Oj5b4uPaq10p/ Fl3xe7booQ15qdmHkw+QDlclS7nTU91u9YbFXfHOuPvcQH+Yyf2m9iZZ71hQOv9GqA1nz/ /WmVWgoCjnz8ElJit8TFaiL7kyYWol3AMYHtriuNpnFFymQ/RPgCnsqeY5HPBUiutR6nZ3 Qjq3yF2SPXMEoStiJ/3bZkeDJayCpeNIdNsSgObVp0T1H7LGspLVE3trK8pHbQ== 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 8428983262 for ; Mon, 30 Dec 2024 15:21:05 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSGd3-0005hc-Jr; Mon, 30 Dec 2024 09:20:21 -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 1tSGcu-0005dB-Bg for guix-patches@gnu.org; Mon, 30 Dec 2024 09:20:12 -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 1tSGct-0001sK-La for guix-patches@gnu.org; Mon, 30 Dec 2024 09:20:11 -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=NCT9KGvqjbaHRfQf/oO2pvciUz2Ih437MzR+4vnI+Lk=; b=FnZRIS19/VCIUinJjy5dsKaL+INkqYjw/dKOBgoX77aQu/uMbBtp6RKbee/IWXfFNUktINJdHL2TBOY9hVogW3IMUX4mejqY49526y+oO6P+ayZmtALcjW2duv211f/NmwgFAfZnsX2Bwlj1FEvGQrvT9DYOIhaWQxxOu+Ke7cfrVCDj2v0iQsA08if0fLAnMjNOGgz/5d5JakXc/fGyymsRa1e4DQh6824CosaiYHI0aatk3adopb3vXowfKr44FPKAMcbEZWhEtzcRNt4A7gbsTdvE6e2N5wnfsyt7H6yxRceAL+luTGsxYM2qrmaN2mBAYCVzxaH1R2ZLnkUyjw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSGcq-0003xZ-Id; Mon, 30 Dec 2024 09:20:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75146] [PATCH v3 05/16] gnu: xfconf: 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: Mon, 30 Dec 2024 14:20:08 +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: Ashvith Shetty , 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.173556837614864 (code B ref 75146); Mon, 30 Dec 2024 14:20:08 +0000 Received: (at 75146) by debbugs.gnu.org; 30 Dec 2024 14:19:36 +0000 Received: from localhost ([127.0.0.1]:57911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSGcJ-0003rT-AX for submit@debbugs.gnu.org; Mon, 30 Dec 2024 09:19:36 -0500 Received: from mail.envs.net ([5.199.136.28]:57692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSGcF-0003r7-8U for 75146@debbugs.gnu.org; Mon, 30 Dec 2024 09:19:32 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id D31A938A3E52; Mon, 30 Dec 2024 14:19:30 +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 1etUy9pi-80v; Mon, 30 Dec 2024 14:19:27 +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; Mon, 30 Dec 2024 14:19:26 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c56cacf7; Mon, 30 Dec 2024 14:22:18 +0000 (UTC) Date: Mon, 30 Dec 2024 22:21:50 +0800 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <9998f582163c7c335786b23bd282a43c60734652.1735568455.git.iyzsong@member.fsf.org> References: <9998f582163c7c335786b23bd282a43c60734652.1735568455.git.iyzsong@member.fsf.org> MIME-Version: 1.0 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.20 X-Spam-Score: -6.20 X-Migadu-Queue-Id: 8428983262 X-Migadu-Scanner: mx10.migadu.com X-TUID: 7wiVJUGdLU9Y From: Ashvith Shetty * gnu/packages/xfce.scm (xfconf)[source]: Switch to git-fetch. [home-page]: Set to docs.xfce.org. [arguments]: Remove 'patch-configure phase. Simpify 'check phase. Add '--enable-gtk-doc' to configure-flags. [native-inputs]: Add xfce4-dev-tools. Change-Id: Ib7ea144d0c788a287479ebd8a22c3f9504fe8ebf --- gnu/packages/xfce.scm | 69 +++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 42 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 25f7a539b8..25065f769a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -146,53 +146,38 @@ (define-public xfconf (package (name "xfconf") (version "4.20.0") - (source (origin - (method url-fetch) - (uri (string-append "https://archive.xfce.org/src/xfce/" - "xfconf/" (version-major+minor version) "/" - "xfconf-" version ".tar.bz2")) - (sha256 - (base32 - "1zbyar9hzvqf498z1a3q6kf6r77a6qm9x2gw6p7i6sviy5h3ri4b")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.xfce.org/xfce/xfconf") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1k4d2gg77p3jdr0rankz2mv50hy7ddf5xl32si1mdby1wvpa9r2k")))) (build-system gnu-build-system) (arguments - '(#:phases - ;; Run check after install phase to test dbus activation. - (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")))) - ;; tests-end seems to hang forever - (add-before 'configure 'patchout-tests-end - (lambda _ - (substitute* "tests/Makefile.in" - (("tests-end") "")))) - (add-after 'install 'custom-check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service - (string-append %output "/share")) - ;; For the missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "make" "check"))) - (delete 'check)))) - (native-inputs - (list pkg-config - intltool - `(,glib "bin") ;; for gdbus-codegen - gobject-introspection - vala - dbus)) + (list + #:configure-flags #~(list "--enable-gtk-doc") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "HOME" + (getenv "TMPDIR")) ;xfconfd requires a writable HOME + ;; For the missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + ;; Run test-suite under a dbus session. + (invoke "dbus-launch" "make" "check")))))) + (native-inputs (list dbus + gobject-introspection + vala + xfce4-dev-tools)) (propagated-inputs ;; libxfconf-0.pc refers to all these. (list glib)) - (inputs - (list libxfce4util)) - (home-page "https://www.xfce.org/") + (inputs (list libxfce4util)) + (home-page "https://docs.xfce.org/xfce/xfconf/") (synopsis "Configuration storage and query system for Xfce") (description "Settings daemon for Xfce, implemented as a D-Bus-based configuration -- 2.46.0