From: Pierre Neidhardt <ambrevar@gmail.com>
To: 31999@debbugs.gnu.org
Subject: [bug#31999] [PATCH 7/7] gnu: Update udisk to 2.7.6.
Date: Sun, 29 Jul 2018 00:11:10 +0200 [thread overview]
Message-ID: <20180728221110.14912-1-ambrevar@gmail.com> (raw)
In-Reply-To: <87a7qw6sun.fsf@fastmail.com>
* 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 <rhelling@mykolab.com>
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com>
;;;
;;; 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
next prev parent reply other threads:[~2018-07-28 22:12 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-28 21:32 [bug#31999] [PATCH 1/7] gnu: Add volume-key Pierre Neidhardt
2018-06-28 21:35 ` [bug#31999] [PATCH 2/7] gnu: Add ndctl Pierre Neidhardt
2018-06-28 21:35 ` [bug#31999] [PATCH 3/7] gnu: Add libbytesize Pierre Neidhardt
2018-07-12 20:20 ` Marius Bakke
2018-07-28 22:07 ` Pierre Neidhardt
2018-07-29 22:10 ` Marius Bakke
2018-07-30 9:59 ` Pierre Neidhardt
2018-07-30 13:36 ` Pierre Neidhardt
2018-07-30 18:42 ` Marius Bakke
2018-06-28 21:35 ` [bug#31999] [PATCH 4/7] gnu: lvm2: Add device-mapper-event support Pierre Neidhardt
2018-07-12 21:26 ` Marius Bakke
2018-07-28 22:09 ` Pierre Neidhardt
2018-07-29 22:33 ` Marius Bakke
2018-07-30 10:10 ` Pierre Neidhardt
2018-07-30 10:12 ` Pierre Neidhardt
2018-07-30 12:50 ` Marius Bakke
2018-07-30 13:36 ` Pierre Neidhardt
2018-07-30 18:43 ` Marius Bakke
2018-06-28 21:35 ` [bug#31999] [PATCH 5/7] gnu: Add dmraid Pierre Neidhardt
2018-07-12 21:28 ` Marius Bakke
2018-07-28 15:32 ` Pierre Neidhardt
2018-07-28 22:10 ` Pierre Neidhardt
2018-07-29 22:42 ` Marius Bakke
2018-07-30 10:23 ` Pierre Neidhardt
2018-07-30 13:37 ` Pierre Neidhardt
2018-07-30 18:44 ` Marius Bakke
2018-08-01 3:21 ` [bug#31999] [PATCH 5/7] gnu: Add dmraid. --- Failed to build from master Brendan Tildesley
2018-08-01 11:37 ` Marius Bakke
2018-06-28 21:35 ` [bug#31999] [PATCH 6/7] gnu: Add libblockdev Pierre Neidhardt
2018-07-12 20:24 ` Marius Bakke
2018-07-28 22:10 ` Pierre Neidhardt
2018-07-29 22:56 ` Marius Bakke
2018-07-30 9:14 ` Pierre Neidhardt
2018-07-30 12:52 ` Marius Bakke
2018-07-30 13:37 ` Pierre Neidhardt
2018-07-30 18:48 ` Marius Bakke
2018-06-28 21:35 ` [bug#31999] [PATCH 7/7] gnu: Update udisk to 2.7.6 Pierre Neidhardt
2018-06-28 21:40 ` Pierre Neidhardt
2018-07-12 21:34 ` Marius Bakke
2018-07-28 22:11 ` Pierre Neidhardt [this message]
2018-07-28 22:17 ` Pierre Neidhardt
2018-07-29 23:01 ` Marius Bakke
2018-07-30 13:38 ` [bug#31999] [PATCH 7/7] gnu: Update udisks to 2.7.7 Pierre Neidhardt
2018-07-30 18:54 ` Marius Bakke
2018-07-30 19:20 ` Pierre Neidhardt
2018-07-30 19:36 ` Pierre Neidhardt
2018-07-30 19:39 ` Marius Bakke
2018-07-30 19:50 ` Pierre Neidhardt
2018-07-30 20:59 ` Marius Bakke
2018-07-12 20:12 ` [bug#31999] [PATCH 2/7] gnu: Add ndctl Marius Bakke
2018-07-28 22:05 ` Pierre Neidhardt
2018-07-29 22:23 ` Marius Bakke
2018-07-30 9:47 ` Pierre Neidhardt
2018-07-30 12:54 ` Marius Bakke
2018-07-30 13:35 ` Pierre Neidhardt
2018-07-30 18:56 ` Marius Bakke
2018-07-12 20:04 ` [bug#31999] [PATCH 1/7] gnu: Add volume-key Marius Bakke
2018-07-28 21:58 ` [bug#32299] " Pierre Neidhardt
2018-07-28 22:02 ` bug#32299: " Pierre Neidhardt
2018-07-29 22:28 ` [bug#32299] " Marius Bakke
2018-07-30 9:19 ` [bug#31999] " Pierre Neidhardt
2018-07-30 13:16 ` [bug#31999] " Pierre Neidhardt
2018-07-30 19:01 ` Marius Bakke
2018-07-28 22:04 ` Pierre Neidhardt
2018-07-30 19:53 ` bug#31999: [PATCH 7/7] gnu: Update udisks to 2.7.7 Pierre Neidhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180728221110.14912-1-ambrevar@gmail.com \
--to=ambrevar@gmail.com \
--cc=31999@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.