From patchwork Fri Oct 27 17:51:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55425 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 146E327BBEA; Fri, 27 Oct 2023 19:02:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 1EBDE27BBE2 for ; Fri, 27 Oct 2023 19:02:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwRAG-0007kW-84; Fri, 27 Oct 2023 14:02:32 -0400 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 1qwRAE-0007k4-Ef for guix-patches@gnu.org; Fri, 27 Oct 2023 14:02:30 -0400 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 1qwRAE-0000gT-7h for guix-patches@gnu.org; Fri, 27 Oct 2023 14:02:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwRAj-00080u-Ls for guix-patches@gnu.org; Fri, 27 Oct 2023 14:03:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66689] [PATCH gnome-team v5 17/17] gnu: dbus: Update to 1.15.8. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Oct 2023 18:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66689 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66689@debbugs.gnu.org Received: via spool by 66689-submit@debbugs.gnu.org id=B66689.169842977330786 (code B ref 66689); Fri, 27 Oct 2023 18:03:01 +0000 Received: (at 66689) by debbugs.gnu.org; 27 Oct 2023 18:02:53 +0000 Received: from localhost ([127.0.0.1]:37140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwRAa-00080U-Ee for submit@debbugs.gnu.org; Fri, 27 Oct 2023 14:02:52 -0400 Received: from planete-kraus.eu ([89.234.140.182]:46038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwRAZ-00080M-7f for 66689@debbugs.gnu.org; Fri, 27 Oct 2023 14:02:51 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id f773bf28 for <66689@debbugs.gnu.org>; Fri, 27 Oct 2023 18:02:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=albinoniB; bh=GLMgzst+jRYxoO6vbvJafCDNUY4=; b=A 331P7RRgmjWwGGwgpRuEhcyNaN3k/TU3b6iSwdPx86K5PLsoUHU5+8hv6N4SUuQw sDJ1EWVj3IyVherPyj7peWWjs32HpoY0CobaqFe6lbejBraEemx1pc9ovTiEXJ+X XpX3H7L4CyA2ZXnp/JBOmuG/g0B3Hw9xBnzSzZVYWoma506+yGG/VCc1BydXeN96 9iY8Iyh/AR3WCFxmzsOAUnF9KpAT8cgrMosHTQI4clZrDG/fDJCaFwSLMTvmPTrz hStedScjCxKI2QG/qr5TbuPpLKtegP3pT/zSOfEVvL8Ukkr35KEcDfdLhC09MXOv qON4qcx5IKy0c0STC8dBg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 32d5bdf9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66689@debbugs.gnu.org>; Fri, 27 Oct 2023 18:02:18 +0000 (UTC) Message-ID: <5c098200f03a7e20033d344f8b44485d5126e917.1698429258.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Fri, 27 Oct 2023 19:51:58 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 * gnu/packages/glib.scm (dbus): Update to 1.15.8. [arguments]: Convert to list of G-Expressions. [native-inputs]: Add autoconf, autoconf-archive, automake, libtool and which. Sort. Change-Id: I1833eb51ab37f138ec4d007230d84b541d66170d --- gnu/packages/glib.scm | 73 ++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3c1a2080d7..2e3c5f0e8b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -37,6 +37,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -106,7 +107,7 @@ (define-module (gnu packages glib) (define dbus (package (name "dbus") - (version "1.14.0") + (version "1.15.8") (source (origin (method url-fetch) (uri (string-append @@ -114,49 +115,57 @@ (define dbus version ".tar.xz")) (sha256 (base32 - "1m7bibavml4gx9d67j403l0kzd1a4z8lhrpxb2as3q4nfpiwrmyc")) + "016j3rqc8m62bg0h7z4rpvbvm5bg0hbjrld733f0aby8drz5kz44")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - (list - ;; Install the system bus socket under /var. - "--localstatedir=/var" + (list + #:configure-flags + #~(list + ;; Install the system bus socket under /var. + "--localstatedir=/var" - ;; Install the session bus socket under /tmp. - "--with-session-socket-dir=/tmp" + ;; Install the session bus socket under /tmp. + "--with-session-socket-dir=/tmp" - ;; Build shared libraries only. - "--disable-static" + ;; Build shared libraries only. + "--disable-static" - ;; Use /etc/dbus-1 for system-wide config. - ;; Look for configuration file under - ;; /etc/dbus-1. This is notably required by - ;; 'dbus-daemon-launch-helper', which looks for - ;; the 'system.conf' file in that place, - ;; regardless of what '--config-file' was - ;; passed to 'dbus-daemon' on the command line; - ;; see . - "--sysconfdir=/etc") - #:phases - (modify-phases %standard-phases - (replace 'install - (lambda _ - ;; Don't try to create /var and /etc. - (invoke "make" - "localstatedir=/tmp/dummy" - "sysconfdir=/tmp/dummy" - "install")))))) + ;; Use /etc/dbus-1 for system-wide config. + ;; Look for configuration file under + ;; /etc/dbus-1. This is notably required by + ;; 'dbus-daemon-launch-helper', which looks for + ;; the 'system.conf' file in that place, + ;; regardless of what '--config-file' was + ;; passed to 'dbus-daemon' on the command line; + ;; see . + "--sysconfdir=/etc") + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + ;; Don't try to create /var and /etc. + (invoke "make" + "localstatedir=/tmp/dummy" + "sysconfdir=/tmp/dummy" + "install")))))) (native-inputs - (list pkg-config - ;; Dependencies to generate the doc. + ;; Some dependencies are required to generate the documentation. Also, + ;; quoting NEWS for 1.15.8: “Autotools-generated files are no longer + ;; included in the tarball release.” + (list autoconf + autoconf-archive + automake docbook-xml-4.4 docbook-xsl doxygen - xmlto + libtool libxml2 ;for XML_CATALOG_FILES libxslt - yelp-tools)) + which + xmlto + yelp-tools + pkg-config)) (inputs (list expat ;; Add a dependency on libx11 so that 'dbus-launch' has support for