From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aP2JH465LF/fEQAA0tVLHw (envelope-from ) for ; Fri, 07 Aug 2020 02:16:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id oPkxG465LF8CLwAAbx9fmQ (envelope-from ) for ; Fri, 07 Aug 2020 02:16:46 +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 10BE99400C7 for ; Fri, 7 Aug 2020 02:16:43 +0000 (UTC) Received: from localhost ([::1]:59388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3rw2-0005uH-Qn for larch@yhetil.org; Thu, 06 Aug 2020 22:16:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3rvo-0005t3-O8 for guix-devel@gnu.org; Thu, 06 Aug 2020 22:16:29 -0400 Received: from knopi.disroot.org ([178.21.23.139]:57800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3rvf-0003Vf-UL for guix-devel@gnu.org; Thu, 06 Aug 2020 22:16:28 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3A57E5299B; Fri, 7 Aug 2020 04:16:16 +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 EF9XVvI4h6xB; Fri, 7 Aug 2020 04:16:09 +0200 (CEST) To: Danny Milosavljevic DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1596766569; bh=Wc2hK0SjwZkf1wD85X+Ed4zbX8SNvb62UIxOivH9b5w=; h=To:Cc:References:From:Subject:Date:In-Reply-To; b=TXFFamWu6YKOuztWex+oQgVSBfrByMx54FdOtfLXJcv9mQ8KCkIjDxRfcKg/ihPBc +7Yl9fuSYcKK7JOPMQGYObgTbNt3FTzV73cePBmcMQASGeRplK5libdVPfSv1/hwHC Q9Y/z8iX7B0M71oMPqUrc7lBEGJe3GDjUu6tkDqnHqRoYyBQ8DJPo9/M3t9WSINboK DYWuoI687OGGpDJ08MJej/zO9OF3h3JOnuWkTrXHYNeIpa3LOB+3LN+27rcFtTCXsO kyTUwUO13XZmh29Dp6c9Y6mrPElrvmy0NwkQCa2CZXMZMt1hO3QbDSo1kZYSGPWo3G S/agzsFuNRh9A== References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <20200705212515.711f6327@scratchpost.org> <20200717143823.3db2405c@scratchpost.org> <39b2d7bc-f9a4-b98e-2565-ddf542acead3@disroot.org> <20200719212257.7add44f8@scratchpost.org> <9859f0c6-473f-3191-189e-5b2aa6fd02f4@disroot.org> <6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org> <08ded8e0-0217-ffba-e173-61c4e72a65dc@disroot.org> <945405e0-29e2-1ad3-9ae7-4c964d14eda2@disroot.org> <07c36137-cbab-1b33-a008-992c3781b04d@disroot.org> <445cfd68-4b49-8d54-6d40-e08fdf2aced3@disroot.org> <20200804002921.39a351a1@scratchpost.org> <20200805171415.38264893@scratchpost.org> From: Raghav Gururajan 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: Date: Thu, 6 Aug 2020 22:14:19 -0400 Mime-Version: 1.0 In-Reply-To: <20200805171415.38264893@scratchpost.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="5nWKJybVmoktH2ZRIKKw4qrJpGjIDAfvy" 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/08/06 22:16:16 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no 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=TXFFamWu; 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: -0.01 X-TUID: q56zhTlkUzCs This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --5nWKJybVmoktH2ZRIKKw4qrJpGjIDAfvy Content-Type: multipart/mixed; boundary="VQ07UxTtWZlbZhgfaem7pzvQj2nwBOx3r"; 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: Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <20200705212515.711f6327@scratchpost.org> <20200717143823.3db2405c@scratchpost.org> <39b2d7bc-f9a4-b98e-2565-ddf542acead3@disroot.org> <20200719212257.7add44f8@scratchpost.org> <9859f0c6-473f-3191-189e-5b2aa6fd02f4@disroot.org> <6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org> <08ded8e0-0217-ffba-e173-61c4e72a65dc@disroot.org> <945405e0-29e2-1ad3-9ae7-4c964d14eda2@disroot.org> <07c36137-cbab-1b33-a008-992c3781b04d@disroot.org> <445cfd68-4b49-8d54-6d40-e08fdf2aced3@disroot.org> <20200804002921.39a351a1@scratchpost.org> <20200805171415.38264893@scratchpost.org> In-Reply-To: <20200805171415.38264893@scratchpost.org> --VQ07UxTtWZlbZhgfaem7pzvQj2nwBOx3r Content-Type: multipart/mixed; boundary="------------53C3E954B073CC530AF4B73C" Content-Language: en-US This is a multi-part message in MIME format. --------------53C3E954B073CC530AF4B73C Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable @Danny Please find the attached patches. NOTE: I am not done with some these packages yet. Have to work on some run-time issues. @Others Please find the following git-log. *** START *** commit 9fa96cda1abaa15665e231da20a14b283042276b Author: Raghav Gururajan Date: Thu Aug 6 21:59:02 2020 -0400 gnu: gnome-weather: Update package definition. * gnu/packages/gnome.scm (gnome-weather) [version]: Update to 3.36.1.= [sources][sha256]: Modify base32. [arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase. ['fix-desktop-file]: Remove phase. ['wrap]: Modify phase. [native-inputs]: Add desktop-file-utils and python-wrapper. Remove gtk+:bin. [inputs]: Add glib and gtk+. Change gdk-pixbuf to gdk-pixbuf+svg. commit bbc83c1df07acdb271ebbc0c8c10a5d5fbb9259b Author: Raghav Gururajan Date: Thu Aug 6 21:22:32 2020 -0400 gnu: gnome-user-share: Update package definition. * gnu/packages/gnome.scm (gnome-user-share) [version]: Update to 3.34= =2E0. [source][sha256]: Modify base32. [arguments]<#:configure-flags>[-Dsystemd]: Remove flag. [-Dsystemduserunitdir]: New flag. [-Dhttpd]: New flag. [-Dmodules_path]: New flag. [native-inputs]: Remove gtk+:bin and yelp-tools. [inputs]: Add httpd and libselinux. Remove gnome-bluetooth, libcanberra and libnotify. commit b1918a7c727a7b1ae16c7f4008df017f63b526d4 Author: Raghav Gururajan Date: Thu Aug 6 20:51:52 2020 -0400 gnu: gnome-user-docs: Update package definition. * gnu/packages/gnome.scm (gnome-user-docs) [version]: Update to 3.36.= 2. [source][sha256]: Modify base32. [synopsis]: Modify. [description]: Modify. commit c3f3f8850f4538400b54202b0c344967137f0c25 Author: Raghav Gururajan Date: Thu Aug 6 20:40:20 2020 -0400 gnu: gnome-themes-extra: Update package definition. * gnu/packages/gnome.scm (gnome-themes-extra): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [native-inputs]: Add libxml2. [inputs]: Add cairo, gdk-pixbuf+svg and glib. Remove libxml2. [description]: Modify. commit f0616f6f25bc316c9d417c951f674e18b0cc39bd Author: Raghav Gururajan Date: Thu Aug 6 20:07:07 2020 -0400 gnu: gnome-terminal: Update package definition. * gnu/packages/gnome.scm (gnome-terminal) [version]: Update to 3.36.2= =2E [source][sha256]: Modify base32. [outputs]: New output "help". [arguments]<#:configure-flags>[--disable-static]: New flag. [--disable-migration]: Remove flag. [--without-nautilus-extension]: Remove flag. [--with-help-dir]: New flag. <#:phases>['patch-/bin/true]: Remove phase. ['remove-systemd]: New phase. [native-inputs]: Add vala. [inputs]: Add dconf, glib, nautilus and pcre2. Remove gnutls and vala= =2E [propagated-inputs]: Remove dconf. [description]: Modify. [license]: Add fdl1.3+. commit 05ef1f07aa8018de7f4dbec4158099e0e3b401b7 Author: Raghav Gururajan Date: Thu Aug 6 18:01:52 2020 -0400 gnu: gnome-system-monitor: Update package extensions. * gnu/packages/gnome.scm (gnome-system-monitor) [version]: Update to 3.36.1. [source][sha256]: Modify base32. [outputs]: New output "help". [arguments]<#:configure-flags>[-Dwnck]: New flag. <#:phases>['skip-gtk-update-icon-cache]: New phase. ['move-help]: New phase. [native-inputs]: Add desktop-file-utils. Remove polkit. Move libgtop to ... [inputs]: ... here. Add appstream-glib, glib, glibmm and libselinux. Remove gdk-pixbuf+svg. [synopsis]: Modify. [description]: Modify. commit cd4ae0bed9e78ae01be37385d4953c442e7dbc54 Author: Raghav Gururajan Date: Thu Aug 6 17:26:01 2020 -0400 gnu: gnome-shell-extensions: Update package definition. * gnu/packages/gnome.scm (gnome-shell-extensions) [version]: Update to 3.36.2. [source][sha256]: Modify base32. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dclassic_mode]: New flag. [inputs]: Add mozjs60 and sassc. [description]: Modify. [license]: Change from gpl3+ to gpl2+. commit c59d4373532863647b6d6e9d7e253b6cfdddc5ad Author: Raghav Gururajan Date: Thu Aug 6 16:46:06 2020 -0400 gnu: gnome-settings-daemon: Update package definition. * gnu/packages/gnome.scm (gnome-settings-daemon) [version]: Update to 3.36.1. [arguments]<#:configure-flags>['-Dudev_dir]: Modify flag. [native-inputs]: Add python-dbusmock, gobject-introspection, umockdev= and which. Remove docbook-xml and docbook-xsl. [inputs]: Add fontconfig, glib, gtk+, xorgproto, pango, eudev, libxex= t and libxi. Remove libxtst. [description]: Modify. [home-page]: Modify. [license]: Add lgpl2.1+. commit 9d9b5bcefaaf0a7858fc79f6ee7183d8b787700c Author: Raghav Gururajan Date: Thu Aug 6 15:36:30 2020 -0400 gnu: gnome-session: Update package definition. * gnu/packages/gnome.scm (gnome-session) [version]: Update to 3.36.0.= [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:configure-flags>[-Dsession_selector]: New flag. [-Dsystemd]: New flag. [-Dsystemd_session]: New flag. [-Ddocbook]: Remove flag. [-Dman]: Remove flag. <#:phases>['patch-docbook]: New phase. ['pre-configure]: Remove phase. ['move-doc]: New phase. ['wrap-gnome-session]: Modify phase. [inputs]: Add libepoxy, glib, libice and libx11. Remove elogind, gsettings-desktop-schemas, libxtst and upower. commit 5f10e67e1559968a9b3c38c58a1f7725a4e8709b Author: Raghav Gururajan Date: Thu Aug 6 14:54:00 2020 -0400 gnu: gnome-screenshot: Update package definition. * gnu/packages/gnome.scm (gnome-screenshot) [version]: Update to 3.36= =2E0. [source][sha256]: Modify base32. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add libxml2. Remove appstream-glib. [inputs]: Add glib. [description]: Modify. commit 461c396d624413e65564df24d6863112cc8cfcb5 Author: Raghav Gururajan Date: Thu Aug 6 14:28:58 2020 -0400 gnu: gnome-photos: Update package definition. * gnu/packages/gnome.scm (gnome-photos): Update package definition. [outputs]: New output "help". [arguements]<#:phases>['skip-gtk-update-icon-cache]: New phase. ['pre-check]: New phase. ['move-help]: New phase. ['wrap-gnome-photos]: Remove phase. [native-inputs]: Add xorg-server-for-tests. Remove gtk+:bin. Move dbus to ... [inputs]: ... here. Add glib. Remove gnome-online-miners, grilo-plugi= ns, rest, python-pygobject and tracker-miners. Change gnome-online-accoun= ts to gnome-online-accounts:lib. [synopsis]: Modify. commit bfba8b2ffdd035083206c2521ead437cc46b7d41 Author: Raghav Gururajan Date: Thu Aug 6 13:49:43 2020 -0400 gnu: gnome-music: Update package definition. * gnu/packages/gnome.scm (gnome-music) [version]: Update to 3.36.4.1.= [source][sha256]: Modify base32. [outputs]: New output "help". [arguments]<#:tests?>: New argument. <#:phases>['skip-gtk-update-icon-cache]: New phase. ['move-help]: New phase. ['wrap-gnome-music]: Modify phase. [native-inputs]: Remove gtk+:bin. [inputs]: Add appstream-glib, gtk+ and python. Change gnome-online-accounts to gnome-online-accounts:lib. Remove gst-plugins-base, gstreamer, gvfs and tracker-miners. [propagated-inputs]: Add glib. [synopsis]: Modify. [description]: Modify. commit 1414a2f0b8c1ec47f1f968f32085460b0b26deba Author: Raghav Gururajan Date: Thu Aug 6 11:32:45 2020 -0400 gnu: gnome-maps: Update package definition. * gnu/packages/gnome.scm (gnome-maps) [version]: Update to 3.36.0. [source][sha256]: Modify base32. [build-system]: Change from gnu to glib-or-gtk. [arguments]<#:configure-flags>[--disable-static]: New flag. <#:make-flags>[INTROSPECTION_GIRDIR]: New flag. [INTROSPECTION_TYPELIBDIR]: New flag. [native-inputs]: Add gjs and gobject-introspection. Move glib to ... [propagated-inputs]: ... here. [synopsis]: Modify. [license]: Add gpl2+. commit 6ec52554da9c14a29f2c8ae31c815461da71bef5 Author: Raghav Gururajan Date: Wed Aug 5 21:26:46 2020 -0400 gnu: gnome-maps: Update package definition. * gnu/packages/gnome.scm (gnome-maps) [version]: Update to 3.36.4. [source][sha256]: Modify base32. [arguments]<#:phases>['wrap]: Modify phase. [native-inputs]: Add desktop-file-utils and glib:bin. [inputs]: Add appstream-glib. Remove evolution-data-server, gdk-pixbuf+svg, gfbgraph, gnome-online-accounts:lib, gsettings-desktop-schemas, libgweather, libsecret, libsoup and webkitgtk. [synopsis]: Modify. [description]: Modify. commit 2dd3ec1ed9317f609f61d0f2e83c3b4b26431ed4 Author: Raghav Gururajan Date: Wed Aug 5 19:39:11 2020 -0400 gnu: seed: Disable tests. * gnu/packages/gnome.scm (seed) [arguments]<#:tests?>: New argument. commit 22a6ceb627294dbb895761c90070d6e753db517d Author: Raghav Gururajan Date: Wed Aug 5 18:46:11 2020 -0400 gnu: gnome-keyring: Update package definition. * gnu/packages/gnome.scm (gnome-keyring) [version]: Update to 3.36.0.= [source][sha256]: Modify base32. [build-system]: Change from gnu to glib-or-gtk. [arguments]<#:configure-flags>[--enable-doc]: New flag. [--with-pkcs11-config]: Modify flag. [--with-pkcs11-modules]: Modify flag. <#:phases>['patch-docbook]: New phase. ['trigger-bootstrap]: New phase. ['fix-/bin/sh-reference]: Remove phase. ['fix-docbook]: Remove phase. [native-inputs]: Add gobject-introspection and libtool. Change python-2 to python-wrapper. [inputs]: Add libcap-ng. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Modify. commit 60b251a90fb668fd4e74c4d22a53ec675a720b81 Author: Raghav Gururajan Date: Wed Aug 5 16:57:57 2020 -0400 gnu: gnome-initial-setup: Update package definition. * gnu/packages/gnome.scm (gnome-initial-setup) [version]: Update to 3.36.4. [source][sha256]: Modify base32. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dcheese]: Remove flag. [native-inputs]: Remove gtk+:bin. [inputs]: Add cheese, geocode-glib, gtk+, malcontent and pango. Remove gnome-getting-started-docs, gstreamer, packagekit and upower. [description]: Modify. [home-page]: Modify. commit e8eca868dd9a7b389b272b517e5e181175d9668c Author: Raghav Gururajan Date: Wed Aug 5 15:55:06 2020 -0400 gnu: malcontent: Update package definition. * gnu/packages/freedesktop.scm (malcontent): Update package definitio= n. [outputs]: New output "help". [arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase. ['move-help]: New phase. [native-inputs]: Remove gtk+:bin. [inputs]: Remove libostree. Move accountsservice, flatpack, glib and gtk+ to ... [propagated-inputs]: ... here. [license]: Modify. commit 6b48b50eeffa044f4973b8591f1387f5ddfb789e Author: Raghav Gururajan Date: Wed Aug 5 15:41:37 2020 -0400 gnu: flatpak: Update package definition. * gnu/packages/package-management.scm (flatpak): Update package definition. [inputs]: Replace fuse with fuse-legacy. Move libostree to ... [propagated-inputs]: ... here. Add glib. commit bd5161bd90ead802200bd28eceecbd912d4c240a Author: Raghav Gururajan Date: Wed Aug 5 15:33:38 2020 -0400 gnu: libostree: Update package definition. * gnu/packages/package-management.scm (libostree): Update package definition. [inputs]: Replace fuse with fuse-legacy. Move glib to ... [propagated-inputs]: ... here. commit 394ab38f2f7416be427138789472ef845790baa9 Author: Raghav Gururajan Date: Wed Aug 5 15:27:26 2020 -0400 gnu: Add fuse@2.9.9. * gnu/packages/linux.scm (fuse-legacy): New variable. commit c6a80558d787cfbb773061a2484b796a28121719 Author: Raghav Gururajan Date: Wed Aug 5 14:36:35 2020 -0400 gnu: gnome-getting-started-docs: Update package definition. * gnu/packages/gnome.scm (gnome-getting-started-docs) [version]: Update to 3.36.2. [source][sha256]: Modify base32. [synopsis]: Modify. [description]: Modify. commit 20d62c9ddc18e338f59a0237c8dd0e654ea2380e Author: Raghav Gururajan Date: Wed Aug 5 14:13:37 2020 -0400 gnu: gnome-font-viewer: Update package definition. * gnu/packages/gnome.scm (gnome-font-viewer) [version]: Update to 3.34.0. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-post-install-script]: Remove phase. [native-inputs]: Add desktop-file-utils. [inputs]: Add fontconfig, freetype and harfbuzz. [synopsis]: Modify. [description]: Modify. commit b0af26fa55b2e45e49fc6aab45b4e4ef2bbeed2b Author: Raghav Gururajan Date: Wed Aug 5 13:56:04 2020 -0400 gnu: gnome-disk-utility: Update package definition. * gnu/packages/gnome.scm (gnome-disk-utility) [version]: Update to 3.36.3. [source][sha256]: Modify base32. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-docbook-xsl]: New phase. [native-inputs]: Remove docbook-xml. [inputs]: Add xz. Remove appstream-glib. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. commit b22d8c556e9876d67f0049a52268218d5a576484 Author: Raghav Gururajan Date: Wed Aug 5 13:13:48 2020 -0400 gnu: gnome-desktop: Update package definition. * gnu/packages/gnome.scm (gnome-desktop) [version]: Update to 3.36.4.= [source][sha256]: Modify base32. [outputs]: New outputs "help" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dgnome_distributor]: New flag. [-Dudev]: New flag. [-Dsystemd]: New flag. [-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['patch-path]: Modify phase. ['pre-check]: Modify phase. ['move-doc]: New phase. ['move-help]: New phase. [native-inputs]: Add docbook-xml and gtk-doc. [inputs]: Add fontconfig. Remove gdk-pixbuf, glib, libxext, libxkbfil= e and libxrandr. [propagated-inputs]: Add gdk-pixbuf+svg, glib, glib-networking and eudev. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add fdl1.1+ and lgpl2.0+. *** END *** Regards, RG. --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0020-gnu-gnome-desktop-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0020-gnu-gnome-desktop-Update-package-definition.patch" =46rom b22d8c556e9876d67f0049a52268218d5a576484 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 13:13:48 -0400 Subject: [PATCH 20/44] gnu: gnome-desktop: Update package definition. * gnu/packages/gnome.scm (gnome-desktop) [version]: Update to 3.36.4. [source][sha256]: Modify base32. [outputs]: New outputs "help" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dgnome_distributor]: New flag. [-Dudev]: New flag. [-Dsystemd]: New flag. [-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['patch-path]: Modify phase. ['pre-check]: Modify phase. ['move-doc]: New phase. ['move-help]: New phase. [native-inputs]: Add docbook-xml and gtk-doc. [inputs]: Add fontconfig. Remove gdk-pixbuf, glib, libxext, libxkbfile and libxrandr. [propagated-inputs]: Add gdk-pixbuf+svg, glib, glib-networking and eudev. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add fdl1.1+ and lgpl2.0+. --- gnu/packages/gnome.scm | 116 +++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 39 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7fe43541c0..d6d59d3359 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2373,23 +2373,39 @@ and offline sources, providing a centralized plac= e for managing your contacts.") (define-public gnome-desktop (package (name "gnome-desktop") - (version "3.34.2") + (version "3.36.4") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1v983xirwp1y6ggz97bh742ak6gff0hxb359dgn37nikjxhvm0a0")))) + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1ilv49qkppbbag5728iswg1jhhqx9hbj7j8k8wccnbyaq54bsyq0"))= )) (build-system meson-build-system) + (outputs '("out" "help" "doc")) (arguments - '(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dgnome_distributor=3DGuix" + "-Dudev=3Denabled" + "-Dsystemd=3Ddisabled" + "-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/gnome-desktop3" + (substitute* "gnome-desktop3-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-before 'configure 'patch-path (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "libc"))) + (let* ((libc (assoc-ref inputs "libc"))) (substitute* "libgnome-desktop/gnome-languages.c" (("\"locale\"") (string-append "\"" libc "/bin/locale\""))) @@ -2405,53 +2421,75 @@ and offline sources, providing a centralized plac= e for managing your contacts.") "\", \"" (%store-directory) "\",")) - (("\"--ro-bind\", \"/etc/ld.so.cache\", \"/etc/ld.so.cach= e\",") "")) + (("\"--ro-bind\", \"/etc/ld.so.cache\", \"/etc/ld.so.cach= e\",") + "")) #t)) (add-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) ;; Tests require a running X server and locales. - (system "Xvfb :1 &") + (system "Xvfb :1 +extension GLX &") (setenv "DISPLAY" ":1") (setenv "GUIX_LOCPATH" (string-append (assoc-ref inputs "glibc-locales") "/lib/locale")) - #t))))) + #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 'move-doc 'move-help + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (help (assoc-ref outputs "help"))) + (mkdir-p (string-append help "/share")) + (rename-file + (string-append out "/share/help") + (string-append help "/share/help")) + #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for gdbus-codegen - ("glibc-locales" ,glibc-locales) ; for tests + `(("docbook-xml" ,docbook-xml-4.1.2) + ("glib:bin" ,glib "bin") + ("glibc-locales" ,glibc-locales) ("gobject-introspection" ,gobject-introspection) - ("itstool" ,itstool) + ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) + ("itstool" ,itstool) ("pkg-config" ,pkg-config) ("xmllint" ,libxml2) ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("fontconfig" ,fontconfig) + ("bubblewrap" ,bubblewrap))) (propagated-inputs - ;; Required by gnome-desktop-3.0.pc. - `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + `(("gdk-pixbuf" ,gdk-pixbuf+svg) + ("glib" ,glib) + ("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) ("iso-codes" ,iso-codes) ("libseccomp" ,libseccomp) - ("libx11" ,libx11) - ("xkeyboard-config" ,xkeyboard-config))) - (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("bubblewrap" ,bubblewrap) - ("libxext" ,libxext) - ("libxkbfile" ,libxkbfile) - ("libxrandr" ,libxrandr))) - (home-page "https://www.gnome.org/") - (synopsis - "Libgnome-desktop, gnome-about, and desktop-wide documents") - (description - "The libgnome-desktop library provides API shared by several applic= ations -on the desktop, but that cannot live in the platform for various reasons= =2E -There is no API or ABI guarantee, although we are doing our best to prov= ide -stability. Documentation for the API is available with gtk-doc. - -The gnome-about program helps find which version of GNOME is installed."= ) - ; Some bits under the LGPL. - (license license:gpl2+))) + ("libudev" ,eudev) + ("xkeyboard-config" ,xkeyboard-config) + ("x11" ,libx11))) + (synopsis "Library for sharing code between GNOME desktop components= ") + (description "GNOME-Desktop contains the libgnome-desktop library as= well as +a data file that exports the GNOME version to the Settings Details panel= =2E +The libgnome-desktop library provides API shared by several applications= on the +desktop.") + (home-page "https://gitlab.gnome.org/GNOME/gnome-desktop") + (license + (list + ;; Documentation + license:fdl1.1+ + ;; Library + license:lgpl2.0+ + ;; Others + license:gpl2+)))) =20 (define-public gnome-doc-utils (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0021-gnu-gnome-disk-utility-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0021-gnu-gnome-disk-utility-Update-package-definition.patch" =46rom b0af26fa55b2e45e49fc6aab45b4e4ef2bbeed2b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 13:56:04 -0400 Subject: [PATCH 21/44] gnu: gnome-disk-utility: Update package definition= =2E * gnu/packages/gnome.scm (gnome-disk-utility) [version]: Update to 3.36.3. [source][sha256]: Modify base32. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-docbook-xsl]: New phase. [native-inputs]: Remove docbook-xml. [inputs]: Add xz. Remove appstream-glib. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gnome.scm | 63 +++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6d59d3359..3a480d131c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2525,49 +2525,62 @@ and keep up to date translations of documentation= =2E") (define-public gnome-disk-utility (package (name "gnome-disk-utility") - (version "3.34.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1mb7q90lnlp97dhxhnadhjagcfd12dfqzp0vj9h6b1r61pzhy97y"))= )) + (version "3.36.3") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0yhnjmjzkixj29vcw6rzaijpg4mlwm2k1kqp4g3hn1xb6qzks0yx"))= )) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dlogind=3Dlibelogind") + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dlogind=3Dlibelogind") #:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. + (add-after 'unpack 'patch-docbook-xsl + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc/man" + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl/current")= + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl))))) + #t)) + (add-before 'configure 'skip-gtk-update-icon-cache (lambda _ (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")) + (("gtk-update-icon-cache") + "true")) #t))))) (native-inputs - `(("glib:bin" ,glib "bin") + `(("docbook-xsl" ,docbook-xsl) + ("glib:bin" ,glib "bin") ("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt))) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) (inputs - `(("elogind" ,elogind) + `(("dvdread" ,libdvdread) + ("elogind" ,elogind) ("glib" ,glib) - ("appstream-glib" ,appstream-glib) ("gnome-settings-daemon" ,gnome-settings-daemon) ("gtk+" ,gtk+) ("libcanberra" ,libcanberra) - ("libdvdread" ,libdvdread) + ("liblzma" ,xz) ("libnotify" ,libnotify) - ("libpwquality" ,libpwquality) ("libsecret" ,libsecret) + ("pwquality" ,libpwquality) ("udisks" ,udisks))) - (home-page "https://git.gnome.org/browse/gnome-disk-utility") - (synopsis "Disk management utility for GNOME") - (description "Disk management utility for GNOME.") + (synopsis "View, modify and configure disks and media") + (description "GNOME-Disk-Utility provides libraries and applications= for +dealing with storage devices.") + (home-page "https://wiki.gnome.org/Apps/Disks") (license license:gpl2+))) =20 (define-public gnome-font-viewer --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0022-gnu-gnome-font-viewer-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0022-gnu-gnome-font-viewer-Update-package-definition.patch" =46rom 20d62c9ddc18e338f59a0237c8dd0e654ea2380e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 14:13:37 -0400 Subject: [PATCH 22/44] gnu: gnome-font-viewer: Update package definition.= * gnu/packages/gnome.scm (gnome-font-viewer) [version]: Update to 3.34.0. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-post-install-script]: Remove phase. [native-inputs]: Add desktop-file-utils. [inputs]: Add fontconfig, freetype and harfbuzz. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3a480d131c..5522525780 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2586,37 +2586,37 @@ dealing with storage devices.") (define-public gnome-font-viewer (package (name "gnome-font-viewer") - (version "3.30.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gnome-font-vie= wer/" - (version-major+minor version) - "/gnome-font-viewer-" version ".tar.xz= ")) - (sha256 - (base32 - "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5"))= )) + (version "3.34.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/gnome-font-viewer/" + (version-major+minor version) + "/gnome-font-viewer-" version ".tar.xz")) + (sha256 + (base32 "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa"))= )) (build-system meson-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-post-install-script - (lambda _ - (substitute* "meson-postinstall.sh" - (("update-desktop-database") (which "true"))) - #t))))) + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("gettext" ,gettext-minimal) + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) (inputs - `(("glib" ,glib) + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("glib" ,glib) ("gnome-desktop" ,gnome-desktop) - ("gtk+" ,gtk+))) + ("gtk+" ,gtk+) + ("harfbuzz" ,harfbuzz))) + (synopsis "View fonts on your system") + (description "GNOME-Font-Viewer is an application to show you the fo= nts +installed on your computer for your use as thumbnails. Selecting any th= umbnails +shows the full view of how the font would look under various sizes.") (home-page "https://gitlab.gnome.org/GNOME/gnome-font-viewer") - (synopsis "GNOME Fonts") - (description "Application to show you the fonts installed on your co= mputer -for your use as thumbnails. Selecting any thumbnails shows the full vie= w of how -the font would look under various sizes.") (license license:gpl2+))) =20 (define-public gcr --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0023-gnu-gnome-getting-started-docs-Update-package-defini.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0023-gnu-gnome-getting-started-docs-Update-package-defini.pa"; filename*1="tch" =46rom c6a80558d787cfbb773061a2484b796a28121719 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 14:36:35 -0400 Subject: [PATCH 23/44] gnu: gnome-getting-started-docs: Update package definition. * gnu/packages/gnome.scm (gnome-getting-started-docs) [version]: Update to 3.36.2. [source][sha256]: Modify base32. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 47 ++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5522525780..3c9395ec56 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1998,31 +1998,28 @@ and system administrators.") =20 (define-public gnome-getting-started-docs (package - (name "gnome-getting-started-docs") - (version "3.32.2") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gnome-getting-started-= docs/" - (version-major+minor version) - "/gnome-getting-started-docs-" version ".tar.x= z")) - (sha256 - (base32 "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq")))= ) - (build-system gnu-build-system) - (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config) - ("xmllint" ,libxml2))) - (synopsis "Help to get new users started with the GNOME desktop") - (description - "The GNOME Getting Started Documentation contains GNOME's intuitive -\"Getting Started\" tour, with video guides, that can be viewed with Yel= p. - -It is normally used together with @command{gnome-initial-setup}, but is = also -useful as a tutorial and users' guide for new or less experienced users.= ") - (home-page "https://live.gnome.org/DocumentationProject") - (license license:cc-by-sa3.0))) + (name "gnome-getting-started-docs") + (version "3.36.2") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/gnome-getting-started-doc= s/" + (version-major+minor version) + "/gnome-getting-started-docs-" version ".tar.xz")= ) + (sha256 + (base32 "1ihxa9g687rbb4s2gxd2pf726adx98ahq4kfad868swl7a8vi504"))= )) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) + (synopsis "Help a new user get started in GNOME") + (description "GNOME-Getting-Started-Docs provides the Getting Starte= d guide +for GNOME Desktop.") + (home-page "https://live.gnome.org/DocumentationProject") + (license license:cc-by-sa3.0))) =20 (define-public dia ;; This version from GNOME's repository includes fixes for compiling w= ith --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0024-gnu-Add-fuse-2.9.9.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0024-gnu-Add-fuse-2.9.9.patch" =46rom 394ab38f2f7416be427138789472ef845790baa9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 15:27:26 -0400 Subject: [PATCH 24/44] gnu: Add fuse@2.9.9. * gnu/packages/linux.scm (fuse-legacy): New variable. --- gnu/packages/linux.scm | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4357ed8f87..950bab9900 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2669,6 +2669,68 @@ reference implementation for communicating with th= e FUSE kernel module.") ;; Others. license:gpl2+)))) =20 +(define-public fuse-legacy + (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))) + (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")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-file-names + (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") + (("/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\\\"")) + #t))))) + (supported-systems (delete "i586-gnu" %supported-systems)) + (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 + (define-public unionfs-fuse (package (name "unionfs-fuse") --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0025-gnu-libostree-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0025-gnu-libostree-Update-package-definition.patch" =46rom bd5161bd90ead802200bd28eceecbd912d4c240a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 15:33:38 -0400 Subject: [PATCH 25/44] gnu: libostree: Update package definition. * gnu/packages/package-management.scm (libostree): Update package definition. [inputs]: Replace fuse with fuse-legacy. Move glib to ... [propagated-inputs]: ... here. --- gnu/packages/package-management.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-m= anagement.scm index 30253157c1..4302acb8e8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1086,7 +1086,7 @@ for packaging and deployment of cross-compiled Wind= ows applications.") (define-public libostree (package (name "libostree") - (version "2020.3") + (version "2020.4") (source (origin (method url-fetch) (uri (string-append @@ -1094,7 +1094,7 @@ for packaging and deployment of cross-compiled Wind= ows applications.") (version-major+minor version) "/libostree-" version = ".tar.xz")) (sha256 (base32 - "01cch4as23xspq6pck59al7x5jj60wl21g8p3iqbdxcjl1p3jxsq"))= )) + "0s13cjrpx5r1dc9j9c9924zak45wl9nlbg9hiwgpsal80l92c39n"))= )) (build-system gnu-build-system) (arguments '(#:phases @@ -1122,12 +1122,13 @@ for packaging and deployment of cross-compiled Wi= ndows applications.") ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("e2fsprogs" ,e2fsprogs) - ("fuse" ,fuse) - ("glib" ,glib) + ("fuse" ,fuse-legacy) ("gpgme" ,gpgme) ("libarchive" ,libarchive) ("libsoup" ,libsoup) ("util-linux" ,util-linux))) + (propagated-inputs + `(("glib" ,glib))) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgr= ades") (description --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0026-gnu-flatpak-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0026-gnu-flatpak-Update-package-definition.patch" =46rom 6b48b50eeffa044f4973b8591f1387f5ddfb789e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 15:41:37 -0400 Subject: [PATCH 26/44] gnu: flatpak: Update package definition. * gnu/packages/package-management.scm (flatpak): Update package definitio= n. [inputs]: Replace fuse with fuse-legacy. Move libostree to ... [propagated-inputs]: ... here. Add glib. --- gnu/packages/package-management.scm | 171 ++++++++++++++-------------- 1 file changed, 86 insertions(+), 85 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-m= anagement.scm index 4302acb8e8..98af9d9752 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1140,92 +1140,93 @@ the boot loader configuration.") =20 (define-public flatpak (package - (name "flatpak") - (version "1.6.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/flatpak/flatpak/releases/do= wnload/" - version "/flatpak-" version ".tar.xz")) - (sha256 - (base32 - "17s8nqdxd4xdy7ag9bw06adxccha78jmlsa3zpqnl3qh92pg0hji")))) - - ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing = GIO to - ;; find the TLS backend in glib-networking. - (build-system glib-or-gtk-build-system) - - (arguments - '(#:configure-flags - (list - "--enable-documentation=3Dno" ;; FIXME - "--enable-system-helper=3Dno" - "--localstatedir=3D/var" - (string-append "--with-system-bubblewrap=3D" - (assoc-ref %build-inputs "bubblewrap") - "/bin/bwrap") - (string-append "--with-system-dbus-proxy=3D" - (assoc-ref %build-inputs "xdg-dbus-proxy") - "/bin/xdg-dbus-proxy")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively - (string-append (assoc-ref inputs "glibc-utf8-locales") - "/lib/locale/") "/tmp/locale") - (for-each make-file-writable (find-files "/tmp")) - (substitute* "tests/make-test-runtime.sh" - (("cp `which.*") "echo guix\n") - (("cp -r /usr/lib/locale/C\\.\\*") - (string-append "mkdir ${DIR}/usr/lib/locale/en_US; \ + (name "flatpak") + (version "1.6.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/flatpak/flatpak/releases/= download/" + version "/flatpak-" version ".tar.xz")) + (sha256 + (base32 + "17s8nqdxd4xdy7ag9bw06adxccha78jmlsa3zpqnl3qh92pg0hji")))) + + ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing= GIO to + ;; find the TLS backend in glib-networking. + (build-system glib-or-gtk-build-system) + + (arguments + '(#:configure-flags + (list + "--enable-documentation=3Dno" ;; FIXME + "--enable-system-helper=3Dno" + "--localstatedir=3D/var" + (string-append "--with-system-bubblewrap=3D" + (assoc-ref %build-inputs "bubblewrap") + "/bin/bwrap") + (string-append "--with-system-dbus-proxy=3D" + (assoc-ref %build-inputs "xdg-dbus-proxy") + "/bin/xdg-dbus-proxy")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively + (string-append (assoc-ref inputs "glibc-utf8-locales") + "/lib/locale/") "/tmp/locale") + (for-each make-file-writable (find-files "/tmp")) + (substitute* "tests/make-test-runtime.sh" + (("cp `which.*") "echo guix\n") + (("cp -r /usr/lib/locale/C\\.\\*") + (string-append "mkdir ${DIR}/usr/lib/locale/en_US; \ cp -r /tmp/locale/*/en_US.*"))) - (substitute* "tests/libtest.sh" - (("/bin/kill") (which "kill")) - (("/usr/bin/python3") (which "python3"))) - #t)) - ;; Many tests fail for unknown reasons, so we just run a few bas= ic - ;; tests - (replace 'check - (lambda _ - (setenv "HOME" "/tmp") - (invoke "make" "check" - "TESTS=3Dtests/test-basic.sh tests/test-config.sh te= stcommon")))))) + (substitute* "tests/libtest.sh" + (("/bin/kill") (which "kill")) + (("/usr/bin/python3") (which "python3"))) + #t)) + ;; Many tests fail for unknown reasons, so we just run a few ba= sic + ;; tests + (replace 'check + (lambda _ + (setenv "HOME" "/tmp") + (invoke "make" "check" + "TESTS=3Dtests/test-basic.sh tests/test-config.sh t= estcommon")))))) (native-inputs - `(("bison" ,bison) - ("dbus" ,dbus) ; for dbus-daemon - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-mkenums + gdbus-codeg= en - ("glibc-utf8-locales" ,glibc-utf8-locales) - ("gobject-introspection" ,gobject-introspection) - ("libcap" ,libcap) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("socat" ,socat) - ("which" ,which))) - (propagated-inputs `(("glib-networking" ,glib-networking) - ("gnupg" ,gnupg) - ("gsettings-desktop-schemas" - ,gsettings-desktop-schemas))) - (inputs - `(("appstream-glib" ,appstream-glib) - ("bubblewrap" ,bubblewrap) - ("dconf" ,dconf) - ("fuse" ,fuse) - ("gdk-pixbuf" ,gdk-pixbuf) - ("gpgme" ,gpgme) - ("json-glib" ,json-glib) - ("libarchive" ,libarchive) - ("libostree" ,libostree) - ("libseccomp" ,libseccomp) - ("libsoup" ,libsoup) - ("libxau" ,libxau) - ("libxml2" ,libxml2) - ("util-linux" ,util-linux) - ("xdg-dbus-proxy" ,xdg-dbus-proxy))) - (home-page "https://flatpak.org") - (synopsis "System for building, distributing, and running sandboxed d= esktop + `(("bison" ,bison) + ("dbus" ,dbus) ; for dbus-daemon + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; for glib-mkenums + gdbus-codegen + ("glibc-utf8-locales" ,glibc-utf8-locales) + ("gobject-introspection" ,gobject-introspection) + ("libcap" ,libcap) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("socat" ,socat) + ("which" ,which))) + (propagated-inputs `(("glib-networking" ,glib-networking) + ("glib" ,glib) + ("libostree" ,libostree) + ("gnupg" ,gnupg) + ("gsettings-desktop-schemas" + ,gsettings-desktop-schemas))) + (inputs + `(("appstream-glib" ,appstream-glib) + ("bubblewrap" ,bubblewrap) + ("dconf" ,dconf) + ("fuse" ,fuse-legacy) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gpgme" ,gpgme) + ("json-glib" ,json-glib) + ("libarchive" ,libarchive) + ("libseccomp" ,libseccomp) + ("libsoup" ,libsoup) + ("libxau" ,libxau) + ("libxml2" ,libxml2) + ("util-linux" ,util-linux) + ("xdg-dbus-proxy" ,xdg-dbus-proxy))) + (home-page "https://flatpak.org") + (synopsis "System for building, distributing, and running sandboxed = desktop applications") - (description "Flatpak is a system for building, distributing, and run= ning + (description "Flatpak is a system for building, distributing, and ru= nning sandboxed desktop applications on GNU/Linux.") - (license license:lgpl2.1+))) + (license license:lgpl2.1+))) --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0027-gnu-malcontent-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0027-gnu-malcontent-Update-package-definition.patch" =46rom e8eca868dd9a7b389b272b517e5e181175d9668c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 15:55:06 -0400 Subject: [PATCH 27/44] gnu: malcontent: Update package definition. * gnu/packages/freedesktop.scm (malcontent): Update package definition. [outputs]: New output "help". [arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase. ['move-help]: New phase. [native-inputs]: Remove gtk+:bin. [inputs]: Remove libostree. Move accountsservice, flatpack, glib and gtk+ to ... [propagated-inputs]: ... here. [license]: Modify. --- gnu/packages/freedesktop.scm | 41 ++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b471a6e46d..2357805125 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -151,6 +151,7 @@ tests.") (sha256 (base32 "0vnf0pk516fwwh41v96c29l2i7h1pnwhivlkbf53kkx1q35g7lb3"))= )) (build-system meson-build-system) + (outputs '("out" "help")) (arguments `(#:glib-or-gtk? #t #:phases @@ -160,28 +161,42 @@ tests.") (lambda _ (substitute* "libmalcontent/tests/app-filter.c" (("g_test_add_func \\(\"/app-filter/appinfo\", test_app_f= ilter_appinfo\\);") - "")) - #t))))) + "")) + #t)) + (add-before 'configure 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "build-aux/meson_post_install.py" + (("gtk-update-icon-cache") + "true")) + #t)) + (add-after 'install 'move-help + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (help (assoc-ref outputs "help"))) + (mkdir-p (string-append help "/share")) + (rename-file + (string-append out "/share/help") + (string-append help "/share/help")) + #t)))))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") ("itstool" ,itstool) ("libglib-testing" ,libglib-testing) - ("libxml2" ,libxml2) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) (inputs - `(("accountsservice" ,accountsservice) - ("appstream-glib" ,appstream-glib) + `(("appstream-util" ,appstream-glib) ("dbus" ,dbus) - ("flatpak" ,flatpak) - ("glib" ,glib) - ("gtk+" ,gtk+) - ("libostree" ,libostree) ("linux-pam" ,linux-pam) ("polkit" ,polkit))) + (propagated-inputs + `(("accountsservice" ,accountsservice) + ("flatpak" ,flatpak) + ("glib" ,glib) + ("gtk+" ,gtk+))) (synopsis "Parental controls support") (description "MalContent implements parental controls support which = can be used by applications to filter or limit the access of child accounts = to @@ -189,7 +204,11 @@ inappropriate content.") (home-page "https://gitlab.freedesktop.org/pwithnall/malcontent") (license (list + ;; Documentation + license:cc-by-sa3.0 + ;; Application license:gpl2+ + ;; Library license:lgpl2.1+)))) =20 (define-public xdg-utils --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0028-gnu-gnome-initial-setup-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0028-gnu-gnome-initial-setup-Update-package-definition.patch" =46rom 60b251a90fb668fd4e74c4d22a53ec675a720b81 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 16:57:57 -0400 Subject: [PATCH 28/44] gnu: gnome-initial-setup: Update package definitio= n. * gnu/packages/gnome.scm (gnome-initial-setup) [version]: Update to 3.36.4. [source][sha256]: Modify base32. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dcheese]: Remove flag. [native-inputs]: Remove gtk+:bin. [inputs]: Add cheese, geocode-glib, gtk+, malcontent and pango. Remove gnome-getting-started-docs, gstreamer, packagekit and upower. [description]: Modify. [home-page]: Modify. --- gnu/packages/gnome.scm | 125 +++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 62 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c9395ec56..b0f8c528e1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1601,68 +1601,69 @@ and handling media art caches.") =20 (define-public gnome-initial-setup (package - (name "gnome-initial-setup") - (version "3.32.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gnome-initial-set= up/" - (version-major+minor version) - "/gnome-initial-setup-" version ".tar.xz= ")) - (sha256 - (base32 - "1gwhp7dalyc8zsb2pa66cmpdrj2d6drbq5p331sq6zp8ds10k9ry"))))= - (build-system meson-build-system) - (arguments - '(#:configure-flags '(;; Enable camera support for user selfie. - "-Dcheese=3Dauto" - "-Dsystemd=3Dfalse") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'set-gkbd-file-name - (lambda* (#:key inputs #:allow-other-keys) - ;; Allow the "Preview" button in the keyboard layou= t - ;; selection dialog to display the layout. - (let ((libgnomekbd (assoc-ref inputs "libgnomekbd")= )) - (substitute* "gnome-initial-setup/pages/keyboard/= cc-input-chooser.c" - (("\"gkbd-keyboard-display") - (string-append "\"" libgnomekbd - "/bin/gkbd-keyboard-display")))= - #t)))))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config))) - (inputs - `(("accountsservice" ,accountsservice) - ;("adwaita-icon-theme" ,adwaita-icon-theme) - ("gdm" ,gdm) - ("geoclue" ,geoclue) - ("gnome-desktop" ,gnome-desktop) - ("gnome-getting-started-docs" ,gnome-getting-started-docs) - ("gnome-online-accounts" ,gnome-online-accounts) - ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") - ("gstreamer" ,gstreamer) - ("ibus" ,ibus) - ("json-glib" ,json-glib) - ("krb5" ,mit-krb5) - ("libgweather" ,libgweather) - ("libnma" ,libnma) - ("libsecret" ,libsecret) - ("network-manager" ,network-manager) - ("packagekit" ,packagekit) - ("polkit" ,polkit) - ("pwquality" ,libpwquality) - ("rest" ,rest) - ("upower" ,upower) - ("webkitgtk" ,webkitgtk) - ("libgnomekbd" ,libgnomekbd))) - (synopsis "Initial setup wizard for GNOME desktop") - (description "This package provides a set-up wizard when a -user logs into GNOME for the first time. It typically provides a -tour of all gnome components and allows the user to set them up.") - (home-page "https://gitlab.gnome.org/GNOME/gnome-initial-setup") - (license license:gpl2))) + (name "gnome-initial-setup") + (version "3.36.4") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/gnome-initial-setup/" + (version-major+minor version) + "/gnome-initial-setup-" version ".tar.xz")) + (sha256 + (base32 "17szzz2a5wpi7kwjnhimiwf8vg0bfliyk3k0adgv1pw2mcfpxp5s"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dsystemd=3Dfalse") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-gkbd-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Allow the "Preview" button in the keyboard layout + ;; selection dialog to display the layout. + (let* ((libgnomekbd (assoc-ref inputs "libgnomekbd"))) + (substitute* "gnome-initial-setup/pages/keyboard/cc-input= -chooser.c" + (("\"gkbd-keyboard-display") + (string-append "\"" libgnomekbd + "/bin/gkbd-keyboard-display"))) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config))) + (inputs + `(("accountsservice" ,accountsservice) + ("cheese" ,cheese) + ("gdm" ,gdm) + ("geocode-glib" ,geocode-glib) + ("gnome-desktop" ,gnome-desktop) + ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("gtk+" ,gtk+) + ("gweather" ,libgweather) + ("ibus" ,ibus) + ("json-glib" ,json-glib) + ("krb5" ,mit-krb5) + ("libgeoclue" ,geoclue) + ("libgnomekbd" ,libgnomekbd) + ("libnm" ,network-manager) + ("libnma" ,libnma) + ("libsecret" ,libsecret) + ("malcontent" ,malcontent) + ("pango" ,pango) + ("polkit" ,polkit) + ("pwquality" ,libpwquality) + ("rest" ,rest) + ("webkitgtk" ,webkitgtk))) + (synopsis "Initial setup wizard for GNOME desktop") + (description "GNOME-Initial-Setup aims to provide a simple, easy, an= d safe +way to prepare a new system.") + (home-page "https://wiki.gnome.org/Design/OS/InitialSetup") + (license license:gpl2+))) =20 (define-public gnome-user-share (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0029-gnu-gnome-keyring-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0029-gnu-gnome-keyring-Update-package-definition.patch" =46rom 22a6ceb627294dbb895761c90070d6e753db517d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 18:46:11 -0400 Subject: [PATCH 29/44] gnu: gnome-keyring: Update package definition. * gnu/packages/gnome.scm (gnome-keyring) [version]: Update to 3.36.0. [source][sha256]: Modify base32. [build-system]: Change from gnu to glib-or-gtk. [arguments]<#:configure-flags>[--enable-doc]: New flag. [--with-pkcs11-config]: Modify flag. [--with-pkcs11-modules]: Modify flag. <#:phases>['patch-docbook]: New phase. ['trigger-bootstrap]: New phase. ['fix-/bin/sh-reference]: Remove phase. ['fix-docbook]: Remove phase. [native-inputs]: Add gobject-introspection and libtool. Change python-2 to python-wrapper. [inputs]: Add libcap-ng. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Modify. --- gnu/packages/gnome.scm | 123 +++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 59 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b0f8c528e1..6f269b213b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2791,78 +2791,83 @@ GObject oriented way.") (define-public gnome-keyring (package (name "gnome-keyring") - (version "3.34.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0hqrsh5g9q9lm190f0m85q4nki8k4ng7wphl6qbccdry59aakkg9")))= ) - (build-system gnu-build-system) + (version "3.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"))= )) + (build-system glib-or-gtk-build-system) (arguments - `(#:tests? #f ;48 of 603 tests fail because /var/lib/dbus/machine-i= d does - ;not exist + `(#:tests? #f ; Tests require missing machine-id #:configure-flags (list + "--enable-doc" (string-append "--with-pkcs11-config=3D" - (assoc-ref %outputs "out") "/share/p11-kit/module= s/") + (assoc-ref %outputs "out") + "/share/p11-kit/modules") (string-append "--with-pkcs11-modules=3D" - (assoc-ref %outputs "out") "/share/p11-kit/module= s/")) + (assoc-ref %outputs "out") + "/lib/pkcs11")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-/bin/sh-reference + (add-after 'unpack 'trigger-bootstrap (lambda _ - (substitute* "po/Makefile.in.in" - (("/bin/sh") (which "sh"))) + (for-each delete-file + (list + "configure" + "Makefile.in")) #t)) - (add-after 'unpack 'fix-docbook + (add-before 'configure 'patch-docbook (lambda* (#:key inputs #:allow-other-keys) - (substitute* "docs/Makefile.am" - (("http://docbook.sourceforge.net/release/xsl/current/man= pages/docbook.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl"))) - (setenv "XML_CATALOG_FILES" - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")) - ;; Rerun the whole thing to avoid version mismatch ("This i= s - ;; Automake 1.15.1, but the definition used by this - ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we = don't - ;; use 'autoreconf' because it insists on running 'libtooli= ze'. - (invoke "autoconf") - (invoke "aclocal") - (invoke "automake" "-ac")))))) - (inputs - `(("libgcrypt" ,libgcrypt) - ("linux-pam" ,linux-pam) - ("openssh" ,openssh) - ("dbus" ,dbus) - ("gcr" ,gcr))) + (with-directory-excursion "docs" + (substitute* '("gnome-keyring-daemon.xml" + "gnome-keyring.xml" "Makefile.am") + (("http://docbook.sourceforge.net/release/xsl/current")= + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl))) + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) ("glib" ,glib "bin") - ("glib" ,glib) ; for m4 macros - ("python" ,python-2) ;for tests + ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libxslt" ,libxslt) ;for documentation - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl))) - (home-page "https://www.gnome.org") - (synopsis "Daemon to store passwords and encryption keys") - (description - "gnome-keyring is a program that keeps passwords and other secrets = for -users. It is run as a daemon in the session, similar to ssh-agent, and = other -applications locate it via an environment variable or D-Bus. - -The program can manage several keyrings, each with its own master passwo= rd, -and there is also a session keyring which is never stored to disk, but -forgotten when the session ends.") - (license license:lgpl2.1+))) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("xsltproc" ,libxslt))) + (inputs + `(("gcr" ,gcr) + ("glib" ,glib) + ("libcap-ng" ,libcap-ng) + ("libgcrypt" ,libgcrypt) + ("linux-pam" ,linux-pam) + ("openssh" ,openssh))) + (synopsis "GNOME Key Manager") + (description "GNOME-Keyring is a collection of components in GNOME t= hat +store secrets, passwords, keys, certificates and make them available to +applications. It is integrated with the user's login, so that their sec= ret +storage can be unlocked when the user logins into their session. It is = based +around a standard called PKCS#11, which is a standard way for applicatio= ns to +manage certificates and keys on smart cards or secure storage.") + (home-page "https://wiki.gnome.org/Projects/GnomeKeyring") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Others + license:gpl2+)))) =20 (define-public evince (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0030-gnu-seed-Disable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0030-gnu-seed-Disable-tests.patch" =46rom 2dd3ec1ed9317f609f61d0f2e83c3b4b26431ed4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 19:39:11 -0400 Subject: [PATCH 30/44] gnu: seed: Disable tests. * gnu/packages/gnome.scm (seed) [arguments]<#:tests?>: New argument. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6f269b213b..7cf66e2109 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -365,7 +365,8 @@ bindings.") (build-system glib-or-gtk-build-system) (outputs '("out" "doc")) (arguments - `(#:configure-flags + `(#:tests? #f ; FIXME + #:configure-flags (list "--disable-static" "--enable-xorg-module" --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0031-gnu-gnome-maps-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0031-gnu-gnome-maps-Update-package-definition.patch" =46rom 6ec52554da9c14a29f2c8ae31c815461da71bef5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 5 Aug 2020 21:26:46 -0400 Subject: [PATCH 31/44] gnu: gnome-maps: Update package definition. * gnu/packages/gnome.scm (gnome-maps) [version]: Update to 3.36.4. [source][sha256]: Modify base32. [arguments]<#:phases>['wrap]: Modify phase. [native-inputs]: Add desktop-file-utils and glib:bin. [inputs]: Add appstream-glib. Remove evolution-data-server, gdk-pixbuf+sv= g, gfbgraph, gnome-online-accounts:lib, gsettings-desktop-schemas, libgweath= er, libsecret, libsoup and webkitgtk. [synopsis]: Modify. [description]: Modify. --- gnu/packages/geo.scm | 86 ++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 56 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8c21392bb7..e6bce24abf 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -65,6 +65,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -204,83 +205,56 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "3.34.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "00xslcnhhwslqglgfv2im7vq3awa49y2jxzr8wsby7f713k28vf5"))= )) + (version "3.36.4") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1ila7li9yi4lyjc84a787qr33wr7ayppphxn451jzg410pfcamhz"))= )) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. (lambda _ (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")) + (("gtk-update-icon-cache") + "true")) #t)) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH")) - (geocode-glib-path (string-append - (assoc-ref inputs "geocode-glib")= - "/lib")) - (goa-path (string-append - (assoc-ref inputs "gnome-online-accounts:l= ib") - "/lib")) - (gdk-pixbuf-path (string-append - (assoc-ref inputs "gdk-pixbuf") - "/lib")) - (webkitgtk-path (string-append - (assoc-ref inputs "webkitgtk") - "/lib"))) - (wrap-program (string-append out "/bin/gnome-maps") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) - - ;; There seems to be no way to embed the path of - ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37, - ;; libgdk_pixbuf-2.0.so, libjavascriptcoregtk-4.0.so.18= , and - ;; libgeocode-glib.so.0 - `("LD_LIBRARY_PATH" ":" prefix (,goa-path - ,webkitgtk-path - ,gdk-pixbuf-path - ,geocode-glib-path))) + (let* ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/gnome-maps")) #t)))))) (native-inputs - `(("gettext" ,gettext-minimal) + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (inputs - `(("evolution-data-server" ,evolution-data-server) + `(("appstream-util" ,appstream-glib) + ("champlain" ,libchamplain) ("folks" ,folks) - ("libchamplain" ,libchamplain) - ("libgee" ,libgee) - ("libsecret" ,libsecret) - ("libsoup" ,libsoup) - ("libgweather" ,libgweather) - ("libxml2" ,libxml2) - ("gdk-pixbuf" ,gdk-pixbuf+svg) - ("glib-networking" ,glib-networking) + ("gee" ,libgee) ("geoclue" ,geoclue) ("geocode-glib" ,geocode-glib) - ("gfbgraph" ,gfbgraph) ("gjs" ,gjs) ("glib" ,glib) - ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("glib-networking" ,glib-networking) ("gtk+" ,gtk+) - ("rest" ,rest) - ("webkitgtk" ,webkitgtk))) - (synopsis "Graphical map viewer and wayfinding program") - (description "GNOME Maps is a graphical map viewer. It uses map dat= a from -the OpenStreetMap project. It can provide directions for walking, bicyc= ling, -and driving.") + ("libxml2" ,libxml2) + ("rest" ,rest))) + (synopsis "Map application for GNOME") + (description "GNOME-Maps gives you quick access to maps all across t= he +world. It uses the collaborative OpenStreetMap database, enabling users= to make +smaller changes to places and points-of-interests.") (home-page "https://wiki.gnome.org/Apps/Maps") (license license:gpl2+))) =20 --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0032-gnu-gnome-maps-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0032-gnu-gnome-maps-Update-package-definition.patch" =46rom 1414a2f0b8c1ec47f1f968f32085460b0b26deba Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 11:32:45 -0400 Subject: [PATCH 32/44] gnu: gnome-maps: Update package definition. * gnu/packages/gnome.scm (gnome-maps) [version]: Update to 3.36.0. [source][sha256]: Modify base32. [build-system]: Change from gnu to glib-or-gtk. [arguments]<#:configure-flags>[--disable-static]: New flag. <#:make-flags>[INTROSPECTION_GIRDIR]: New flag. [INTROSPECTION_TYPELIBDIR]: New flag. [native-inputs]: Add gjs and gobject-introspection. Move glib to ... [propagated-inputs]: ... here. [synopsis]: Modify. [license]: Add gpl2+. --- gnu/packages/gnome.scm | 53 +++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7cf66e2109..fe5e9934bb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1876,25 +1876,50 @@ project.") (define-public gnome-menus (package (name "gnome-menus") - (version "3.32.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gnome-menus/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0x2blzqrapmbsbfzxjcdcpa3vkw9hq5k96h9kvjmy9kl415wcl68"))= )) - (build-system gnu-build-system) + (version "3.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/gnome-menus/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r"))= )) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list + "--disable-static") + #:make-flags + (list + (string-append "INTROSPECTION_GIRDIR=3D" + (assoc-ref %outputs "out") + "/share/gir-" + ,(version-major (package-version gobject-introspe= ction)) + ".0") + (string-append "INTROSPECTION_TYPELIBDIR=3D" + (assoc-ref %outputs "out") + "/lib/girepository-" + ,(version-major (package-version gobject-introspe= ction)) + ".0")))) (native-inputs `(("gettext" ,gettext-minimal) - ("glib" ,glib) + ("gjs" ,gjs) + ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) - (synopsis "Menu support for GNOME desktop") - (description "GNOME Menus contains the libgnome-menu library, the la= yout + (propagated-inputs + `(("glib" ,glib))) + (synopsis "GNOME Menu support") + (description "GNOME-Menus contains the libgnome-menu library, the la= yout configuration files for the GNOME menu, as well as a simple menu editor.= ") (home-page "https://gitlab.gnome.org/GNOME/gnome-menus") - (license license:lgpl2.0+))) + (license + (list + ;; Library + license:lgpl2.0+ + ;; Others + license:gpl2+)))) =20 (define-public deja-dup (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0033-gnu-gnome-music-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0033-gnu-gnome-music-Update-package-definition.patch" =46rom bfba8b2ffdd035083206c2521ead437cc46b7d41 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 13:49:43 -0400 Subject: [PATCH 33/44] gnu: gnome-music: Update package definition. * gnu/packages/gnome.scm (gnome-music) [version]: Update to 3.36.4.1. [source][sha256]: Modify base32. [outputs]: New output "help". [arguments]<#:tests?>: New argument. <#:phases>['skip-gtk-update-icon-cache]: New phase. ['move-help]: New phase. ['wrap-gnome-music]: Modify phase. [native-inputs]: Remove gtk+:bin. [inputs]: Add appstream-glib, gtk+ and python. Change gnome-online-accoun= ts to gnome-online-accounts:lib. Remove gst-plugins-base, gstreamer, gvfs an= d tracker-miners. [propagated-inputs]: Add glib. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 61 ++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe5e9934bb..a9c65f39e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -860,7 +860,7 @@ cloud integration is offered through GNOME Online Acc= ounts.") (define-public gnome-music (package (name "gnome-music") - (version "3.34.5") + (version "3.36.4.1") (source (origin (method url-fetch) @@ -869,24 +869,38 @@ cloud integration is offered through GNOME Online A= ccounts.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 - "1r5sfw5cbd6qqh27lzhblazir0bfi3k7nqppw66qw990isqm5psy")))) + (base32 "0zdpjgwf48bqb66wrl6k33pzcmc2g3m1046ma7z8xaj9idpi37jh"))= )) (build-system meson-build-system) + (outputs '("out" "help")) (arguments - `(#:glib-or-gtk? #t + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:tests? #f ; Tests require networking #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-gnome-music + (add-before 'configure 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") + "true")) + #t)) + (add-after 'install 'move-help + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (help (assoc-ref outputs "help"))) + (mkdir-p (string-append help "/share")) + (rename-file + (string-append out "/share/help") + (string-append help "/share/help")) + #t))) + (add-after 'move-help 'wrap-gnome-music (lambda* (#:key inputs outputs #:allow-other-keys) - (let* - ((out (assoc-ref outputs "out")) - (pylib (string-append out "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages"))) + (let* ((out (assoc-ref outputs "out")) + (pylib (string-append out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) (wrap-program (string-append out "/bin/gnome-music") `("GI_TYPELIB_PATH" =3D (,(getenv "GI_TYPELIB_PATH"))) - `("GST_PLUGIN_SYSTEM_PATH" =3D (,(getenv "GST_PLUGIN_SY= STEM_PATH"))) `("GRL_PLUGIN_PATH" =3D (,(getenv "GRL_PLUGIN_PATH"))) `("PYTHONPATH" =3D (,(getenv "PYTHONPATH") ,pylib)))) #t))))) @@ -895,28 +909,29 @@ cloud integration is offered through GNOME Online A= ccounts.") ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") ("itstools" ,itstool) ("pkg-config" ,pkg-config))) (inputs - `(("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + `(("appstream-util" ,appstream-glib) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("grilo" ,grilo) ("grilo-plugins" ,grilo-plugins) - ("gst-plugins-base" ,gst-plugins-base) - ("gstreamer" ,gstreamer) - ("gvfs" ,gvfs) + ("gtk+" ,gtk+) ("libdazzle" ,libdazzle) ("libmediaart" ,libmediaart) ("libsoup" ,libsoup) ("pycairo" ,python-pycairo) ("pygobject" ,python-pygobject) - ("tracker" ,tracker) - ("tracker-miners" ,tracker-miners))) - (synopsis "Simple music player for GNOME desktop") - (description "GNOME Music is the new GNOME music playing application= that -aims to combine an elegant and immersive browsing experience with simple= -and straightforward controls.") + ("python" ,python) + ("tracker" ,tracker))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "Simple music player") + (description "GNOME-Music is the new GNOME music playing application= =2E +It aims to combine an elegant and immersive browsing experience with sim= ple and +straightforward controls.") (home-page "https://wiki.gnome.org/Apps/Music") + ;; With added exception clause. (license license:gpl2+))) =20 (define-public portablexdr --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0034-gnu-gnome-photos-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0034-gnu-gnome-photos-Update-package-definition.patch" =46rom 461c396d624413e65564df24d6863112cc8cfcb5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 14:28:58 -0400 Subject: [PATCH 34/44] gnu: gnome-photos: Update package definition. * gnu/packages/gnome.scm (gnome-photos): Update package definition. [outputs]: New output "help". [arguements]<#:phases>['skip-gtk-update-icon-cache]: New phase. ['pre-check]: New phase. ['move-help]: New phase. ['wrap-gnome-photos]: Remove phase. [native-inputs]: Add xorg-server-for-tests. Remove gtk+:bin. Move dbus to ... [inputs]: ... here. Add glib. Remove gnome-online-miners, grilo-plugins, rest, python-pygobject and tracker-miners. Change gnome-online-accounts to gnome-online-accounts:lib. [synopsis]: Modify. --- gnu/packages/gnome.scm | 70 +++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a9c65f39e9..18efe684ad 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -799,59 +799,73 @@ sysprof.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 - "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w")))) + (base32 "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w"))= )) (build-system meson-build-system) + (outputs '("out" "help")) (arguments - `(#:glib-or-gtk? #t + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags - (list "-Ddogtail=3Dfalse" ; Not available - ;; Required for RUNPATH validation. - (string-append "-Dc_link_args=3D-Wl,-rpath=3D" - (assoc-ref %outputs "out") "/lib/gnome-photo= s")) + (list + "-Ddogtail=3Dfalse" + ;; Required for RUNPATH validation. + (string-append "-Dc_link_args=3D-Wl,-rpath=3D" + (assoc-ref %outputs "out") + "/lib/gnome-photos")) #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-gnome-photos - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* - ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/gnome-photos") - `("GRL_PLUGIN_PATH" =3D (,(getenv "GRL_PLUGIN_PATH"))))= ) - #t))))) + (add-before 'configure 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") + "true")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-after 'install 'move-help + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (help (assoc-ref outputs "help"))) + (mkdir-p (string-append help "/share")) + (rename-file + (string-append out "/share/help") + (string-append help "/share/help")) + #t)))))) (native-inputs - `(("dbus" ,dbus) - ("desktop-file-utils" ,desktop-file-utils) + `(("desktop-file-utils" ,desktop-file-utils) ("gettext" ,gettext-minimal) ("git" ,git-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk+:bin" ,gtk+ "bin") ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("babl" ,babl) ("cairo" ,cairo) + ("dbus" ,dbus) ("gdk-pixbuf" ,gdk-pixbuf+svg) ("gegl" ,gegl) ("geocode-glib" ,geocode-glib) ("gexiv2" ,gexiv2) - ("gnome-online-accounts" ,gnome-online-accounts) - ("gnome-online-miners" ,gnome-online-miners) + ("glib" ,glib) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("grilo" ,grilo) - ("grilo-plugins" ,grilo-plugins) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) ("libdazzle" ,libdazzle) ("libgdata" ,libgdata) ("libgfbgraph" ,gfbgraph) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) - ("librest" ,rest) - ("pygobject" ,python-pygobject) - ("tracker" ,tracker) - ("tracker-miners" ,tracker-miners))) - (synopsis "Access, organize and share your photos on GNOME desktop")= - (description "GNOME Photos is a simple and elegant replacement for u= sing a + ("tracker" ,tracker))) + (synopsis "Access, organize and share your photos") + (description "GNOME-Photos is a simple and elegant replacement for u= sing a file manager to deal with photos. Enhance, crop and edit in a snap. Se= amless cloud integration is offered through GNOME Online Accounts.") (home-page "https://wiki.gnome.org/Apps/Photos") --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0035-gnu-gnome-screenshot-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0035-gnu-gnome-screenshot-Update-package-definition.patch" =46rom 5f10e67e1559968a9b3c38c58a1f7725a4e8709b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 14:54:00 -0400 Subject: [PATCH 35/44] gnu: gnome-screenshot: Update package definition. * gnu/packages/gnome.scm (gnome-screenshot) [version]: Update to 3.36.0. [source][sha256]: Modify base32. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add libxml2. Remove appstream-glib. [inputs]: Add glib. [description]: Modify. --- gnu/packages/gnome.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 18efe684ad..327afe2773 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10435,43 +10435,43 @@ packaged with the GNOME desktop.") (define-public gnome-screenshot (package (name "gnome-screenshot") - (version "3.34.0") + (version "3.36.0") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 - (base32 - "1rmiq890j7gfn5mcz31xy6jfnnxgc17dq67bhn2k9m5ylbvza2n8")))) + (base32 "0rhj6fkpxfm26jv3vsn7yb2ybkc2k86ggy23nxa945q74y4msj9k"))= )) (build-system meson-build-system) (arguments - '(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. (lambda _ (substitute* "build-aux/postinstall.py" - (("gtk-update-icon-cache") "true")) + (("gtk-update-icon-cache") + "true")) #t))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. - ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-d= atabase + `(("glib:bin" ,glib "bin") + ("desktop-file-utils" ,desktop-file-utils) ("intltool" ,intltool) - ("appstream-glib" ,appstream-glib) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) (inputs - `(("gtk+" ,gtk+) + `(("glib" ,glib) + ("gtk+" ,gtk+) ("libcanberra" ,libcanberra) - ("libx11" ,libx11) - ("libxext" ,libxext))) - (home-page "https://gitlab.gnome.org/GNOME/gnome-screenshot") + ("x11" ,libx11) + ("xext" ,libxext))) (synopsis "Take pictures of your screen") - (description - "GNOME Screenshot is a utility used for taking screenshots of the e= ntire -screen, a window or a user defined area of the screen, with optional -beautifying border effects.") + (description "GNOME-Screenshot is a small utility that takes a scree= nshot of +the whole desktop; the currently focused window; or an area of the scree= n.") + (home-page "https://gitlab.gnome.org/GNOME/gnome-screenshot") (license license:gpl2+))) =20 (define-public dconf-editor --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0036-gnu-gnome-session-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0036-gnu-gnome-session-Update-package-definition.patch" =46rom 9d9b5bcefaaf0a7858fc79f6ee7183d8b787700c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 15:36:30 -0400 Subject: [PATCH 36/44] gnu: gnome-session: Update package definition. * gnu/packages/gnome.scm (gnome-session) [version]: Update to 3.36.0. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:configure-flags>[-Dsession_selector]: New flag. [-Dsystemd]: New flag. [-Dsystemd_session]: New flag. [-Ddocbook]: Remove flag. [-Dman]: Remove flag. <#:phases>['patch-docbook]: New phase. ['pre-configure]: Remove phase. ['move-doc]: New phase. ['wrap-gnome-session]: Modify phase. [inputs]: Add libepoxy, glib, libice and libx11. Remove elogind, gsettings-desktop-schemas, libxtst and upower. --- gnu/packages/gnome.scm | 104 ++++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 47 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 327afe2773..fa5229313c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8192,70 +8192,80 @@ the archive.") (define-public gnome-session (package (name "gnome-session") - (version "3.34.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1qgqp97f8k2zi2ydvhds14zsjzfj7cv521r6wx5sw0qacn0p7dwb"))= )) + (version "3.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0ymvf1bap35348rpjqp63qwnwnnawdwi4snch95zc4n832w3hjym"))= )) + (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - '(#:glib-or-gtk? #t + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dsession_selector=3Dtrue" + "-Dsystemd=3Dfalse" + "-Dsystemd_session=3Ddisable" + "-Dsystemd_journal=3Dfalse") #:phases (modify-phases %standard-phases - (add-before 'configure 'pre-configure - (lambda* (#:key outputs #:allow-other-keys) - ;; Use elogind instead of systemd. - (substitute* "meson.build" - (("libsystemd-login") "libelogind") - (("and libsystemd_daemon_dep.found.*") ",")) - (substitute* "gnome-session/gsm-systemd.c" - (("#include ") - "#include ")) - ;; Remove uses of the systemd daemon. - (substitute* "gnome-session/gsm-autostart-app.c" - (("#ifdef HAVE_SYSTEMD") "#if 0")) + (add-after 'unpack 'patch-docbook + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* '("dbus/gnome-session.xml.in" "man/meson.bui= ld") + (("http://docbook.sourceforge.net/release/xsl/current")= + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl))) + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) #t)) - (add-after 'install 'wrap-gnome-session + (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/doc") + (string-append doc "/share/doc")) + #t))) + (add-after 'move-doc 'wrap-gnome-session (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make sure 'gnome-session' finds the 'gsettings' program.= - (let ((glib (assoc-ref inputs "glib:bin")) - (out (assoc-ref outputs "out"))) + (let* ((glib (assoc-ref inputs "glib:bin")) + (out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/gnome-session") `("PATH" ":" prefix (,(string-append glib "/bin")))) - #t)))) - - #:configure-flags - '("-Ddocbook=3Dfalse" ; FIXME: disabled because of docbook valida= tion error - "-Dman=3Dfalse" ; FIXME: disabled because of docbook validation= error - "-Dsystemd_journal=3Dfalse"))) - (build-system meson-build-system) + #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. - ("pkg-config" ,pkg-config) - ("intltool" ,intltool) - ("xsltproc" ,libxslt) - ("libxml2" ,libxml2) ;for 'XML_CATALOG_FILES' + `(("docbook-xml" ,docbook-xml-4.1.2) ("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml) - ("xmlto" ,xmlto))) + ("glib:bin" ,glib "bin") + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2) + ("xmlto" ,xmlto) + ("xsltproc" ,libxslt))) (inputs - `(("elogind" ,elogind) + `(("epoxy" ,libepoxy) + ("glib" ,glib) ("gnome-desktop" ,gnome-desktop) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) + ("ice" ,libice) ("json-glib" ,json-glib) - ("libsm" ,libsm) - ("libxcomposite" ,libxcomposite) - ("libxtst" ,libxtst) ("mesa" ,mesa) - ("upower" ,upower) + ("sm" ,libsm) + ("x11" ,libx11) + ("xcomposite" ,libxcomposite) ("xtrans" ,xtrans))) (synopsis "Session manager for GNOME") - (description - "This package contains the GNOME session manager, as well as a + (description "GNOME-Session contains the GNOME session manager, as w= ell as a configuration program to choose applications starting on login.") (home-page "https://wiki.gnome.org/Projects/SessionManagement") (license license:gpl2+))) --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0037-gnu-gnome-settings-daemon-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0037-gnu-gnome-settings-daemon-Update-package-definition.pat"; filename*1="ch" =46rom c59d4373532863647b6d6e9d7e253b6cfdddc5ad Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 16:46:06 -0400 Subject: [PATCH 37/44] gnu: gnome-settings-daemon: Update package definit= ion. * gnu/packages/gnome.scm (gnome-settings-daemon) [version]: Update to 3.36.1. [arguments]<#:configure-flags>['-Dudev_dir]: Modify flag. [native-inputs]: Add python-dbusmock, gobject-introspection, umockdev and which. Remove docbook-xml and docbook-xsl. [inputs]: Add fontconfig, glib, gtk+, xorgproto, pango, eudev, libxext and libxi. Remove libxtst. [description]: Modify. [home-page]: Modify. [license]: Add lgpl2.1+. --- gnu/packages/gnome.scm | 109 +++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 49 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fa5229313c..e44de72165 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6156,72 +6156,83 @@ online services for numerous locations.") (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.34.1") + (version "3.36.1") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 - (base32 - "07y1gbicz0pbxmdgwrdzyc4byy30wfwpbqgvnx27gnpqmc5s50cr")))) + (base32 "0jzf2nznpcrjqq7fjwk66kw8a6x87kgbdjidc2msaqmm379xncry"))= )) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags - (list (string-append "-Dudev_dir=3D" - (assoc-ref %outputs "out") - "/lib/udev/rules.d/") - "-Dsystemd=3Dfalse" - ;; Otherwise, the RUNPATH will lack the final path componen= t. - (string-append "-Dc_link_args=3D-Wl,-rpath=3D" - (assoc-ref %outputs "out") - "/lib/gnome-settings-daemon-3.0")) - ;; Color management test can't reach the colord system service. - #:tests? #f)) + (list + (string-append "-Dudev_dir=3D" + (assoc-ref %outputs "out") + "/lib/udev") + "-Dsystemd=3Dfalse" + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=3D-Wl,-rpath=3D" + (assoc-ref %outputs "out") + "/lib/gnome-settings-daemon-3.0")))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums - ("pkg-config" ,pkg-config) + `(("dbusmock" ,python-dbusmock) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) - ("xsltproc" ,libxslt) - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES= - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl))) + ("pkg-config" ,pkg-config) + ("umockdev" ,umockdev) + ("which" ,which) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) (inputs - `(("alsa-lib" ,alsa-lib) + `(("alsa" ,alsa-lib) ("colord" ,colord) - ("libgudev" ,libgudev) - ("upower" ,upower) - ("polkit" ,polkit) - ("pulseaudio" ,pulseaudio) - ("libcanberra" ,libcanberra) - ("libx11" ,libx11) - ("libxtst" ,libxtst) - ("lcms" ,lcms) - ("libnotify" ,libnotify) - ("geoclue" ,geoclue) + ("cups" ,cups) + ("fontconfig" ,fontconfig) + ("gcr" ,gcr) ("geocode-glib" ,geocode-glib) - ("libgweather" ,libgweather) + ("glib" ,glib) ("gnome-desktop" ,gnome-desktop) - ("nss" ,nss) - ("cups" ,cups) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("libwacom" ,libwacom) + ("gtk+" ,gtk+) + ("gudev" ,libgudev) + ("gweather" ,libgweather) + ("kbproto" ,xorgproto) + ("lcms" ,lcms) + ("libcanberra" ,libcanberra) + ("libgeoclue" ,geoclue) + ("libnm" ,network-manager) + ("libnotify" ,libnotify) + ("libpulse" ,pulseaudio) ("librsvg" ,librsvg) - ("xf86-input-wacom" ,xf86-input-wacom) + ("libwacom" ,libwacom) + ("mm-glib" ,modem-manager) + ("nss" ,nss) + ("pango" ,pango) + ("polkit" ,polkit) + ("udev" ,eudev) + ("upower-glib" ,upower) ("wayland" ,wayland) - ("network-manager" ,network-manager) - ("gcr" ,gcr) - ("modem-manager" ,modem-manager))) - (home-page "https://www.gnome.org") + ("x11" ,libx11) + ("xext" ,libxext) + ("xf86-input-wacom" ,xf86-input-wacom) + ("xi" ,libxi))) (synopsis "GNOME settings daemon") - (description - "This package contains the daemon responsible for setting the vario= us -parameters of a GNOME session and the applications that run under it. I= t -handles settings such keyboard layout, shortcuts, and accessibility, cli= pboard -settings, themes, mouse settings, and startup of other daemons.") - (license license:gpl2+))) + (description "GNOME-Settings-Daemon contains the daemon responsible = for +setting the various parameters of a GNOME session and the applications t= hat run +under it.") + (home-page "https://gitlab.gnome.org/GNOME/gnome-settings-daemon") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Others + license:gpl2+)))) =20 (define-public totem-pl-parser (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0038-gnu-gnome-shell-extensions-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0038-gnu-gnome-shell-extensions-Update-package-definition.pa"; filename*1="tch" =46rom cd4ae0bed9e78ae01be37385d4953c442e7dbc54 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 17:26:01 -0400 Subject: [PATCH 38/44] gnu: gnome-shell-extensions: Update package defini= tion. * gnu/packages/gnome.scm (gnome-shell-extensions) [version]: Update to 3.36.2. [source][sha256]: Modify base32. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dclassic_mode]: New flag. [inputs]: Add mozjs60 and sassc. [description]: Modify. [license]: Change from gpl3+ to gpl2+. --- gnu/packages/gnome.scm | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e44de72165..ecba2f9291 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11166,29 +11166,37 @@ GNOME Shell appearance and extension, etc.") (define-public gnome-shell-extensions (package (name "gnome-shell-extensions") - (version "3.34.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1f5l35l3kdkzrv49xmg1sh11vwmgjbg7hx3gb91i39bfl1snxqd1"))= )) + (version "3.36.2") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0gq0z0k02b5cfaqrikk2hzbqzjkb6qwcanaqi2jh7nswa7g050lp"))= )) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dextension_set=3Dall"))) + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dextension_set=3Dall" + "-Dclassic_mode=3Dtrue"))) (native-inputs `(("glib:bin" ,glib "bin") ("intltool" ,intltool) ("pkg-config" ,pkg-config))) + (inputs + `(("js60" ,mozjs-60) + ("sassc" ,sassc))) (propagated-inputs `(("glib" ,glib))) (synopsis "Extensions for GNOME Shell") - (description "GNOME Shell extensions modify and extend GNOME Shell -functionality and behavior.") + (description "GNOME-Shell-Extensions is a collection of extensions p= roviding +additional and optional functionality to GNOME Shell.") (home-page "https://extensions.gnome.org/") - (license license:gpl3+))) + (license license:gpl2+))) =20 (define-public arc-theme (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0039-gnu-gnome-system-monitor-Update-package-extensions.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0039-gnu-gnome-system-monitor-Update-package-extensions.patc"; filename*1="h" =46rom 05ef1f07aa8018de7f4dbec4158099e0e3b401b7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 18:01:52 -0400 Subject: [PATCH 39/44] gnu: gnome-system-monitor: Update package extensio= ns. * gnu/packages/gnome.scm (gnome-system-monitor) [version]: Update to 3.36.1. [source][sha256]: Modify base32. [outputs]: New output "help". [arguments]<#:configure-flags>[-Dwnck]: New flag. <#:phases>['skip-gtk-update-icon-cache]: New phase. ['move-help]: New phase. [native-inputs]: Add desktop-file-utils. Remove polkit. Move libgtop to ... [inputs]: ... here. Add appstream-glib, glib, glibmm and libselinux. Remove gdk-pixbuf+svg. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 59 ++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ecba2f9291..79b2633f6d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11740,43 +11740,62 @@ Bluefish supports many programming and markup l= anguages.") (define-public gnome-system-monitor (package (name "gnome-system-monitor") - (version "3.32.1") + (version "3.36.1") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 - (base32 - "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8")))) + (base32 "18dwwwmw4m2kzvfmxyaxmnm66d1plwvh6c6naznb0xac1ymlfsw6"))= )) (build-system meson-build-system) + (outputs '("out" "help")) (arguments - '(#:glib-or-gtk? #t - #:configure-flags '("-Dsystemd=3Dfalse"))) + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dwnck=3Dtrue" + "-Dsystemd=3Dfalse") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") + "true")) + #t)) + (add-after 'install 'move-help + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (help (assoc-ref outputs "help"))) + (mkdir-p (string-append help "/share")) + (rename-file + (string-append out "/share/help") + (string-append help "/share/help")) + #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums. - ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache + `(("desktop-file-utils" ,desktop-file-utils) + ("glib:bin" ,glib "bin") ("intltool" ,intltool) ("itstool" ,itstool) - ("libgtop" ,libgtop) - ("polkit" ,polkit) ("pkg-config" ,pkg-config))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) ; for loading SVG files. + `(("appstream-util" ,appstream-glib) + ("glib" ,glib) + ("glibmm" ,glibmm) ("gtk+" ,gtk+) ("gtkmm" ,gtkmm) + ("libgtop" ,libgtop) ("librsvg" ,librsvg) + ("libselinux" ,libselinux) ("libxml2" ,libxml2) ("libwnck" ,libwnck))) + (synopsis "View current processes and monitor system state") + (description "GNOME-System-Monitor is a tool to manage running proce= sses +and monitor system resources.") (home-page "https://wiki.gnome.org/Apps/SystemMonitor") - (synopsis "Process viewer and system resource monitor for GNOME") - (description - "GNOME System Monitor is a GNOME process viewer and system monitor = with -an attractive, easy-to-use interface. It has features, such as a tree v= iew -for process dependencies, icons for processes, the ability to hide proce= sses, -graphical time histories of CPU/memory/swap usage and the ability to -kill/reinice processes.") (license license:gpl2+))) =20 (define-public python-pyatspi --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0040-gnu-gnome-terminal-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0040-gnu-gnome-terminal-Update-package-definition.patch" =46rom f0616f6f25bc316c9d417c951f674e18b0cc39bd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 20:07:07 -0400 Subject: [PATCH 40/44] gnu: gnome-terminal: Update package definition. * gnu/packages/gnome.scm (gnome-terminal) [version]: Update to 3.36.2. [source][sha256]: Modify base32. [outputs]: New output "help". [arguments]<#:configure-flags>[--disable-static]: New flag. [--disable-migration]: Remove flag. [--without-nautilus-extension]: Remove flag. [--with-help-dir]: New flag. <#:phases>['patch-/bin/true]: Remove phase. ['remove-systemd]: New phase. [native-inputs]: Add vala. [inputs]: Add dconf, glib, nautilus and pcre2. Remove gnutls and vala. [propagated-inputs]: Remove dconf. [description]: Modify. [license]: Add fdl1.3+. --- gnu/packages/gnome.scm | 69 ++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 79b2633f6d..180c0e52ff 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5749,52 +5749,61 @@ more fun.") (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.34.2") + (version "3.36.2") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 - (base32 - "0gc004f9b5k94gkdanmqjz3wqgnpny0l3nqm8zd19h4f0ps27mrv")))) + (base32 "0inzmkmxv8xw4px2zjfw7236d08yjcv7znxcjki6dh4pvjivdla1"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "help")) (arguments - '(#:configure-flags - (list "--disable-migration" "--disable-search-provider" - "--without-nautilus-extension") + `(#:configure-flags + (list + "--disable-static" + "--disable-search-provider" ; To be enabled + (string-append "--with-help-dir=3D" + (assoc-ref %outputs "help") + "/share/help")) #:phases (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/true - (lambda _ - (substitute* "configure" - (("/bin/true") (which "true")))))))) + (add-after 'install 'remove-systemd + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively + (string-append (assoc-ref outputs "out") + "/lib/systemd")) + #t))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("desktop-file-utils" ,desktop-file-utils) + `(("desktop-file-utils" ,desktop-file-utils) ("intltool" ,intltool) ("itstool" ,itstool) + ("pkg-config" ,pkg-config) + ("vala" ,vala) ("xmllint" ,libxml2))) - (propagated-inputs - `(("dconf" ,dconf))) (inputs - `(("gtk+" ,gtk+) - ("vte" ,vte) - ("gnutls" ,gnutls) + `(("dconf" ,dconf) + ("glib" ,glib) + ;; To be enabled. + ;; ("gnome-shell-search-provider" ,gnome-shell) + ("gtk+" ,gtk+) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("libnautilus-extension" ,nautilus) + ("libpcre2" ,pcre2) ("util-linux" ,util-linux "lib") - ("vala" ,vala))) - (home-page "https://wiki.gnome.org/Apps/Terminal") + ("vte" ,vte))) (synopsis "Terminal emulator") - (description - "GNOME Terminal is a terminal emulator application for accessing a -UNIX shell environment which can be used to run programs available on -your system. - -It supports several profiles, multiple tabs and implements several -keyboard shortcuts.") - (license license:gpl3+))) + (description "GNOME-Terminal is a terminal emulator for GNOME.") + (home-page "https://wiki.gnome.org/Apps/Terminal") + (license + (list + ;; Documentation + license:fdl1.3+ + ;; Others + license:gpl3+)))) =20 (define-public colord (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0041-gnu-gnome-themes-extra-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0041-gnu-gnome-themes-extra-Update-package-definition.patch" =46rom c3f3f8850f4538400b54202b0c344967137f0c25 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 20:40:20 -0400 Subject: [PATCH 41/44] gnu: gnome-themes-extra: Update package definition= =2E * gnu/packages/gnome.scm (gnome-themes-extra): Update package definition.= [build-system]: Change from gnu to glib-or-gtk. [native-inputs]: Add libxml2. [inputs]: Add cairo, gdk-pixbuf+svg and glib. Remove libxml2. [description]: Modify. --- gnu/packages/gnome.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 180c0e52ff..0c6bf2115e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12944,35 +12944,35 @@ and a high score table.") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" name "-" - version ".tar.xz")) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" name "-" + version ".tar.xz")) (sha256 - (base32 - "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw")))) - (build-system gnu-build-system) + (base32 "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw"))= )) + (build-system glib-or-gtk-build-system) (arguments - '(#:configure-flags - ;; Don't create 'icon-theme.cache'. + `(#:configure-flags (let* ((coreutils (assoc-ref %build-inputs "coreutils")) - (true (string-append coreutils "/bin/true"))) - (list (string-append "GTK_UPDATE_ICON_CACHE=3D" true))))) + (true (string-append coreutils "/bin/true"))) + (list + (string-append "GTK_UPDATE_ICON_CACHE=3D" true))))) (native-inputs `(("glib:bin" ,glib "bin") ("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) (inputs - `(("glib" ,glib) + `(("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("glib" ,glib) ("gtk+" ,gtk+) ("gtk+-2" ,gtk+-2) - ("librsvg" ,librsvg) - ("libxml2" ,libxml2))) - (home-page "https://gitlab.gnome.org/GNOME/gnome-themes-extra") + ("librsvg" ,librsvg))) (synopsis "GNOME Extra Themes") - (description "This package provides themes and related elements that= don't -really fit in other upstream packages. It offers legacy support for GTK= + 2 -versions of Adwaita, Adwaita-dark and HighContrast themes. It also prov= ides -index files needed for Adwaita to be used outside of GNOME.") + (description "GNOME-Themes-Extra houses themes and theme-y tidbits t= hat +don=E2=80=99t really fit in anywhere else, or deserve their own module."= ) + (home-page "https://gitlab.gnome.org/GNOME/gnome-themes-extra") (license license:lgpl2.1+))) =20 (define-public polari --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0042-gnu-gnome-user-docs-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0042-gnu-gnome-user-docs-Update-package-definition.patch" =46rom b1918a7c727a7b1ae16c7f4008df017f63b526d4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 20:51:52 -0400 Subject: [PATCH 42/44] gnu: gnome-user-docs: Update package definition. * gnu/packages/gnome.scm (gnome-user-docs) [version]: Update to 3.36.2. [source][sha256]: Modify base32. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0c6bf2115e..1c2a83d17e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2028,29 +2028,29 @@ either on a local, or remote machine via a number= of methods.") =20 (define-public gnome-user-docs (package - (name "gnome-user-docs") - (version "3.32.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gnome-user-docs/" - (version-major+minor version) - "/gnome-user-docs-" version ".tar.xz")) - (sha256 - (base32 "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig")))= ) - (build-system gnu-build-system) - (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config) - ("xmllint" ,libxml2))) - (synopsis "User documentation for the GNOME desktop") - (description - "The GNOME User Documentation explains how to use the GNOME desktop = and its -components. It covers usage and setup of the core GNOME programs by end= -users -and system administrators.") - (home-page "https://live.gnome.org/DocumentationProject") - (license license:cc-by3.0))) + (name "gnome-user-docs") + (version "3.36.2") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/gnome-user-docs/" + (version-major+minor version) + "/gnome-user-docs-" version ".tar.xz")) + (sha256 + (base32 "0n4rbrq5zww6gjjmicyw5hlvzi8azc6m4sisak15snkp6v4f93qr"))= )) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) + (synopsis "GNOME User Documentation") + (description "GNOME-User-Docs contains documents that are targeted f= or +end-users and system administrators of GNOME and have general GNOME +applicability.") + (home-page "https://live.gnome.org/DocumentationProject") + (license license:cc-by3.0))) =20 (define-public gnome-getting-started-docs (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0043-gnu-gnome-user-share-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0043-gnu-gnome-user-share-Update-package-definition.patch" =46rom bbc83c1df07acdb271ebbc0c8c10a5d5fbb9259b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 21:22:32 -0400 Subject: [PATCH 43/44] gnu: gnome-user-share: Update package definition. * gnu/packages/gnome.scm (gnome-user-share) [version]: Update to 3.34.0. [source][sha256]: Modify base32. [arguments]<#:configure-flags>[-Dsystemd]: Remove flag. [-Dsystemduserunitdir]: New flag. [-Dhttpd]: New flag. [-Dmodules_path]: New flag. [native-inputs]: Remove gtk+:bin and yelp-tools. [inputs]: Add httpd and libselinux. Remove gnome-bluetooth, libcanberra and libnotify. --- gnu/packages/gnome.scm | 79 ++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1c2a83d17e..d97821a985 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1697,43 +1697,48 @@ way to prepare a new system.") =20 (define-public gnome-user-share (package - (name "gnome-user-share") - (version "3.33.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0lf790pyamdyj7180ils8vizjl8brxcg7jsm1iavfp9ay4wa8mz7"))))= - (build-system meson-build-system) - (arguments - `(#:glib-or-gtk? #t - #:configure-flags - `("-Dsystemd=3Dfalse" - ;; Enable nautilus extension for file sharing. - "-Dnautilus_extension=3Dtrue"))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("yelp-tools" ,yelp-tools))) - (inputs - `(("glib" ,glib) - ("gnome-bluetooth" ,gnome-bluetooth) - ("gtk+" ,gtk+) - ("libcanberra" ,libcanberra) - ("libnotify" ,libnotify) - ("nautilus" ,nautilus))) ; For nautilus extension. - (synopsis "File sharing for GNOME desktop") - (description "GNOME User Share is a small package that binds together= -various free software projects to bring easy to use user-level file -sharing to the masses.") - (home-page "https://gitlab.gnome.org/GNOME/gnome-user-share") - (license license:gpl2+))) + (name "gnome-user-share") + (version "3.34.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + (string-append "-Dsystemduserunitdir=3D" + (getcwd)) + "-Dnautilus_extension=3Dtrue" + (string-append "-Dhttpd=3D" + (assoc-ref %build-inputs "httpd") + "/bin/httpd") + (string-append "-Dmodules_path=3D" + (assoc-ref %build-inputs "httpd") + "/modules/")))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("gtk+" ,gtk+) + ("httpd" ,httpd) + ("libnautilus-extension" ,nautilus) + ("libselinux" ,libselinux))) + (synopsis "File sharing for GNOME desktop") + (description "GNOME User Share is a small package that binds togethe= r various +free software projects to bring easy to use user-level file sharing to t= he +masses.") + (home-page "https://gitlab.gnome.org/GNOME/gnome-user-share") + (license license:gpl2+))) =20 (define-public sushi (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C Content-Type: text/x-patch; charset=UTF-8; name="0044-gnu-gnome-weather-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0044-gnu-gnome-weather-Update-package-definition.patch" =46rom 9fa96cda1abaa15665e231da20a14b283042276b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 6 Aug 2020 21:59:02 -0400 Subject: [PATCH 44/44] gnu: gnome-weather: Update package definition. * gnu/packages/gnome.scm (gnome-weather) [version]: Update to 3.36.1. [sources][sha256]: Modify base32. [arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase. ['fix-desktop-file]: Remove phase. ['wrap]: Modify phase. [native-inputs]: Add desktop-file-utils and python-wrapper. Remove gtk+:bin. [inputs]: Add glib and gtk+. Change gdk-pixbuf to gdk-pixbuf+svg. --- gnu/packages/gnome.scm | 102 ++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d97821a985..0598ffc373 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10605,58 +10605,56 @@ associations for GNOME.") =20 (define-public gnome-weather (package - (name "gnome-weather") - (version "3.34.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1g63xzs17i36if923b36k9fwbk0nqa5vz6zh1k6q2axrzhhpx1i4"))))= - (build-system meson-build-system) - (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config))) - (inputs - `( ;("adwaita-icon-theme" ,adwaita-icon-theme) - ("appstream-glib" ,appstream-glib) - ("geoclue" ,geoclue) - ("gdk-pixbuf" ,gdk-pixbuf) - ("gjs" ,gjs) - ("gnome-desktop" ,gnome-desktop) - ("libgweather" ,libgweather))) - (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'install 'fix-desktop-file - ;; FIXME: "gapplication launch org.gnome.Weather" fails for so= me reason. - ;; See https://issues.guix.gnu.org/issue/39324. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (applications (string-append out "/share/applications= "))) - (substitute* (string-append applications "/org.gnome.Weath= er.desktop") - (("Exec=3D.*") "Exec=3Dgnome-weather\n")) - #t))) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - ;; GNOME Weather needs the typelib files of GTK+, Pango et= c at runtime. - (wrap-program (string-append out "/bin/gnome-weather") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) - #t)))))) - (synopsis "Weather monitoring for GNOME desktop") - (description "GNOME Weather is a small application that allows you to= -monitor the current weather conditions for your city, or anywhere in the= -world.") - (home-page "https://wiki.gnome.org/Apps/Weather") - (license license:gpl2+))) + (name "gnome-weather") + (version "3.36.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + (modify-phases %standard-phases + (add-before 'configure 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") + "true")) + #t)) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/gnome-weather") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) + #t)))))) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("appstream-util" ,appstream-glib) + ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("geoclue" ,geoclue) + ("gjs" ,gjs) + ("glib" ,glib) + ("gnome-desktop" ,gnome-desktop) + ("gtk+" ,gtk+) + ("gweather" ,libgweather))) + (synopsis "Weather monitoring for GNOME desktop") + (description "GNOME-Weather is a small application that allows you t= o monitor +the current weather conditions for your city, or anywhere in the world."= ) + (home-page "https://wiki.gnome.org/Apps/Weather") + (license license:gpl2+))) =20 (define-public gnome (package --=20 2.28.0 --------------53C3E954B073CC530AF4B73C-- --VQ07UxTtWZlbZhgfaem7pzvQj2nwBOx3r-- --5nWKJybVmoktH2ZRIKKw4qrJpGjIDAfvy Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJ0EvNKqRjepA0pQorm7zBG1ve1cFAl8suP0ACgkQrm7zBG1v e1fYHwf/dFcucxNr7LxV6UBMaPpKFuAF2r3Wy/uEpHmGLqQokO6rhJNMuKrYegrH 2YhkbyuS/bLccescYuIEZTUH6QXKBEoEWNciroRIkKt7omC0TtC4nbAEA+IrG/ce mxH+rjFdUiKW/xiLftObi3jnEdqiaVnDUELxTpssaMg3zXVlATpNb2Trgns5I5fj k0RgxFUZUJ3s1zVZwEm5DADjVtZZVK8LRi96m5+fvP19VQ5eTq3+vT/cyyhw9HQX DqfwaW4Y3soYjB9D05kP9ENmtfufYBjjHStkfnnS/O/pnnDh+YApB3+TANoC18JS bhDrMIvyC8syiAAWsld+IcxdoWsBpA== =4j4k -----END PGP SIGNATURE----- --5nWKJybVmoktH2ZRIKKw4qrJpGjIDAfvy--