From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjXRW-0007M9-2q for guix-patches@gnu.org; Sat, 28 Jul 2018 18:12:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjXRS-0000k4-O3 for guix-patches@gnu.org; Sat, 28 Jul 2018 18:12:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:56344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fjXRS-0000jP-JO for guix-patches@gnu.org; Sat, 28 Jul 2018 18:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fjXRS-00029T-DK for guix-patches@gnu.org; Sat, 28 Jul 2018 18:12:02 -0400 Subject: [bug#31999] [PATCH 7/7] gnu: Update udisk to 2.7.6. Resent-Message-ID: From: Pierre Neidhardt Date: Sun, 29 Jul 2018 00:11:10 +0200 Message-Id: <20180728221110.14912-1-ambrevar@gmail.com> In-Reply-To: <87a7qw6sun.fsf@fastmail.com> References: <87a7qw6sun.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31999@debbugs.gnu.org * gnu/package/freedesktop.scm (udisks): Update to 2.7.6. [inputs]: Replace parted with libblockdev. --- gnu/packages/freedesktop.scm | 47 +++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b42a27b8c..43c49f51e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,9 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) + #:use-module (gnu packages base) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages swig) #:use-module (srfi srfi-1)) (define-public xdg-utils @@ -623,33 +627,42 @@ Analysis and Reporting Technology) functionality.") (define-public udisks (package (name "udisks") - (version "2.1.8") + (version "2.7.6") (source (origin - (method url-fetch) - (uri (string-append "https://udisks.freedesktop.org/releases/" - name "-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/storaged-project/udisks") + (commit (string-append name "-" version)))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1nkxhnqh39c9pzvm4zfj50rgv6apqawdx09bv3sfaxrah4a6jhfs")))) + "16kf104vv2xbk8cdgaqygszcl69d7lz9gf3vmi7ggywn7nfbp2ks")))) (build-system gnu-build-system) (native-inputs - `(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("docbook-xml" ,docbook-xml-4.3) ; to build the manpages ("docbook-xsl" ,docbook-xsl) - ("glib:bin" ,glib "bin") ; for glib-mkenums + ("glib:bin" ,glib "bin") ; for glib-mkenums + ("gnome-common" ,gnome-common) ; TODO: Why is this needed? ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("libtool" ,libtool) ; for glib-gettextize ("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("xsltproc" ,libxslt))) + ("xsltproc" ,libxslt) + ;; For autogen.sh: + ("which" ,which))) (propagated-inputs `(("glib" ,glib))) ; required by udisks2.pc (inputs `(("acl" ,acl) + ("cryptsetup" ,cryptsetup) ("libatasmart" ,libatasmart) + ("libblockdev" ,libblockdev) ("libgudev" ,libgudev) ("polkit" ,polkit) - ("util-linux" ,util-linux) - ("cryptsetup" ,cryptsetup) - ("parted" ,parted))) + ("util-linux" ,util-linux))) (outputs '("out" "doc")) ;5 MiB of gtk-doc HTML (arguments @@ -657,6 +670,8 @@ Analysis and Reporting Technology) functionality.") #:disallowed-references ("doc") ;enforce separation of "doc" #:configure-flags (list "--enable-man" + "--enable-gtk-doc" ; Without this the HTML doc does not seem to build automatically. + "--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=" @@ -680,6 +695,13 @@ Analysis and Reporting Technology) functionality.") docbook-xml-catalog-file))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + ;; The autogen.sh script in gnome-common will run ./configure + ;; by default, which is problematic because source shebangs + ;; have not yet been patched. + (setenv "NOCONFIGURE" "t") + (invoke "sh" "autogen.sh"))) (add-before 'configure 'fix-girdir (lambda _ @@ -702,9 +724,6 @@ Analysis and Reporting Technology) functionality.") ;; cryptsetup is required for setting encrypted ;; partitions, e.g. in gnome-disks ,(string-append cryptsetup "/sbin") - ;; parted is required for managing partitions, e.g. in - ;; gnome-disks - ,(string-append parted "/sbin") "/run/current-system/profile/bin" "/run/current-system/profile/sbin"))) #t)))))) -- 2.18.0