From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KH7JFwllAF9wRQAA0tVLHw (envelope-from ) for ; Sat, 04 Jul 2020 11:16:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EEqXEwllAF82QwAAB5/wlQ (envelope-from ) for ; Sat, 04 Jul 2020 11:16:25 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8A84B9401D0 for ; Sat, 4 Jul 2020 11:16:23 +0000 (UTC) Received: from localhost ([::1]:35298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrg9e-0002SG-DB for larch@yhetil.org; Sat, 04 Jul 2020 07:16:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrg9K-0002Po-0A for guix-devel@gnu.org; Sat, 04 Jul 2020 07:16:02 -0400 Received: from knopi.disroot.org ([178.21.23.139]:58322) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrg9E-0001SI-5s for guix-devel@gnu.org; Sat, 04 Jul 2020 07:16:01 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id AE4C455E59; Sat, 4 Jul 2020 13:15:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ye-6X2xGQf_M; Sat, 4 Jul 2020 13:15:49 +0200 (CEST) From: Raghav Gururajan DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1593861349; bh=GK5yM4GF0P5cbrBN4tbRwhvBAoO670qy7X4CRFGmwwA=; h=From:To:Cc:References:Subject:Date:In-Reply-To; b=DzsObTgAzbaMgOiJ3p/OmQDJMyto5pCz6Z9bIca5eRv3zO9Q9x/YQhICFQ5avyAht 1F7kGZCOrGqZ5nrfBjVwJVjvDRPLaZaFZS+r3HcaqD5YyAQdGoQprsB1y6CffclO6x oysnNd6YnFL3nxKnpYsvpTupHOVNIkacsaj1/XL1XGJZBV7yDwCjt4l2mpW7epfQMJ uAbzR8Cib30rc9W3UalaWu6YsaYQ3HcyM13Q172ARSUQDXr8V2MYmQ8Cb3PKGKvt+Q fQSBpue+chNNH/G0nTr/wi9pMK1lOHEwhunxJ7fpOcCGAIIbwaKELONcxCDVQajlyA kT7U+6He761gw== To: Danny Milosavljevic References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> Autocrypt: addr=raghavgururajan@disroot.org; keydata= mQENBF6yxWcBCAClEApjrOYs8fSzDl8GBwMFtUzF6VCOVrWaGun1vvPDvk4AFzbB3ZV6+Jn8 VfEuqh3OOvSJGHL2cJoR28Q5gVqeOwupyaMWVdEt6TmDrHISyxriF426KVaJnklfMjYwIi0l /7j8bs3pDRyyR6uFrY6sYL9t6HFvevtt7NwgWL1MAEVy6txKkriyrK1h+qc13wRRgVx3tzl7 dNwYEDWd3yUDn+LESoDOlawJ7TQbO8d1K4FFHaqwyQ/SyaIfLBnMAz9Qd18MUWpDkktLh/9u jRfctouFx5BUr+uGgCHAWcII5D60lt867y5m6vp3Ua75TkVQrYTt7KSF/wm7NZ7L02fTABEB AAG0M1JhZ2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmFnaGF2Z3VydXJhamFuQGRpc3Jvb3Qub3Jn PokBTgQTAQgAOBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJetePbAhsDBQsJCAcCBhUKCQgL AgQWAgMBAh4BAheAAAoJEK5u8wRtb3tXvWIH/3NiwaJfcrOoO/r4/reE0PmfgVWRpWP8uhdy ZiuBmcnyltxSmxZ1drlWpnbap5P7ssVyIlY6SrLTAeN7R0S70HAINkn7XvKpWajHShX0MR4b NeqjETNZg7gh2PTg6zfTnYD1UQqdNxnPMiJTSBZBLCAm/LhdEuigt559uoDA9ZEVLR5ycKh+ ny94NLUhmuRXpH/sb6Ey0FKmdMc47KNnkGQaySeGY88RwONgfv3/rriNbOJ1t12d2qsqkiOo znuxg5O3nT6obd7hCuq+EYwjzwSVrUZuMelO32UE4d2iePhiPBfiprVCNDGPFztJTe0Y+OQA ajj23CBgGIap/L1CpZ25AQ0EXrLFZwEIANGMTVaAiSGtpAbxRo9AHOc2kgatkAsH/ejtzNH0 mtGwtE0g5Gh0OKTI678KItanztmukKcZmBngPCwvUGGNQYzWWwsS+kBti5wJ3OForg+JtYuf /n9DjSAhnb7h1piL9Xi0drULl5ovVFRp/IPldkbT3R8pgc9VwAa0VVRP59dsgF6nPhoHjxfB p/XcA2QRnRfB2bN4BVCValJelPGYR0pSwkftFpmha4FRa0LrJtcMeh+PG20asPiKcE4sNGZT mH3keHkTfk5Tuds3ly5vlqmEKg7qY/zoS1yWQJj0j36JoX1/ravo+gUxszig80140a5bF2VU ERLcKO+Cp0lI4/8AEQEAAYkBNgQYAQgAIBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJessVn AhsMAAoJEK5u8wRtb3tXqTIH/A9z70HLCZcAfnpluGj4APfi3haqdU7xvtrkN9eHJoPV7pwx y1luNRR8xg7YHkwcQ/9qEcvSicNIvhjRw5cSpyW9HGmOFyiZ7+KLf3XPUjC7pC5pIM+AAWyy D5GlyqakH1wBe8RC9/8vNyfZnmbV4PUvHoHvY/xZH+D/Afg1J2igdIebkQzzhFBC65TAKFeM NIWQkYIMKjq4u+nmv3sreqvRvlt8VYq0VSq24SFs0JJ+dEmuO3/s72122JIL0XEUS3ooGb/p 678RM2OpelLZcZSPG6vIIrQFKw6/NVjDtOY3DrNPtQ+h84UnFPUtaZyvQQwpGNjvtNzU/Ym+ NwsFm0Q= Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix Message-ID: <90e45d2e-cc3e-adc0-df4f-db838d00aab6@disroot.org> Date: Sat, 4 Jul 2020 07:14:33 -0400 Mime-Version: 1.0 In-Reply-To: <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="EZmYrdb9Avwd2Tum8Iap5XMcXHQOTXhiv" Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/04 06:39:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=DzsObTgA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: 7yS3f/5LKN+y This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --EZmYrdb9Avwd2Tum8Iap5XMcXHQOTXhiv Content-Type: multipart/mixed; boundary="C5rEkmLjr3U92tlnGn0mj1VcynSJTWFKB"; protected-headers="v1" From: Raghav Gururajan To: Danny Milosavljevic Cc: guix-devel@gnu.org, =?UTF-8?Q?G=c3=a1bor_Boskovits?= , Tobias Geerinckx-Rice Message-ID: <90e45d2e-cc3e-adc0-df4f-db838d00aab6@disroot.org> Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> In-Reply-To: <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> --C5rEkmLjr3U92tlnGn0mj1VcynSJTWFKB Content-Type: multipart/mixed; boundary="------------81B901C9B3AB5DE0E0FC1FA3" Content-Language: en-US This is a multi-part message in MIME format. --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable @Danny Please find the attached patches. @Others Please find the following git log. *** START *** commit b9b918f4addca5b5f17e1002b5769a6a5e99fa91 Author: Raghav Gururajan Date: Sat Jul 4 07:06:43 2020 -0400 gnu: gvfs: Update package definition. * gnu/packages/gnome.scm (gvfs) [version]: Update to 1.44.1. [native-inputs]: Add docbook-xml and docbook-xsl. [inputs]: Remove docbook-xml and docbook-xsl. Add libplist and libus= b. [synopsis]: Modify. [description]: Modify. commit 22a222359461fda738b3b7e72312f01125381a9c Author: Raghav Gururajan Date: Sat Jul 4 07:05:52 2020 -0400 gnu: fuse: Update package definition. * gnu/packages/linux.scm (fuse) [version]: Update to 3.9.2. [source][method]: Change from url-fetch to git-fetch. [build-system]: Change from gnu to meson. [arguments]: Modify inaccordance with build-system. [native-inputs]: Add pkg-config. [inputs]: Add bash, eudev and libiconv. [synopsis]: Modify. [description]: Modify. commit 2463234416baa0ee82daaa49401e1bcb123a37f0 Author: Raghav Gururajan Date: Sat Jul 4 07:04:51 2020 -0400 gnu: gtksourceview-2: Update package definition. * gnu/packages/gtk.scm (gtksourceview-2): Inherit from gtksourceview.= [inherit]: New field. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output 'doc'. [arguments]<#:configure-flags>[--with-html-dir]: New flag. commit 5a18af17481f52576681f6f81d0343eac4fe63e9 Author: Raghav Gururajan Date: Sat Jul 4 06:58:44 2020 -0400 gnu: gtksourceview-3: Update package definition. * gnu/packages/gtk.scm (gtksourceview-3) [version]: Update to 3.24.11= =2E [build-system]: Change from gnu to glib-or-gtk. [arguments]<#:configure-flags>[--enable-glade-catalog]: New flag. [--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-glade]: New phase. commit 474550331394ba6c008df08951b2ec6a389eacf4 Author: Raghav Gururajan Date: Sat Jul 4 06:58:09 2020 -0400 gnu: gtksourceview: Update package definition. * gnu/packages/gtk.scm (gtksourceview) [version]: Update to 4.6.0. [build-system]: Change from gnu to meson. [outputs]: New outputs 'doc' and 'glade'. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dglade-catalog]: New flag. [-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. ['move-glade]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, groovy, gtk-doc, and ruby. [inputs]: Add glade. [propagated-inputs]: Add fribidi. [synopsis]: Modify. [description]: Modify. commit e9b2c518390c5f6aeaebb0b5789f097909ed06fd Author: Raghav Gururajan Date: Sat Jul 4 06:57:20 2020 -0400 gnu: gtk+: Propagate libcloudproviders. * gnu/packages/gtk.scm (gtk+) [inputs]: Move libcloudproviders to ...= [propagated-inputs]: ... here. commit 7a3879883fca4ed31a813098f958860a9c44c612 Author: Raghav Gururajan Date: Sat Jul 4 06:56:11 2020 -0400 gnu: gtk-doc: Update package definition. * gnu/packages/gtk.scm (gtk-doc) [version]: Update to 1.32. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output 'help'. [arguments]<#:configure-flags>[--with-help-dir]: New flag. <#:phases>['patch-test-out]: Remove phase. ['disable-failing-tests]: New phase. [native-inputs]: Add glib:bin, perl and python-wrapper. [inputs]: Add python-anytree, python-lxml, python-parameterized, python-pygments, python-unittest2 and yelp-tools. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add fdl1.1+. commit eef37a91621dda1c178317fedce1f81d71482421 Author: Raghav Gururajan Date: Sat Jul 4 06:55:04 2020 -0400 gnu: gtk+: Update package definition. * gnu/packages/gtk.scm (gtk+): Remove inheritance from gtk+-2. [version]: Update to 3.24.20. [source]: Modify base32. [arguments]<#:configure-flags>[--enable-cloudproviders]: New flag. <#:phases>['pre-configure]: Remove phase. ['pre-check]: New phase. ['disable-failing-tests]: New phase. [native-inputs]: Add docbook-xml, intltool, sassc and libxslt. [inputs]: Add graphene, harfbuzz, iso-codes, libcloudproviders and pa= pi. [propagated-inputs]: Add cairo, fribidi, fontconfig, freetype, glib, libx11, libxcomposite, libxext, libxfixes and libxrender. commit 3ce004cec2767aa70891c0403cec94efa83da3a1 Author: Raghav Gururajan Date: Sat Jul 4 06:49:44 2020 -0400 gnu: Add libcloudproviders. * gnu/packages/gnome.scm (libcloudproviders): New variable. commit 240062e81a990a882b779dcd7d27ecd1d492469d Author: Raghav Gururajan Date: Sat Jul 4 06:48:39 2020 -0400 gnu: gtk+-2: Update package definition. * gnu/packages/gtk.scm (gtk+-2): Update package definition. [arguments]<#:phases>['disable-tests]: Remove phase. ['disable-failing-tests]: New phase. ['pre-check]: New phase. [native-inputs]: Add intltool and xorg-server-for-tests. [inputs]: Add libx11, libxext, libxkbcommon, libxrender and libxshmfence. [propagated-inputs]: Add cairo and glib. [search-paths]: New field. *** END *** Regards, RG. --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0052-gnu-gtk-2-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0052-gnu-gtk-2-Update-package-definition.patch" =46rom 240062e81a990a882b779dcd7d27ecd1d492469d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 06:48:39 -0400 Subject: [PATCH 52/61] gnu: gtk+-2: Update package definition. * gnu/packages/gtk.scm (gtk+-2): Update package definition. [arguments]<#:phases>['disable-tests]: Remove phase. ['disable-failing-tests]: New phase. ['pre-check]: New phase. [native-inputs]: Add intltool and xorg-server-for-tests. [inputs]: Add libx11, libxext, libxkbcommon, libxrender and libxshmfence. [propagated-inputs]: Add cairo and glib. [search-paths]: New field. --- gnu/packages/gtk.scm | 159 +++++++++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 65 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bff7da27a8..d3d707188c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -70,6 +70,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libffi) @@ -370,8 +371,8 @@ diagrams.") (base32 "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))= (patches - (search-patches - "gtksourceview-2-add-default-directory.patch")))) + (search-patches + "gtksourceview-2-add-default-directory.patch")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -712,72 +713,100 @@ the GNOME accessibility project.") =20 (define-public gtk+-2 (package - (name "gtk+") - (version "2.24.32") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n")) - (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"= - "gtk2-respect-GUIX_GTK2_IM_MODULE_F= ILE.patch" - "gtk2-theme-paths.patch")))) - (build-system gnu-build-system) - (outputs '("out" "bin" "doc")) - (propagated-inputs - `(("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf+svg) - ("pango" ,pango))) - (inputs - `(("cups" ,cups) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxdamage" ,libxdamage) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr))) - (native-inputs - `(("perl" ,perl) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) - (arguments - `(#:configure-flags - (list "--with-xinput=3Dyes" - (string-append "--with-html-dir=3D" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'disable-tests - (lambda _ - ;; FIXME: re-enable tests requiring an X server - (substitute* "gtk/Makefile.in" - (("SUBDIRS =3D theme-bits . tests") "SUBDIRS =3D theme-bit= s .")) - #t)) - (add-after 'install 'remove-cache - (lambda* (#:key outputs #:allow-other-keys) - (for-each - delete-file - (find-files (assoc-ref outputs "out") "immodules.cache")) - #t))))) - (native-search-paths - (list (search-path-specification - (variable "GUIX_GTK2_PATH") - (files '("lib/gtk-2.0"))))) - (synopsis "Cross-platform toolkit for creating graphical user interfa= ces") - (description - "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating= + (name "gtk+") + (version "2.24.32") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n"))= + (patches + (search-patches + "gtk2-respect-GUIX_GTK2_PATH.patch" + "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" + "gtk2-theme-paths.patch")))) + (build-system gnu-build-system) + (outputs '("out" "bin" "doc")) + (arguments + `(#:configure-flags + (list + "--with-xinput=3Dyes" + (string-append "--with-html-dir=3D" (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "gtk/tests/recentmanager.c" + (("g_test_add_func \\(\"/recent-manager/add-many\", recen= t_manager_add_many\\);") + "")) + (substitute* "gtk/tests/defaultvalue.c" + (("return g_test_run\\(\\);") + "")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-after 'install 'remove-cache + (lambda* (#:key outputs #:allow-other-keys) + (for-each + delete-file + (find-files (assoc-ref outputs "out") "immodules.cache")) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("cups" ,cups) + ("libx11" ,libx11) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxext" ,libxext) + ("libxdamage" ,libxdamage) + ("libxi" ,libxi) + ("libxinerama" ,libxinerama) + ("libxkbcommon" ,libxkbcommon) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxshmfence" ,libxshmfence))) + (propagated-inputs + `(("atk" ,atk) + ("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("glib" ,glib) + ("pango" ,pango))) + (native-search-paths + (list + (search-path-specification + (variable "GUIX_GTK2_PATH") + (files '("lib/gtk-2.0"))))) + (search-paths native-search-paths) + (synopsis "Cross-platform toolkit for creating graphical user interf= aces") + (description "GTK+, or the GIMP Toolkit, is a multi-platform toolkit= for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off tools to complete application suites.") - (license license:lgpl2.0+) - (home-page "https://www.gtk.org/"))) + (home-page "https://www.gtk.org/") + (license license:lgpl2.0+))) =20 (define-public gtk+ (package (inherit gtk+-2) --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0053-gnu-Add-libcloudproviders.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0053-gnu-Add-libcloudproviders.patch" =46rom 3ce004cec2767aa70891c0403cec94efa83da3a1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 06:49:44 -0400 Subject: [PATCH 53/61] gnu: Add libcloudproviders. * gnu/packages/gnome.scm (libcloudproviders): New variable. --- gnu/packages/gnome.scm | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f6a530a9fc..2fbd7e8f67 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -263,6 +263,54 @@ Desktop. It is designed to be as simple as possible= and has some unique features to enable users to create their discs easily and quickly.") (license license:gpl2+))) =20 +(define-public libcloudproviders + (package + (name "libcloudproviders") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0aars24myf6n8b8hm1n12hsgcm54097kpbpm4ba31zp1l4y22qs7"))= )) + (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Denable-gtk-doc=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + #t)))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (inputs + `(("glib" ,glib) + ("glib-networking" ,glib-networking))) + (synopsis "Cloudproviders Integration API") + (description "Libcloudproviders is a DBus API that allows cloud stor= age sync +clients to expose their services. Clients such as file managers and des= ktop +environments can then provide integrated access to the cloud providers +services.") + (home-page "https://csorianognome.wordpress.com/2015/07/07/cloud-pro= viders/") + (license license:lgpl3+))) + (define-public sysprof (package (name "sysprof") --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0054-gnu-gtk-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0054-gnu-gtk-Update-package-definition.patch" =46rom eef37a91621dda1c178317fedce1f81d71482421 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 06:55:04 -0400 Subject: [PATCH 54/61] gnu: gtk+: Update package definition. * gnu/packages/gtk.scm (gtk+): Remove inheritance from gtk+-2. [version]: Update to 3.24.20. [source]: Modify base32. [arguments]<#:configure-flags>[--enable-cloudproviders]: New flag. <#:phases>['pre-configure]: Remove phase. ['pre-check]: New phase. ['disable-failing-tests]: New phase. [native-inputs]: Add docbook-xml, intltool, sassc and libxslt. [inputs]: Add graphene, harfbuzz, iso-codes, libcloudproviders and papi. [propagated-inputs]: Add cairo, fribidi, fontconfig, freetype, glib, libx11, libxcomposite, libxext, libxfixes and libxrender. --- gnu/packages/gtk.scm | 217 ++++++++++++++++++++++++++----------------- 1 file changed, 131 insertions(+), 86 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d3d707188c..05c7d81104 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -73,18 +73,21 @@ #:use-module (gnu packages graphics) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages iso-codes) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages profiling) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages cups) #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) @@ -809,92 +812,134 @@ application suites.") (license license:lgpl2.0+))) =20 (define-public gtk+ - (package (inherit gtk+-2) - (name "gtk+") - (version "3.24.20") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d")) - (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"= - "gtk3-respect-GUIX_GTK3_IM_MODULE_F= ILE.patch")))) - (propagated-inputs - `(("at-spi2-atk" ,at-spi2-atk) - ("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf+svg) - ("libepoxy" ,libepoxy) - ("libxcursor" ,libxcursor) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxdamage" ,libxdamage) - ("libxrandr" ,libxrandr) - ("mesa" ,mesa) - ("pango" ,pango) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) - (inputs - `(("libxml2" ,libxml2) - ;; XXX: colord depends on mozjs (through polkit), which fails on - ;; on non-intel systems now. - ;;("colord" ,colord) - ("cups" ,cups) ;for printing support - ;; XXX: rest depends on p11-kit, which fails on mips64el now. - ;;("rest" ,rest) - ("json-glib" ,json-glib))) - (native-inputs - `(("perl" ,perl) - ("glib" ,glib "bin") - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("gobject-introspection" ,gobject-introspection) - ("python-wrapper" ,python-wrapper) - ;; By using a special xorg-server for GTK+'s tests, we reduce the = impact - ;; of updating xorg-server directly on the master branch. - ("xorg-server" ,xorg-server-for-tests))) - (arguments - `(#:disallowed-references (,xorg-server-for-tests) - ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB = goes - ;; to "doc". - #:configure-flags (list (string-append "--with-html-dir=3D" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html") - ;; The header file is r= equired - ;; by gnome-control-center - "--enable-wayland-backend" - ;; This is necessary to build both backend= s. - "--enable-x11-backend" - ;; This enables the HTML5 websocket backen= d. - "--enable-broadway-backend") - #:phases (modify-phases %standard-phases - (add-before 'configure 'pre-configure - (lambda _ - ;; Disable most tests, failing in the chroot with the messag= e: - ;; D-Bus library appears to be incorrectly set up; failed to= read - ;; machine uuid: Failed to open "/etc/machine-id": No such f= ile or - ;; directory. - ;; See the manual page for dbus-uuidgen to correct this issu= e. - (substitute* "testsuite/Makefile.in" - (("SUBDIRS =3D gdk gtk a11y css reftests") - "SUBDIRS =3D gdk")) - #t)) - (add-after 'install 'move-desktop-files - ;; Move desktop files into 'bin' to avoid cycle references. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p (string-append bin "/share")) - (rename-file (string-append out "/share/applications") - (string-append bin "/share/applications")) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "GUIX_GTK3_PATH") - (files '("lib/gtk-3.0"))))))) + (package + (name "gtk+") + (version "3.24.20") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d"))= + (patches + (search-patches + "gtk3-respect-GUIX_GTK3_PATH.patch" + "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) + (build-system gnu-build-system) + (outputs '("out" "bin" "doc")) + (arguments + `(#:configure-flags + (list + "--enable-x11-backend" + "--enable-broadway-backend" + "--enable-wayland-backend" + "--enable-cloudproviders" + (string-append "--with-html-dir=3D" (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "testsuite/gtk/Makefile.in" + (("builderparser cellarea check-icon-names check-cursor-n= ames") + "builderparser cellarea check-cursor-names") + (("notify no-gtk-init object objects-finalize papersize r= btree") + "no-gtk-init papersize rbtree") + (("stylecontext templates textbuffer textiter treemodel t= reepath") + "stylecontext textbuffer textiter treemodel treepath")) + (substitute* "testsuite/a11y/Makefile.in" + (("accessibility-dump tree-performance text children deri= ve") + "tree-performance text children derive")) + (substitute* "testsuite/reftests/Makefile.in" + (("TEST_PROGS =3D gtk-reftest") + "TEST_PROGS =3D ")) + #t)) + ;; Move desktop files into 'bin' to avoid cycle references. + (add-after 'install 'move-desktop-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p (string-append bin "/share")) + (rename-file + (string-append out "/share/applications") + (string-append bin "/share/applications")) + #t)))))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.1.2) + ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) + ("sassc" ,sassc) + ("xorg-server" ,xorg-server-for-tests) + ("xsltproc" ,libxslt))) + (inputs + `(("colord" ,colord) + ("cups" ,cups) + ("graphene" ,graphene) + ("harfbuzz" ,harfbuzz) + ("iso-codes" ,iso-codes) + ("json-glib" ,json-glib) + ("libcloudproviders" ,libcloudproviders) + ("libxml2" ,libxml2) + ("papi" ,papi) + ("rest" ,rest))) + (propagated-inputs + `(("atk" ,atk) + ("at-spi2-atk" ,at-spi2-atk) + ("cairo" ,cairo) + ("fribidi" ,fribidi) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("glib" ,glib) + ("libepoxy" ,libepoxy) + ("libx11" ,libx11) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxi" ,libxi) + ("libxinerama" ,libxinerama) + ("libxkbcommon" ,libxkbcommon) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("mesa" ,mesa) + ("pango" ,pango) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (native-search-paths + (list + (search-path-specification + (variable "GUIX_GTK3_PATH") + (files '("lib/gtk-3.0"))))) + (search-paths native-search-paths) + (synopsis "Cross-platform toolkit for creating graphical user interf= aces") + (description "GTK+, or the GIMP Toolkit, is a multi-platform toolkit= for creating +graphical user interfaces. Offering a complete set of widgets, GTK+ is +suitable for projects ranging from small one-off tools to complete +application suites.") + (home-page "https://www.gtk.org/") + (license license:lgpl2.0+))) =20 ;;; ;;; Guile bindings. --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0055-gnu-gtk-doc-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0055-gnu-gtk-doc-Update-package-definition.patch" =46rom 7a3879883fca4ed31a813098f958860a9c44c612 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 06:56:11 -0400 Subject: [PATCH 55/61] gnu: gtk-doc: Update package definition. * gnu/packages/gtk.scm (gtk-doc) [version]: Update to 1.32. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output 'help'. [arguments]<#:configure-flags>[--with-help-dir]: New flag. <#:phases>['patch-test-out]: Remove phase. ['disable-failing-tests]: New phase. [native-inputs]: Add glib:bin, perl and python-wrapper. [inputs]: Add python-anytree, python-lxml, python-parameterized, python-pygments, python-unittest2 and yelp-tools. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add fdl1.1+. --- gnu/packages/gtk.scm | 124 ++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 54 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 05c7d81104..d50ed70819 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1646,48 +1646,48 @@ information.") (define-public gtk-doc (package (name "gtk-doc") - (version "1.28") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))= )) - (build-system gnu-build-system) + (version "1.32") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "help")) (arguments - `(#:parallel-tests? #f + `(#:configure-flags + (list + (string-append "--with-xml-catalog=3D" + (assoc-ref %build-inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml") + (string-append "--with-help-dir=3D" + (assoc-ref %outputs "help") + "/share/help")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) (substitute* "gtk-doc.xsl" - (("http://docbook.sourceforge.net/release/xsl/current/html= /chunk.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/html/chunk.xsl")) - (("http://docbook.sourceforge.net/release/xsl/current/comm= on/en.xml") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/common/en.xml"))) + (("http://docbook.sourceforge.net/release/xsl/current/htm= l/chunk.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/html/chunk.xsl")) + (("http://docbook.sourceforge.net/release/xsl/current/com= mon/en.xml") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/common/en.xml"))) #t)) - (add-after 'patch-gtk-doc-scan 'patch-test-out + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; sanity.sh counts the number of status lines. Since our - ;; texlive regenerates the fonts every time and the font - ;; generator metafont outputs a lot of extra lines, this - ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) - #t)) - (add-before 'build 'set-HOME - (lambda _ - ;; FIXME: dblatex with texlive-union does not find the buil= t - ;; metafonts, so it tries to generate them in HOME. - (setenv "HOME" "/tmp") + (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh pro= gram.sh") + "")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) @@ -1704,6 +1704,12 @@ information.") "^catalog.xml$")) " \"http://docbook.sourceforge.net/releas= e/xsl/"))) #t)) + (add-before 'build 'set-HOME + (lambda _ + ;; FIXME: dblatex with texlive-union does not find the buil= t + ;; metafonts, so it tries to generate them in HOME. + (setenv "HOME" "/tmp") + #t)) (add-after 'install 'wrap-executables (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -1711,34 +1717,44 @@ information.") (wrap-program prog `("PYTHONPATH" ":" prefix (,(getenv "PYTHON= PATH"))))) (find-files (string-append out "/bin"))) - #t)))) - #:configure-flags - (list (string-append "--with-xml-catalog=3D" - (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")))) + #t)))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("itstool" ,itstool) - ("libxml" ,libxml2) - ("gettext" ,gettext-minimal) - ("bc" ,bc))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) (inputs - `(("perl" ,perl) - ("python" ,python) - ("xsltproc" ,libxslt) + `(("bc" ,bc) ("dblatex" ,dblatex) ("docbook-xml" ,docbook-xml-4.3) ("docbook-xsl" ,docbook-xsl) - ("source-highlight" ,source-highlight) ("glib" ,glib) - ("python-six" ,python-six))) - (home-page "https://www.gtk.org/gtk-doc/") - (synopsis "Documentation generator from C source code") - (description - "GTK-Doc generates API documentation from comments added to C code.= It is -typically used to document the public API of GTK+ and GNOME libraries, b= ut it -can also be used to document application code.") - (license license:gpl2+))) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-anytree" ,python-anytree) + ("python-lxml" ,python-lxml) + ("python-parameterized" ,python-parameterized) + ("python-pygments" ,python-pygments) + ("python-unittest2" ,python-unittest2) + ("source-highlight" ,source-highlight) + ("yelp-tools" ,yelp-tools))) + (synopsis "GTK+ DocBook Documentation Generator") + (description "GtkDoc is a tool used to extract API documentation fro= m C-code +like Doxygen, but handles documentation of GObject (including signals an= d +properties) that makes it very suitable for GTK+ apps and libraries. It= uses +docbook for intermediate files and can produce html by default and pdf/m= an-pages +with some extra work.") + (home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc") + (license + (list + ;; Docs. + license:fdl1.1+ + ;; Others. + license:gpl2+)))) =20 (define-public gtk-engines (package --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0056-gnu-gtk-Propagate-libcloudproviders.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0056-gnu-gtk-Propagate-libcloudproviders.patch" =46rom e9b2c518390c5f6aeaebb0b5789f097909ed06fd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 06:57:20 -0400 Subject: [PATCH 56/61] gnu: gtk+: Propagate libcloudproviders. * gnu/packages/gtk.scm (gtk+) [inputs]: Move libcloudproviders to ... [propagated-inputs]: ... here. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d50ed70819..98d967d74a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -898,7 +898,6 @@ application suites.") ("harfbuzz" ,harfbuzz) ("iso-codes" ,iso-codes) ("json-glib" ,json-glib) - ("libcloudproviders" ,libcloudproviders) ("libxml2" ,libxml2) ("papi" ,papi) ("rest" ,rest))) @@ -911,6 +910,7 @@ application suites.") ("freetype" ,freetype) ("gdk-pixbuf" ,gdk-pixbuf+svg) ("glib" ,glib) + ("libcloudproviders" ,libcloudproviders) ("libepoxy" ,libepoxy) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0057-gnu-gtksourceview-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0057-gnu-gtksourceview-Update-package-definition.patch" =46rom 474550331394ba6c008df08951b2ec6a389eacf4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 06:58:09 -0400 Subject: [PATCH 57/61] gnu: gtksourceview: Update package definition. * gnu/packages/gtk.scm (gtksourceview) [version]: Update to 4.6.0. [build-system]: Change from gnu to meson. [outputs]: New outputs 'doc' and 'glade'. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dglade-catalog]: New flag. [-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. ['move-glade]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, groovy, gtk-doc, and ruby. [inputs]: Add glade. [propagated-inputs]: Add fribidi. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gtk.scm | 133 +++++++++++++++++++++++++++++-------------- 1 file changed, 90 insertions(+), 43 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 98d967d74a..23eede063c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) + #:use-module (gnu packages groovy) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages iso-codes) @@ -83,6 +84,7 @@ #:use-module (gnu packages profiling) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages ruby) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages cups) @@ -420,52 +422,97 @@ printing and other features typical of a source cod= e editor.") (home-page "https://developer.gnome.org/gtksourceview/"))) =20 (define-public gtksourceview - (package - (name "gtksourceview") - (version "4.2.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gtksourceview/"= - (version-major+minor version) "/" - "gtksourceview-" version ".tar.xz")) - (sha256 - (base32 - "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4")))= ) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before - 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server"))) + (package + (name "gtksourceview") + (version "4.6.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/gtksourceview/" + (version-major+minor version) "/" + "gtksourceview-" version ".tar.xz")) + (sha256 + (base32 "11csdnb5xj1gkn1shynp3jdsfhhi7ks3apgmavfan0p6n85f64sc"))= )) + (build-system meson-build-system) + (outputs '("out" "doc" "glade")) + (arguments + `(#:glib-or-gtk? #t ;To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dglade_catalog=3Dtrue" + "-Dgtk_doc=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* '("gtksourceview-docs.xml.in" "intro.xml.in"= + "lang-reference.xml.in" "lang-tutorial.xml= " + "porting-guide-3-to-4.xml" "style-referenc= e.xml.in") + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-before 'check 'pre-check + (lambda _ ;; Tests require a running X server. - (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (system "Xvfb :1 +extension GLX &") (setenv "DISPLAY" ":1") - ;; For the missing /etc/machine-id. + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") - #t)))))) - (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. - ("intltool" ,intltool) - ("itstool" ,itstool) - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("vala" ,vala) - ;; For testing. - ("xorg-server" ,xorg-server-for-tests) - ("shared-mime-info" ,shared-mime-info))) - (propagated-inputs - ;; gtksourceview-3.0.pc refers to all these. - `(("glib" ,glib) - ("gtk+" ,gtk+) - ("libxml2" ,libxml2))) - (home-page "https://wiki.gnome.org/Projects/GtkSourceView") - (synopsis "GNOME source code widget") - (description "GtkSourceView is a text widget that extends the standar= d -GTK+ text widget GtkTextView. It improves GtkTextView by implementing s= yntax -highlighting and other features typical of a source code editor.") - (license license:lgpl2.1+))) + #t)) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc"))) + #t)) + (add-after 'install 'move-glade + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (glade (assoc-ref outputs "glade"))) + (mkdir-p (string-append glade "/share")) + (rename-file + (string-append out "/share/glade") + (string-append glade "/share/glade"))) + #t))))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("groovy" ,groovy) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config) + ("ruby" ,ruby) + ("shared-mime-info" ,shared-mime-info) + ("vala" ,vala) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("glade" ,glade3))) + (propagated-inputs + `(("fribidi" ,fribidi) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("libxml2" ,libxml2))) + (synopsis "GNOME source code widget") + (description "GtkSourceView is a GNOME library that extends GtkTextV= iew, the +standard GTK+ widget for multiline text editing. GtkSourceView adds sup= port for +syntax highlighting, undo/redo, file loading and saving, search and repl= ace, a +completion system, printing, displaying line numbers, and other features= typical +of a source code editor.") + (home-page "https://wiki.gnome.org/Projects/GtkSourceView") + (license license:lgpl2.1+))) =20 (define-public gtksourceview-3 (package (inherit gtksourceview) --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0058-gnu-gtksourceview-3-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0058-gnu-gtksourceview-3-Update-package-definition.patch" =46rom 5a18af17481f52576681f6f81d0343eac4fe63e9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 06:58:44 -0400 Subject: [PATCH 58/61] gnu: gtksourceview-3: Update package definition. * gnu/packages/gtk.scm (gtksourceview-3) [version]: Update to 3.24.11. [build-system]: Change from gnu to glib-or-gtk. [arguments]<#:configure-flags>[--enable-glade-catalog]: New flag. [--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-glade]: New phase. --- gnu/packages/gtk.scm | 66 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 23eede063c..1452d8779a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -515,17 +515,61 @@ of a source code editor.") (license license:lgpl2.1+))) =20 (define-public gtksourceview-3 - (package (inherit gtksourceview) - (name "gtksourceview") - (version "3.24.10") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b")))= ))) + (package + (inherit gtksourceview) + (name "gtksourceview") + (version "3.24.11") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32"1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9")))= ) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list + "--enable-glade-catalog" + "--enable-gtk-doc" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* '("gtksourceview-docs.xml.in" "intro.xml.in"= + "lang-reference.xml.in" "lang-tutorial.xml= " + "style-reference.xml.in") + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-after 'install 'move-glade + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (glade (assoc-ref outputs "glade"))) + (mkdir-p (string-append glade "/share")) + (rename-file + (string-append out "/share/glade") + (string-append glade "/share/glade"))) + #t))))))) =20 (define-public gdk-pixbuf (package --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0059-gnu-gtksourceview-2-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0059-gnu-gtksourceview-2-Update-package-definition.patch" =46rom 2463234416baa0ee82daaa49401e1bcb123a37f0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 07:04:51 -0400 Subject: [PATCH 59/61] gnu: gtksourceview-2: Update package definition. * gnu/packages/gtk.scm (gtksourceview-2): Inherit from gtksourceview. [inherit]: New field. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output 'doc'. [arguments]<#:configure-flags>[--with-html-dir]: New flag. --- gnu/packages/gtk.scm | 103 +++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 58 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1452d8779a..9365864ab5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -363,64 +363,6 @@ graph-like environments, e.g. modular synths or fini= te state machine diagrams.") (license license:gpl3+))) =20 -(define-public gtksourceview-2 - (package - (name "gtksourceview") - (version "2.10.5") ; This is the last version which builds against g= tk+2 - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.bz2")) - (sha256 - (base32 - "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))= - (patches - (search-patches - "gtksourceview-2-add-default-directory.patch")))) - (build-system gnu-build-system) - (native-inputs - `(("intltool" ,intltool) - ("glib" ,glib "bin") ; for glib-genmarshal, etc. - ("pkg-config" ,pkg-config) - ;; For testing. - ("xorg-server" ,xorg-server-for-tests) - ("shared-mime-info" ,shared-mime-info))) - (propagated-inputs - ;; As per the pkg-config file. - `(("gtk" ,gtk+-2) - ("libxml2" ,libxml2))) - (arguments - `(#:phases - ;; Unfortunately, some of the tests in "make check" are highly de= pendent - ;; on the environment therefore, some black magic is required. - (modify-phases %standard-phases - (add-before 'check 'start-xserver - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (mime (assoc-ref inputs "shared-mime-info"))) - - ;; There must be a running X server and make check doesn'= t start one. - ;; Therefore we must do it. - (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) - (setenv "DISPLAY" ":1") - - ;; The .lang files must be found in $XDG_DATA_HOME/gtksou= rceview-2.0 - (system "ln -s gtksourceview gtksourceview-2.0") - (setenv "XDG_DATA_HOME" (getcwd)) - - ;; Finally, the mimetypes must be available. - (setenv "XDG_DATA_DIRS" (string-append mime "/share/"))) - #t))))) - (synopsis "Widget that extends the standard GTK+ 2.x 'GtkTextView' w= idget") - (description - "GtkSourceView is a portable C library that extends the standard GT= K+ -framework for multiline text editing with support for configurable synta= x -highlighting, unlimited undo/redo, search and replace, a completion fram= ework, -printing and other features typical of a source code editor.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gtksourceview/"))) - (define-public gtksourceview (package (name "gtksourceview") @@ -571,6 +513,51 @@ of a source code editor.") (string-append glade "/share/glade"))) #t))))))) =20 +(define-public gtksourceview-2 + (package + (inherit gtksourceview) + (name "gtksourceview") + (version "2.10.5") ; This is the last version which builds against g= tk+2 + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.bz2")) + (sha256 + (base32 "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))= + (patches + (search-patches + "gtksourceview-2-add-default-directory.patch")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + (let* ((xorg-server (assoc-ref inputs "xorg-server")) + (mime (assoc-ref inputs "shared-mime-info"))) + ;; There must be a running X server and make check doesn'= t start one. + ;; Therefore we must do it. + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1") + ;; The .lang files must be found in $XDG_DATA_HOME/gtksou= rceview-2.0 + (system "ln -s gtksourceview gtksourceview-2.0") + (setenv "XDG_DATA_HOME" (getcwd)) + ;; Finally, the mimetypes must be available. + (setenv "XDG_DATA_DIRS" (string-append mime "/share/"))) + #t))))) + (propagated-inputs + `(("gtk+-2" ,gtk+-2) + ,@(package-propagated-inputs gtksourceview))))) + (define-public gdk-pixbuf (package (name "gdk-pixbuf") --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0060-gnu-fuse-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0060-gnu-fuse-Update-package-definition.patch" =46rom 22a222359461fda738b3b7e72312f01125381a9c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 07:05:52 -0400 Subject: [PATCH 60/61] gnu: fuse: Update package definition. * gnu/packages/linux.scm (fuse) [version]: Update to 3.9.2. [source][method]: Change from url-fetch to git-fetch. [build-system]: Change from gnu to meson. [arguments]: Modify inaccordance with build-system. [native-inputs]: Add pkg-config. [inputs]: Add bash, eudev and libiconv. [synopsis]: Modify. [description]: Modify. --- gnu/packages/linux.scm | 103 +++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1c34c5a2e1..6de94349e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2606,64 +2606,65 @@ processes currently causing I/O.") (define-public fuse (package (name "fuse") - (version "2.9.9") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libfuse/libfuse/re= leases/" - "download/fuse-" version - "/fuse-" version ".tar.gz")) - (sha256 - (base32 - "1ddlq6kzxilccgbvxjfx80jx6kamgw4sv49phks2zhlcc1frvrnh"))= - (patches (search-patches "fuse-overlapping-headers.patch")= ))) - (build-system gnu-build-system) - (inputs `(("util-linux" ,util-linux))) + (version "3.9.2") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/libfuse/libfuse.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10xsbly7rv895c9zv4fqmnrxbdc0kd1qhlk75x4m9cv95f93k843"))= )) + (build-system meson-build-system) (arguments - '(#:configure-flags (list (string-append "MOUNT_FUSE_PATH=3D" - (assoc-ref %outputs "out")= - "/sbin") - (string-append "INIT_D_PATH=3D" - (assoc-ref %outputs "out")= - "/etc/init.d") - - ;; The rule makes /dev/fuse 666. - (string-append "UDEV_RULES_PATH=3D" - (assoc-ref %outputs "out")= - "/lib/udev/rules.d")) + `(#:tests? #f ; FIX-ME: Fails with wrong commands + #:configure-flags + (list + (string-append "-Dudevrulesdir=3D" + (assoc-ref %outputs "out") + "/lib/udev/rules.d") + "-Duseroot=3Dfalse") #:phases (modify-phases %standard-phases - (add-before 'build 'set-file-names + (add-after 'unpack 'patch-program-references (lambda* (#:key inputs #:allow-other-keys) - ;; libfuse calls out to mount(8) and umount(8). Make sure - ;; it refers to the right ones. - (substitute* '("lib/mount_util.c" "util/mount_util.c") - (("/bin/(u?)mount" _ maybe-u) - (string-append (assoc-ref inputs "util-linux") - "/bin/" maybe-u "mount"))) - (substitute* '("util/mount.fuse.c") + (substitute* "lib/mount.c" + (("/bin/mount") + (string-append (assoc-ref inputs "util-linux") "/bin/mou= nt")) + (("/bin/umount") + (string-append (assoc-ref inputs "util-linux") "/bin/umo= unt"))) + (substitute* "util/mount.fuse.c" (("/bin/sh") - (which "sh"))) - - ;; This hack leads libfuse to search for 'fusermount' in - ;; $PATH, where it may find a setuid-root binary, instead o= f - ;; trying solely $out/sbin/fusermount and failing because - ;; it's not setuid. - (substitute* "lib/Makefile" - (("-DFUSERMOUNT_DIR=3D[[:graph:]]+") - "-DFUSERMOUNT_DIR=3D\\\"/var/empty\\\"")) + (string-append (assoc-ref inputs "bash") "/bin/sh"))) + #t)) + (add-after 'unpack 'patch-install-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "util/install_helper.sh" + (("\\$\\{DESTDIR\\}/etc/init.d/fuse3") + (string-append (assoc-ref outputs "out") "/etc/init.d/fu= se3"))) #t))))) - (supported-systems (delete "i586-gnu" %supported-systems)) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("bash" ,bash) + ("eudev" ,eudev) + ("libiconv" ,libiconv) + ("util-linux" ,util-linux))) + (synopsis "Filesystem in Userspace") + (description "FUSE is an interface for userspace programs to export = a +filesystem to the Linux kernel. The FUSE project consists of two compon= ents: +the fuse kernel module (maintained in the regular kernel repositories) a= nd the +libfuse userspace library (maintained in this repository). Libfuse prov= ides the +reference implementation for communicating with the FUSE kernel module."= ) (home-page "https://github.com/libfuse/libfuse") - (synopsis "Support file systems implemented in user space") - (description - "As a consequence of its monolithic design, file system code for Li= nux -normally goes into the kernel itself---which is not only a robustness is= sue, -but also an impediment to system extensibility. FUSE, for \"file system= s in -user space\", is a kernel module and user-space library that tries to ad= dress -part of this problem by allowing users to run file system implementation= s as -user-space processes.") - (license (list license:lgpl2.1 ;library - license:gpl2+)))) ;command-line utilitie= s + (license + (list + ;; Headers and Libraries. + license:lgpl2.1 + ;; Others. + license:gpl2+)))) =20 (define-public unionfs-fuse (package --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3 Content-Type: text/x-patch; charset=UTF-8; name="0061-gnu-gvfs-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0061-gnu-gvfs-Update-package-definition.patch" =46rom b9b918f4addca5b5f17e1002b5769a6a5e99fa91 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 4 Jul 2020 07:06:43 -0400 Subject: [PATCH 61/61] gnu: gvfs: Update package definition. * gnu/packages/gnome.scm (gvfs) [version]: Update to 1.44.1. [native-inputs]: Add docbook-xml and docbook-xsl. [inputs]: Remove docbook-xml and docbook-xsl. Add libplist and libusb. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 57 +++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2fbd7e8f67..1230983f69 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5861,40 +5861,45 @@ part of udev-extras, then udev, then systemd. It= 's now a project on its own.") (define-public gvfs (package (name "gvfs") - (version "1.40.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gvfs/" - (version-major+minor version) "/" - "gvfs-" version ".tar.xz")) - (sha256 - (base32 - "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj"))= )) + (version "1.44.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/gvfs/" + (version-major+minor version) "/" + "gvfs-" version ".tar.xz")) + (sha256 + (base32 "0ipv0jgzim6glsgizmfjkx0m3gd1l9lr242m0jj6cdmhs52k5vsh"))= )) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t #:configure-flags - (list "-Dsystemduserunitdir=3Dno" - "-Dtmpfilesdir=3Dno" - ;; Otherwise, the RUNPATH will lack the final path componen= t. - (string-append "-Dc_link_args=3D-Wl,-rpath=3D" - (assoc-ref %outputs "out") "/lib/gvfs")))) + (list + "-Dsystemduserunitdir=3Dno" + "-Dtmpfilesdir=3Dno" + "-Dman=3Dtrue" + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=3D-Wl,-rpath=3D" + (assoc-ref %outputs "out") "/lib/gvfs")))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. + `(("docbook-xml" ,docbook-xml-4.2) + ("docbook-xsl" ,docbook-xsl) ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ("gtk-doc" ,gtk-doc) + ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs `(("avahi" ,avahi) - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) ("dbus" ,dbus) ("elogind" ,elogind) ("fuse" ,fuse) ("gcr" ,gcr) ("glib" ,glib) ("gnome-online-accounts" ,gnome-online-accounts) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("libarchive" ,libarchive) ("libbluray" ,libbluray) ("libcap" ,libcap) @@ -5906,23 +5911,23 @@ part of udev-extras, then udev, then systemd. It= 's now a project on its own.") ("libimobiledevice" ,libimobiledevice) ("libmtp" ,libmtp) ("libnfs" ,libnfs) + ("libplist" ,libplist) ("libsecret" ,libsecret) ("libsmbclient" ,samba) ("libsoup" ,libsoup) + ("libusb" ,libusb) ("libxml2" ,libxml2) ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) + (synopsis "Virtual filesystem implementation for GIO") + (description "GVfs is a userspace virtual filesystem implementation = for GIO +(a library available in GLib). GVfs comes with a set of backends, inclu= ding +trash support, SFTP, SMB, HTTP, DAV, and many others. GVfs also contain= s +modules for GIO that implement volume monitors and persistent metadata s= torage. +There is also FUSE support that provides limited access to the GVfs file= systems +for applications not using GIO.") (home-page "https://wiki.gnome.org/gvfs/") - (synopsis "Userspace virtual file system for GIO") - (description - "GVFS is a userspace virtual file system designed to work with the = I/O -abstraction of GIO. It contains a GIO module that seamlessly adds GVFS = support -to all applications using the GIO API. It also supports exposing the GV= FS -mounts to non-GIO applications using FUSE. - -GVFS comes with a set of backends, including trash support, SFTP, SMB, H= TTP, -DAV, and others.") (license license:lgpl2.0+))) =20 (define-public gusb --=20 2.26.2 --------------81B901C9B3AB5DE0E0FC1FA3-- --C5rEkmLjr3U92tlnGn0mj1VcynSJTWFKB-- --EZmYrdb9Avwd2Tum8Iap5XMcXHQOTXhiv Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJ0EvNKqRjepA0pQorm7zBG1ve1cFAl8AZJoACgkQrm7zBG1v e1fiIQf9HPGgUPQo3/eZefXn+Ycnrxy0W0+CV4n3k0yZxRJRFZ0DYqrrkh372s9H GLVcfEHTbzDiMuijVAJkSNqEkj+lXQjWPx1xubyFDP2mlDncm+K1y6oPPbeJxZeu WH6VWbhuG7xDXXIvPAArKORzpM1ltxAe5x3H0TytbS62Ig61UkY+6i32HVTCkRTq 8Jc6a0sMM22Z2qgR+InzPFAnVRpaAanCs3Z8BM0spgvCDwI/SsKqTVUzU42F5d9v X6zewwYVdbwqNQGOmtB8QYkR14OMf1MX7VudA1jTXT2YrCbGBDPcKl+Qdc7jmcjC 4Ed9d1pQAlPHFK4R2pA6fssOZ3x8qA== =4X1s -----END PGP SIGNATURE----- --EZmYrdb9Avwd2Tum8Iap5XMcXHQOTXhiv--