From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id oKFLJx39Hl/fNgAA0tVLHw (envelope-from ) for ; Mon, 27 Jul 2020 16:13:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8AZKIx39Hl9YIwAAB5/wlQ (envelope-from ) for ; Mon, 27 Jul 2020 16:13:17 +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 9D60B940704 for ; Mon, 27 Jul 2020 16:13:15 +0000 (UTC) Received: from localhost ([::1]:38020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k05kY-00072N-Bc for larch@yhetil.org; Mon, 27 Jul 2020 12:13:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k05kM-00071r-5y for guix-devel@gnu.org; Mon, 27 Jul 2020 12:13:02 -0400 Received: from knopi.disroot.org ([178.21.23.139]:35414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k05kE-0001rh-4y for guix-devel@gnu.org; Mon, 27 Jul 2020 12:13:01 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DFA905293C; Mon, 27 Jul 2020 18:12:50 +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 fbweHiajU6ng; Mon, 27 Jul 2020 18:12:44 +0200 (CEST) From: Raghav Gururajan DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1595866364; bh=izTfudOl8TD7CsP93LFz/gHt8mb+aStgqKLD9EshlGc=; h=From:To:Cc:References:Subject:Date:In-Reply-To; b=B4cMIot1wLl/h3alazEuFAvwooxW8WVU5+2iYTXDqYuk+FU3HRY8Zn5mr8EUOnl+O TUOoCKKTt0yFEKlIQSDbPc3X60WsGsxt00SGM01BL/CiEpO4QRxA5r7DDloyBiFraU KHfYcavYt6jHnoiSIX0PhktlmUJzNogUuUNWUu3LbdHG5Li4VQJMCQ9xluytE6Og9Z /MWsZEl0hU7EKPNBUZhMvBHF6KJ0TnzLqRNWm/4U4DR6hxqGP9Sf2td2T7P03vOaD9 ZLAeh7EO+vGJh3cqFelTxkoYm3Izavh3QXkt9vIkUXNlcJX0QlINjWO+lVWgorefyx exGkmEHLHRHvQ== To: Danny Milosavljevic References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <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> 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: Mon, 27 Jul 2020 12:11:04 -0400 Mime-Version: 1.0 In-Reply-To: <07c36137-cbab-1b33-a008-992c3781b04d@disroot.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uAAAdVWRRH0zoO43APtEz2L0vgnIrPf3v" Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/27 12:12:51 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=B4cMIot1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: XnciylWt8ZMZ This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --uAAAdVWRRH0zoO43APtEz2L0vgnIrPf3v Content-Type: multipart/mixed; boundary="UPm40HQSEfOq4TTH6z1tW7Y4TVUBYZnUS"; 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> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <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> In-Reply-To: <07c36137-cbab-1b33-a008-992c3781b04d@disroot.org> --UPm40HQSEfOq4TTH6z1tW7Y4TVUBYZnUS Content-Type: multipart/mixed; boundary="------------04D74C79D7C55B61300A0A56" Content-Language: en-US This is a multi-part message in MIME format. --------------04D74C79D7C55B61300A0A56 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable @Danny Please find the attached patches. @Others Please find the following git-log. *** START *** commit cafa3a036aec6d95ce6f477ad93987d5c0c703a2 Author: Raghav Gururajan Date: Mon Jul 27 11:59:41 2020 -0400 gnu: libzapojit: Update package definition. * gnu/packages/gnome.scm (libzapojit): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--disable-static]: New flag. [--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml and gtk-doc. [inputs]: Move gnome-online-accounts:lib, json-glib and rest to ... [propagated-inputs]: ... here. Add glib and libsoup. [synopsis]: Modify. [description]: Modify. commit 77b42f2623ca37bf0f452fd9eaa9c7e9ba01cf8e Author: Raghav Gururajan Date: Mon Jul 27 10:45:27 2020 -0400 gnu: rest: Update package definition. * gnu/packages/gnome.scm (rest): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:tests?>: Remove argument. <#:configure-flags>[--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['disable-failing-tests]: New phase. [native-inputs]: Add docbook-xml, gsettings-desktop-schemas and gtk-d= oc. Remove glib:bin. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. commit f5e01306c885d2605d457b387ae9a9b2596868f4 Author: Raghav Gururajan Date: Mon Jul 27 05:47:51 2020 -0400 gnu: libpeas: Update package definition. * gnu/packages/gnome.scm (libpeas) [version]: Update to 1.26.0. [source][sha256]: Modify base32. [outputs]: New outputs "demo" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dpython2]: New flag. [-Dvapi]: New flag. [-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['start-xorg-server]: Remove phase. ['pre-check]: New phase. ['move-doc]: New phase. ['move-demo]: New phase. [native-inputs]: Add docbook-xml, gtk-doc, luajit and vala. [inputs]: Add lua, python-2 and python2-pygobject. Remove gtk+. [propagated-inputs]: Remove gobject-introspection. Add glib and gtk+.= [synopsis]: Modify. [home-page]: Modify. [license]: Update to lgpl2.1+. commit dc4acce6e2dab1954daccc0c0238cd1554de1b8d Author: Raghav Gururajan Date: Mon Jul 27 05:01:13 2020 -0400 gnu: libnma: Update package definition. * gnu/packages/gnome.scm (libnma) [version]: Update to 1.8.30. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-docbook-xml]: Modify phase. ['move-doc]: New phase. [inputs]: Add glib. Move network-manager to ... [propagated-inputs]: ... here. [synopsis]: Modify. [description]: Modify. [license]: Modify. commit 3a81ae114512ef23d748a2519e7612df10761754 Author: Raghav Gururajan Date: Mon Jul 27 04:21:11 2020 -0400 gnu: libmediaart: Update package definition. * gnu/packages/gnome.scm (libmediaart): Update package definition. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, glib:bin, gobject-introspection, gtk-doc and vala. [inputs]: Remove gettext-minimal, gdk-pixbuf, gobject-introspection, gtk+:doc and vala. [propagated-inputs]: Add gdk-pixbuf+svg and glib. [synopsis]: Modify. [description]: Modify. commit eaaf245836b519c529f852d54a6ecfd9fc25252d Author: Raghav Gururajan Date: Mon Jul 27 03:27:43 2020 -0400 gnu: libhandy: Update package definition. * gnu/packages/gnome.scm (libhandy) [version]: Update to 0.84.0. [source][method]: Change from git-fetch to url-fetch. [uri]: Change from puri.sm to gnome.org. [sha256]: Modify base32. [outputs]: New outputs "examples" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dglade_catalog]: Remove flag. <#:phases>['patch-docbook-xml]: New phase. ['disable-failing-tests]: New phase. ['pre-check]: Modify phase. ['move-doc]: New phase. ['move-examples]: New phase. [native-inputs]: Add docbook-xml, gtk+:bin and libxml2. [inputs]: Add glade and glib. Move gtk+ to ... [propagated-inputs]: ... here. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. commit 23d01ca12831dd1dbab32e080b83e55c91cb244c Author: Raghav Gururajan Date: Mon Jul 27 01:47:33 2020 -0400 gnu: libgxps: Update package definition. * gnu/packages/gnome.scm (libgxps): Update package definition. [outputs]: New outputs "bin" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Denable-gtk-doc]: New flag. [-Denable-man]: New flag. <#:phases>['patch-docbook]: New phase. ['move-doc]: New phase. ['move-bin]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and libxslt. [inputs]: Add freetype and libpng. [synopsis]: Modify. [description]: Modify. commit 3511a4ce23a3b810b3b0efaaacc3e3f50d016844 Author: Raghav Gururajan Date: Sun Jul 26 07:04:25 2020 -0400 gnu: libgweather: Update package definition. * gnu/packages/gnome.scm (libgweather) [version]: Update to 3.36.1. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dowm_apikey=3D]: New flag. [-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml and gtk-doc. [inputs]: Add glade. [propagated-inputs]: Add glib and glib-networking. Remove gdk-pixbuf.= [synopsis]: Modify. [description]: Modify. [home-page]: Modify. commit 2a6a26704a6a5250e5c016c55b58460175e3cdd1 Author: Raghav Gururajan Date: Sun Jul 26 06:15:11 2020 -0400 gnu: glade: Update package definition. * gnu/packages/gnome.scm (glade): Update package definition. [outputs]: New outputs "doc" and "help". [arguments]<#:configure-flags>[--enable-gtk-doc]: New flag. [--enable-man-pages]: New flag. [--enable-gladeui]: New flag. [--with-html-dir=3D]: New flag. [--with-help-dir]: New flag. <#:phases>['fix-docbook]: Remove phase. ['patch-docbook-xml]: New phase. ['pre-check]: Modify phase. [native-inputs]: Add gettext-minimal, gtk-doc, python-pygobject, and python-wrapper. Remove python2. [inputs]: Add glib and webkitgtk. Move gtk+ and libxml2 to ... [propagated-inputs]: ... here. [synopsis]: Modify. [description]: Modify. [license]: Modify. commit e246d1364a573dca78691cd2d273fa089659fb5e Author: Raghav Gururajan Date: Sun Jul 26 02:37:37 2020 -0400 gnu: libgudev: Update package definition. * gnu/packages/gnome.scm (libgudev) [version]: Update to 233. [source][sha256]: Modify base32. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--enable-gtk-doc]: New flag. [--with-html-dir=3D]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml and gtk-doc. [description]: Modify. commit 541f5792339565f39ef6e60b6a608f43e8b8e161 Author: Raghav Gururajan Date: Sun Jul 26 02:06:42 2020 -0400 gnu: libgtop: Update package definition. * gnu/packages/gnome.scm (libgtop): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--disable-static]: New flag. [--enable-gtk-doc]: New flag. [--with-html-dir=3D]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal and gtk-doc. [inputs]: Add libx11. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. commit b1ea83489068b2f6d21674a16557d5dbc4cb4d97 Author: Raghav Gururajan Date: Sun Jul 26 01:22:50 2020 -0400 gnu: libgsf: Update package definition. * gnu/packages/gnome.scm (libgsf): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New outputs "bin" and "doc". [arguments]<#:configure-flags>[--enable-introspection]: New flag. [--with-gir-dir=3D]: New flag. [--with-typelib-dir=3D]: New flag. [--with-html-dir]: New flag. [--with-zlib]: New flag. [--with-bz2]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, gobject-introspection and python-wrapper. [inputs]: Add gdk-pixbuf. [propagated-inputs]: Remove gdk-pixbuf. [synopsis]: Modify. [home-page]: Modify. [license]: Modify. commit b923e5525b5808e32e9f0a2d6440c1c4c51eee04 Author: Raghav Gururajan Date: Sun Jul 26 00:30:40 2020 -0400 gnu: libgnomekbd: Update package definition. * gnu/packages/gnome.scm (libgnomekbd): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [arguments]<#:configure-flags>[--disable-static]: New flag. [native-inputs]: Add gettext-minimal and gobject-introspection. Remove glib:bin. [home-page]: Modify. commit 93602dfccd03df005e258eea0f008671a0892df8 Author: Raghav Gururajan Date: Sat Jul 25 22:46:42 2020 -0400 gnu: libdazzle: Update package definition. * gnu/packages/gnome.scm (libdazzle) [version]: Update to 3.36.0. [source][sha256]: Modify base32. [outputs]: New outputs "tools" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Denable_rdtscp]: New flag. [-Denable_gtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['pre-check]: Modify phase. ['move-doc]: New phase. ['move-tools]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, gobject-introspection, gtk-doc, vala and libxml2. [inputs]: Remove gtk+, gobject-introspection and vala. [propagated-inputs]: Add gtk+. [synopsis]: Modify. [description]: Modify. commit 65f34652c522716bbb060eac0f9e457d949f1eef Author: Raghav Gururajan Date: Sat Jul 25 11:09:28 2020 -0400 gnu: libchamplain: Update package definition. * gnu/packages/gnome.scm (libchamplain) [version]: Update to 0.12.20.= [source][sha256]: Modify base32. [patches]: Add libchamplain-memphis-demos.patch. [build-system]: Change from gnu to meson. [outputs]: New outputs "demo" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[--enable-vala]: Remove flag. [-Dmemphis]: New flag. [-Dgtk_doc]: New flag. [-Ddemos]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['enable-demos]: New phase. ['move-doc]: New phase. ['move-demos]: New phase. [native-inputs]: Add docbook-xml, gjs, glib:bin, gtk-doc and python-wrapper. [propagated-inputs]: Remove glib:bin. Add memphis. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. commit de46311b41ffa74f9c215a7144ec6b9cc7bdc9f9 Author: Raghav Gururajan Date: Sat Jul 25 06:37:47 2020 -0400 gnu: Add memphis. * gnu/packages/geo.scm (memphis): New variable. commit 4a661b8ca83a51c436114011cbcb6a3ebb6db7c0 Author: Raghav Gururajan Date: Sat Jul 25 09:01:19 2020 -0400 gnu: Add seed. * gnu/packages/gnome.scm (seed): New variable. * gnu/packages/patches/seed-webkit.patch: New file. * gnu/local.mk (seed-webkit.patch): New reference. commit 7b2bc145bea98999670bd6880a5835d47104f3bf Author: Raghav Gururajan Date: Sat Jul 25 08:04:57 2020 -0400 gnu: Add gnome-js-common. * gnu/packages/gnome.scm (gnome-js-common): New variable. *** END *** Regards, RG. --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0037-gnu-Add-gnome-js-common.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0037-gnu-Add-gnome-js-common.patch" =46rom 7b2bc145bea98999670bd6880a5835d47104f3bf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 25 Jul 2020 08:04:57 -0400 Subject: [PATCH 37/54] gnu: Add gnome-js-common. * gnu/packages/gnome.scm (gnome-js-common): New variable. --- gnu/packages/gnome.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1c241daf7b..1ec0fb01fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -268,6 +268,34 @@ Desktop. It is designed to be as simple as possible= and has some unique features to enable users to create their discs easily and quickly.") (license license:gpl2+))) =20 +(define-public gnome-js-common + (package + (name "gnome-js-common") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.gz")) + (sha256 + (base32 "1zv5b9bcbclzj64xd9kgql4ndmbwvvi6cl937ykw8fp21xgh8z7y"))= )) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list + "--disable-static"))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (synopsis "Common JS Modules") + (description "GNOME-JS-Common provides common modules for GNOME Java= Script +bindings.") + (home-page "https://wiki.gnome.org/Projects/Seed") + (license license:gpl3+))) + (define-public libdmapsharing (package (name "libdmapsharing") --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0038-gnu-Add-seed.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0038-gnu-Add-seed.patch" =46rom 4a661b8ca83a51c436114011cbcb6a3ebb6db7c0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 25 Jul 2020 09:01:19 -0400 Subject: [PATCH 38/54] gnu: Add seed. * gnu/packages/gnome.scm (seed): New variable. * gnu/packages/patches/seed-webkit.patch: New file. * gnu/local.mk (seed-webkit.patch): New reference. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 81 ++++++++++++++++++++++++++ gnu/packages/patches/seed-webkit.patch | 49 ++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 gnu/packages/patches/seed-webkit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4266f87f3c..b70762f4ce 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1501,6 +1501,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/scribus-1.5.5-poppler-0.86-build-fix.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ + %D%/packages/patches/seed-webkit.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sgml-common-manpage.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1ec0fb01fb..73bf202a16 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -296,6 +296,87 @@ bindings.") (home-page "https://wiki.gnome.org/Projects/Seed") (license license:gpl3+))) =20 +(define-public seed + (package + (name "seed") + (version "3.8.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0cmcxaggcdcy13j27gy8id2qsf2p2sl4bz2mwb9zhv3gzavlvjw0"))= + (patches + (search-patches "seed-webkit.patch")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:tests? #f ; XXX: Fix-me + #:configure-flags + (list + "--disable-static" + "--enable-xorg-module" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") + "--with-webkit=3D4.0") + #:phases + (modify-phases %standard-phases + ;; The seed-webkit.patch patches configure.ac. + ;; So the source files need to be re-bootstrapped. + (add-after 'unpack 'trigger-bootstrap + (lambda _ + (for-each delete-file + (list + "configure" + "Makefile.in")) + #t)) + (add-before 'build 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* '("reference/seed-docs.sgml" "modules/book.x= ml") + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("docbook-xml" ,docbook-xml-4.1.2) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("dbus" ,dbus) + ("dbus-glib" ,dbus-glib) + ("gnome-js-common" ,gnome-js-common) + ("gtk+" ,gtk+) + ("gtk+-2" ,gtk+-2) + ("libffi" ,libffi) + ("libxml2" ,libxml2) + ("mpfr" ,mpfr) + ("readline" ,readline) + ("sqlite" ,sqlite) + ("xscrnsaver" ,libxscrnsaver))) + (propagated-inputs + `(("glib" ,glib) + ("webkit" ,webkitgtk))) + (synopsis "GObject JavaScriptCore bridge") + (description "Seed is a library and interpreter, dynamically bridgin= g +(through GObjectIntrospection) the WebKit JavaScriptCore engine, with th= e +GNOME platform. It serves as something which enables you to write stand= alone +applications in JavaScript, or easily enable your application to be exte= nsible +in JavaScript.") + (home-page "https://wiki.gnome.org/Projects/Seed") + (license license:lgpl2.0+))) + (define-public libdmapsharing (package (name "libdmapsharing") diff --git a/gnu/packages/patches/seed-webkit.patch b/gnu/packages/patche= s/seed-webkit.patch new file mode 100644 index 0000000000..55f15af12f --- /dev/null +++ b/gnu/packages/patches/seed-webkit.patch @@ -0,0 +1,49 @@ +From 6d512b5c4d774a9853b51dae464a10cea7e3423a Mon Sep 17 00:00:00 2001 +From: Peter Rustler +Date: Mon, 7 Dec 2015 11:40:05 +0000 +Subject: [PATCH] Add support for new webkit version 4.0 to build system + +Add new configure value for option --with-webkit. +Now you can add 4.0 as value to --with-webkit. +Default is still 3.0. + +https://bugzilla.gnome.org/show_bug.cgi?id=3D759171 +--- + configure.ac | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2313c093..3d5d4823 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -77,12 +77,12 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DWebKit=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D + m4_define([webkit_default], [3.0]) +=20 + AC_ARG_WITH([webkit], +- [AC_HELP_STRING([--with-webkit=3D@<:@3.0/1.0@:>@], ++ [AC_HELP_STRING([--with-webkit=3D@<:@4.0/3.0/1.0@:>@], + [Select the Webkit backend, default=3D3.0])= ], + [], + [with_webkit=3Dwebkit_default]) +=20 +-dnl=3D=3D=3D support both 1.0 and 3.0 (default 3.0) =3D=3D ++dnl=3D=3D=3D support all 1.0, 3.0 and 4.0 (default 3.0) =3D=3D + AS_CASE([$with_webkit], + [3.0], [ + WEBKIT_PC=3Dwebkitgtk-3.0 +@@ -90,6 +90,12 @@ AS_CASE([$with_webkit], + AC_CHECK_LIB(webkitgtk-3.0, JSContextGroupCreate,, + AC_CHECK_LIB(javascriptcoregtk-3.0, JSContextGroupCrea= te,WEBKIT_PC=3Djavascriptcoregtk-3.0))=20 + ], ++ [4.0], [ ++ WEBKIT_PC=3Dwebkitgtk-4.0 ++ SEED_GTK_VERSION=3D-gtk4 ++ AC_CHECK_LIB(webkitgtk-4.0, JSContextGroupCreate,, ++ AC_CHECK_LIB(javascriptcoregtk-4.0, JSContextGroupCrea= te,WEBKIT_PC=3Djavascriptcoregtk-4.0)) ++ ], + [1.0], [ + AC_CHECK_LIB(webkitgtk-1.0, JSContextGroupCreate,WEBKIT_PC=3Dwebkitgt= k-1.0, + AC_CHECK_LIB(javascriptcoregtk-1.0, JSContextGroupCrea= te,WEBKIT_PC=3Djavascriptcoregtk-1.0,=20 +--=20 +GitLab + --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0039-gnu-Add-memphis.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0039-gnu-Add-memphis.patch" =46rom de46311b41ffa74f9c215a7144ec6b9cc7bdc9f9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 25 Jul 2020 06:37:47 -0400 Subject: [PATCH 39/54] gnu: Add memphis. * gnu/packages/geo.scm (memphis): New variable. --- gnu/packages/geo.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1ad6f697a4..8c21392bb7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) + #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) #:use-module (gnu packages flex) @@ -100,6 +101,69 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) =20 +(define-public memphis + (package + (name "memphis") + (version "0.2.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/jiuka/memphis.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "068c3943pgbpfjq44pmvn5fmkh005ak5aa67vvrq3fn487c6w54q"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "--disable-static" + "--enable-gtk-doc" + "--enable-vala" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-autogen + (lambda _ + (substitute* "autogen.sh" + (("\\./configure \"\\$@\"") + "")) + #t)) + (add-after 'patch-autogen 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* "libmemphis-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("docbook-xml" ,docbook-xml-4.3) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("seed" ,seed) + ("vala" ,vala))) + (inputs + `(("expat" ,expat) + ("glib" ,glib))) + (propagated-inputs + `(("cairo" ,cairo))) + (synopsis "Map-rendering for OpenSteetMap") + (description "Memphis is a map-rendering application and a library f= or +OpenStreetMap written in C using eXpat, Cairo and GLib.") + (home-page "http://trac.openstreetmap.ch/trac/memphis/") + (license license:lgpl2.1+))) + (define-public geos (package (name "geos") --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0040-gnu-libchamplain-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0040-gnu-libchamplain-Update-package-definition.patch" =46rom 65f34652c522716bbb060eac0f9e457d949f1eef Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 25 Jul 2020 11:09:28 -0400 Subject: [PATCH 40/54] gnu: libchamplain: Update package definition. * gnu/packages/gnome.scm (libchamplain) [version]: Update to 0.12.20. [source][sha256]: Modify base32. [patches]: Add libchamplain-memphis-demos.patch. [build-system]: Change from gnu to meson. [outputs]: New outputs "demo" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[--enable-vala]: Remove flag. [-Dmemphis]: New flag. [-Dgtk_doc]: New flag. [-Ddemos]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['enable-demos]: New phase. ['move-doc]: New phase. ['move-demos]: New phase. [native-inputs]: Add docbook-xml, gjs, glib:bin, gtk-doc and python-wrapper. [propagated-inputs]: Remove glib:bin. Add memphis. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 105 +++++++++++++----- .../patches/libchamplain-memphis-demos.patch | 24 ++++ 3 files changed, 104 insertions(+), 26 deletions(-) create mode 100644 gnu/packages/patches/libchamplain-memphis-demos.patch= diff --git a/gnu/local.mk b/gnu/local.mk index b70762f4ce..6fe674ffec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1175,6 +1175,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ + %D%/packages/patches/libchamplain-memphis-demos.patch \ %D%/packages/patches/libdrm-realpath-virtio.patch \ %D%/packages/patches/libextractor-exiv2.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch = \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 73bf202a16..4ad165c764 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6083,37 +6083,90 @@ implements the ClutterGstPlayer interface using p= laybin.") (define-public libchamplain (package (name "libchamplain") - (version "0.12.16") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://gnome/sources/libchamplain/0.12/libchampla= in-" - version ".tar.xz")) - (sha256 - (base32 - "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"))= )) - (build-system gnu-build-system) - (arguments '(#:configure-flags '("--enable-vala"))) + (version "0.12.20") + (source + (origin + (method url-fetch) + (uri + (string-append + "mirror://gnome/sources/libchamplain/0.12/libchamplain-" + version ".tar.xz")) + (sha256 + (base32 "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"))= + (patches + (search-patches + ;; To fix the upstream bug, + ;; https://gitlab.gnome.org/GNOME/libchamplain/-/issues/55 + "libchamplain-memphis-demos.patch")))) + (build-system meson-build-system) + (outputs '("out" "demos" "doc")) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dmemphis=3Dtrue" + "-Dgtk_doc=3Dtrue" + "-Ddemos=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* "champlain-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-before 'configure 'enable-demos + (lambda _ + (with-directory-excursion "demos" + (substitute* "meson.build" + (("install: false,") + "install: true,"))) + #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-demos + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (demos (assoc-ref outputs "demos"))) + (mkdir-p (string-append demos "/bin")) + (rename-file + (string-append out "/bin") + (string-append demos "/bin")) + #t)))))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("docbook-xml" ,docbook-xml-4.1.2) + ("gjs" ,gjs) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) - ("vala" ,vala))) + ("python" ,python-wrapper) + ("vapigen" ,vala))) (propagated-inputs - `(("libsoup" ,libsoup) - ("sqlite" ,sqlite) + `(("cairo" ,cairo) ("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) - ("glib:bin" ,glib "bin") ;glib-mkenums, etc. - ("cairo" ,cairo) - ("gtk+3" ,gtk+) - ("glib" ,glib))) - (home-page "https://projects.gnome.org/libchamplain/") - (synopsis "C library providing a ClutterActor to display maps") - (description - "libchamplain is a C library providing a ClutterActor to display ma= ps. -It also provides a Gtk+ widget to display maps in Gtk+ applications. Py= thon -and Perl bindings are also available. It supports numerous free map sou= rces -such as OpenStreetMap, OpenCycleMap, OpenAerialMap, and Maps for free.")= + ("glib" ,glib) + ("gtk+" ,gtk+) + ("libsoup" ,libsoup) + ("memphis" ,memphis) + ("sqlite" ,sqlite))) + (synopsis "Map Widget") + (description "LibChamplain is a Gtk+ widget displaying zoomable and = pannable +maps that can be loaded from various network sources. It supports overl= ay +layers, markers, and custom elements displayed on top of the maps. The = library +is written in C but other language mappings are also available thanks to= +GObject-Introspection.") + (home-page "https://https://wiki.gnome.org/Projects/libchamplain") (license license:lgpl2.1+))) =20 (define-public gom diff --git a/gnu/packages/patches/libchamplain-memphis-demos.patch b/gnu/= packages/patches/libchamplain-memphis-demos.patch new file mode 100644 index 0000000000..6ebccd0671 --- /dev/null +++ b/gnu/packages/patches/libchamplain-memphis-demos.patch @@ -0,0 +1,24 @@ +From 84df89f5490e995d271b4ac56999450e94bfd563 Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Sat, 25 Jul 2020 10:21:45 -0400 +Subject: [PATCH] [PATCH]: Fix demos build with memphis. + +--- + demos/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/demos/meson.build b/demos/meson.build +index cf852d1..bf9b3bb 100644 +--- a/demos/meson.build ++++ b/demos/meson.build +@@ -85,6 +85,7 @@ if build_with_memphis and build_gtk_widgetry + dependencies: [ + libchamplain_dep, + libchamplain_gtk_dep, ++ memphis_dep, + ] + ) + endforeach +--=20 +GitLab + --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0041-gnu-libdazzle-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0041-gnu-libdazzle-Update-package-definition.patch" =46rom 93602dfccd03df005e258eea0f008671a0892df8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 25 Jul 2020 22:46:42 -0400 Subject: [PATCH 41/54] gnu: libdazzle: Update package definition. * gnu/packages/gnome.scm (libdazzle) [version]: Update to 3.36.0. [source][sha256]: Modify base32. [outputs]: New outputs "tools" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Denable_rdtscp]: New flag. [-Denable_gtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['pre-check]: Modify phase. ['move-doc]: New phase. ['move-tools]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, gobject-introspection,= gtk-doc, vala and libxml2. [inputs]: Remove gtk+, gobject-introspection and vala. [propagated-inputs]: Add gtk+. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 85 ++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 24 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ad165c764..2b4fdb655b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11265,42 +11265,79 @@ hexadecimal or ASCII. It is useful for editing= binary files in general.") (define-public libdazzle (package (name "libdazzle") - (version "3.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libdazzle/" - (version-major+minor version) "/" - "libdazzle-" version ".tar.xz")) - (sha256 - (base32 - "01cmcrd75b7ns7j2b4p6h7pv68vjhkcl9zbvzzx7pf4vknxir61x"))= )) + (version "3.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/libdazzle/" + (version-major+minor version) "/" + "libdazzle-" version ".tar.xz")) + (sha256 + (base32 "0n6r16a07in82cnzw91vl675pbjzbvazkxwbqxq2kihganzipcw2"))= )) (build-system meson-build-system) + (outputs '("out" "tools" "doc")) (arguments - `(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Denable_rdtscp=3Dtrue" + "-Denable_gtk_doc=3Dtrue") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "dazzle-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. - (system "Xvfb :1 &") + (system "Xvfb :1 +extension GLX &") (setenv "DISPLAY" ":1") - #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-tools + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (tools (assoc-ref outputs "tools"))) + (mkdir-p (string-append tools "/bin")) + (rename-file + (string-append out "/bin") + (string-append tools "/bin")) + #t)))))) (native-inputs - `(("glib" ,glib "bin") ; glib-compile-resources + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) - ;; For tests. + ("vapigen" ,vala) + ("xmllint" ,libxml2) ("xorg-server" ,xorg-server-for-tests))) (inputs - `(("glib" ,glib) - ("gobject-introspection" ,gobject-introspection) - ("gtk+" ,gtk+) - ("vala" ,vala))) - (home-page "https://gitlab.gnome.org/GNOME/libdazzle") + `(("glib" ,glib))) + (propagated-inputs + `(("gtk+" ,gtk+))) (synopsis "Companion library to GObject and Gtk+") - (description "The libdazzle library is a companion library to GObjec= t and -Gtk+. It provides various features that the authors wish were in the -underlying library but cannot for various reasons. In most cases, they = are -wildly out of scope for those libraries. In other cases, they are not q= uite -generic enough to work for everyone.") + (description "LibDazzle is a companion library to GObject and Gtk+. = It +provides various features that the authors wish were in the underlying l= ibrary +but cannot for various reasons. In most cases, they are wildly out of s= cope for +those libraries. In other cases, they are not quite generic enough to w= ork for +everyone.") + (home-page "https://gitlab.gnome.org/GNOME/libdazzle") (license license:gpl3+))) =20 (define-public evolution --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0042-gnu-libgnomekbd-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0042-gnu-libgnomekbd-Update-package-definition.patch" =46rom b923e5525b5808e32e9f0a2d6440c1c4c51eee04 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 26 Jul 2020 00:30:40 -0400 Subject: [PATCH 42/54] gnu: libgnomekbd: Update package definition. * gnu/packages/gnome.scm (libgnomekbd): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [arguments]<#:configure-flags>[--disable-static]: New flag. [native-inputs]: Add gettext-minimal and gobject-introspection. Remove glib:bin. [home-page]: Modify. --- gnu/packages/gnome.scm | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2b4fdb655b..53956909e6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10403,29 +10403,33 @@ which generates C code when compiled.") (package (name "libgnomekbd") (version "3.26.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libgnomekbd/" - (version-major+minor version) "/" - "libgnomekbd-" version ".tar.xz")) - (sha256 - (base32 - "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"))= )) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/libgnomekbd/" + (version-major+minor version) "/" + "libgnomekbd-" version ".tar.xz")) + (sha256 + (base32 "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"))= )) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list + "--disable-static"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") - ("intltool" ,intltool))) + `(("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) (propagated-inputs - ;; Referred to in .h files and .pc. `(("glib" ,glib) ("gtk+" ,gtk+) ("libxklavier" ,libxklavier))) - (home-page "https://www.gnome.org") (synopsis "GNOME keyboard configuration library") - (description - "Libgnomekbd is a keyboard configuration library for the GNOME desk= top -environment, which can notably display keyboard layouts.") + (description "Libgnomekbd is a keyboard configuration library for th= e +GNOME desktop environment, which can notably display keyboard layouts.")= + (home-page "https://gitlab.gnome.org/GNOME/libgnomekbd") (license license:lgpl2.0+))) =20 ;;; This package is no longer maintained: --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0043-gnu-libgsf-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0043-gnu-libgsf-Update-package-definition.patch" =46rom b1ea83489068b2f6d21674a16557d5dbc4cb4d97 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 26 Jul 2020 01:22:50 -0400 Subject: [PATCH 43/54] gnu: libgsf: Update package definition. * gnu/packages/gnome.scm (libgsf): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New outputs "bin" and "doc". [arguments]<#:configure-flags>[--enable-introspection]: New flag. [--with-gir-dir=3D]: New flag. [--with-typelib-dir=3D]: New flag. [--with-html-dir]: New flag. [--with-zlib]: New flag. [--with-bz2]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, gobject-introspection and python-wrapper. [inputs]: Add gdk-pixbuf. [propagated-inputs]: Remove gdk-pixbuf. [synopsis]: Modify. [home-page]: Modify. [license]: Modify. --- gnu/packages/gnome.scm | 87 +++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 53956909e6..b8d0bf703b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3144,39 +3144,74 @@ XML/CSS rendering engine.") (package (name "libgsf") (version "1.14.47") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "bin" "doc")) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags + (list + "--disable-static" + "--enable-introspection" + (string-append "--with-gir-dir=3D" + (assoc-ref %outputs "out") + "/share/gir-" + ,(version-major + (package-version gobject-introspection)) + ".0") + (string-append "--with-typelib-dir=3D" + (assoc-ref %outputs "out") + "/lib/girepository-" + ,(version-major + (package-version gobject-introspection)) + ".0") + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") + "--with-zlib" + "--with-bz2") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "gsf-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("docbook-xml" ,docbook-xml) ("gettext" ,gettext-minimal) - - ;; For tests. + ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) - ("perl-xml-parser" ,perl-xml-parser))) + ("perl-xml-parser" ,perl-xml-parser) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (inputs - `(("zlib" ,zlib) - ("bzip2" ,bzip2))) + `(("bzip2" ,bzip2) + ("gdk-pixbuf" ,gdk-pixbuf) + ("zlib" ,zlib))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) + `(("glib" ,glib) ("libxml2" ,libxml2))) - (home-page "https://www.gnome.org/projects/libgsf") - (synopsis "GNOME's Structured File Library") - (description - "Libgsf aims to provide an efficient extensible I/O abstraction for= -dealing with different structured file formats.") - - ;; LGPLv2.1-only. - (license license:lgpl2.1))) + (synopsis "G Structured File Library") + (description "Libgsf aims to provide an efficient extensible I/O abs= traction +for dealing with different structured file formats.") + (home-page "https://gitlab.gnome.org/GNOME/libgsf") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Others + license:lgpl2.0+)))) =20 (define-public librsvg (package --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0044-gnu-libgtop-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0044-gnu-libgtop-Update-package-definition.patch" =46rom 541f5792339565f39ef6e60b6a608f43e8b8e161 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 26 Jul 2020 02:06:42 -0400 Subject: [PATCH 44/54] gnu: libgtop: Update package definition. * gnu/packages/gnome.scm (libgtop): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--disable-static]: New flag. [--enable-gtk-doc]: New flag. [--with-html-dir=3D]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal and gtk-doc. [inputs]: Add libx11. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gnome.scm | 55 ++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b8d0bf703b..c80b981e03 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8772,27 +8772,50 @@ providing graphical log-ins and managing local an= d remote displays.") (package (name "libgtop") (version "2.40.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libgtop/" - (version-major+minor version) "/" - "libgtop-" version ".tar.xz")) - (sha256 - (base32 - "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"))= )) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/libgtop/" + (version-major+minor version) "/" + "libgtop-" version ".tar.xz")) + (sha256 + (base32 "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "--disable-static" + "--enable-gtk-doc" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc/reference" + (substitute* "libgtop-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("docbook-xml" ,docbook-xml-4.1.2) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) ("perl" ,perl) ("pkg-config" ,pkg-config))) + (inputs + `(("x11" ,libx11))) (propagated-inputs - `(("glib" ,glib))) ; required by libgtop-2.0.pc - (synopsis "Portable system access library") - (home-page "https://www.gnome.org/") - (description - "LibGTop is a library to get system specific data such as CPU and m= emory -usage and information about running processes.") + `(("glib" ,glib))) + (synopsis "System Monitoring Library") + (description "LibGTop is a library for collecting system monitoring = data.") + (home-page "https://gitlab.gnome.org/GNOME/libgtop") (license license:gpl2+))) =20 (define-public gnome-bluetooth --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0045-gnu-libgudev-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0045-gnu-libgudev-Update-package-definition.patch" =46rom e246d1364a573dca78691cd2d273fa089659fb5e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 26 Jul 2020 02:37:37 -0400 Subject: [PATCH 45/54] gnu: libgudev: Update package definition. * gnu/packages/gnome.scm (libgudev) [version]: Update to 233. [source][sha256]: Modify base32. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--enable-gtk-doc]: New flag. [--with-html-dir=3D]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml and gtk-doc. [description]: Modify. --- gnu/packages/gnome.scm | 55 +++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c80b981e03..cba5bd24f1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6785,32 +6785,49 @@ side panel; (define-public libgudev (package (name "libgudev") - (version "232") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - version "/" name "-" version ".tar.xz"= )) - (sha256 - (base32 - "0q3qki451zzgdjazlgshsfzbbm0in40lyx7dyrag7kbkqnwv4k7f"))= )) - (build-system gnu-build-system) + (version "233") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments - '(#:configure-flags - ;; umockdev depends on libgudev. - (list "--disable-umockdev"))) + `(#:configure-flags + (list + "--enable-gtk-doc" + "--disable-umockdev" ; Due to circular-dependency + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* "gudev-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. + `(("docbook-xml" ,docbook-xml-4.3) ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("glib" ,glib))) ; required by gudev-1.0.pc (inputs `(("udev" ,eudev))) - (home-page "https://wiki.gnome.org/Projects/libgudev") + (propagated-inputs + `(("glib" ,glib))) (synopsis "GObject bindings for libudev") - (description - "This library provides GObject bindings for libudev. It was origin= ally -part of udev-extras, then udev, then systemd. It's now a project on its= own.") + (description "LibGudev is a library that provides GObject bindings f= or +libudev. It was originally part of udev-extras, then udev, then systemd= =2E +It's now a project on its own.") + (home-page "https://wiki.gnome.org/Projects/libgudev") (license license:lgpl2.1+))) =20 (define-public gvfs --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0046-gnu-glade-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0046-gnu-glade-Update-package-definition.patch" =46rom 2a6a26704a6a5250e5c016c55b58460175e3cdd1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 26 Jul 2020 06:15:11 -0400 Subject: [PATCH 46/54] gnu: glade: Update package definition. * gnu/packages/gnome.scm (glade): Update package definition. [outputs]: New outputs "doc" and "help". [arguments]<#:configure-flags>[--enable-gtk-doc]: New flag. [--enable-man-pages]: New flag. [--enable-gladeui]: New flag. [--with-html-dir=3D]: New flag. [--with-help-dir]: New flag. <#:phases>['fix-docbook]: Remove phase. ['patch-docbook-xml]: New phase. ['pre-check]: Modify phase. [native-inputs]: Add gettext-minimal, gtk-doc, python-pygobject, and python-wrapper. Remove python2. [inputs]: Add glib and webkitgtk. Move gtk+ and libxml2 to ... [propagated-inputs]: ... here. [synopsis]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gnome.scm | 92 +++++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 33 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cba5bd24f1..061779a4d6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3058,57 +3058,83 @@ additional GDK objects which support OpenGL rende= ring in GTK+ and GtkWidget API add-ons to make GTK+ widgets OpenGL-capable.") (license license:lgpl2.1+))) =20 -(define-public glade3 +(define-public glade (package (name "glade") (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 - "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r"))= )) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "doc" "help")) (arguments - `(#:phases + `(#:configure-flags + (list + "--enable-gtk-doc" + "--enable-man-pages" + "--enable-gladeui" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") + (string-append "--with-help-dir=3D" + (assoc-ref %outputs "help") + "/share/help")) + #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-docbook + (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) - (substitute* "man/Makefile.in" - (("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"))) + (with-directory-excursion "doc" + (substitute* "gladeui-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) #t)) (add-before 'check 'pre-check (lambda _ - (setenv "HOME" "/tmp") ;; Tests require a running X server. - (system "Xvfb :1 &") + (system "Xvfb :1 +extension GLX &") (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") #t))))) - (inputs - `(("gtk+" ,gtk+) - ("libxml2" ,libxml2))) (native-inputs - `(("hicolor-icon-theme" ,hicolor-icon-theme) + `(("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("hicolor-icon-theme" ,hicolor-icon-theme) ("intltool" ,intltool) ("itstool" ,itstool) - ("libxslt" ,libxslt) ;for xsltproc - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) - ("python" ,python-2) ("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server-for-tests))) + ("pygobject" ,python-pygobject) + ("python" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests) + ("xsltproc" ,libxslt))) + (inputs + `(("glib" ,glib) + ("webkitgtk" ,webkitgtk))) + (propagated-inputs + `(("gtk+" ,gtk+) + ("libxml2" ,libxml2))) + (synopsis "User Interface designer for Gtk+ and GNOME") + (description "Glade is a RAD tool to enable quick and easy developme= nt of +user interfaces for the GTK+ toolkit and the GNOME desktop environment."= ) (home-page "https://glade.gnome.org") - (synopsis "GTK+ rapid application development tool") - (description "Glade is a rapid application development (RAD) tool to= -enable quick & easy development of user interfaces for the GTK+ toolkit = and -the GNOME desktop environment.") - (license license:lgpl2.0+))) + (license + (list + ;; Most of the code base. + license:lgpl2.0+ + ;; Some of the code base. + license:gpl2+)))) =20 (define-public libcroco (package --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0047-gnu-libgweather-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0047-gnu-libgweather-Update-package-definition.patch" =46rom 3511a4ce23a3b810b3b0efaaacc3e3f50d016844 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 26 Jul 2020 07:04:25 -0400 Subject: [PATCH 47/54] gnu: libgweather: Update package definition. * gnu/packages/gnome.scm (libgweather) [version]: Update to 3.36.1. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dowm_apikey=3D]: New flag. [-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml and gtk-doc. [inputs]: Add glade. [propagated-inputs]: Add glib and glib-networking. Remove gdk-pixbuf. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gnome.scm | 91 ++++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 29 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 061779a4d6..afdd360d4b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5559,43 +5559,76 @@ service via the system message bus.") (define-public libgweather (package (name "libgweather") - (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 - "1fgiqswkhiaijanml3mb16ajn5aanrk7x6yiwagp9n9rssam6902"))= )) + (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 "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:tests? #f ; one of two tests requires network access + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:tests? #f ; Tests require networking #:configure-flags - `(,(string-append "-Dzoneinfo_dir=3D" - (assoc-ref %build-inputs "tzdata") - "/share/zoneinfo")))) + (list + (string-append "-Dzoneinfo_dir=3D" + (assoc-ref %build-inputs "tzdata") + "/share/zoneinfo") + ;; NOTE: This is the API-Key for OpenWeatherMaps. + ;; It has been generated from my OWM account. + ;; Currently, the account subscription is on "Free Plan". + ;; It provides 3 hour forecast for 5 days. + ;; It allows 60 calls/minute and 1,000,000 calls/month. + ;; Feel free to use it. + ;; Raghav (RG) Gururajan + "-Dowm_apikey=3D9c052a3406aa129d5261cfb999104cb7" + "-Dgtk_doc=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "libgweather-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #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)))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums + `(("docbook-xml" ,docbook-xml-4.3) + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("vala" ,vala) - ("intltool" ,intltool))) + ("vala" ,vala))) + (inputs + `(("glade" ,glade) + ("tzdata" ,tzdata))) (propagated-inputs - ;; gweather-3.0.pc refers to GTK+, GDK-Pixbuf, GLib/GObject, libxml= , and - ;; libsoup. - `(("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf) - ("libxml2" ,libxml2) + `(("glib" ,glib) + ("glib-networking" ,glib-networking) + ("geocode-glib" ,geocode-glib) + ("gtk+" ,gtk+) ("libsoup" ,libsoup) - ("geocode-glib" ,geocode-glib))) - (inputs - `(("tzdata" ,tzdata))) - (home-page "https://wiki.gnome.org/action/show/Projects/LibGWeather"= ) - (synopsis "Location, time zone, and weather library for GNOME") - (description - "libgweather is a library to access weather information from online= -services for numerous locations.") + ("libxml2" ,libxml2))) + (synopsis "Weather information library and database") + (description "LibGWeather is a library to access weather information= from +online services for numerous locations.") + (home-page "https://wiki.gnome.org/Projects/LibGWeather") (license license:gpl2+))) =20 (define-public gnome-settings-daemon --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0048-gnu-libgxps-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0048-gnu-libgxps-Update-package-definition.patch" =46rom 23d01ca12831dd1dbab32e080b83e55c91cb244c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Jul 2020 01:47:33 -0400 Subject: [PATCH 48/54] gnu: libgxps: Update package definition. * gnu/packages/gnome.scm (libgxps): Update package definition. [outputs]: New outputs "bin" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Denable-gtk-doc]: New flag. [-Denable-man]: New flag. <#:phases>['patch-docbook]: New phase. ['move-doc]: New phase. ['move-bin]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and libxslt. [inputs]: Add freetype and libpng. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 80 ++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index afdd360d4b..da25335d7e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1943,34 +1943,78 @@ services, and has full asynchronous support.") (package (name "libgxps") (version "0.3.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"))= )) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"))= )) (build-system meson-build-system) + (outputs '("out" "bin" "doc")) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Denable-gtk-doc=3Dtrue" + "-Denable-man=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* "reference/libgxps-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))) + (substitute* "tools/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-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-bin + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p (string-append bin "/bin")) + (rename-file + (string-append out "/bin") + (string-append bin "/bin")) + #t)))))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + `(("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (inputs - `(("gtk+" ,gtk+) - ("libjpeg" ,libjpeg-turbo) + `(("freetype" ,freetype) + ("gtk+" ,gtk+) ("lcms" ,lcms) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) ("libtiff" ,libtiff))) (propagated-inputs - ;; In Requires of libgxps.pc. `(("cairo" ,cairo) ("glib" ,glib) ("libarchive" ,libarchive))) + (synopsis "XPS management library") + (description "LibGxps is a GObject-based library for handling and re= ndering XPS +documents.") (home-page "https://wiki.gnome.org/Projects/libgxps") - (synopsis "GObject-based library for handling and rendering XPS docu= ments") - (description - "libgxps is a GObject-based library for handling and rendering XPS -documents. This package also contains binaries that can convert XPS doc= uments -to other formats.") (license license:lgpl2.1+))) =20 (define-public gnome-characters --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0049-gnu-libhandy-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0049-gnu-libhandy-Update-package-definition.patch" =46rom eaaf245836b519c529f852d54a6ecfd9fc25252d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Jul 2020 03:27:43 -0400 Subject: [PATCH 49/54] gnu: libhandy: Update package definition. * gnu/packages/gnome.scm (libhandy) [version]: Update to 0.84.0. [source][method]: Change from git-fetch to url-fetch. [uri]: Change from puri.sm to gnome.org. [sha256]: Modify base32. [outputs]: New outputs "examples" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dglade_catalog]: Remove flag. <#:phases>['patch-docbook-xml]: New phase. ['disable-failing-tests]: New phase. ['pre-check]: Modify phase. ['move-doc]: New phase. ['move-examples]: New phase. [native-inputs]: Add docbook-xml, gtk+:bin and libxml2. [inputs]: Add glade and glib. Move gtk+ to ... [propagated-inputs]: ... here. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gnome.scm | 95 ++++++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 27 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da25335d7e..39514aa460 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11696,47 +11696,88 @@ advanced image management tool") (define-public libhandy (package (name "libhandy") - (version "0.0.12") + (version "0.84.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://source.puri.sm/Librem5/libhandy") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 - (base32 "09wlknarzsbk9hr5ws6s7x5kibkhx9ayrbhshfqib4zkhq2f76hw"))= )) + (base32 "1ak1yncnbq9gc2735mqns9vwz7whfin5f83kl0lxy77rjsgm6p60"))= )) (build-system meson-build-system) + (outputs '("out" "examples" "doc")) (arguments - `(#:configure-flags - '("-Dglade_catalog=3Ddisabled" - "-Dgtk_doc=3Dtrue") + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dgtk_doc=3Dtrue") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* + '("build-howto.xml" + "handy-docs.xml" + "hdy-migrating-0-0-to-1.xml" + "visual-index.xml") + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-before 'configure 'disable-failing-tests + (lambda _ + (substitute* "tests/meson.build" + (("'test-avatar',") + "")) + #t)) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. - (system "Xvfb :1 &") + (system "Xvfb :1 +extension GLX &") (setenv "DISPLAY" ":1") - #t))))) - (inputs - `(("gtk+" ,gtk+))) + #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-examples + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (examples (assoc-ref outputs "examples"))) + (mkdir-p (string-append examples "/bin")) + (rename-file + (string-append out "/bin") + (string-append examples "/bin")) + #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) ; for g-ir-scann= er - ("vala" ,vala) + `(("hicolor-icon-theme" ,hicolor-icon-theme) + ("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) + ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - - ;; Test suite dependencies. - ("xorg-server" ,xorg-server-for-tests) - ("hicolor-icon-theme" ,hicolor-icon-theme))) - (home-page "https://source.puri.sm/Librem5/libhandy") - (synopsis "Library full of GTK+ widgets for mobile phones") - (description "The aim of the handy library is to help with developin= g user -interfaces for mobile devices using GTK+. It provides responsive GTK+ w= idgets -for usage on small and big screens.") + ("vala" ,vala) + ("xmllint" ,libxml2) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("glade" ,glade) + ("glib" ,glib))) + (propagated-inputs + `(("gtk+" ,gtk+))) + (synopsis "Building blocks for modern adaptive GNOME apps") + (description "LibHandy aims to help with developing UI for mobile de= vices +using GTK/GNOME.") + (home-page "https://gitlab.gnome.org/GNOME/libhandy") (license license:lgpl2.1+))) =20 (define-public libgit2-glib --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0050-gnu-libmediaart-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0050-gnu-libmediaart-Update-package-definition.patch" =46rom 3a81ae114512ef23d748a2519e7612df10761754 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Jul 2020 04:21:11 -0400 Subject: [PATCH 50/54] gnu: libmediaart: Update package definition. * gnu/packages/gnome.scm (libmediaart): Update package definition. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, glib:bin, gobject-introspection, gtk-doc and vala. [inputs]: Remove gettext-minimal, gdk-pixbuf, gobject-introspection, gtk+:doc and vala. [propagated-inputs]: Add gdk-pixbuf+svg and glib. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 60 +++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 39514aa460..22f6252f91 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1389,28 +1389,52 @@ handling and implementation of UPnP A/V profiles.= ") (package (name "libmediaart") (version "1.9.4") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0gc10imyabk57ar54m0qzms0x9dnmkymhkzyk8w1aj3y4lby0yx5"))= )) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0gc10imyabk57ar54m0qzms0x9dnmkymhkzyk8w1aj3y4lby0yx5"))= )) + (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference/libmediaart" + (substitute* "libmediaart-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #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)))))) (native-inputs - `(("glib:bin" ,glib "bin") - ("pkg-config" ,pkg-config))) - (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("docbook-xml" ,docbook-xml-4.1.2) ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk+:doc", gtk+ "doc") + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) ("vala" ,vala))) - (synopsis "Media art library for the GNOME desktop") - (description - "The libmediaart library is the foundation for media art caching, -extraction, and lookup for applications on the desktop.") + (propagated-inputs + `(("gdk-pixbuf" ,gdk-pixbuf+svg) + ("glib" ,glib))) + (synopsis "Media-Art Library") + (description "LibMediaArt provides library tasked with managing, ext= racting +and handling media art caches.") (home-page "https://gitlab.gnome.org/GNOME/libmediaart") (license license:lgpl2.1+))) =20 --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0051-gnu-libnma-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0051-gnu-libnma-Update-package-definition.patch" =46rom dc4acce6e2dab1954daccc0c0238cd1554de1b8d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Jul 2020 05:01:13 -0400 Subject: [PATCH 51/54] gnu: libnma: Update package definition. * gnu/packages/gnome.scm (libnma) [version]: Update to 1.8.30. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-docbook-xml]: Modify phase. ['move-doc]: New phase. [inputs]: Add glib. Move network-manager to ... [propagated-inputs]: ... here. [synopsis]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gnome.scm | 58 +++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 22f6252f91..3117ece373 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1650,26 +1650,37 @@ client devices can handle.") (define-public libnma (package (name "libnma") - (version "1.8.28") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))= )) + (version "1.8.30") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1d5gzn7ss5vi0bhc8s4i5gsrck1ajslajam5jxfqazg094mffcys"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) - (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml= ") - "/xml/dtd/docbook"))) - (substitute* "libnma-docs.xml" - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) + (substitute* "libnma-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))) + #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)))))) (native-inputs `(("docbook-xml" ,docbook-xml-4.3) @@ -1681,18 +1692,23 @@ client devices can handle.") ("vala" ,vala))) (inputs `(("gcr" ,gcr) + ("glib" ,glib) ("gtk+" ,gtk+) ("iso-codes" ,iso-codes) - ("mobile-broadband-provider-info" ,mobile-broadband-provider-info= ) - ("network-manager" ,network-manager))) - (synopsis "Network Manager's applet library") + ("mobile-broadband-provider-info" ,mobile-broadband-provider-info= ))) + (propagated-inputs + `(("libnm" ,network-manager))) + (synopsis "Network-Manager Applet Library") (description "Libnma is an applet library for Network Manager. It w= as initially part of network-manager-applet and has now become a separate project.") (home-page "https://gitlab.gnome.org/GNOME/libnma") - ;; Some files carry the "GPL-2.0+" SPDX identifier while others say - ;; "LGPL-2.1+". - (license license:gpl2+))) + (license + (list + ;; Library + license:gpl2+ + ;; Others + license:lgpl2.1+)))) =20 (define-public gnome-menus (package --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0052-gnu-libpeas-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0052-gnu-libpeas-Update-package-definition.patch" =46rom f5e01306c885d2605d457b387ae9a9b2596868f4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Jul 2020 05:47:51 -0400 Subject: [PATCH 52/54] gnu: libpeas: Update package definition. * gnu/packages/gnome.scm (libpeas) [version]: Update to 1.26.0. [source][sha256]: Modify base32. [outputs]: New outputs "demo" and "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dpython2]: New flag. [-Dvapi]: New flag. [-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['start-xorg-server]: Remove phase. ['pre-check]: New phase. ['move-doc]: New phase. ['move-demo]: New phase. [native-inputs]: Add docbook-xml, gtk-doc, luajit and vala. [inputs]: Add lua, python-2 and python2-pygobject. Remove gtk+. [propagated-inputs]: Remove gobject-introspection. Add glib and gtk+. [synopsis]: Modify. [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gnome.scm | 97 +++++++++++++++++++++++++++++++----------- 1 file changed, 71 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3117ece373..5646a09e14 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3058,51 +3058,96 @@ form of information without getting in the user's= way.") (define-public libpeas (package (name "libpeas") - (version "1.24.1") + (version "1.26.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw")))) + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0xkk9zhkw8f2fm7g9nb4ry4xxig5n27s7rjmx6l7jr2941zdfxm9"))= )) (build-system meson-build-system) + (outputs '("out" "demo" "doc")) (arguments - '(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dpython2=3Dtrue" + "-Dvapi=3Dtrue" + "-Dgtk_doc=3Dtrue") + #:phases (modify-phases %standard-phases - (add-before 'check 'start-xserver + (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (disp ":1")) - (setenv "DISPLAY" disp) - ;; Tests require a running X server. - (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp)) + (with-directory-excursion "docs/reference" + (substitute* "libpeas-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #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-demo + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (demo (assoc-ref outputs "demo"))) + (mkdir-p (string-append demo "/bin")) + (mkdir-p (string-append demo "/lib")) + (rename-file + (string-append out "/bin") + (string-append demo "/bin")) + (rename-file + (string-append out "/lib/peas-demo") + (string-append demo "/lib/peas-demo")) #t)))))) - (inputs - `(("gtk+" ,gtk+) - ("glade" ,glade3) - ("python" ,python) - ("python-pygobject" ,python-pygobject))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("luajit" ,luajit) + ("pkg-config" ,pkg-config) + ("vala" ,vala) ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("glade" ,glade) + ("lua" ,lua) + ("python2" ,python-2) + ("python3" ,python) + ("python2-pygobject" ,python2-pygobject) + ("python3-pygobject" ,python-pygobject))) (propagated-inputs - ;; The .pc file "Requires" gobject-introspection. - `(("gobject-introspection" ,gobject-introspection))) - (home-page "https://wiki.gnome.org/Libpeas") - (synopsis "GObject plugin system") + `(("glib" ,glib) + ("gtk+" ,gtk+))) + (synopsis "GObject Plugin System") (description "Libpeas is a gobject-based plugin engine, targeted at giving every= application the chance to assume its own extensibility. It also has a s= et of features including, but not limited to: multiple extension points; on-de= mand (lazy) programming language support for C, Python and JS; simplicity of = the API.") - (license license:lgpl2.0+))) + (home-page "https://wiki.gnome.org/Projects/Libpeas") + (license license:lgpl2.1+))) =20 (define-public gtkglext (package --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0053-gnu-rest-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0053-gnu-rest-Update-package-definition.patch" =46rom 77b42f2623ca37bf0f452fd9eaa9c7e9ba01cf8e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Jul 2020 10:45:27 -0400 Subject: [PATCH 53/54] gnu: rest: Update package definition. * gnu/packages/gnome.scm (rest): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:tests?>: Remove argument. <#:configure-flags>[--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['disable-failing-tests]: New phase. [native-inputs]: Add docbook-xml, gsettings-desktop-schemas and gtk-doc. Remove glib:bin. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gnome.scm | 66 +++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5646a09e14..ebe3b2ded5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5018,34 +5018,60 @@ proxy information from the GSettings schemas in g= settings-desktop-schemas.") (package (name "rest") (version "0.8.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/rest/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1j81bgqmd55s5lxyaxcplym9n6xywcs1cm9wmvafsg2xiv9sl4q5"))= )) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/rest/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1j81bgqmd55s5lxyaxcplym9n6xywcs1cm9wmvafsg2xiv9sl4q5"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments - '(#:tests? #f ; tests require internet connection - #:configure-flags - '("--with-ca-certificates=3D/etc/ssl/certs/ca-certificates.crt"))= ) + `(#:configure-flags + (list + "--enable-gtk-doc" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") + "--with-ca-certificates=3D/etc/ssl/certs/ca-certificates.crt") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference/rest" + (substitute* "rest-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-before 'configure 'disable-failing-tests + (lambda _ + (substitute* "tests/Makefile.in" + (("oauth\\$\\(EXEEXT\\) oauth-async\\$\\(EXEEXT\\) oauth2= \\$\\(EXEEXT\\)") + "") + (("flickr\\$\\(EXEEXT\\) lastfm\\$\\(EXEEXT\\) xml\\$\\(E= XEEXT\\)") + "") + (("XFAIL_TESTS =3D xml\\$\\(EXEEXT\\)") + "XFAIL_TESTS =3D")) + #t))))) (native-inputs - `(("glib-mkenums" ,glib "bin") + `(("docbook-xml" ,docbook-xml-4.1.2) ("gobject-introspection" ,gobject-introspection) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config))) (propagated-inputs - ;; rest-0.7.pc refers to all these. - `(("glib" ,glib) + `(("glib" ,glib) ("libsoup" ,libsoup) ("libxml2" ,libxml2))) - (home-page "https://www.gtk.org/") - (synopsis "RESTful web api query library") - (description - "This library was designed to make it easier to access web services= that -claim to be \"RESTful\". It includes convenience wrappers for libsoup a= nd + (synopsis "Library for Representational State Transfer") + (description "LibREST was designed to make it easier to access web s= ervices +that claim to be RESTful. It includes convenience wrappers for libsoup = and libxml to ease remote use of the RESTful API.") + (home-page "https://gitlab.gnome.org/GNOME/librest") (license license:lgpl2.1+))) =20 (define-public libsoup --=20 2.27.0 --------------04D74C79D7C55B61300A0A56 Content-Type: text/x-patch; charset=UTF-8; name="0054-gnu-libzapojit-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0054-gnu-libzapojit-Update-package-definition.patch" =46rom cafa3a036aec6d95ce6f477ad93987d5c0c703a2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Jul 2020 11:59:41 -0400 Subject: [PATCH 54/54] gnu: libzapojit: Update package definition. * gnu/packages/gnome.scm (libzapojit): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--disable-static]: New flag. [--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml and gtk-doc. [inputs]: Move gnome-online-accounts:lib, json-glib and rest to ... [propagated-inputs]: ... here. Add glib and libsoup. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 55 ++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ebe3b2ded5..c68c089133 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10120,28 +10120,51 @@ libcanberra C library.") (package (name "libzapojit") (version "0.0.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"))= )) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "--disable-static" + "--enable-gtk-doc" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* "libzapojit-0.0-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("docbook-xml" ,docbook-xml-4.1.2) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (inputs - `(("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + (propagated-inputs + `(("glib" ,glib) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("json-glib" ,json-glib) + ("libsoup" ,libsoup) ("rest" ,rest))) + (synopsis "REST API Wrapper") + (description "LibZapojit is a GLib/GObject wrapper for the SkyDrive = and +Hotmail REST APIs.") (home-page "https://wiki.gnome.org/Projects/Zapojit") - (synopsis "Library for accessing SkyDrive and Hotmail") - (description - "Libzapojit is a GLib-based library for accessing online service AP= Is of -Microsoft SkyDrive and Hotmail, using their REST protocols.") (license license:lgpl2.1+))) =20 (define-public gnome-clocks --=20 2.27.0 --------------04D74C79D7C55B61300A0A56-- --UPm40HQSEfOq4TTH6z1tW7Y4TVUBYZnUS-- --uAAAdVWRRH0zoO43APtEz2L0vgnIrPf3v Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJ0EvNKqRjepA0pQorm7zBG1ve1cFAl8e/JkACgkQrm7zBG1v e1fxxgf+Ma5YWdJk8XBy7Uk2xuWe6SQJWU42Bbai9DzkukT5ae98rUrYiAytdm7a 4fjaM8F59803cy2I60VNqUyYTIDKT0MnTFUeMvYZS1pXHUIVxO9Jgy+d+IpXzbsB ieqvD4b7w5VCDcIj5B4KxCgX31LGkkiFr6Qq/me+BXLna09X4726Vgyc/3l+opCj dWeVuGD5/kWleFLbmAs8UMOv2LQua9RSqUffVw94eWsFK80uTAopJj6iwol2Poj5 KzmExYMjOOie0fPSZ7ujF4O7/eZ0FBqdmKN6vV0f0Oa0Fc4A1mM2oU9I2aLCGMMW AGVaJidrJH89TaojVWJTjbGbfx3BoQ== =1cva -----END PGP SIGNATURE----- --uAAAdVWRRH0zoO43APtEz2L0vgnIrPf3v--