From patchwork Sat Dec 28 11:52:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 36005 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C403127BBE9; Sat, 28 Dec 2024 11:56:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2F1A327BBEE for ; Sat, 28 Dec 2024 11:56:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRVQO-0006xD-J4; Sat, 28 Dec 2024 06:56:08 -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 1tRVQJ-0006lL-NH for guix-patches@gnu.org; Sat, 28 Dec 2024 06:56:03 -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 1tRVQJ-00063A-EK for guix-patches@gnu.org; Sat, 28 Dec 2024 06:56:03 -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=Zkx0g2iQLNsl1DXXUjNSQ3Hf8HHw0kFvYqI9pv8jDUw=; b=votjy2AxcBn7AMpuWE5UcP1PKdCSA7tAwm0aWkSTLp1MzPqS2iqndvFC+4yhE/ZR+TcRKl+MRgckBsMP/b8sUd/M0EGtQh7CWnIhDXGj1z0jQK4BPW4jpG5j3AGOTLtlqg4s3/ZBeeMG6/UrwIIqU+hp5EVf6idz9fPmbnIAtCQ3NwtbvlOTJ33Xhl/kyEVbtgqH8eBZQA5tJRzNgYLL9nO0VaUpDQKw7BWQ94rS1sjhWpm/8wByUbkwjAeDqgDC/ZOV1ADnW0AV7rbf6iF1F48alXK6bh+HQGTmJgmNxz/g/2B6at1J5u/G+kKAfZWBPtDhpnNjXuiwXNegG5IX3A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRVQJ-0000oZ-9L for guix-patches@gnu.org; Sat, 28 Dec 2024 06:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75146] [PATCH v1 04/15] gnu: xfconf: Update variable fields. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 11:56: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 Received: via spool by 75146-submit@debbugs.gnu.org id=B75146.17353869363056 (code B ref 75146); Sat, 28 Dec 2024 11:56:03 +0000 Received: (at 75146) by debbugs.gnu.org; 28 Dec 2024 11:55:36 +0000 Received: from localhost ([127.0.0.1]:49551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRVPs-0000nD-2O for submit@debbugs.gnu.org; Sat, 28 Dec 2024 06:55:36 -0500 Received: from mail-pl1-f178.google.com ([209.85.214.178]:52639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRVPp-0000n5-KU for 75146@debbugs.gnu.org; Sat, 28 Dec 2024 06:55:34 -0500 Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21661be2c2dso89590385ad.1 for <75146@debbugs.gnu.org>; Sat, 28 Dec 2024 03:55:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735386873; x=1735991673; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Zkx0g2iQLNsl1DXXUjNSQ3Hf8HHw0kFvYqI9pv8jDUw=; b=mdt8oOzQQlC4LK5zDYfw4SrHMLd9zqajYG3buiq/CPU8y+F3x4dJNVy1I0be4dku20 qZlsaBLP2C1z4XMENJzpcVISIENwLr8uCeMn5Jj9XbEyWo0urflDCczXhP2e/+9VuD7z Z7her8Xgu5MVxxRoi/lJ+QSwlU+B1VKYBtPtNRbcvY23ZyWFSKaDbzUdJYThXlVxj+K3 0djRdp4biGIMAbPuVNBYFDaM1LVfv4gyyaM06hNfBZjA95n8avELJI9+4vU/aTIWPIbX uoxdbSjLAnFKZbHSgKq5Knil0ZG73koz7ltVmTOEvDjkKVCZ36PUOvE8fHETbktZeG9K LEmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735386873; x=1735991673; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zkx0g2iQLNsl1DXXUjNSQ3Hf8HHw0kFvYqI9pv8jDUw=; b=vyiJSwqd/UVPl2gDlEw20q2IsIXJOD9kyQSWNb4VqTia1/wghKnAyZDABhfqAJpClp wTqOvNxl8kkXSpMl4G5c6KED9E+G5GUZ6Xvq3A64xUey9CdC2YdykeoddaZnqFHe6TQB Re97IcDUixkm3WQ4OG5bKpkoCvlMB9AjCpew+pslRfN5j6WMPxeYEJCw446Oh2ts+PsK rBvnqbB2CAsBjCOFpKiYwqEfVPwH57Ovrz/rmTK5aY3TXj4bR4ZkZfzKGrNwEfhNNXtF a4CUU73H+R2H6/Kwt8ro8vBnio/st+9zN4g6AoSP0BEnEEwnVV3qkBv79c1nqdfKYLbK XmVA== X-Gm-Message-State: AOJu0YymsHlb+DkuVjWvXtXszePnuRRegeuxDJZcURaN/PlitQTpqxSV F+v5K2Y8wYQzYnG3RIX88wsTr28r5FHPvIopBoNVUe2gGg9I1xOaAMiEBRmV X-Gm-Gg: ASbGncua8CVaGBWHuJ59HkBmqxzkEhopovXQrDWwaJx5o/nAVfTej4v5lVGIq0mSAFv 6psHTTQCSr90e9yh1Ggku3O0ORuLTKig7RkPgppHezWt8pf8qVaLy+28xskxdlaf+ISLB6kF1Yz lZqNECrMz7eOuio6CDh+AsmYsVYVmKJ06RRHFuHxFEAjDTIziFa8Oo9pl2ie+zvd30LvNpYoh9Q rFYYYeY5PwOL10B+o2toM5poxKGusHDRifH37Fry1+htmqZ5sr0cvBC8BCU9IU56AYS6Agkp2cV B3hWEkqx5Q== X-Google-Smtp-Source: AGHT+IGYye1qLuWfZkEYkxYiGp4PHyt92sH54Em2zS2rpR49fJGRvXSXhy6EZdFa7hZR9vI01qFcdg== X-Received: by 2002:a17:903:32c5:b0:215:e98c:c5bb with SMTP id d9443c01a7336-219e6eb43d6mr435592305ad.28.1735386872774; Sat, 28 Dec 2024 03:54:32 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:846d:3ba6:3078:1833:5938]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-219dc96e919sm149487555ad.69.2024.12.28.03.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2024 03:54:32 -0800 (PST) From: Ashvith Shetty X-Google-Original-From: Ashvith Shetty Date: Sat, 28 Dec 2024 17:22:54 +0530 Message-ID: <20241228115320.24218-5-ashvith@noreply.codeberg.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241228115320.24218-1-ashvith@noreply.codeberg.org> References: <20241228115320.24218-1-ashvith@noreply.codeberg.org> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Ashvith Shetty * gnu/packages/xfce.scm (xfconf): [source]: Update to XFCE's GitLab URL. [home-page]: Set to docs.xfce.org. [arguments]: Undo delete of phase 'check. Replace 'custom-check with 'check. [native-inputs]: Add autoconf, automake, gtk-doc, libtool, and xfce4-dev-tools. Change-Id: Ib7ea144d0c788a287479ebd8a22c3f9504fe8ebf --- gnu/packages/xfce.scm | 84 +++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e3a746dee9..a60f4515b1 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -129,53 +129,53 @@ (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 + #: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")))) + (replace '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")))))) + (native-inputs (list autoconf + automake + dbus + (list glib "bin") ;for gdbus-codegen + gobject-introspection + gtk-doc + intltool + libtool + pkg-config + 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