From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 APw/LSWYc2cQFgAAe85BDQ:P1 (envelope-from ) for ; Tue, 31 Dec 2024 07:07:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id APw/LSWYc2cQFgAAe85BDQ (envelope-from ) for ; Tue, 31 Dec 2024 08:07:17 +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="p0sZp1s/"; 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=1735628837; 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=zkLxlDJAGRS1KnsVZolJbQVHmZR+kQ1V3l+C7+7VlAY=; b=aRBqN3f5SE7h5PU+PHvY0hiKs9+QN1lQux5C0Y1+/C5yEAfswLC8tp+q4zyWV9L+FKuvRl LrRY4SEJ4GK/2S96Y0oSCaBcCcBwxiMYdvOEF5dexJrEf+1cfX7Zqg6VztwLR3damlIFe3 5jDNuUTlDt9r8AO7WbGRJOSpbPRqaNf4hWf3EY27pZoKMJwy5TD8oZXXkuUtuHJZaU2Na+ Cg8lkTNjpQp4YYl92cgi3usslnzjuwFQTceVw2sakhFNICUdc/CE/rdxegbQqHPkZY+5vY xyoF5l/o3f6n070KGf6VHJ6AQP7KEzJwzq0lqeien+2a2+T1V+2qO4I0pJ6yVw== 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="p0sZp1s/"; 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=1735628837; a=rsa-sha256; cv=none; b=RSFuWrnOesToAtgZNvL65JX0cao8KWtMjjf9FxLCWdGHe0QcDFcNNRb/FAf7J++JJy/kTC fHUBlj+K79QH4ZfEwYxouRrY7zBATUI6xrA0sHvPPRyc6+cCfKKhinbE7Q9feBFGPQ8be2 oOIpUvCDcjie3JIDKetxW/zNd4yj6/lSBWZRzG4qtck4wIDOoEzzoqGAgUN+fJVbLtiKCY jTDfJiezchSx6pLMkqaO6V1/UUyQceRvv7R1dp11uk9MUpTVAN5ZNkIru2oZ9Ps9R6IlTE vNUnX55Q2VexvIOzStri1oHoBuG/e5iR5yVUJUOsag6eliCOyXCyFLL3mMWkZQ== 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 811291E8BD for ; Tue, 31 Dec 2024 08:07:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSVyo-0003fJ-75; Tue, 31 Dec 2024 01:43:50 -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 1tSVyB-0003TU-V3 for guix-patches@gnu.org; Tue, 31 Dec 2024 01:43:13 -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 1tSVy7-00057M-Vh for guix-patches@gnu.org; Tue, 31 Dec 2024 01:43: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=zkLxlDJAGRS1KnsVZolJbQVHmZR+kQ1V3l+C7+7VlAY=; b=p0sZp1s/CA1j2EAODBXtoNI2ye1D7YzwLjoM5NeY7G8qNvDFCH8DT2s4Y2uubb/bnGVsDJE6NnXo9ZooyEK5PM/8fLL6lfOydXI+nijjP5NF+UpdhdRggALHCDG2opy6tlFkqOvdCsqC+xGMaxFVjtdmL8uaRQFZfZOZYgmL7+3IOJLsOA0eH97JCrEo8yjAa2vn5SOm8LgsoIJyz95h/vnCsxnVrcQ8A2zceojLglOBK48E2UOhEO/lOhqgTp3+60TD588Gt8XlpMIFwMF8+NNhL1Kjqt/kL8I1v80Bl8j8tLrOVVE2YhTOpI5Zjfjf0QKFXqwTVQ+yrAZ19pEfUw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSVy4-0000p2-1v; Tue, 31 Dec 2024 01:43:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75146] [PATCH v4 05/68] 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: Tue, 31 Dec 2024 06:43:03 +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.17356273402847 (code B ref 75146); Tue, 31 Dec 2024 06:43:03 +0000 Received: (at 75146) by debbugs.gnu.org; 31 Dec 2024 06:42:20 +0000 Received: from localhost ([127.0.0.1]:60912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVxL-0000jp-VZ for submit@debbugs.gnu.org; Tue, 31 Dec 2024 01:42:20 -0500 Received: from mail.envs.net ([5.199.136.28]:35232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVx7-0000iQ-J1 for 75146@debbugs.gnu.org; Tue, 31 Dec 2024 01:42:06 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 3176E38A3E63; Tue, 31 Dec 2024 06:42:05 +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 2iFfs-igHBSd; Tue, 31 Dec 2024 06:42:01 +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:00 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f2b593fe; Tue, 31 Dec 2024 06:45:04 +0000 (UTC) Date: Tue, 31 Dec 2024 14:43:35 +0800 Message-ID: <6b771bf34112b9929d7b85a27eb279e1b95126cb.1735627083.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 1.30 X-Spam-Score: 1.30 X-Migadu-Queue-Id: 811291E8BD X-TUID: NBqCla2/K5Z6 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 cce60feeca..35ce1b20f6 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