From patchwork Wed Aug 23 22:35:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53140 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 239CB27BBE9; Wed, 23 Aug 2023 23:38:41 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 2922B27BBE2 for ; Wed, 23 Aug 2023 23:38:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwUR-0000Sv-F6; Wed, 23 Aug 2023 18:38:15 -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 1qYwUB-0000Fi-7b for guix-patches@gnu.org; Wed, 23 Aug 2023 18:38:00 -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 1qYwUA-00058N-Uh for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwUE-0004H4-56 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 28/61] gnu: udisks: Rewrite using G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169283023816304 (code B ref 65479); Wed, 23 Aug 2023 22:38:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:37:18 +0000 Received: from localhost ([127.0.0.1]:35466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTV-0004Ee-Jm for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:37:18 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:37484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTE-00048w-Sh for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:37:01 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id AEA5C20E97 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 1F1AD80098; Thu, 24 Aug 2023 00:36:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id PWmtOepxM4W8; Thu, 24 Aug 2023 00:36:14 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 1A7CF80060; Thu, 24 Aug 2023 00:36:14 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:20 +0100 Message-Id: <28df5a47c71c3f9a517f6fe22dea0acbad354d8b.1692830150.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/freedesktop.scm (udisks)[arguments]: Rewrite using G-Expressions. Drop trailing #t. [native-inputs]: Drop labels. --- gnu/packages/freedesktop.scm | 120 +++++++++++++++++------------------ 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index cf7c2fbd4d..61d830d74b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1491,15 +1491,15 @@ (define-public udisks "06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj")))) (build-system gnu-build-system) (native-inputs - `(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages - ("docbook-xsl" ,docbook-xsl) - ("glib:bin" ,glib "bin") ; for glib-mkenums - ("gnome-common" ,gnome-common) ; TODO: Why is this needed? - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("xsltproc" ,libxslt))) + (list docbook-xml-4.3 ; to build the manpages + docbook-xsl + `(,glib "bin") ; for glib-mkenums + gnome-common ; TODO: Why is this needed? + gobject-introspection + gtk-doc/stable + intltool + pkg-config + libxslt)) (propagated-inputs (list glib)) ; required by udisks2.pc (inputs @@ -1517,59 +1517,55 @@ (define-public udisks (outputs '("out" "doc")) ;5 MiB of gtk-doc HTML (arguments - `(#:tests? #f ; requiring system message dbus - #:disallowed-references ("doc") ;enforce separation of "doc" - #:configure-flags - (list "--enable-man" - "--enable-available-modules" ; Such as lvm2, btrfs, etc. - "--localstatedir=/var" - "--enable-fhs-media" ;mount devices in /media, not /run/media - (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/doc/udisks/html") - (string-append "--with-udevdir=" %output "/lib/udev")) - #:make-flags - (let* ((docbook-xsl-name-version ,(string-append - (package-name docbook-xsl) "-" - (package-version docbook-xsl))) - (docbook-xsl-catalog-file (string-append - (assoc-ref %build-inputs "docbook-xsl") - "/xml/xsl/" - docbook-xsl-name-version - "/catalog.xml")) - (docbook-xml-catalog-file (string-append - (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml"))) - ;; Reference the catalog files required to build the manpages. - (list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file " " - docbook-xml-catalog-file))) - #:phases - (modify-phases %standard-phases - (add-before - 'configure 'fix-girdir - (lambda _ - ;; Install introspection data to its own output. - (substitute* "udisks/Makefile.in" - (("girdir = .*") - "girdir = $(datadir)/gir-1.0\n") - (("typelibsdir = .*") - "typelibsdir = $(libdir)/girepository-1.0\n")))) - (add-after 'install 'wrap-udisksd - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Tell 'udisksd' where to find the 'mount' command. - (let ((out (assoc-ref outputs "out")) - (utils (assoc-ref inputs "util-linux")) - (cryptsetup (assoc-ref inputs "cryptsetup")) - (parted (assoc-ref inputs "parted"))) - (wrap-program (string-append out "/libexec/udisks2/udisksd") - `("PATH" ":" prefix - (,(string-append utils "/bin") ;for 'mount' - ;; cryptsetup is required for setting encrypted - ;; partitions, e.g. in gnome-disks - ,(string-append cryptsetup "/sbin") - "/run/current-system/profile/bin" - "/run/current-system/profile/sbin"))) - #t)))))) + (list + #:tests? #f ; requiring system message dbus + #:disallowed-references '("doc") ;enforce separation of "doc" + #:configure-flags + #~(list "--enable-man" + "--enable-available-modules" ; Such as lvm2, btrfs, etc. + "--localstatedir=/var" + "--enable-fhs-media" ;mount devices in /media, not /run/media + (string-append "--with-html-dir=" #$output:doc + "/share/doc/udisks/html") + (string-append "--with-udevdir=" #$output "/lib/udev")) + #:make-flags + #~(let* ((docbook-xsl-name-version + #$(string-append (package-name docbook-xsl) "-" + (package-version docbook-xsl))) + (docbook-xsl-catalog-file + (string-append #$(this-package-native-input "docbook-xsl") + "/xml/xsl/" docbook-xsl-name-version + "/catalog.xml")) + (docbook-xml-catalog-file + #$(file-append (this-package-native-input "docbook-xml") + "/xml/dtd/docbook/catalog.xml"))) + ;; Reference the catalog files required to build the manpages. + (list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file + " " docbook-xml-catalog-file))) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'fix-girdir + (lambda _ + ;; Install introspection data to its own output. + (substitute* "udisks/Makefile.in" + (("girdir = .*") + "girdir = $(datadir)/gir-1.0\n") + (("typelibsdir = .*") + "typelibsdir = $(libdir)/girepository-1.0\n")))) + (add-after 'install 'wrap-udisksd + (lambda _ + ;; Tell 'udisksd' where to find the 'mount' command. + (let ((utils #$(this-package-input "util-linux")) + (cryptsetup #$(this-package-input "cryptsetup")) + (parted #$(this-package-input "parted"))) + (wrap-program (string-append #$output "/libexec/udisks2/udisksd") + `("PATH" ":" prefix + (,(string-append utils "/bin") ;for 'mount' + ;; cryptsetup is required for setting encrypted + ;; partitions, e.g. in gnome-disks + ,(string-append cryptsetup "/sbin") + "/run/current-system/profile/bin" + "/run/current-system/profile/sbin"))))))))) (home-page "https://www.freedesktop.org/wiki/Software/udisks/") (synopsis "Disk manager service") (description