From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjuhS-0001Nm-Te for guix-patches@gnu.org; Sun, 29 Jul 2018 19:02:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjuhO-0008SX-W7 for guix-patches@gnu.org; Sun, 29 Jul 2018 19:02:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57412) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fjuhO-0008SM-RI for guix-patches@gnu.org; Sun, 29 Jul 2018 19:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fjuhO-0003tO-Fi for guix-patches@gnu.org; Sun, 29 Jul 2018 19:02:02 -0400 Subject: [bug#31999] [PATCH 7/7] gnu: Update udisk to 2.7.6. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20180728221110.14912-1-ambrevar@gmail.com> References: <87a7qw6sun.fsf@fastmail.com> <20180728221110.14912-1-ambrevar@gmail.com> Date: Mon, 30 Jul 2018 01:01:20 +0200 Message-ID: <87h8kh3av3.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: Pierre Neidhardt , 31999@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Pierre Neidhardt writes: > * gnu/package/freedesktop.scm (udisks): Update to 2.7.6. > [inputs]: Replace parted with libblockdev. Woohoo! Please also mention the changes to [native-inputs] and [arguments] here. [...] =20=20 > @@ -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/releas= es/" > - 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"))= )) 2.7.7 is out! Also use the uploaded release instead of a git checkout. Then you can drop the autotools inputs and autogen phase as well! Other than that LGTM. > (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 see= m to build automatically. > + "--enable-available-modules" ; Such as lvm2, btrfs, etc. > "--localstatedir=3D/var" > "--enable-fhs-media" ;mount devices in /media, not /run= /media > (string-append "--with-html-dir=3D" > @@ -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 ./configu= re > + ;; 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)))))) > --=20 > 2.18.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlteR0AACgkQoqBt8qM6 VPpNHwf/efJ/nAQZPbAjSVLoO4bG4DxOOIK2hn3JvctpEYTgUcyEsL9svkrTwUL2 /mNddB+NjltgNuY+9GpyTKOXrPmp5UJ4rcewNvxzQxvZQneOmfff0JHxrW3xDERT v0qI5PQ1efF+BvjEM77ONBYT2hXowwrsYyUQXlcPxBksT8VGX+ov45ETp+C9UsIK bU3GFc99M7ivlUXg+JAveO1oggGnS9H8e3bjRpwVpPFPldbeQNMjtPk8BG8a71VN PilC6QvyTyfYtqNIlSjVr7cyeiFHriSnIXTxFinrCLfW6kjVVt9mksKA7e6JP4oB w3+0EJVUztDABubR5SmPYCxrvRMC5g== =yC35 -----END PGP SIGNATURE----- --=-=-=--