From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mIHlBSQpG1/PGQAA0tVLHw (envelope-from ) for ; Fri, 24 Jul 2020 18:32:04 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id SK/AASQpG18zbgAA1q6Kng (envelope-from ) for ; Fri, 24 Jul 2020 18:32:04 +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 F3B1694050A for ; Fri, 24 Jul 2020 18:32:01 +0000 (UTC) Received: from localhost ([::1]:47842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz2UC-0003ft-Su for larch@yhetil.org; Fri, 24 Jul 2020 14:32:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz2Tl-0003eY-CB for guix-devel@gnu.org; Fri, 24 Jul 2020 14:31:33 -0400 Received: from knopi.disroot.org ([178.21.23.139]:42138) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz2TT-0002Mm-DT for guix-devel@gnu.org; Fri, 24 Jul 2020 14:31:28 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A484B52947; Fri, 24 Jul 2020 20:31:11 +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 UdOY5AQptUHN; Fri, 24 Jul 2020 20:31:00 +0200 (CEST) Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1595615460; bh=i8i+pA51L81HT4KWfhG3noFVn6g1VZFSqHK/hKy66zw=; h=Subject:From:To:Cc:References:Date:In-Reply-To; b=Smp7n2JD9y6ckIQUDWL14jFhIlAxPoaLjvA0/92UVYpTcUwLqc+VxfBhA2nAYPkYY YJ0lE1nBkktbu5SzLn03nk8HrSMlaVLFb+8e7f4Omg/WTx0rwS7ZZVdYmj7gUXQ246 9Xo0y+ES4Z84UqXvox73f/XHOSDFRUUI18WPuaVnEAmDcM0q4zsUgf6EOw8MvR7pkZ k+0bnIB9dRu8XWNFyu2gNUBgAMuCnDPK8xrQTygOh4cY1rpkcT77GcOt2yVWqV1l6X qsADyw2i8RmcvP/Ua4YPLGaQFsRXIx6zpHDB2o0EirekySLKpU2WtpEVw+gYQGRyPs w3gelV0Auwy+g== From: Raghav Gururajan To: Danny Milosavljevic References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <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> 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= Message-ID: <6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org> Date: Fri, 24 Jul 2020 14:29:24 -0400 Mime-Version: 1.0 In-Reply-To: <9859f0c6-473f-3191-189e-5b2aa6fd02f4@disroot.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Efy7vMqwT5QIugpQ7jDefFwigujS7niUN" 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/24 14:31:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 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, URI_NOVOWEL=0.5 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=Smp7n2JD; 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: tgMqSdVJXJG1 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Efy7vMqwT5QIugpQ7jDefFwigujS7niUN Content-Type: multipart/mixed; boundary="ThpHZrWc8FHAPmLDsIK5r924jwwNCboMT"; 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: <6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org> Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <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> In-Reply-To: <9859f0c6-473f-3191-189e-5b2aa6fd02f4@disroot.org> --ThpHZrWc8FHAPmLDsIK5r924jwwNCboMT Content-Type: multipart/mixed; boundary="------------7ADC8BAB25337DF1232EC2BD" Content-Language: en-US This is a multi-part message in MIME format. --------------7ADC8BAB25337DF1232EC2BD 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 dc979672cfb865073608aea2b443f326ceada3d1 Author: Raghav Gururajan Date: Fri Jul 24 14:18:35 2020 -0400 gnu: gtk-vnc: Update package definition. * gnu/packages/gnome.scm (gtk-vnc) [version]: Update to 1.0.0. [source][sha256]: Modify base32. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add gjs, node and perl. [inputs]: Add cairo, gdk-pixbuf+svg, libx11 and zlib. [synopsis]: Modify. [description]: Modify. commit fc52b2744edf499d2b07cc49cc35ee27948c9e5b Author: Raghav Gururajan Date: Fri Jul 24 13:49:24 2020 -0400 gnu: gspell: Update package definition. * gnu/packages/gnome.scm (gspell) [version]: Update to 1.8.3. [source][sha256]: Modify base32. [patches]: Remove gspell-dash-test.patch. [outputs]: New output "doc". [arguments]<#:configure-flags>[--enable-vala]: Remove flag. [--enable-gtk-doc]: New flag. [--with-html-dir=3D]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['disable-failing-tests]: New phase. ['pre-check]: Modify phase. [native-inputs]: Add docbook-xml, gettext-minimal and gtk-doc. [inputs]: Move glib and gtk+ to ... [propagated-inputs]: ... here. [synopsis]: Modify. [description]: Modify. [license]: Change from gpl2+ to lgpl2.1+. * gnu/packages/patches/gspell-dash-test.patch: Remove file. * gnu/local.mk (gspell-dash-test.patch): Remove reference. commit 55e35961a5641ad6c562e5226fe437c22a0138d3 Author: Raghav Gururajan Date: Fri Jul 24 13:10:42 2020 -0400 gnu: gsound: Update package definition. * gnu/packages/gnome.scm (gsound): Update package definition. [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 and gtk-doc. commit 1bbadcc904f28c4761d49118b33bf287d547dd19 Author: Raghav Gururajan Date: Fri Jul 24 11:38:57 2020 -0400 gnu: gupnp-dlna: Update package definition. * gnu/packages/gnome.scm (gupnp-dlna): 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. Remove libxml2. [inputs]: Add libxml2. Remove gstreamer. [propagated-inputs]: Add glib, glib-networking and gstreamer. Remove gst-plugins-good. [description]: Modify. commit b70d1b570dbf307db0019eea2d268a72a3adc470 Author: Raghav Gururajan Date: Fri Jul 24 11:10:25 2020 -0400 gnu: grilo-plugins: Update package definition. * gnu/packages/gnome.scm (grilo-plugins) [version]: Update to 0.3.11.= [source][sha256]: Modify base32. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['disable-failing-tests]: New phase. [native-inputs]: Add gobject-introspection, lua and python-wrapper. [inputs]: Add glib, glib-networking, gmime, gperf, gssdp, gstreamer, gupnp, gupnp-av, libarchive, libdmapsharing, librest, libxml2, liboau= th and sqlite. [synopsis]: Modify. [description]: Modify. commit 493edd0a14c7a004b024d66d955b8065e0c7ba5e Author: Raghav Gururajan Date: Fri Jul 24 10:19:20 2020 -0400 gnu: gupnp-av: Update package definition. * gnu/packages/gnome.scm (gupnp-av): 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 and vala. Remove libxml2. [inputs]: Add libxml2. [description]: Modify. commit 157b87e82a8f5ed8bda0eb8e05e98c4ac6939b6f Author: Raghav Gururajan Date: Fri Jul 24 09:53:15 2020 -0400 gnu: gupnp: Update package definition. * gnu/packages/gnome.scm (gupnp) [version]: Update to 1.2.3. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, gjs, gsettings-desktop-schemas and libxslt. [inputs]: Move gssdp and libsoup to ... [propagated-inputs]: ... here. Add glib, glib-networking and libxml2.= [synopsis]: Modify. [description]: Modify. commit dcdaccce335f7ff71b3deb89ea20690d3f7efbbb Author: Raghav Gururajan Date: Fri Jul 24 09:33:48 2020 -0400 gnu: gssdp: Update package definition. * gnu/packages/gnome.scm (gssdp) [version]: Update to 1.2.3. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml. [inputs]: Remove libsoup. [propagated-inputs]: Add glib, glib-networking and libsoup. [synopsis]: Modify. [description]: Modify. commit cad317f3b6eaeefde3b760b32e161bc46489012d Author: Raghav Gururajan Date: Fri Jul 24 08:55:56 2020 -0400 gnu: Add libdmapsharing. * gnu/packages/gnome.scm (libdmapsharing): New variable. commit b9576949759167e8803797fd24e5d04fd11ea78a Author: Raghav Gururajan Date: Fri Jul 24 08:03:26 2020 -0400 gnu: Add pedansee. * gnu/packages/check.scm (pedansee): New variable. commit 2af3819e659c70c29385890f4fc5313c95653a89 Author: Raghav Gururajan Date: Fri Jul 24 06:38:42 2020 -0400 gnu: grilo: Update package definition. * gnu/packages/gnome.scm (grilo) [version]: Update to 0.3.12. [source][sha256]: Modify base32. [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 and python-wrapper. [inputs]: Remove cyrus-sasl. Move glib and libxml2 to ... [propagated-inputs]: ... here. Add glib-networking. [search-paths]: New field. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. commit c5b988c1b05f98cd7897d8ddffa0eb52206d4c87 Author: Raghav Gururajan Date: Fri Jul 24 05:49:15 2020 -0400 gnu: gom: Update package definition. * gnu/packages/gnome.scm (gom) [version]: Update to 0.4. [source][sha256]: Modify base32. [build-system]: Change from glib-or-gtk to meson. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Denable-gtk-doc]: New flag. [-Dpygobject-override-dir=3D]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, gjs and gtk-doc. [inputs]: Change gdk-pixbuf to gdk-pixbuf+svg. [synopsis]: Modify. [description]: Modify. commit b6659ff9c17d3840ff5b9528f760fec4c87f0a58 Author: Raghav Gururajan Date: Fri Jul 24 07:12:40 2020 -0400 gnu: gjs: Disable tests. * gnu/packages/gnome.scm (gjs): Disable tests. [arguments]<#:tests?>: New argument. <#:phases>['pre-check]: Remove phase. commit eda77a67cf1120488ef8a448ea5aadf7b4b584fa Author: Raghav Gururajan Date: Fri Jul 24 04:02:34 2020 -0400 gnu: gnome-video-effects: Update package definition. * gnu/packages/gnome.scm (gnome-video-effects) [version]: Update to 0.5.0. [source][sha256]: Modify base32. [build-system]: Change from glib-or-gtk to meson. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Remove glib:bin. Add perl and perl-xml-parser. [synopsis]: Modify. [description]: Modify. commit 38457adc7c53b1ba5795984a689d50d17a0bde4e Author: Raghav Gururajan Date: Fri Jul 24 00:57:05 2020 -0400 gnu: gnome-online-miners: Update package definition. * gnu/packages/gnome.scm (gnome-online-miners): Update package definition. [arguments]<#:configure-flags>[--disable-static]: New flag. [inputs]: Add glib and glib-networking. Remove gnome-online-accounts and rest. commit 5924b45ed5169f86f7442f3a004d5518ae3f7a4b Author: Raghav Gururajan Date: Fri Jul 24 03:09:43 2020 -0400 gnu: gfbgraph: Update package definition. * gnu/packages/gnome.scm (gfbgraph) [version]: Update to 0.2.4. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:configure-flags>[--enable-introspection]: Remove flag. [--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add autoconf, automake, docbook-xml, gettext-minimal= , gtk-doc and which. [inputs]: Move gnome-online-accounts, json-glib and rest to ... [propagated-inputs]: ... here. Add glib and libsoup. [synopsis]: Modify. [description]: Modify. commit c6875dc0d722d07c7906f8103f5ec01649d030e5 Author: Raghav Gururajan Date: Thu Jul 23 11:19:25 2020 -0400 gnu: gnome-online-accounts: Update package definition. * gnu/packages/gnome.scm (gnome-online-accounts): Update package definition. [outputs]: New output 'doc'. [arguments]<#:configure-flags>[--disable-static]: New flag. [--enable-documentation]: New flag. [--enable-gtk-doc]: New flag. [--enable-inspector]: New flag. [--enable-media-server]: New flag. [--enable-lastfm]: New flag. [--with-html-dir=3D]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl and gtk-doc. Remove glib:bin. [inputs]: Remove docbook-xsl. Add dbus, gcr, mit-krb5, libsoup and libxml2. [propagated-inputs]: Add glib-networking. [description]: Modify. commit 4749f46650f8f816ae97c4b9ad2424d9bff99e88 Author: Raghav Gururajan Date: Wed Jul 22 15:27:33 2020 -0400 gnu: gnome-autoar: Update package definition. * gnu/packages/gnome.scm (gnome-autoar): Update package definition. [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, gtk-doc and vala. [inputs]: Remove gtk+. [propagated-inputs]: Add glib and gtk+. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. commit 6f094fc726db15e73298abb581c7afcd9ee570b1 Author: Raghav Gururajan Date: Wed Jul 22 12:30:38 2020 -0400 gnu: gmime: Update package definition. * gnu/packages/mail.scm (gmime): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. [--with-gpgme-prefix]: New flag. <#:phases>['patch-paths-in-tests]: Remove phase. ['patch-docbook-xml]: New phase. ['disable-failing-tests]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, docbook-utils, gobject-introspection, gtk-doc, perl and vala. Remove gnupg. [inputs]: Add gnupg and libidn2. Remove glib. [propagated-inputs]: Add glib. [synopsis]: Modify. [description]: Modify. [license]: Modify. commit 71ba0b6c89718906b40fbbed65dbc3d5ca406860 Author: Raghav Gururajan Date: Wed Jul 22 05:25:16 2020 -0400 gnu: Add docbook-utils. * gnu/packages/docbook.scm (docbook-utils): New variable. * gnu/packages/patches: Add files docbook-utils-autotools.patch, docbook-utils-typo.patch, docbook-utils-frontends.patch, docbook-utils-helpers-date.patch, docbook-utils-helpers-name.patch, docbook-utils-helpers-whitespace.patch, docbook-utils-helpers-support.patch and docbook-utils-jade.patch. * gnu/local.mk: Add references to new patches. commit e750481a6261b44a518e71e2f081304dd29ea3a8 Author: Raghav Gururajan Date: Wed Jul 22 08:29:54 2020 -0400 gnu: Add docbook-dsssl. * gnu/packages/docbook.scm (docbook-dsssl): New variable. commit ed6641a62515619521bdeb6460880166518b0a1f Author: Raghav Gururajan Date: Tue Jul 21 08:52:03 2020 -0400 gnu: Add sgml-common. * gnu/packages/docbook.scm (sgml-common): New variable. * gnu/packages/patches/sgml-common-manpage.patch: New file. * gnu/local.mk (sgml-common-manpage.patch): New reference. commit 8f97cf8ad6561e5072abb8723c058c09d5f7a796 Author: Raghav Gururajan Date: Tue Jul 21 08:12:34 2020 -0400 gnu: Add openjade. * gnu/packages/xml.scm (openjade): New variable. commit f02f44f066b5df67da5a9211f78771b9305f2ff9 Author: Raghav Gururajan Date: Tue Jul 21 05:45:49 2020 -0400 gnu: gexiv2: Update package definition. * gnu/packages/gnome.scm (gexiv2) [version]: Update to 0.12.1. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, gtk-doc, python-2 and python. Remove gcr. [inputs]: Remove glib. [propagated-inputs]: Add glib. [synopsis]: Modify. commit e4ba886dbc21e22556650552d55c8541e824c620 Author: Raghav Gururajan Date: Tue Jul 21 04:29:16 2020 -0400 gnu: geocode-glib: Update package definition. * gnu/packages/gnome.scm (geocode-glib) [version]: Update to 3.26.2. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-D-Denable-installed-tests]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml and python-wrapper. Remove json-glib= =2E [inputs]: Add json-glib. [propagated-inputs]: Add glib-networking. commit cffe17c384893d2a43156ebf0cc5780d6ccf2123 Author: Raghav Gururajan Date: Tue Jul 21 03:45:21 2020 -0400 gnu: gegl: Update package definition. * gnu/packages/gimp.scm (gegl): Update package definition. [source][patches]: Add gegl-mrg.patch. [outputs]: New output "doc". [arguments]<#:configure-flags>[-Dintrospection]: Remove flag. [-Ddocs]: New flag. [-Dworkshop]: New flag. [-Dsdl1]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add asciidoc, docbook-xml, docbook-xsl, enscript, gobject-introspection, gtk-doc, perl, python-pygobject, python-wrappe= r, ruby and vala. [inputs]: Add exiv2, gdk-pixbuf+svg, gexiv2, jasper, lcms, lensfun, ffmpeg, libnsgif, libraw, librsvg, libspiro, libtiff, lua, luajit, mrg, openexr, poly2tri-c, poppler, sdl, sdl2, suitesparse, v4l-utils and libwebp. [synopsis]: Modify. [description]: Modify. [license]: Remove gpl3+. * gnu/packages/patches/gegl-mrg.patch: New file. * gnu/local.mk (gegl-mrg.patch): New reference. commit af02e9eb2e681975c7b42a7e6a42ce5adff93a1e Author: Raghav Gururajan Date: Mon Jul 20 12:21:09 2020 -0400 gnu: Add mrg. * gnu/packages/gimp.scm (mrg): New variable. commit d95f0ab7fd46370eb80a6d821928c1d2f6c6c6ae Author: Raghav Gururajan Date: Mon Jul 20 11:00:41 2020 -0400 gnu: Add mmm. * gnu/packages/graphics.scm (mmm): New variable. commit 46b13e21a57b04cf443d5823d2eea472f9d3d286 Author: Raghav Gururajan Date: Mon Jul 20 08:45:05 2020 -0400 gnu: Add poly2tri-c. * gnu/packages/gimp.scm (poly2tri-c): New variable. commit e2a4c1746f91265d202b6d5258e9058c4ca6171e Author: Raghav Gururajan Date: Mon Jul 20 04:54:29 2020 -0400 gnu: folks: Update package definition. * gnu/packages/gnome.scm (folks) [version]: Update to 0.14.0. [outputs]: New outputs "doc" and "help". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dtracker_backend]: New flag. [-Dzeitgeist]: New flag. [-Ddocs]: New flag. <#:phases>['skip-gtk-update-icon-cache]: Remove phase. ['disable-failing-tests]: New phase. ['move-doc]: New phase. ['move-help]: New phase. [native-inputs]: Add cmake, docbook-xml, gtk-doc, gtk+:bin, python-wrapper and python-dbusmock. [inputs]: Remove bdb, evolution-data-server, glib, libgee and telepathy-glib. Add libxml2 and zeitgeist. [propagated-inputs]: Add evolution-data-server, glib, libgee, telepathy-glib and tracker. [synopsis]: Modify. [description]: Modify. commit cc27746676b693a2898012e6652dcb0a1cefc24b Author: Raghav Gururajan Date: Mon Jul 20 01:49:43 2020 -0400 gnu: Add zeitgeist. * gnu/packages/gnome.scm (zeitgeist): New variable. commit d939da668cdab3dc891773b78d25be8ccc5c99eb Author: Raghav Gururajan Date: Sun Jul 19 06:54:46 2020 -0400 gnu: Add dee. * gnu/packages/gnome.scm (dee): New variable. * gnu/packages/patches/dee-vapi.patch: New file. * gnu/local.mk (dee-vapi.patch): New reference. commit 60db9b21985945f42209d493e15433c27cf775eb Author: Raghav Gururajan Date: Sun Jul 19 06:11:54 2020 -0400 gnu: Add gtx. * gnu/packages/gnome.scm (gtx): New variable. commit 54f10ad0cdef2a02daa4c320e30f69e86ac0f748 Author: Raghav Gururajan Date: Sun Jul 19 03:23:18 2020 -0400 gnu: evolution-data-server: Update package definition. * gnu/packages/gnome.scm (evolution-data-server) [version]: Update to 3.36.4. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:imported-modules>: New argument. <#:modules>: New argument. <#:configure-flags>[-DSENDMAIL_PATH]: New flag. [-DWITH_SYSTEMDUSERUNITDIR]: New flag. [-DENABLE_GTK_DOC]: New flag. [-DWITH_PRIVATE_DOCS]: New flag. [-DENABLE_BACKEND_PER_PROCESS]: New flag. [-DCMAKE_INSTALL_RPATH]: Modify flag. [-DENABLE_UOA]: Remove flag. [-DENABLE_GOOGLE]: Remove flag. [-DENABLE_GOOGLE_AUTH]: Remove flag. <#:phases>['patch-docbook-xml]: New phase. ['fix-errors]: New phase. ['disable-failing-tests]: Modify phase. ['move-doc]: New phase. ['glib-or-gtk-compile-schemas]: New phase. ['glib-or-gtk-wrap]: New phase. ['patch-paths]: Remove phase. ['dont-override-rpath]: Remove phase. [native-inputs]: Add docbook-xml, gsettings-desktop-schemas, gtk-doc and gtk+:bin. Remove gperf. [inputs]: Add gperf, icu4c, libgdata, liboauth and sendmail. [propagated-inputs]: Add glib, glib-networking, libxml2 and nspr. [synopsis]: Modify. [description]: Modify. * gnu/packages/patches/evolution-data-server-locales.patch: Remove fi= le. * gnu/packages/patches/evolution-data-server-libical-compat.patch: Remove file. * gnu/local.mk (evolution-data-server-locales.patch): Remove referenc= e. * gnu/local.mk (evolution-data-server-libical-compat.patch): Remove reference. commit 0e10b61e461c607a01f90dca257ce9dba7965929 Author: Raghav Gururajan Date: Sat Jul 18 16:46:19 2020 -0400 gnu: babl: Update package definition. * gnu/packages/gimp.scm (babl): Update package definition. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add gobject-introspection, python-wrapper, ruby and vala. [inputs]: Add librsvg and w3m. [synopsis]: Modify. [description]: Modify. commit a178c52797dab6ad1eaa57148a8beced7e4446f8 Author: Raghav Gururajan Date: Sat Jul 18 08:59:04 2020 -0400 gnu: amtk: Update package definition. * gnu/packages/gnome.scm (amtk) [version]: Update to 5.1.1. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, gtk+:bin, gtk-doc and python-wrapper. [inputs]: Change field to propagated-inputs. *** END *** Regards, RG. --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-amtk-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-amtk-Update-package-definition.patch" =46rom a178c52797dab6ad1eaa57148a8beced7e4446f8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 18 Jul 2020 08:59:04 -0400 Subject: [PATCH 01/36] gnu: amtk: Update package definition. * gnu/packages/gnome.scm (amtk) [version]: Update to 5.1.1. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, gtk+:bin, gtk-doc and python-wrapper. [inputs]: Change field to propagated-inputs. --- gnu/packages/gnome.scm | 61 ++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f772b9c0d2..22ffeba3e8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5170,32 +5170,53 @@ which are easy to play with the aid of a mouse.")= (define-public amtk (package (name "amtk") - (version "5.0.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/amtk/" - (version-major+minor version) "/" - "amtk-" version ".tar.xz")) - (sha256 - (base32 - "11jgz2i9wjzv4alrxl1qyxiapb52w7vs5ygfgsw0qgdap8gqkk3i"))= )) - (build-system gnu-build-system) + (version "5.1.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/amtk/" + (version-major+minor version) "/" + "amtk-" version ".tar.xz")) + (sha256 + (base32 "1wax6mim8dj0m21k8ima7ysm3bzzp54r00jganwbzakq8bfnnrgr"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments - '(#:configure-flags '("--enable-gtk-doc"))) + `(#:configure-flags + (list + "--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* '("amtk-docs.xml.in" + "amtk-intro.xml.in") + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) - ("glib:bin" ,glib "bin") ; for glib-mkenums + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") ("gtk-doc" ,gtk-doc) - ("pkg-config" ,pkg-config))) - (inputs + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (propagated-inputs `(("glib" ,glib) ("gtk+" ,gtk+))) - (home-page "https://wiki.gnome.org/Projects/Amtk") (synopsis "Actions, Menus and Toolbars Kit for GTK+ applications") - (description - "Amtk is the acronym for @acronym{Amtk, Actions Menus and Toolbars = Kit}. -It is a basic GtkUIManager replacement based on GAction. It is suitable= for -both a traditional UI or a modern UI with a GtkHeaderBar.") + (description "Amtk is the acronym for @acronym{Amtk, Actions Menus a= nd +Toolbars Kit}. It is a basic GtkUIManager replacement based on GAction.= It is +suitable for both a traditional UI or a modern UI with a GtkHeaderBar.")= + (home-page "https://wiki.gnome.org/Projects/Amtk") (license license:lgpl2.1+))) =20 (define-public devhelp --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-babl-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-babl-Update-package-definition.patch" =46rom 0e10b61e461c607a01f90dca257ce9dba7965929 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 18 Jul 2020 16:46:19 -0400 Subject: [PATCH 02/36] gnu: babl: Update package definition. * gnu/packages/gimp.scm (babl): Update package definition. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add gobject-introspection, python-wrapper, ruby and vala. [inputs]: Add librsvg and w3m. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gimp.scm | 58 +++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index c52dc7a4d1..84c3ed8019 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -45,6 +45,8 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages photo) #:use-module (gnu packages python) + #:use-module (gnu packages ruby) + #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xorg)) =20 @@ -52,39 +54,41 @@ (package (name "babl") (version "0.1.78") - (source (origin - (method url-fetch) - (uri (list (string-append "https://download.gimp.org/pub/b= abl/" - (version-major+minor version) - "/babl-" version ".tar.xz") - (string-append "https://ftp.gtk.org/pub/babl/" - (version-major+minor version) - "/babl-" version ".tar.xz") - (string-append "ftp://ftp.gtk.org/pub/babl/" - (version-major+minor version) - "/babl-" version ".tar.xz"))) - (sha256 - (base32 - "0fjjfb0pbgimlqi7rk8cqz8pq595b7gw8nrpkxfmixdz6cv4km8p"))= )) + (source + (origin + (method url-fetch) + (uri + (list + (string-append "https://download.gimp.org/pub/babl/" + (version-major+minor version) + "/babl-" version ".tar.xz") + (string-append "https://ftp.gtk.org/pub/babl/" + (version-major+minor version) + "/babl-" version ".tar.xz") + (string-append "ftp://ftp.gtk.org/pub/babl/" + (version-major+minor version) + "/babl-" version ".tar.xz"))) + (sha256 + (base32 "0fjjfb0pbgimlqi7rk8cqz8pq595b7gw8nrpkxfmixdz6cv4km8p"))= )) (build-system meson-build-system) (arguments - `(#:configure-flags - (list "-Denable-gir=3Dfalse"))) + `(#:glib-or-gtk? #t)) ; To wrap binaires and/or compile schemas (native-inputs - `(("pkg-config" ,pkg-config))) + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("ruby" ,ruby) + ("vala" ,vala))) + (inputs + `(("rsvg-convert" ,librsvg) + ("w3m" ,w3m))) (propagated-inputs - ;; Propagated to satisfy =E2=80=98babl.pc=E2=80=99. `(("lcms" ,lcms))) + (synopsis "Pixel encoding and color space conversion engine in C") + (description "Babl is a pixel encoding and color space conversion en= gine, +with format introspection, cached runtime self-benchmarking alternate an= d cpu +specific code paths.") (home-page "http://gegl.org/babl/") - (synopsis "Image pixel format conversion library") - (description - "Babl is a dynamic, any-to-any pixel format translation library. -It allows converting between different methods of storing pixels, known = as -@dfn{pixel formats}, that have different bit depths and other data -representations, color models, and component permutations. - -A vocabulary to formulate new pixel formats from existing primitives is -provided, as well as a framework to add new color models and data types.= ") (license license:lgpl3+))) =20 (define-public gegl --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-evolution-data-server-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0003-gnu-evolution-data-server-Update-package-definition.pat"; filename*1="ch" =46rom 54f10ad0cdef2a02daa4c320e30f69e86ac0f748 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 19 Jul 2020 03:23:18 -0400 Subject: [PATCH 03/36] gnu: evolution-data-server: Update package definit= ion. * gnu/packages/gnome.scm (evolution-data-server) [version]: Update to 3.36.4. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:imported-modules>: New argument. <#:modules>: New argument. <#:configure-flags>[-DSENDMAIL_PATH]: New flag. [-DWITH_SYSTEMDUSERUNITDIR]: New flag. [-DENABLE_GTK_DOC]: New flag. [-DWITH_PRIVATE_DOCS]: New flag. [-DENABLE_BACKEND_PER_PROCESS]: New flag. [-DCMAKE_INSTALL_RPATH]: Modify flag. [-DENABLE_UOA]: Remove flag. [-DENABLE_GOOGLE]: Remove flag. [-DENABLE_GOOGLE_AUTH]: Remove flag. <#:phases>['patch-docbook-xml]: New phase. ['fix-errors]: New phase. ['disable-failing-tests]: Modify phase. ['move-doc]: New phase. ['glib-or-gtk-compile-schemas]: New phase. ['glib-or-gtk-wrap]: New phase. ['patch-paths]: Remove phase. ['dont-override-rpath]: Remove phase. [native-inputs]: Add docbook-xml, gsettings-desktop-schemas, gtk-doc and gtk+:bin. Remove gperf. [inputs]: Add gperf, icu4c, libgdata, liboauth and sendmail. [propagated-inputs]: Add glib, glib-networking, libxml2 and nspr. [synopsis]: Modify. [description]: Modify. * gnu/packages/patches/evolution-data-server-locales.patch: Remove file. * gnu/packages/patches/evolution-data-server-libical-compat.patch: Remove= file. * gnu/local.mk (evolution-data-server-locales.patch): Remove reference. * gnu/local.mk (evolution-data-server-libical-compat.patch): Remove refer= ence. --- gnu/local.mk | 2 - gnu/packages/gnome.scm | 198 ++++++++++++------ ...evolution-data-server-libical-compat.patch | 36 ---- .../evolution-data-server-locales.patch | 33 --- 4 files changed, 131 insertions(+), 138 deletions(-) delete mode 100644 gnu/packages/patches/evolution-data-server-libical-co= mpat.patch delete mode 100644 gnu/packages/patches/evolution-data-server-locales.pa= tch diff --git a/gnu/local.mk b/gnu/local.mk index 0786fa426b..7274f50264 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -908,8 +908,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ - %D%/packages/patches/evolution-data-server-locales.patch \ - %D%/packages/patches/evolution-data-server-libical-compat.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 22ffeba3e8..1b8e93dcfd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7222,91 +7222,155 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Ke= rberos.") (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.34.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (patches (search-patches "evolution-data-server-locales.pa= tch" - "evolution-data-server-libical-co= mpat.patch")) - (sha256 - (base32 - "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y"))= )) + (version "3.36.4") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "03sc7r6hpi62kcxpnzm5gv1ky3hmslh4fnf2vy2qghb5xqg3zy1r"))= )) (build-system cmake-build-system) + (outputs '("out" "doc")) (arguments - '(#:configure-flags - (let* ((lib (string-append (assoc-ref %outputs "out") "/lib")) - (runpaths (map (lambda (s) - (string-append lib "/evolution-data-serve= r/" s)) - '("addressbook-backends" "calendar-backends= " - "camel-providers" "credential-modules" - "registry-modules")))) - (list "-DENABLE_UOA=3DOFF" ;disable Ubuntu Online A= ccounts support - "-DENABLE_GOOGLE=3DOFF" ;disable Google Contacts= support - "-DENABLE_GOOGLE_AUTH=3DOFF" ;disable Google authenti= cation - "-DENABLE_VALA_BINDINGS=3DON" - (string-append "-DCMAKE_INSTALL_RPATH=3D" lib ";" - (string-append lib "/evolution-data-server= ;") - (string-join runpaths ";")) - "-DENABLE_INTROSPECTION=3DON")) ;required for Vala bindi= ngs + `(#:imported-modules + (,@%cmake-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils)) + #:configure-flags + (list + (string-append "-DSENDMAIL_PATH=3D" + (assoc-ref %build-inputs "sendmail")) + "-DWITH_SYSTEMDUSERUNITDIR=3DOFF" + "-DENABLE_INTROSPECTION=3DON" + "-DENABLE_GTK_DOC=3DON" + "-DWITH_PRIVATE_DOCS=3DON" + "-DENABLE_BACKEND_PER_PROCESS=3DON" + "-DENABLE_VALA_BINDINGS=3DON" + ;; Required for RUNPATH validation. + (string-append "-DCMAKE_INSTALL_RPATH=3D" + (assoc-ref %outputs "out") + "/lib" + ":" + (assoc-ref %outputs "out") + "/lib/evolution-data-server" + ":" + (assoc-ref %outputs "out") + "/lib/evolution-data-server/addressbook-backends"= + ":" + (assoc-ref %outputs "out") + "/lib/evolution-data-server/calendar-backends" + ":" + (assoc-ref %outputs "out") + "/lib/evolution-data-server/camel-providers" + ":" + (assoc-ref %outputs "out") + "/lib/evolution-data-server/credential-modules" + ":" + (assoc-ref %outputs "out") + "/lib/evolution-data-server/registry-modules")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests - (lambda _ - ;; tests/book-migration/test-migration.c:160:test_fetch_con= tacts: - ;; assertion failed (g_slist_length (contacts) =3D=3D 20): = (0 =3D=3D 20) - (delete-file-recursively "tests/book-migration") - (substitute* "tests/CMakeLists.txt" - (("add_subdirectory\\(book-migration\\)") "")) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* '("camel/camel-docs.sgml.in" + "evolution-data-server/evolution-data-serv= er-docs.sgml.in" + "private/libedbus-private-docs.sgml.in") + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) #t)) - (add-after 'unpack 'patch-paths - (lambda _ - (substitute* '("tests/test-server-utils/e-test-server-utils.= c" - "tests/libedata-book/data-test-utils.c" - "tests/libedata-book/test-book-cache-utils.c"= - "tests/libedata-cal/test-cal-cache-utils.c") - (("/bin/rm") (which "rm"))) - #t)) - (add-before 'configure 'dont-override-rpath + (add-after 'patch-docbook-xml 'fix-errors (lambda _ + ;; Entity not available. + (substitute* "docs/reference/evolution-data-server/evolutio= n-data-server-docs.sgml.in" + (("") + "")) + ;; CMakeLists.txt hard-codes runpath to just the libdir. + ;; Remove it so the configure flag is respected. (substitute* "CMakeLists.txt" - ;; CMakeLists.txt hard-codes runpath to just the libdir. - ;; Remove it so the configure flag is respected. - (("SET\\(CMAKE_INSTALL_RPATH .*") "")) - #t))))) + (("SET\\(CMAKE_INSTALL_RPATH \"\\$\\{privlibdir\\}\"\\)")= + "")) + ;; Fix references to 'rm' program. + (substitute* '("tests/test-server-utils/e-test-server-utils= =2Ec" + "tests/libedata-book/data-test-utils.c" + "tests/libedata-book/test-book-cache-utils.c= " + "tests/libedata-cal/test-cal-cache-utils.c")= + (("/bin/rm") (which "rm"))) + #t)) + (add-after 'fix-errors 'disable-failing-tests + (lambda _ + (substitute* "tests/book-migration/CMakeLists.txt" + (("test-migration") + "")) + (substitute* "tests/libebook/client/CMakeLists.txt" + (("test-book-client-custom-summary") + "")) + #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 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-= schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))= ) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. + `(("docbook-xml" ,docbook-xml-4.1.2) + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gperf" ,gperf) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk-doc" ,gtk-doc) + ("gtk+:bin" ,gtk+ "bin") ("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("vala" ,vala) - ("python" ,python-wrapper))) - (propagated-inputs - ;; These are all in the Requires field of .pc files. - `(("gtk+" ,gtk+) - ("libical" ,libical) - ("libsecret" ,libsecret) - ("libsoup" ,libsoup) - ("nss" ,nss) - ("sqlite" ,sqlite))) + ("python" ,python-wrapper) + ("vala" ,vala))) (inputs - `(("bdb" ,bdb) - ("gcr" ,gcr) + `(("gcr" ,gcr) + ("gweather" ,libgweather) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("gperf" ,gperf) + ("icu" ,icu4c) ("json-glib" ,json-glib) + ("krb5" ,mit-krb5) ("libcanberra" ,libcanberra) - ("libgweather" ,libgweather) - ("mit-krb5" ,mit-krb5) + ("libdb" ,bdb) + ("libgdata" ,libgdata) + ("oauth" ,liboauth) ("openldap" ,openldap) + ("sendmail" ,sendmail) ("webkitgtk" ,webkitgtk))) - (synopsis "Store address books and calendars") + (propagated-inputs + `(("glib" ,glib) + ("glib-networking" ,glib-networking) + ("gtk+" ,gtk+) + ("libical" ,libical) + ("libsecret" ,libsecret) + ("libsoup" ,libsoup) + ("libxml2" ,libxml2) + ("nspr" ,nspr) + ("nss" ,nss) + ("sqlite" ,sqlite))) + (synopsis "Backend for Evolution") + (description "Evolution-Data-Server package provides a unified backe= nd for +programs that work with contacts, tasks, and calendar information. It p= rovides +a single database for common, desktop-wide information, such as a user's= address +book or calendar events. It was originally developed for Evolution, but= is now +used by other packages as well.") (home-page "https://wiki.gnome.org/Apps/Evolution") - (description - "This package provides a unified backend for programs that work wit= h -contacts, tasks, and calendar information. It was originally developed = for -Evolution (hence the name), but is now used by other packages as well.")= (license license:lgpl2.0))) =20 (define-public caribou diff --git a/gnu/packages/patches/evolution-data-server-libical-compat.pa= tch b/gnu/packages/patches/evolution-data-server-libical-compat.patch deleted file mode 100644 index da4302d42e..0000000000 --- a/gnu/packages/patches/evolution-data-server-libical-compat.patch +++ /dev/null @@ -1,36 +0,0 @@ -Prevent test failure and possible data loss due to API change in libical= 3.0.7. - -https://gitlab.gnome.org/GNOME/evolution-data-server/issues/185 -https://lists.infradead.org/pipermail/libical-devel/2020-January/000907.= html - -Adapted from upstream: - -https://gitlab.gnome.org/GNOME/evolution-data-server/commit/77384ab552c1= 9bf374dbeda53dc37f98d07bd4ec - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e16b8b225..b3c881967 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -111,7 +111,7 @@ add_definitions(-DSOUP_VERSION_MIN_REQUIRED=3D${soup= _encoded_version}) -=20 - set(gcr_minimum_version 3.4) - set(libgdata_minimum_version 0.15.1) --set(libical_glib_minimum_version 3.0.5) -+set(libical_glib_minimum_version 3.0.7) - set(libsecret_minimum_version 0.5) - set(libxml_minimum_version 2.0.0) - set(sqlite_minimum_version 3.7.17) -diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calend= ar/libedata-cal/e-cal-meta-backend.c -index 7501f2a43..93f4806ba 100644 ---- a/src/calendar/libedata-cal/e-cal-meta-backend.c -+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c -@@ -4067,8 +4067,7 @@ e_cal_meta_backend_inline_local_attachments_sync (= ECalMetaBackend *meta_backend, - gchar *base64; -=20 - base64 =3D g_base64_encode ((const guchar *) content, len); -- new_attach =3D i_cal_attach_new_from_data (base64, NULL, NULL); -+ new_attach =3D i_cal_attach_new_from_data (base64, (GFunc) g_free,= NULL); - g_free (content); -- g_free (base64); -=20 - ecmb_remove_all_but_filename_parameter (prop); diff --git a/gnu/packages/patches/evolution-data-server-locales.patch b/g= nu/packages/patches/evolution-data-server-locales.patch deleted file mode 100644 index 48baefb0d8..0000000000 --- a/gnu/packages/patches/evolution-data-server-locales.patch +++ /dev/null @@ -1,33 +0,0 @@ -This patch fixes locale canonicalization when using newer versions of -ICU. It comes from the upstream repo, and should appear starting in -version 3.33.5. - -From fe4ac94ce3c14f200e049a5d102fc0e4b811c71e Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 16 Jul 2019 07:22:07 +0200 -Subject: [PATCH] I#137 - POSIX locale tests fail with ICU 64.x - -Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/137 ---- - src/libedataserver/e-collator.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/libedataserver/e-collator.c b/src/libedataserver/e-coll= ator.c -index 718eac5da..ec2cf7951 100644 ---- a/src/libedataserver/e-collator.c -+++ b/src/libedataserver/e-collator.c -@@ -132,6 +132,11 @@ canonicalize_locale (const gchar *posix_locale, - gint len; - const gchar *collation_type =3D NULL; -=20 -+ if (posix_locale && ( -+ g_ascii_strcasecmp (posix_locale, "C") =3D=3D 0 || -+ g_ascii_strcasecmp (posix_locale, "POSIX") =3D=3D 0)) -+ posix_locale =3D "en_US_POSIX"; -+ - len =3D uloc_canonicalize (posix_locale, locale_buffer, LOCALE_BUFFER_= LEN, &status); -=20 - if (U_FAILURE (status)) { ---=20 -2.22.0 - --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-Add-gtx.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0004-gnu-Add-gtx.patch" =46rom 60db9b21985945f42209d493e15433c27cf775eb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 19 Jul 2020 06:11:54 -0400 Subject: [PATCH 04/36] gnu: Add gtx. * gnu/packages/gnome.scm (gtx): New variable. --- gnu/packages/gnome.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1b8e93dcfd..45ed3007c8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -265,6 +265,41 @@ 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 gtx + (package + (name "gtx") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri + (string-append "https://launchpad.net/gtx/trunk/" + version "/+download/gtx-" version ".tar.gz")) + (sha256 + (base32 "0i4zvn5v4rf0cw3fxylk6j2pyy5lkrswdiw8jdxkys0ph0nan33n"))= )) + (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")))) + (native-inputs + `(("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "GLib Testing Framework") + (description "GTX is a small collection of convenience functions int= ended to +enhance the GLib testing framework. With specific emphasis on easing th= e pain +of writing test cases for asynchronous interactions.") + (home-page "https://launchpad.net/gtx") + (license license:lgpl2.1+))) + (define-public libcloudproviders (package (name "libcloudproviders") --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-Add-dee.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0005-gnu-Add-dee.patch" =46rom d939da668cdab3dc891773b78d25be8ccc5c99eb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 19 Jul 2020 06:54:46 -0400 Subject: [PATCH 05/36] gnu: Add dee. * gnu/packages/gnome.scm (dee): New variable. * gnu/packages/patches/dee-vapi.patch: New file. * gnu/local.mk (dee-vapi.patch): New reference. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 81 +++++++++++++++++++++++++++++ gnu/packages/patches/dee-vapi.patch | 15 ++++++ 3 files changed, 97 insertions(+) create mode 100644 gnu/packages/patches/dee-vapi.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7274f50264..a5a7125087 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -869,6 +869,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/dconf-meson-0.52.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch= \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ + %D%/packages/patches/dee-vapi.patch \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 45ed3007c8..978062e1aa 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -300,6 +300,87 @@ of writing test cases for asynchronous interactions.= ") (home-page "https://launchpad.net/gtx") (license license:lgpl2.1+))) =20 +(define-public dee + (package + (name "dee") + (version "1.2.7") + (source + (origin + (method url-fetch) + (uri + (string-append "https://launchpad.net/dee/1.0/" + version "/+download/dee-" version ".tar.gz")) + (sha256 + (base32 "12mzffk0lyd566y46x57jlvb9af152b4dqpasr40zal4wrn37w0v"))= + (patches + (search-patches "dee-vapi.patch")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "--disable-maintainer-flags" + (string-append "--with-pygi-overrides-dir=3D" + (assoc-ref %outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages/gi/overrides") + (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/dee-1.0" + (substitute* "dee-1.0-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-after 'patch-docbook-xml 'disable-failing-tests + (lambda _ + (substitute* "tests/test-icu.c" + (("g_test_add \\(DOMAIN\"/Default/AsciiFolder\", Fixture,= 0,") + "") + (("setup, test_ascii_folder, teardown\\);") + "")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running dbus-daemon. + (system "dbus-daemon &") + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t))))) + (native-inputs + `(("dbus" ,dbus) + ("dbus-test-runner" ,dbus-test-runner) + ("docbook-xml" ,docbook-xml-4.3) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("gtx" ,gtx) + ("pkg-config" ,pkg-config) + ("pygobject" ,python-pygobject) + ("python" ,python-wrapper) + ("vala" ,vala))) + (inputs + `(("icu" ,icu4c))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "Model to synchronize multiple instances over DBus") + (description "Dee is a library that uses DBus to provide objects all= owing +you to create Model-View-Controller type programs across DBus. It also = consists +of utility objects which extend DBus allowing for peer-to-peer discovera= bility +of known objects without needing a central registrar.") + (home-page "https://launchpad.net/dee") + (license + ;; Dual-licensed + (list + license:lgpl3+ + license:gpl3+)))) + (define-public libcloudproviders (package (name "libcloudproviders") diff --git a/gnu/packages/patches/dee-vapi.patch b/gnu/packages/patches/d= ee-vapi.patch new file mode 100644 index 0000000000..3a9353a521 --- /dev/null +++ b/gnu/packages/patches/dee-vapi.patch @@ -0,0 +1,15 @@ +Index: dee-1.2.7+17.10.20170616/vapi/Dee-1.0.metadata +=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=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 +--- dee-1.2.7+17.10.20170616.orig/vapi/Dee-1.0.metadata ++++ dee-1.2.7+17.10.20170616/vapi/Dee-1.0.metadata +@@ -2,7 +2,9 @@ GListResultSet skip + GListResultSetClass skip +=20 + FilterModel +- .filter unowned ++ .filter skip // unsupported type for construct property ++Index ++ .reader skip // unsupported type for construct property + Model + .append skip=3Dfalse + .build_named_row skip --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-Add-zeitgeist.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0006-gnu-Add-zeitgeist.patch" =46rom cc27746676b693a2898012e6652dcb0a1cefc24b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 20 Jul 2020 01:49:43 -0400 Subject: [PATCH 06/36] gnu: Add zeitgeist. * gnu/packages/gnome.scm (zeitgeist): New variable. --- gnu/packages/gnome.scm | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 978062e1aa..5ef9b03e6d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -162,12 +162,14 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdesktop) + #:use-module (gnu packages rdf) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) #:use-module (gnu packages rust) #:use-module (gnu packages samba) #:use-module (gnu packages scanner) #:use-module (gnu packages sdl) + #:use-module (gnu packages search) #:use-module (gnu packages selinux) #:use-module (gnu packages slang) #:use-module (gnu packages speech) @@ -381,6 +383,88 @@ of known objects without needing a central registrar= =2E") license:lgpl3+ license:gpl3+)))) =20 +(define-public zeitgeist + (package + (name "zeitgeist") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.freedesktop.org/zeitgeist/zeitgeist.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "0ig3d3j1n0ghaxsgfww6g2hhcdwx8cljwwfmp9jk1nrvkxd6rnmv"))= )) + (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list + "--enable-explain-queries" + "--enable-fts" + "--enable-docs") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc/libzeitgeist" + (substitute* "zeitgeist-gtkdoc-index.sgml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-after 'patch-docbook-xml 'disable-failing-tests + (lambda _ + (substitute* "test/direct/Makefile.am" + ((" log-test ") + "")) + (substitute* "test/c/Makefile.am" + ((" test-log ") + "")) + #t)) + (add-before 'bootstrap 'remove-autogen-script + (lambda _ + ;; To honor `autoreconf -vif` by build-system. + (delete-file "autogen.sh") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("vala" ,vala) + ("xorg-server-for-tests" ,xorg-server-for-tests))) + (inputs + `(("dee-icu" ,dee) + ("gtk+" ,gtk+) + ("json-glib" ,json-glib) + ("sqlite" ,sqlite) + ("telepathy-glib" ,telepathy-glib) + ("python" ,python-wrapper) + ("python-rdflib" ,python-rdflib) + ("xapian-config" ,xapian))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "Desktop Activity Logging") + (description "Zeitgeist is a service which logs the users=E2=80=99s = activities and +events, anywhere from files opened to websites visited and conversations= =2E It +makes this information readily available for other applications to use. = It is +able to establish relationships between items based on similarity and us= age +patterns.") + (home-page "https://zeitgeist.freedesktop.org/") + (license + ;; Dual-licensed + (list + license:lgpl2.1+ + license:gpl2+)))) + (define-public libcloudproviders (package (name "libcloudproviders") --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-folks-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0007-gnu-folks-Update-package-definition.patch" =46rom e2a4c1746f91265d202b6d5258e9058c4ca6171e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 20 Jul 2020 04:54:29 -0400 Subject: [PATCH 07/36] gnu: folks: Update package definition. * gnu/packages/gnome.scm (folks) [version]: Update to 0.14.0. [outputs]: New outputs "doc" and "help". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dtracker_backend]: New flag. [-Dzeitgeist]: New flag. [-Ddocs]: New flag. <#:phases>['skip-gtk-update-icon-cache]: Remove phase. ['disable-failing-tests]: New phase. ['move-doc]: New phase. ['move-help]: New phase. [native-inputs]: Add cmake, docbook-xml, gtk-doc, gtk+:bin, python-wrapper and python-dbusmock. [inputs]: Remove bdb, evolution-data-server, glib, libgee and telepathy-glib. Add libxml2 and zeitgeist. [propagated-inputs]: Add evolution-data-server, glib, libgee, telepathy-glib and tracker. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 98 +++++++++++++++++++++++++++++------------- 1 file changed, 67 insertions(+), 31 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5ef9b03e6d..13d2db6b5e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9735,46 +9735,82 @@ the Moka icon theme.") (define-public folks (package (name "folks") - (version "0.13.1") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://gnome/sources/folks/" - (version-major+minor version) "/" - "folks-" version ".tar.xz")) - (sha256 - (base32 - "0pda8sx4ap3lyri5fdrnakl29la1zkhwlc9bmnp13qigp1iwdw9x"))= )) + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/folks/" + (version-major+minor version) "/" + "folks-" version ".tar.xz")) + (sha256 + (base32 "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"))= )) (build-system meson-build-system) + (outputs '("out" "doc" "help")) (arguments - '(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dtracker_backend=3Dtrue" + "-Dzeitgeist=3Dtrue" + "-Ddocs=3Dtrue") + #:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. + (add-after 'unpack 'disable-failing-tests + ;; Telepathy and Tracker tests require networking. (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")) - #t))))) - (inputs - `(("bdb" ,bdb) - ("dbus-glib" ,dbus-glib) - ("evolution-data-server" ,evolution-data-server) - ("glib" ,glib) - ("libgee" ,libgee) - ("readline" ,readline) - ("telepathy-glib" ,telepathy-glib))) + (substitute* "tests/meson.build" + (("subdir\\('telepathy'\\)") + "") + (("subdir\\('tracker'\\)") + "")) + #t)) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + #t))) + (add-after 'move-doc 'move-help + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (help (assoc-ref outputs "help"))) + (mkdir-p (string-append help "/share")) + (rename-file + (string-append out "/share/devhelp") + (string-append help "/share/devhelp")) + #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") + `(("cmake" ,cmake) + ("docbook-xml" ,docbook-xml-4.3) + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("gtk+:bin" ,gtk+ "bin") ("intltool" ,intltool) ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("python-dbusmock" ,python-dbusmock) ("vala" ,vala))) - (synopsis "Library to aggregate data about people") - (description "Libfolks is a library that aggregates information abou= t people -from multiple sources (e.g., Telepathy connection managers for IM contac= ts, -Evolution Data Server for local contacts, libsocialweb for web service c= ontacts, -etc.) to create metacontacts. It's written in Vala, which generates C c= ode when -compiled.") + (inputs + `(("dbus-glib" ,dbus-glib) + ("libxml2" ,libxml2) + ("readline" ,readline) + ("zeitgeist" ,zeitgeist))) + (propagated-inputs + `(("evolution-data-server" ,evolution-data-server) + ("glib" ,glib) + ("gee" ,libgee) + ("telepathy-glib" ,telepathy-glib) + ("tracker-sparql" ,tracker))) + (synopsis "Contact aggregation library") + (description "Libfolks is a library that aggregates people from mult= iple +sources (eg, Telepathy connection managers for IM contacts, Evolution Da= ta +Server for local contacts, etc.) to create metacontacts. It's written i= n Vala, +which generates C code when compiled.") (home-page "https://wiki.gnome.org/Projects/Folks") (license license:lgpl2.1+))) =20 --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-Add-poly2tri-c.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0008-gnu-Add-poly2tri-c.patch" =46rom 46b13e21a57b04cf443d5823d2eea472f9d3d286 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 20 Jul 2020 08:45:05 -0400 Subject: [PATCH 08/36] gnu: Add poly2tri-c. * gnu/packages/gimp.scm (poly2tri-c): New variable. --- gnu/packages/gimp.scm | 77 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 84c3ed8019..a6fa30ad87 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -34,6 +34,8 @@ #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages documentation) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -50,6 +52,81 @@ #:use-module (gnu packages web) #:use-module (gnu packages xorg)) =20 +(define-public poly2tri-c + (package + (name "poly2tri-c") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://storage.googleapis.com/" + "google-code-archive-source/v2/code.google.com/" + "poly2tri-c/source-archive.zip")) + (file-name + (string-append name "-" version ".zip")) + (sha256 + (base32 "17cw0zhbnf2gb59jm26z0wcarqgdwir9jr1fpi3v9lcvyb2s3mqj"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-strict-rules + (lambda _ + (substitute* "configure.ac" + (("\\$CFLAGS -Wall -ansi -pedantic") + "$CFLAGS") + (("\\$CFLAGS -Werror") + "$CFLAGS")) + #t)) + (add-after 'disable-strict-rules 'fix-build-errors + (lambda _ + (substitute* "poly2tri-c/refine/Makefile.am" + (("cdt.c") + "rcdt.c") + (("cdt.h") + "rcdt.h") + (("utils.c") + "rutils.c") + (("utils.h") + "rutils.h")) + #t)) + (add-before 'bootstrap 'configure-later + (lambda _ + (setenv "NOCONFIGURE" "set") + #t)) + (add-after 'build 'generate-doc + (lambda _ + (invoke "doxygen") + #t)) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (copy-recursively + "doc" + (string-append doc "/share/doc/poly2tri-c")) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("doxygen" ,doxygen) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "2D constrained Delaunay triangulation library") + (description "Poly2Tri-C is a library for generating, refining and r= endering +2-Dimensional Constrained Delaunay Triangulations.") + (home-page "https://code.google.com/archive/p/poly2tri-c/") + (license license:bsd-3))) + (define-public babl (package (name "babl") --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-Add-mmm.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0009-gnu-Add-mmm.patch" =46rom d95f0ab7fd46370eb80a6d821928c1d2f6c6c6ae Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 20 Jul 2020 11:00:41 -0400 Subject: [PATCH 09/36] gnu: Add mmm. * gnu/packages/graphics.scm (mmm): New variable. --- gnu/packages/graphics.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9648050fa0..9b1e513b2d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) #:use-module (gnu packages linux) + #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) @@ -92,6 +93,7 @@ #:use-module (gnu packages xdisorg) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) @@ -100,6 +102,35 @@ #:use-module (guix packages) #:use-module (guix utils)) =20 +(define-public mmm + (package + (name "mmm") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/hodefoting/mmm.git") + (commit "c88f89d"))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "08ascvw692ky4pl83npijyc3yh2wzf00vmqwz23xws8phx6zlz78"))= )) + (build-system meson-build-system) + (native-inputs + `(("luajit" ,luajit) + ("pkg-config" ,pkg-config))) + (inputs + `(("alsa" ,alsa-lib) + ("sdl" ,sdl) + ("sdl2" ,sdl2))) + (synopsis "Memory Mapped Machine") + (description "MMM is a shared memory protocol for virtualising acces= s to +framebuffer graphics, audio output and input event.") + (home-page "https://github.com/hodefoting/mrg") + (license license:isc))) + (define-public directfb (package (name "directfb") --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-Add-mrg.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-Add-mrg.patch" =46rom af02e9eb2e681975c7b42a7e6a42ce5adff93a1e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 20 Jul 2020 12:21:09 -0400 Subject: [PATCH 10/36] gnu: Add mrg. * gnu/packages/gimp.scm (mrg): New variable. --- gnu/packages/gimp.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index a6fa30ad87..a8f85ad264 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -40,10 +40,14 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages ghostscript) #:use-module (gnu packages compression) #:use-module (gnu packages xml) + #:use-module (gnu packages linux) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages patchutils) #:use-module (gnu packages pdf) #:use-module (gnu packages photo) #:use-module (gnu packages python) @@ -127,6 +131,39 @@ (home-page "https://code.google.com/archive/p/poly2tri-c/") (license license:bsd-3))) =20 +(define-public mrg + (package + (name "mrg") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/hodefoting/mrg.git") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "0g6wm9f7i3gcr07ab2avqsg18rsaj43b7y2qcnf1n7kc3asc44vm"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("alsa" ,alsa-lib) + ("cairo" ,cairo) + ("gtk+" ,gtk+) + ("mmm" ,mmm) + ("x11" ,libx11))) + (synopsis "Microraptor GUI") + (description "MrG is is a C API for creating user interfaces. It ca= n be +used as an application writing environment or as an interactive canvas f= or part +of a larger interface.") + (home-page "https://github.com/hodefoting/mrg") + (license license:lgpl2.0+))) + (define-public babl (package (name "babl") --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-gegl-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0011-gnu-gegl-Update-package-definition.patch" =46rom cffe17c384893d2a43156ebf0cc5780d6ccf2123 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 21 Jul 2020 03:45:21 -0400 Subject: [PATCH 11/36] gnu: gegl: Update package definition. * gnu/packages/gimp.scm (gegl): Update package definition. [source][patches]: Add gegl-mrg.patch. [outputs]: New output "doc". [arguments]<#:configure-flags>[-Dintrospection]: Remove flag. [-Ddocs]: New flag. [-Dworkshop]: New flag. [-Dsdl1]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add asciidoc, docbook-xml, docbook-xsl, enscript, gobject-introspection, gtk-doc, perl, python-pygobject, python-wrapper, ruby and vala. [inputs]: Add exiv2, gdk-pixbuf+svg, gexiv2, jasper, lcms, lensfun, ffmpe= g, libnsgif, libraw, librsvg, libspiro, libtiff, lua, luajit, mrg, openexr, = poly2tri-c, poppler, sdl, sdl2, suitesparse, v4l-utils and libwebp. [synopsis]: Modify. [description]: Modify. [license]: Remove gpl3+. * gnu/packages/patches/gegl-mrg.patch: New file. * gnu/local.mk (gegl-mrg.patch): New reference. --- gnu/local.mk | 1 + gnu/packages/gimp.scm | 134 +++++++++++++++++++++------- gnu/packages/patches/gegl-mrg.patch | 89 ++++++++++++++++++ 3 files changed, 192 insertions(+), 32 deletions(-) create mode 100644 gnu/packages/patches/gegl-mrg.patch diff --git a/gnu/local.mk b/gnu/local.mk index a5a7125087..0c5be2fa22 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -974,6 +974,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/gd-brect-bounds.patch \ %D%/packages/patches/gdb-hurd.patch \ %D%/packages/patches/gdm-default-session.patch \ + %D%/packages/patches/gegl-mrg.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index a8f85ad264..bcb4679a83 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -35,8 +35,10 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages fontutils) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -45,13 +47,19 @@ #:use-module (gnu packages ghostscript) #:use-module (gnu packages compression) #:use-module (gnu packages xml) + #:use-module (gnu packages lua) + #:use-module (gnu packages maths) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages patchutils) + #:use-module (gnu packages perl) #:use-module (gnu packages pdf) #:use-module (gnu packages photo) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) #:use-module (gnu packages ruby) + #:use-module (gnu packages sdl) + #:use-module (gnu packages video) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xorg)) @@ -209,46 +217,108 @@ specific code paths.") (package (name "gegl") (version "0.4.24") - (source (origin - (method url-fetch) - (uri (list (string-append "https://download.gimp.org/pub/g= egl/" - (string-take version 3) - "/gegl-" version ".tar.xz") - (string-append "https://ftp.gtk.org/pub/gegl/" - (version-major+minor version) - "/gegl-" version ".tar.xz") - (string-append "ftp://ftp.gtk.org/pub/gegl/" - (version-major+minor version) - "/gegl-" version ".tar.xz"))) - (sha256 - (base32 - "0ji57s7cba94vzy49agn7x47ca61rccm6rif0cb0s6rl4ygljrbp"))= )) + (source + (origin + (method url-fetch) + (uri + (list + (string-append "https://download.gimp.org/pub/gegl/" + (string-take version 3) + "/gegl-" version ".tar.xz") + (string-append "https://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz") + (string-append "ftp://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz"))) + (sha256 + (base32 "0ji57s7cba94vzy49agn7x47ca61rccm6rif0cb0s6rl4ygljrbp"))= + (patches + ;; Fix for the bug, + ;; https://gitlab.gnome.org/GNOME/gegl/-/issues/259 + (search-patches "gegl-mrg.patch")))) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments `(#:configure-flags - (list "-Dintrospection=3Dfalse"))) - ;; These are propagated to satisfy 'gegl-0.4.pc'. + (list + "-Ddocs=3Dtrue" + "-Dworkshop=3Dtrue" + "-Dsdl1=3Dauto") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* "gegl-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 + `(("asciidoc" ,asciidoc) + ("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) + ("enscript" ,enscript) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("pygobject" ,python-pygobject) + ("python" ,python-wrapper) + ("ruby" ,ruby) + ("vapigen" ,vala))) + (inputs + `(("cairo" ,cairo) + ("exiv2" ,exiv2) + ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gexiv2" ,gexiv2) + ("jasper" ,jasper) + ("lcms" ,lcms) + ("lensfun" ,lensfun) + ("libav" ,ffmpeg) + ("libnsgif" ,libnsgif) + ("libpng" ,libpng) + ("libjpeg" ,libjpeg-turbo) + ("libraw" ,libraw) + ("librsvg" ,librsvg) + ("libspiro" ,libspiro) + ("libtiff" ,libtiff) + ("lua" ,lua) + ("luajit" ,luajit) + ("mrg" ,mrg) + ("openexr" ,openexr) + ("pango" ,pango) + ;; To be enabled after upstream fixes the bug, + ;; https://gitlab.gnome.org/GNOME/gegl/-/issues/258 + ;; ("poly2tri-c" ,poly2tri-c) + ("poppler" ,poppler) + ("sdl1" ,sdl) + ("sdl2" ,sdl2) + ("umfpack" ,suitesparse) + ("v4l" ,v4l-utils) + ("webp" ,libwebp))) (propagated-inputs `(("babl" ,babl) ("glib" ,glib) ("json-glib" ,json-glib))) - (inputs - `(("cairo" ,cairo) - ("pango" ,pango) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; for gtester - ("intltool" ,intltool))) + (synopsis "Generic Graphics Library") + (description "GEGL is a data flow based image processing framework, +providing floating point processing and non-destructive image processing= +capabilities to GNU Image Manipulation Program and other projects.") (home-page "http://gegl.org") - (synopsis "Graph based image processing framework") - (description "GEGL (Generic Graphics Library) provides infrastructur= e to -do demand based cached non destructive image editing on larger than RAM -buffers.") - ;; The library itself is licensed under LGPL while the sample comman= dline - ;; application and GUI binary gegl is licensed under GPL. - (license (list license:lgpl3+ license:gpl3+)))) + (license license:lgpl3+))) =20 (define-public gimp (package diff --git a/gnu/packages/patches/gegl-mrg.patch b/gnu/packages/patches/g= egl-mrg.patch new file mode 100644 index 0000000000..15603cd9ad --- /dev/null +++ b/gnu/packages/patches/gegl-mrg.patch @@ -0,0 +1,89 @@ +From 1cc5a08d7860fa9cbd22a469e2d270533e689f23 Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Tue, 21 Jul 2020 02:57:39 -0400 +Subject: [PATCH] Fix build with mrg. + +--- + bin/argvs.c | 4 ++-- + bin/mrg-gegl.c | 2 +- + bin/ui-collection.c | 4 ++-- + bin/ui-core.c | 4 ++-- + bin/ui-viewer.c | 4 ++-- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/bin/argvs.c b/bin/argvs.c +index 254b754a0..300370d5c 100644 +--- a/bin/argvs.c ++++ b/bin/argvs.c +@@ -25,8 +25,8 @@ +=20 +=20 + #ifdef MRG_PRINTF +-#include +-#include ++#include ++#include + extern Mrg *mrg; + extern MrgList *scrollback; + extern int use_ui; +diff --git a/bin/mrg-gegl.c b/bin/mrg-gegl.c +index dd0e55686..ffdbb5ee8 100644 +--- a/bin/mrg-gegl.c ++++ b/bin/mrg-gegl.c +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/bin/ui-collection.c b/bin/ui-collection.c +index 671d2dc1f..eee0b0925 100644 +--- a/bin/ui-collection.c ++++ b/bin/ui-collection.c +@@ -25,8 +25,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +diff --git a/bin/ui-core.c b/bin/ui-core.c +index 16dec03af..6350b4cba 100644 +--- a/bin/ui-core.c ++++ b/bin/ui-core.c +@@ -107,8 +107,8 @@ const char *css =3D + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +diff --git a/bin/ui-viewer.c b/bin/ui-viewer.c +index 4a70a4518..9468a246b 100644 +--- a/bin/ui-viewer.c ++++ b/bin/ui-viewer.c +@@ -24,8 +24,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +--=20 +GitLab + --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-geocode-glib-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0012-gnu-geocode-glib-Update-package-definition.patch" =46rom e4ba886dbc21e22556650552d55c8541e824c620 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 21 Jul 2020 04:29:16 -0400 Subject: [PATCH 12/36] gnu: geocode-glib: Update package definition. * gnu/packages/gnome.scm (geocode-glib) [version]: Update to 3.26.2. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-D-Denable-installed-tests]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml and python-wrapper. Remove json-glib. [inputs]: Add json-glib. [propagated-inputs]: Add glib-networking. --- gnu/packages/gnome.scm | 72 ++++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 13d2db6b5e..fb526f3df5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5071,46 +5071,70 @@ possible.") (define-public geocode-glib (package (name "geocode-glib") - (version "3.26.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/geocode-glib/"= - (version-major+minor version) "/" - "geocode-glib-" version ".tar.xz")) - (sha256 - (base32 - "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv"))= )) + (version "3.26.2") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/geocode-glib/" + (version-major+minor version) "/" + "geocode-glib-" version ".tar.xz")) + (sha256 + (base32 "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Denable-installed-tests=3Dfalse") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* "geocode-glib-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) ;; The tests require a bunch of locales. (add-before 'check 'set-locales (lambda* (#:key inputs #:allow-other-keys) (setenv "GUIX_LOCPATH" (string-append (assoc-ref inputs "glibc-locales") "/lib/locale")) - #t))))) + #t)) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums - ("glibc-locales" ,glibc-locales) ; for tests + `(("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("glibc-locales" ,glibc-locales) ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) - ("json-glib" ,json-glib))) - (propagated-inputs - ;; geocode-glib-1.0.pc refers to GIO. - `(("glib" ,glib))) + ("python" ,python-wrapper))) (inputs - `(("libsoup" ,libsoup))) - (home-page "https://github.com/GNOME/geocode-glib/") + `(("json-glib" ,json-glib) + ("libsoup" ,libsoup))) + (propagated-inputs + `(("glib" ,glib) + ("glib-networking" ,glib-networking))) (synopsis "Geocoding and reverse-geocoding library") - (description - "geocode-glib is a convenience library for geocoding (finding longi= tude, -and latitude from an address) and reverse geocoding (finding an address = from -coordinates) using the Nominatim service. geocode-glib caches requests = for -faster results and to avoid unnecessary server load.") + (description "Geocode-Glib is a convenience library for geocoding (f= inding +longitude, and latitude from an address) and reverse geocoding (finding = an +address from coordinates) using the Nominatim service. It also caches r= equests +for faster results and to avoid unnecessary server load.") + (home-page "https://developer.gnome.org/geocode-glib/") (license license:lgpl2.0+))) =20 (define-public upower --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-gexiv2-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0013-gnu-gexiv2-Update-package-definition.patch" =46rom f02f44f066b5df67da5a9211f78771b9305f2ff9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 21 Jul 2020 05:45:49 -0400 Subject: [PATCH 13/36] gnu: gexiv2: Update package definition. * gnu/packages/gnome.scm (gexiv2) [version]: Update to 0.12.1. [source][sha256]: Modify base32. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dgtk_doc]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, gtk-doc, python-2 and python. Remove gcr. [inputs]: Remove glib. [propagated-inputs]: Add glib. [synopsis]: 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 fb526f3df5..b398c5e2e6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6876,33 +6876,59 @@ and classes for commonly used data structures.") (define-public gexiv2 (package (name "gexiv2") - (version "0.12.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq"))= )) + (version "0.12.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + `(#: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 "docs/reference" + (substitute* "gexiv2-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 - `(("gcr" ,gcr) + `(("docbook-xml" ,docbook-xml-4.3) ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) + ("python2" ,python-2) + ("python3" ,python) ("vala" ,vala))) (propagated-inputs - ;; Listed in "Requires" section of gexiv2.pc - `(("exiv2" ,exiv2))) - (inputs - `(("glib" ,glib) - ("gobject-introspection" ,gobject-introspection))) + `(("exiv2" ,exiv2) + ("glib" ,glib))) + (synopsis "GObject-based Exiv2 wrapper") + (description "Gexiv2 is a GObject wrapper around the Exiv2 photo met= adata +library. It allows for GNOME applications to easily inspect and update = EXIF, +IPTC, and XMP metadata in photo and video files of various formats.") (home-page "https://wiki.gnome.org/Projects/gexiv2") - (synopsis "GObject wrapper around the Exiv2 photo metadata library")= - (description - "Gexiv2 is a GObject wrapper around the Exiv2 photo metadata librar= y. It -allows for GNOME applications to easily inspect and update EXIF, IPTC, a= nd XMP -metadata in photo and video files of various formats.") (license license:gpl2+))) =20 (define-public shotwell --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-Add-openjade.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0014-gnu-Add-openjade.patch" =46rom 8f97cf8ad6561e5072abb8723c058c09d5f7a796 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 21 Jul 2020 08:12:34 -0400 Subject: [PATCH 14/36] gnu: Add openjade. * gnu/packages/xml.scm (openjade): New variable. --- gnu/packages/xml.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b57d42139c..b5ed189bff 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages finance) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -69,6 +70,54 @@ #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config)) =20 +(define-public openjade + (package + (name "openjade") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri + (string-append "https://downloads.sourceforge.net/" + name "/" name "-" version ".tar.gz")) + (sha256 + (base32 "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"))= )) + (build-system gnu-build-system) + (arguments + `(#:test-target "testsuite" + #:configure-flags + (list + (string-append "--enable-spincludedir=3D" + (assoc-ref %build-inputs "opensp") + "/include/OpenSP") + (string-append "--enable-splibdir=3D" + (assoc-ref %build-inputs "opensp") + "/lib") + "--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build-errors + (lambda _ + (substitute* "msggen.pl" + (("do 'getopts.pl';") + "use Getopt::Std;") + (("&Getopts") + "getopts")) + #t)) + (add-before 'configure 'set-env + (lambda _ + (setenv "HOME" (getcwd)) + #t))))) + (native-inputs + `(("perl" ,perl))) + (inputs + `(("opensp" ,opensp))) + (synopsis "Document Style Semantics and Specification Language") + (description "OpenJade is an implementation of DSSSL engine. It is = an ISO +standard for formatting SGML and XML documents.") + (home-page "http://openjade.sourceforge.net/") + (license license:lgpl2.1))) + (define-public libxmlb (package (name "libxmlb") --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-Add-sgml-common.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0015-gnu-Add-sgml-common.patch" =46rom ed6641a62515619521bdeb6460880166518b0a1f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 21 Jul 2020 08:52:03 -0400 Subject: [PATCH 15/36] gnu: Add sgml-common. * gnu/packages/docbook.scm (sgml-common): New variable. * gnu/packages/patches/sgml-common-manpage.patch: New file. * gnu/local.mk (sgml-common-manpage.patch): New reference. --- gnu/local.mk | 1 + gnu/packages/docbook.scm | 55 +++++++++++++++++++ .../patches/sgml-common-manpage.patch | 14 +++++ 3 files changed, 70 insertions(+) create mode 100644 gnu/packages/patches/sgml-common-manpage.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0c5be2fa22..0ec7317050 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1502,6 +1502,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/scribus-1.5.5-poppler-0.86-build-fix.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ + %D%/packages/patches/sgml-common-manpage.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/shadow-hurd-pctrl.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ee09b9d0b4..181699d317 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -22,6 +22,7 @@ =20 (define-module (gnu packages docbook) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages imagemagick) #:use-module (gnu packages inkscape) @@ -32,9 +33,63 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system python)) =20 +(define-public sgml-common + (package + (name "sgml-common") + (version "0.6.3") + (source + (origin + (method url-fetch) + (uri + (string-append "ftp://sources.redhat.com/pub/docbook-tools/" + "new-trials/SOURCES/" name "-" version ".tgz")) + (sha256 + (base32 "0ngrn72iqf4kqjxvzl1mxfl40y95jwdizmj5bvy3y4k1sg0iii3x"))= + (patches + (search-patches "sgml-common-manpage.patch")))) + (build-system gnu-build-system) + (outputs '("out" "doc")) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'trigger-bootstrap + (lambda _ + (for-each delete-file + (list + "configure" + "Makefile.in" + "bin/Makefile.in" + "config/Makefile.in" + "doc/Makefile.in" + "doc/HTML/Makefile.in" + "doc/man/Makefile.in" + "doc/refentry/Makefile.in" + "sgml-iso-entities/Makefile.in" + "xml-iso-entities/Makefile.in")) + (rename-file "configure.in" "configure.ac") + #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 "/doc") + (string-append doc "/share/doc")) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (synopsis "SGML Catalogs for DocBook-Tools") + (description "SGML-Common package gathers very basic stuff necessary= to work +with SGML and XML.") + (home-page "https://www.sourceware.org/docbook-tools/") + (license gpl3+))) + (define-public docbook-xml-5 (package (name "docbook-xml") diff --git a/gnu/packages/patches/sgml-common-manpage.patch b/gnu/package= s/patches/sgml-common-manpage.patch new file mode 100644 index 0000000000..c3773d14cd --- /dev/null +++ b/gnu/packages/patches/sgml-common-manpage.patch @@ -0,0 +1,14 @@ +Submitted By: Thomas Pegg +Date: 2003-11-18 +Initial Package Version: 0.6.3 +Origin: Thomas Pegg +Description: Fixes syntax of Makefile.am for installation of man pages, +for use with current automake versions 1.7.8 and higher. + +diff -Naur sgml-common-0.6.3.orig/doc/man/Makefile.am sgml-common-0.6.3/= doc/man/Makefile.am +--- sgml-common-0.6.3.orig/doc/man/Makefile.am 2001-01-30 14:42:22.00000= 0000 +0000 ++++ sgml-common-0.6.3/doc/man/Makefile.am 2003-11-18 16:48:47.000000000 = +0000 +@@ -1,2 +1 @@ +-man8dir =3D $(mandir)/man8 +-man8_DATA =3D *.8 ++man_MANS =3D install-catalog.8 --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-Add-docbook-dsssl.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0016-gnu-Add-docbook-dsssl.patch" =46rom e750481a6261b44a518e71e2f081304dd29ea3a8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 22 Jul 2020 08:29:54 -0400 Subject: [PATCH 16/36] gnu: Add docbook-dsssl. * gnu/packages/docbook.scm (docbook-dsssl): New variable. --- gnu/packages/docbook.scm | 60 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 181699d317..fc9d28c490 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -27,12 +27,14 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages inkscape) #:use-module (gnu packages tex) + #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages base) #:use-module (gnu packages xml) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system python)) @@ -90,6 +92,64 @@ with SGML and XML.") (home-page "https://www.sourceware.org/docbook-tools/") (license gpl3+))) =20 +;; Note: Debian-required dependencies are: libosp5 libostyle1c2 openjade= =2E +;; Note: Debian-suggested dependencies are: jadetex docbook-dsssl-doc do= c-base +;; Note: We don't package Debian's extra patch yet: refentry-flow-object= s.patch +(define-public docbook-dsssl + (package + (name "docbook-dsssl") + (version "1.79") + (source + (origin + (method url-fetch) + (uri + (string-append "http://downloads.sourceforge.net/docbook/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig")))) + (build-system copy-build-system) + (arguments + `(#:install-plan + '(("." "share/sgml/docbook/stylesheet/dsssl/modular/" + #:exclude ("/COPYING" "/BUGS" "/ChangeLog" "/README" + "/RELEASE-NOTES.html" "/RELEASE-NOTES.txt" + "/RELEASE-NOTES.xml" "/WhatsNew"))) + #:phases + (modify-phases %standard-phases + (add-before 'install 'install-perl-script + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man1 (string-append out "/man/man1"))) + (chmod "bin/collateindex.pl" #o755) + (install-file "bin/collateindex.pl" bin) + (install-file "bin/collateindex.pl.1" man1) + ;; Make sure that copy-build-system doesn't pick it up. + (delete-file-recursively "bin") + ;; These files are not actually canonical. + ;; Make sure that copy-build-system doesn't pick them up.= + (delete-file-recursively "contrib") + #t))) + (add-before 'install 'install-sgml-catalog + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (etc-sgml (string-append out "/etc/sgml"))) + (mkdir-p etc-sgml) + (call-with-output-file (string-append etc-sgml "/docbook-= dsssl.cat") + (lambda (port) + (format port "CATALOG ~a/share/sgml/docbook/styleshee= t/dsssl/modular/catalog +CATALOG ~a/share/sgml/docbook/stylesheet/dsssl/modular/common/catalog +" out out))) + #t)))))) + (inputs + `(("perl" ,perl))) + (synopsis "DocBook DSSSL Stylesheets") + (description "DocBook-DSSSL contains DSSSL stylesheets. These are u= sed by +OpenJade or other tools to transform SGML and XML DocBook files.") + (home-page "https://docbook.org") + (license x11))) + (define-public docbook-xml-5 (package (name "docbook-xml") --=20 2.27.0 --------------7ADC8BAB25337DF1232EC2BD Content-Type: text/x-patch; charset=UTF-8; name="0017-gnu-Add-docbook-utils.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0017-gnu-Add-docbook-utils.patch" =46rom 71ba0b6c89718906b40fbbed65dbc3d5ca406860 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 22 Jul 2020 05:25:16 -0400 Subject: [PATCH 17/36] gnu: Add docbook-utils. * gnu/packages/docbook.scm (docbook-utils): New variable. * gnu/packages/patches: Add files docbook-utils-autotools.patch, docbook-utils-typo.patch, docbook-utils-frontends.patch, docbook-utils-helpers-date.patch, docbook-utils-helpers-name.patch, docbook-utils-helpers-whitespace.patch, docbook-utils-helpers-support.pat= ch and docbook-utils-jade.patch. * gnu/local.mk: Add references to new patches. --- gnu/local.mk | 8 + gnu/packages/docbook.scm | 68 ++++ .../patches/docbook-utils-autotools.patch | 376 ++++++++++++++++++ .../patches/docbook-utils-frontends.patch | 42 ++ .../patches/docbook-utils-helpers-date.patch | 61 +++ .../patches/docbook-utils-helpers-name.patch | 34 ++ .../docbook-utils-helpers-support.patch | 29 ++ .../docbook-utils-helpers-whitespace.patch | 30 ++ gnu/packages/patches/docbook-utils-jade.patch | 211 ++++++++++ gnu/packages/patches/docbook-utils-typo.patch | 100 +++++ 10 files changed, 959 insertions(+) create mode 100644 gnu/packages/patches/docbook-utils-autotools.patch create mode 100644 gnu/packages/patches/docbook-utils-frontends.patch create mode 100644 gnu/packages/patches/docbook-utils-helpers-date.patch= create mode 100644 gnu/packages/patches/docbook-utils-helpers-name.patch= create mode 100644 gnu/packages/patches/docbook-utils-helpers-support.pa= tch create mode 100644 gnu/packages/patches/docbook-utils-helpers-whitespace= =2Epatch create mode 100644 gnu/packages/patches/docbook-utils-jade.patch create mode 100644 gnu/packages/patches/docbook-utils-typo.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0ec7317050..3925fa024d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -876,6 +876,14 @@ dist_patch_DATA =3D \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ + %D%/packages/patches/docbook-utils-autotools.patch \ + %D%/packages/patches/docbook-utils-typo.patch \ + %D%/packages/patches/docbook-utils-frontends.patch \ + %D%/packages/patches/docbook-utils-helpers-date.patch \ + %D%/packages/patches/docbook-utils-helpers-name.patch \ + %D%/packages/patches/docbook-utils-helpers-whitespace.patch \ + %D%/packages/patches/docbook-utils-helpers-support.patch \ + %D%/packages/patches/docbook-utils-jade.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/docker-fix-tests.patch \ diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index fc9d28c490..9ad169531b 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -150,6 +150,74 @@ OpenJade or other tools to transform SGML and XML Do= cBook files.") (home-page "https://docbook.org") (license x11))) =20 +(define-public docbook-utils + (package + (name "docbook-utils") + (version "0.6.14") + (source + (origin + (method url-fetch) + (uri + (string-append "ftp://sources.redhat.com/pub/docbook-tools/" + "new-trials/SOURCES/" name "-" version ".tar.gz")= ) + (sha256 + (base32 "1scj5vgw1xz872pq54a89blcxqqm11p90yzv8a9mqq57x27apyj8"))= + (patches + (search-patches + "docbook-utils-autotools.patch" + "docbook-utils-typo.patch" + "docbook-utils-frontends.patch" + "docbook-utils-helpers-date.patch" + "docbook-utils-helpers-name.patch" + "docbook-utils-helpers-whitespace.patch" + "docbook-utils-helpers-support.patch" + "docbook-utils-jade.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; XXX: Fix-me. + (add-after 'unpack 'skip-doc-dir + (lambda _ + (substitute* "Makefile.am" + (("SUBDIRS =3D backends bin doc frontends helpers") + "SUBDIRS =3D backends bin frontends helpers")) + #t)) + (add-after 'skip-doc-dir 'trigger-bootstrap + (lambda _ + (for-each delete-file + (list + "configure" + "Makefile.in" + "backends/Makefile.in" + "bin/Makefile.in" + "doc/Makefile.in" + "doc/HTML/Makefile.in" + "doc/man/Makefile.in" + "doc/refentry/Makefile.in" + "frontends/Makefile.in" + "helpers/Makefile.in")) + (rename-file "configure.in" "configure.ac") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("docbook-dsssl" ,docbook-dsssl) + ;; ("docbook-sgml" ,docbook-sgml) + ("openjade" ,openjade) + ("sgml-common" ,sgml-common) + ("perl" ,perl))) + (synopsis "Tools for DocBook") + (description "DocBook-Utils is a collection of utility scripts used = to +convert and analyze SGML documents in general, and DocBook files in part= icular. +The scripts are used to convert from DocBook or other SGML formats into +classical file formats like HTML, man, info, RTF and many more. There's= also a +utility to compare two SGML files and only display the differences in ma= rkup. +This is useful for comparing documents prepared for different languages.= ") + (home-page "https://www.sourceware.org/docbook-tools/") + (license gpl2+))) + (define-public docbook-xml-5 (package (name "docbook-xml") diff --git a/gnu/packages/patches/docbook-utils-autotools.patch b/gnu/pac= kages/patches/docbook-utils-autotools.patch new file mode 100644 index 0000000000..2ab27f6ed9 --- /dev/null +++ b/gnu/packages/patches/docbook-utils-autotools.patch @@ -0,0 +1,376 @@ +Description: autotools_dev results +Author: Mathieu Malaterre + +--- docbook-utils-0.6.14.orig/Makefile.in ++++ docbook-utils-0.6.14/Makefile.in +@@ -128,7 +128,7 @@ sharedstatedir =3D @sharedstatedir@ + sysconfdir =3D @sysconfdir@ + target_alias =3D @target_alias@ + SUBDIRS =3D backends bin doc frontends helpers +-sgmldudir =3D $(prefix)/share/sgml/docbook/utils-@VERSION@ ++sgmldudir =3D $(prefix)/share/docbook-utils + sgmldu_DATA =3D docbook-utils.dsl + EXTRA_DIST =3D AUTHORS README COPYING INSTALL NEWS ChangeLog TODO \ + $(sgmldu_DATA) docbook-utils.spec +--- docbook-utils-0.6.14.orig/Makefile.am ++++ docbook-utils-0.6.14/Makefile.am +@@ -1,6 +1,6 @@ + SUBDIRS =3D backends bin doc frontends helpers +=20 +-sgmldudir =3D $(prefix)/share/sgml/docbook/utils-@VERSION@ ++sgmldudir =3D $(prefix)/share/docbook-utils + sgmldu_DATA =3D docbook-utils.dsl +=20 + EXTRA_DIST =3D AUTHORS README COPYING INSTALL NEWS ChangeLog TODO \ +--- docbook-utils-0.6.14.orig/backends/Makefile.in ++++ docbook-utils-0.6.14/backends/Makefile.in +@@ -104,7 +104,7 @@ sbindir =3D @sbindir@ + sharedstatedir =3D @sharedstatedir@ + sysconfdir =3D @sysconfdir@ + target_alias =3D @target_alias@ +-sgmldudir =3D $(prefix)/share/sgml/docbook/utils-@VERSION@ ++sgmldudir =3D $(prefix)/share/docbook-utils + sgmldubedir =3D $(sgmldudir)/backends + sgmldube_DATA =3D dvi html man pdf ps rtf tex texi txt + EXTRA_DIST =3D dvi html man.in pdf ps rtf tex texi.in txt +--- docbook-utils-0.6.14.orig/backends/Makefile.am ++++ docbook-utils-0.6.14/backends/Makefile.am +@@ -1,4 +1,4 @@ +-sgmldudir =3D $(prefix)/share/sgml/docbook/utils-@VERSION@ ++sgmldudir =3D $(prefix)/share/docbook-utils + sgmldubedir =3D $(sgmldudir)/backends + sgmldube_DATA =3D dvi html man pdf ps rtf tex texi txt +=20 +--- docbook-utils-0.6.14.orig/backends/man.in ++++ docbook-utils-0.6.14/backends/man.in +@@ -3,7 +3,7 @@ + # This program is under GPL license. See LICENSE file for details. +=20 + # Convert to *roff +-HELPER=3D$SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2man-spe= c.pl ++HELPER=3Ddocbook2man-spec.pl + TMPDIR=3D`mktemp -d /tmp/man.XXXXXX` || \ + { echo >&2 "man backend: could not create secure temporary directory";= exit 1;} + trap 'rm -rf "${TMPDIR}"' EXIT +--- docbook-utils-0.6.14.orig/backends/texi.in ++++ docbook-utils-0.6.14/backends/texi.in +@@ -3,7 +3,7 @@ + # This program is under GPL license. See LICENSE file for details. +=20 + # Convert to texinfo +-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/help= ers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi ++nsgmls $SGML_FILE | sgmlspl docbook2texi-spec.pl >$SGML_FILE_NAME.texi + if [ $? -ne 0 ] + then exit 1 + fi +--- docbook-utils-0.6.14.orig/bin/jw.in ++++ docbook-utils-0.6.14/bin/jw.in +@@ -87,10 +87,10 @@ then + fi +=20 + # Set frontend to use +-SGML_FRONTEND=3D"$SGML_BASE_DIR/docbook/utils-@VERSION@/frontends/docbo= ok" ++SGML_FRONTEND=3D"@prefix@/share/docbook-utils/frontends/docbook" +=20 + # Set backend to use +-SGML_BACKEND=3D"$SGML_BASE_DIR/docbook/utils-@VERSION@/backends/html" ++SGML_BACKEND=3D"@prefix@/share/docbook-utils/backends/html" +=20 + # Set main stylesheet + SGML_STYLESHEET=3D"default" +@@ -120,14 +120,14 @@ while [ $# -gt 0 ] + do case $1 in + -f|--frontend) case "$2" in + /*) SGML_FRONTEND=3D"$2" ;; +- *) d=3D$SGML_BASE_DIR/docbook/utils-@VERSION@/frontends ++ *) d=3D@prefix@/share/docbook-utils/frontends + SGML_FRONTEND=3D"$d/$2" ;; + esac + shift 2 + ;; + -b|--backend) case "$2" in + /*) SGML_BACKEND=3D"$2" ;; +- *) d=3D$SGML_BASE_DIR/docbook/utils-@VERSION@/backends ++ *) d=3D@prefix@/share/docbook-utils/backends + SGML_BACKEND=3D"$d/$2" ;; + esac + shift 2 +@@ -186,8 +186,8 @@ do case $1 in + shift 2 + ;; + -w|--warning) case $2 in +- list) echo -e "List of allowed warning types (multiple -w options a= re allowed):\n" +- echo -e $SGML_WARNINGS_LIST ++ list) printf "List of allowed warning types (multiple -w options ar= e allowed):\n\n" ++ printf "$SGML_WARNINGS_LIST\n" + exit 0 + ;; + xml|mixed|sgmldecl|should|default|duplicate|undefined|unclosed|empt= y|net|min-tag|unused-map|unused-param|notation-sysid|all|no-xml|no-mixed|= no-sgmldecl|no-should|no-default|no-duplicate|no-undefined|no-unclosed|no= -empty|no-net|no-min-tag|no-unused-map|no-unused-param|no-notation-sysid)= \ +@@ -195,14 +195,14 @@ do case $1 in + shift 2 + ;; + *) echo "Unknown warning type \"$2\". Allowed warning types are:" >= &2 +- echo -e $SGML_WARNINGS_LIST >&2 ++ printf "$SGML_WARNINGS_LIST\n" >&2 + exit 1 + ;; + esac + ;; + -e|--error) case $2 in +- list) echo -e "List of allowed error types (multiple -e options are= allowed):\n" +- echo -e $SGML_ERRORS_LIST ++ list) printf "List of allowed error types (multiple -e options are = allowed):\n\n" ++ printf "$SGML_ERRORS_LIST\n" + exit 0 + ;; + no-idref|no-significant|no-valid) \ +@@ -210,19 +210,19 @@ do case $1 in + shift 2 + ;; + *) echo "Unknown error type \"$2\". Allowed error types are:" >&2 +- echo -e $SGML_ERRORS_LIST >&2 ++ printf "$SGML_ERRORS_LIST\n" >&2 + exit 1 + ;; + esac + ;; +- -h|--help) echo -e "`basename $0` - Jade Wrapper\n" +- echo -e "$SGML_HELP_MESSAGE" ++ -h|--help) printf "`basename $0` - Jade Wrapper\n\n" ++ printf "$SGML_HELP_MESSAGE\n" + exit 0 + ;; +- -v|--version) echo -e "$SGML_VERSION_MESSAGE" ++ -v|--version) printf "$SGML_VERSION_MESSAGE\n" + exit 0 + ;; +- -*) echo -e "$SGML_HELP_MESSAGE" >&2 ++ -*) printf "$SGML_HELP_MESSAGE\n" >&2 + exit 1 + ;; + *) if [ -z "$SGML_FILE" ] +@@ -233,7 +233,7 @@ do case $1 in + esac + shift 1 + else +- echo -e "$SGML_HELP_MESSAGE" >&2 ++ printf "$SGML_HELP_MESSAGE\n" >&2 + exit 1 + fi + ;; +@@ -243,7 +243,7 @@ done + # Check that we have a frontend + if [ -z "$SGML_FRONTEND" ] + then +- echo -e $SGML_HELP_MESSAGE >&2 ++ printf "$SGML_HELP_MESSAGE\n" >&2 + exit 1 + fi + if [ ! -s $SGML_FRONTEND ] +@@ -255,7 +255,7 @@ fi + # Check that we have a backend + if [ -z "$SGML_BACKEND" ] + then +- echo -e $SGML_HELP_MESSAGE >&2 ++ printf "$SGML_HELP_MESSAGE\n" >&2 + exit 1 + fi + if [ ! -s $SGML_BACKEND ] +@@ -267,7 +267,7 @@ fi + # Check that we have a file to process + if [ -z "$SGML_FILE" ] + then +- echo -e $SGML_HELP_MESSAGE >&2 ++ printf "$SGML_HELP_MESSAGE\n" >&2 + exit 1 + fi + if [ ! -s $SGML_FILE ] +@@ -290,7 +290,7 @@ fi +=20 + # Use SGML declaration for XML if needed + if [ "$SGML_DECL" =3D "" -a "$SGML_XML" =3D "xml" ] +-then SGML_DECL=3D${SGML_BASE_DIR}/xml.dcl ++then SGML_DECL=3D${SGML_BASE_DIR}/declaration/xml.dcl + fi +=20 + # Try to find the SGML normalizer +@@ -402,7 +402,7 @@ fi + # Create output directory if not available + if [ -z "$SGML_OUTPUT_DIRECTORY" ] + then +- echo -e $SGML_HELP_MESSAGE >&2 ++ printf "$SGML_HELP_MESSAGE\n" >&2 + exit 1 + fi + if [ ! -d $SGML_OUTPUT_DIRECTORY ] +--- docbook-utils-0.6.14.orig/doc/refentry/jw.sgml ++++ docbook-utils-0.6.14/doc/refentry/jw.sgml +@@ -230,7 +230,7 @@ + Here we have chosen to generate HTML output. In fact we can + use any of the backends stored in the backends/ + subdirectory of the DocBook-utils distribution directory (usually +- /usr/share/sgml/docbook/utils-&version;). ++ /usr/share/docbook-utils). + Similarly, you can use any frontend defined in the + frontends/ subdirectory to convert from anothe= r + input format. +@@ -592,21 +592,21 @@ + +=20 + +- /usr/share/sgml/docbook/utils-&version;/backends ++ /usr/share/docbook-utils/backends + + The various backends + + +=20 + +- /usr/share/sgml/docbook/utils-&version;/frontends ++ /usr/share/docbook-utils/frontends + + The various frontends + + +=20 + +- /usr/share/sgml/docbook/utils-&version;/helpers ++ /usr/share/perl5/sgmlspl-specs + + The various helper scripts like docbook2man or docbook2= texi + +--- docbook-utils-0.6.14.orig/doc/man/jw.1 ++++ docbook-utils-0.6.14/doc/man/jw.1 +@@ -128,7 +128,7 @@ be in any other directory than the curre + Here we have chosen to generate HTML output. In fact we can + use any of the backends stored in the \fIbackends/\fR + subdirectory of the DocBook-utils distribution directory (usually +-\fI/usr/share/sgml/docbook/utils-0.6.14\fR). ++\fI/usr/share/docbook-utils\fR). + Similarly, you can use any frontend defined in the + \fIfrontends/\fR subdirectory to convert from another + input format. +@@ -355,13 +355,13 @@ Centralized SGML open catalog. This file + vary if another frontend than \fIdocbook\fR + is used. + .TP +-\fB\fI/usr/share/sgml/docbook/utils-0.6.14/backends\fB\fR ++\fB\fI/usr/share/docbook-utils/backends\fB\fR + The various backends + .TP +-\fB\fI/usr/share/sgml/docbook/utils-0.6.14/frontends\fB\fR ++\fB\fI/usr/share/docbook-utils/frontends\fB\fR + The various frontends + .TP +-\fB\fI/usr/share/sgml/docbook/utils-0.6.14/helpers\fB\fR ++\fB\fI/usr/share/perl5/sgmlspl-specs\fB\fR + The various helper scripts like docbook2man or docbook2texi + .SH "AUTHORS" + .PP +--- docbook-utils-0.6.14.orig/doc/HTML/Makefile.in ++++ docbook-utils-0.6.14/doc/HTML/Makefile.in +@@ -103,7 +103,7 @@ sbindir =3D @sbindir@ + sharedstatedir =3D @sharedstatedir@ + sysconfdir =3D @sysconfdir@ + target_alias =3D @target_alias@ +-htmldir =3D $(docdir)/html/docbook-utils-@VERSION@ ++htmldir =3D $(docdir)/html/ + html_DATA =3D api.html \ + backend-spec.html \ + docbook2man.html \ +--- docbook-utils-0.6.14.orig/frontends/Makefile.in ++++ docbook-utils-0.6.14/frontends/Makefile.in +@@ -104,7 +104,7 @@ sbindir =3D @sbindir@ + sharedstatedir =3D @sharedstatedir@ + sysconfdir =3D @sysconfdir@ + target_alias =3D @target_alias@ +-sgmldudir =3D $(prefix)/share/sgml/docbook/utils-@VERSION@ ++sgmldudir =3D $(prefix)/share/docbook-utils + sgmldufedir =3D $(sgmldudir)/frontends + sgmldufe_DATA =3D docbook + all: all-am +--- docbook-utils-0.6.14.orig/frontends/Makefile.am ++++ docbook-utils-0.6.14/frontends/Makefile.am +@@ -1,3 +1,3 @@ +-sgmldudir =3D $(prefix)/share/sgml/docbook/utils-@VERSION@ ++sgmldudir =3D $(prefix)/share/docbook-utils + sgmldufedir =3D $(sgmldudir)/frontends + sgmldufe_DATA =3D docbook +--- docbook-utils-0.6.14.orig/frontends/docbook.in ++++ docbook-utils-0.6.14/frontends/docbook.in +@@ -27,10 +27,7 @@ case "$1" in + done + if [ -z "$SGML_CATALOG" ] + then +- if [ "${SGML_XML}" !=3D "sgml" ] +- then SGML_CATALOG=3D${SGML_CATALOGS_DIR}/${SGML_XML}-docbook.cat +- else SGML_CATALOG=3D${SGML_CATALOGS_DIR}/catalog +- fi ++ SGML_CATALOG=3D${SGML_CATALOGS_DIR}/catalog + fi + echo "$SGML_CATALOG" + ;; +@@ -38,7 +35,7 @@ case "$1" in + style-sheet) + case $SGML_STYLESHEET in + default) +- echo "${SGML_BASE_DIR}/docbook/utils-@VERSION@/docbook-utils.dsl#$= {SGML_TYPE}" ++ echo "/usr/share/docbook-utils/docbook-utils.dsl#${SGML_TYPE}" + ;; + none) + find $SGML_BASE_DIR -name docbook.dsl | grep "$SGML_TYPE/docbook.d= sl" | awk '{print $1}' +--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl ++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl +@@ -1199,8 +1199,8 @@ sgml('cdata', sub + $_[0] =3D~ s/\\/\\\\/g; +=20 + # Escape dots and single quotes in column 1 +- $_[0] =3D~ s/^\./\\\&\./; +- $_[0] =3D~ s/^\'/\\\&\'/; ++ $_[0] =3D~ s/^[ \t]*\./\\\&\./; ++ $_[0] =3D~ s/^[ \t]*\'/\\\&\'/; +=20 + # In non-'pre'-type elements: + if(!$nocollapse_whitespace) { +--- docbook-utils-0.6.14.orig/helpers/Makefile.in ++++ docbook-utils-0.6.14/helpers/Makefile.in +@@ -103,8 +103,8 @@ sbindir =3D @sbindir@ + sharedstatedir =3D @sharedstatedir@ + sysconfdir =3D @sysconfdir@ + target_alias =3D @target_alias@ +-sgmldudir =3D $(prefix)/share/sgml/docbook/utils-@VERSION@ +-sgmlduhedir =3D $(sgmldudir)/helpers ++sgmldudir =3D $(prefix)/share ++sgmlduhedir =3D $(sgmldudir)/perl5/sgmlspl-specs + sgmlduhe_DATA =3D docbook2man-spec.pl docbook2texi-spec.pl + EXTRA_DIST =3D $(sgmlduhe_DATA) + all: all-am +--- docbook-utils-0.6.14.orig/helpers/Makefile.am ++++ docbook-utils-0.6.14/helpers/Makefile.am +@@ -1,5 +1,5 @@ +-sgmldudir =3D $(prefix)/share/sgml/docbook/utils-@VERSION@ +-sgmlduhedir =3D $(sgmldudir)/helpers ++sgmldudir =3D $(prefix)/share ++sgmlduhedir =3D $(sgmldudir)/perl5/sgmlspl-specs + sgmlduhe_DATA =3D docbook2man-spec.pl docbook2texi-spec.pl +=20 + EXTRA_DIST =3D $(sgmlduhe_DATA) +--- docbook-utils-0.6.14.orig/helpers/docbook2texi-spec.pl ++++ docbook-utils-0.6.14/helpers/docbook2texi-spec.pl +@@ -774,7 +774,7 @@ texi_sgml('', "\n\@page\n"); + ## Print the URL + sgml('', sub { + if($skip_inline++) { return; } # hopefully doesn't happen +- output '@uref{', output $_[0]->attribute('URL'), ', ' ++ output '@uref{', $_[0]->attribute('URL')->value, ', ' + }); + sgml('', sub { + output '}' unless --$skip_inline; +@@ -807,6 +807,7 @@ sgml('', sub { + sgml('|[lt ]|', "<"); + sgml('|[gt ]|', ">"); + sgml('|[amp ]|', "&"); ++sgml('|[ndash ]|', "-"); +=20 + # + # Default handlers (uncomment these if needed). Right now, these are s= et diff --git a/gnu/packages/patches/docbook-utils-frontends.patch b/gnu/pac= kages/patches/docbook-utils-frontends.patch new file mode 100644 index 0000000000..73fb2c06d0 --- /dev/null +++ b/gnu/packages/patches/docbook-utils-frontends.patch @@ -0,0 +1,42 @@ +Definition: docbook frontend runs sgmlnorm on xml input, + WARNING: I know very little about the docbook toolchain! Please=20 + double-check and triple-check my suggestion. Works For Me (tm)= + =20 + =20 + Running=20 +=20 + db2html foo.xml +=20 + causes unnecessary long waits (up to 30 seconds or so) if the=20 + input document is an XML document. +=20 + I traced down the problem to the file=20 + /usr/share/sgml/docbook/utils-0.6.13/frontend/docbook (which is + called from /usr/bin/jw). Apparently it runs 'sgmlnorm' even + over XML documents (which should be expected to be well-formed, no?). + This is because $SGML_NORM is set to either 'sgml' or 'xml' in=20 + /usr/bin/jw in any case (and exported), so that the check in docbook + will always lead to sgmlnorm being used. +=20 + To me it seems unnecessary to run sgmlnorm over XML input, but I=20 + may well be wrong :) +=20 + If there is something to it, please have a look at the attached + patch, which works fine for me and fixes those long waits for me. +Author: Tim-Philipp M=C3=BCller +Forwarded: not-needed +Bug-Debian: http://bugs.debian.org/212088 + +Index: docbook-utils-0.6.14/frontends/docbook.in +=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=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 +--- docbook-utils-0.6.14.orig/frontends/docbook.in 2012-05-09 19:15:17.3= 96741140 +0200 ++++ docbook-utils-0.6.14/frontends/docbook.in 2012-05-09 19:15:34.988740= 507 +0200 +@@ -6,7 +6,7 @@ + # Give the location of the centralized catalog + # First try the one with a version matching the version that is indicat= ed in the document + centralized-catalog) +- if [ -n "$SGML_NORM" ]; then ++ if [ -n "$SGML_NORM" ] && [ "$SGML_XML" =3D "sgml" ]; then + SGML_NORM_OPTS=3D'-d' + else + SGML_NORM=3Dcat diff --git a/gnu/packages/patches/docbook-utils-helpers-date.patch b/gnu/= packages/patches/docbook-utils-helpers-date.patch new file mode 100644 index 0000000000..192233d41f --- /dev/null +++ b/gnu/packages/patches/docbook-utils-helpers-date.patch @@ -0,0 +1,61 @@ +Description: patch to get the from the sgml file + For the moment, docbook2man doesn't use the tag date in + to but `date "+%d %B %Y"`, and thus depend on the current locale. +=20 + + + 06 September 2003 + + +=20 + A patch against /usr/share/perl5/sgmlspl-specs/docbook2man-spec.pl + allows to use the date written in the source SGML file (which can be + localized) instead of the current date. +=20 + However, if no correct date tag is present in the SGML file, the date + written in the manpage will depend on the current locale. +Author: Simon Paillard +Forwarded: not-needed +Bug-Debian: http://bugs.debian.org/214982 + +Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl +=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=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 +--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:= 27:28.000000000 +0200 ++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 18:55:53= =2E276783163 +0200 +@@ -278,8 +278,9 @@ + .\\" etc. to Steve Cheng . + _END_BANNER +=20 +- my $manpage_date =3D `date "+%d %B %Y"`; +- =09 ++ my $date =3D `date "+%d %B %Y"`; ++ my $manpage_date =3D $manpage_date || $date ; ++ + output '.TH "'; + =09 + # If the title is not mixed-case, convention says to +@@ -292,7 +293,7 @@ + } + =09 + output '" "', fold_string($manpage_sect),=20 +- '" "', fold_string(`date "+%d %B %Y"`),=20 ++ '" "', fold_string($manpage_date),=20 + '" "', $manpage_misc,=20 + '" "', $manpage_manual,=20 + "\"\n"; +@@ -568,6 +569,15 @@ + sgml('', sub { $_[0]->parent->ext->{'attribution'} =3D po= p_output(); }); +=20 +=20 ++sgml('', sub { ++ save_cdata(); ++}); ++sgml('', sub {=20 ++ $manpage_date =3D fold_string(pop_output()); ++ $raw_cdata--; ++}); ++ ++ + # IGNORE. + sgml('', sub { push_output('nul'); }); + sgml('', sub { pop_output(); }); diff --git a/gnu/packages/patches/docbook-utils-helpers-name.patch b/gnu/= packages/patches/docbook-utils-helpers-name.patch new file mode 100644 index 0000000000..d577fed748 --- /dev/null +++ b/gnu/packages/patches/docbook-utils-helpers-name.patch @@ -0,0 +1,34 @@ +Description: docbook2man should translate the NAME section according to = the REFENTRY's lang attribute + Currently, docbook2man translates the NAME section according to the lan= g + attribute provided to the REFNAMEDIV tag. + When a lang attribute is specified in the REFENTRY tag and no lang + attribute is specified with the REFNAMEDIV, the lang attribute of the + REFENTRY should be used. +Author: Nicolas Fran=C3=A7ois +Forwarded: not-needed +Bug-Debian: http://bugs.debian.org/394511 + +Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl +=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=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 +--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:= 55:53.276783163 +0200 ++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 18:58:04= =2E792778418 +0200 +@@ -359,11 +359,14 @@ + # NAME section + man_sgml('', sub { + my %words =3D qw( fr NOM es NOMBRE de NAME ); +- if (defined($_[0]->attribute('LANG')->value)) { +- my $id =3D $_[0]->attribute('LANG')->value; +- my $ad =3D $words{$id}; +- output("\n.SH $ad\n");} +- else {output("\n.SH NAME\n");} ++ # Use the REFNAMEDIV's lang attribute, and default to the ++ # REFENTRY's lang attribute. ++ my $lang =3D $_[0]->attribute('LANG')->value; ++ $lang =3D $manpage_lang unless defined $lang; ++ if (defined($lang) and defined $words{lc($lang)}) { ++ my $ad =3D $words{lc($lang)}; ++ output("\n.SH $ad\n");} ++ else { output("\n.SH NAME\n");} + }); +=20 + sgml('', \&save_cdata); diff --git a/gnu/packages/patches/docbook-utils-helpers-support.patch b/g= nu/packages/patches/docbook-utils-helpers-support.patch new file mode 100644 index 0000000000..ee3510a1d0 --- /dev/null +++ b/gnu/packages/patches/docbook-utils-helpers-support.patch @@ -0,0 +1,29 @@ +Author: Reiner Herrmann +Description: Support SOURCE_DATE_EPOCH for timestamps + To allow generating documents in a reproducible way, + allow overriding the timestamp through the environment. + . + See also: https://reproducible-builds.org/specs/source-date-epoch/ +Bug-Debian: https://bugs.debian.org/800797 + +--- a/helpers/docbook2man-spec.pl ++++ b/helpers/docbook2man-spec.pl +@@ -57,6 +57,7 @@ + use SGMLS; # Use the SGMLS package. + use SGMLS::Output; # Use stack-based output. + use SGMLS::Refs; ++use POSIX qw(strftime setlocale LC_TIME); +=20 + #######################################################################= # + # SGMLSPL script produced automatically by the script sgmlspl.pl +@@ -279,6 +280,10 @@ + _END_BANNER +=20 + my $date =3D `date "+%d %B %Y"`; ++ if ($ENV{SOURCE_DATE_EPOCH}) { ++ setlocale(LC_TIME, "C"); ++ $date =3D strftime("%d %B %Y", gmtime($ENV{SOURCE_DATE_EPOCH} || time= )); ++ } + my $manpage_date =3D $manpage_date || $date ; +=20 + output '.TH "'; diff --git a/gnu/packages/patches/docbook-utils-helpers-whitespace.patch = b/gnu/packages/patches/docbook-utils-helpers-whitespace.patch new file mode 100644 index 0000000000..8b1bba3ff4 --- /dev/null +++ b/gnu/packages/patches/docbook-utils-helpers-whitespace.patch @@ -0,0 +1,30 @@ +Description: incorrectly strips whitespace (patch included) + In the previous upload, docbook2man was patched to escape the special + characters . and ' at the beginning of a line (see #399947). + Unfortunately that patch was incorrect -- as well as escaping the speci= al + characters, it also removes all whitespace from the beginning of + affected lines. As a result, if you are in a block where whitespace + matters (such as ...) then the output is now incorrect= =2E +=20 + This is very easy to fix -- just match the whitespace and preserve it, + instead of tossing it away. The full patch (just two lines) is include= d + below. +Author: Ben Burton +Forwarded: not-needed +Bug-Debian: http://bugs.debian.org/528334 + +Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl +=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=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 +--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:= 59:42.584774885 +0200 ++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 19:00:34= =2E788773002 +0200 +@@ -1212,8 +1212,8 @@ + $_[0] =3D~ s/\\/\\\\/g; +=20 + # Escape dots and single quotes in column 1 +- $_[0] =3D~ s/^[ \t]*\./\\\&\./; +- $_[0] =3D~ s/^[ \t]*\'/\\\&\'/; ++ $_[0] =3D~ s/^([ \t]*)\./$1\\\&\./; ++ $_[0] =3D~ s/^([ \t]*)\'/$1\\\&\'/; +=20 + # In non-'pre'-type elements: + if(!$nocollapse_whitespace) { diff --git a/gnu/packages/patches/docbook-utils-jade.patch b/gnu/packages= /patches/docbook-utils-jade.patch new file mode 100644 index 0000000000..e90989aca4 --- /dev/null +++ b/gnu/packages/patches/docbook-utils-jade.patch @@ -0,0 +1,211 @@ +Description: Change dependencies on jade and sp to openjade and opensp +Author: Neil Roeth +Last-Update: 2016-07-24 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/doc/HTML/Makefile.am ++++ b/doc/HTML/Makefile.am +@@ -1,4 +1,4 @@ +-htmldir =3D $(docdir)/html/docbook-utils-@VERSION@ ++htmldir =3D $(docdir)/html + html_DATA =3D api.html \ + backend-spec.html \ + docbook2man.html \ +@@ -25,6 +25,6 @@ + $(top_srcdir)/doc/refentry/sgmldiff.sgml + SGML_CATALOG_FILES=3D/etc/sgml/catalog \ + SGML_SEARCH_PATH=3D$(top_srcdir):$(top_srcdir)/doc:.. \ +- jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \ ++ openjade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \ + -V '%use-id-as-filename%' $< +=20 +--- a/doc/man/Makefile.am ++++ b/doc/man/Makefile.am +@@ -12,5 +12,5 @@ + $(top_srcdir)/helpers/docbook2man-spec.pl + SGML_CATALOG_FILES=3D/etc/sgml/catalog \ + SGML_SEARCH_PATH=3D$(top_srcdir)/doc:.. \ +- nsgmls $< | \ ++ onsgmls $< | \ + sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl +--- a/backends/man.in ++++ b/backends/man.in +@@ -7,8 +7,8 @@ + TMPDIR=3D`mktemp -d /tmp/man.XXXXXX` || \ + { echo >&2 "man backend: could not create secure temporary directory";= exit 1;} + trap 'rm -rf "${TMPDIR}"' EXIT +-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp" +-sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs" ++onsgmls $SGML_FILE > "${TMPDIR}/onsgmls.tmp" ++sgmlspl $HELPER <"${TMPDIR}/onsgmls.tmp" 2>"${TMPDIR}/errs" + if [ $? -ne 0 ] + then + cat "${TMPDIR}/errs" +@@ -18,7 +18,7 @@ + if grep unresolved "${TMPDIR}/errs" >/dev/null 2>&1 + then + echo "Resolving references.." +- sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" ++ sgmlspl $HELPER <"${TMPDIR}/onsgmls.tmp" + if [ $? -ne 0 ] + then exit 1 + fi +--- a/backends/texi.in ++++ b/backends/texi.in +@@ -3,7 +3,7 @@ + # This program is under GPL license. See LICENSE file for details. +=20 + # Convert to texinfo +-nsgmls $SGML_FILE | sgmlspl docbook2texi-spec.pl >$SGML_FILE_NAME.texi ++onsgmls $SGML_FILE | sgmlspl docbook2texi-spec.pl >$SGML_FILE_NAME.texi= + if [ $? -ne 0 ] + then exit 1 + fi +--- a/bin/sgmldiff.in ++++ b/bin/sgmldiff.in +@@ -22,13 +22,13 @@ +=20 + use strict; + use integer; +-use vars qw($nsgmls $errors $errorlog $VERSION); ++use vars qw($onsgmls $errors $errorlog $VERSION); + use Getopt::Long 2.01; +=20 + $VERSION =3D 1.03; +=20 +-my $nsgmls; +-$nsgmls =3D "@jade_bindir@/nsgmls"; ++my $onsgmls; ++$onsgmls =3D "@jade_bindir@/onsgmls"; +=20 + #----------------------------------------------------------------------= + # TODO: +@@ -37,7 +37,7 @@ + # - Wait for suggestions ;-) + #=20 + # Note: the input file need not be valid, nor is it necessary to have=20 +-# the DTDs. nsgmls always returns a structure. ++# the DTDs. onsgmls always returns a structure. + #----------------------------------------------------------------------= +=20 + # Get file name +@@ -141,11 +141,11 @@ + unlink $diff2; +=20 + #--------------------------------------------------------------------- +-# Process nsgmls output: keep all stuff that is important for the ++# Process onsgmls output: keep all stuff that is important for the + # structure comparison. Make two structures: one that is diffed + # (without text) (DIFF) and one that is used to present the + # differences to the user (@full). For more info: see SP +-# documentation, nsgmls output format. ++# documentation, onsgmls output format. +=20 + sub prepare { + my($filename,$todiffname) =3D @_; +@@ -161,7 +161,7 @@ + my @line_numbered =3D (); + my $line =3D 0; +=20 +- open(ESIS, "$nsgmls -l $errors $errorlog -onotation-sysid -oid -oem= pty $filename | "); #-oentity generates strange output; ? -ononsgml ++ open(ESIS, "$onsgmls -l $errors $errorlog -onotation-sysid -oid -oe= mpty $filename | "); #-oentity generates strange output; ? -ononsgml + open(DIFF, "> $todiffname"); + while () { + chomp $_; +@@ -375,7 +375,7 @@ + }; +=20 + #----------------------------------------------------------------------= +-# Normalise data text from nsgmls (i.e. don't print the escaped text). ++# Normalise data text from onsgmls (i.e. don't print the escaped text).= + sub normalise_text { + my($string,$prefix) =3D @_; + my $result =3D "$prefix"; +--- a/configure.in ++++ b/configure.in +@@ -21,7 +21,7 @@ +=20 + dnl Checks for programs. + jade_bindirs=3D"/usr/bin /usr/local/bin" +-AC_FIND_PROGRAM(nsgmls, $jade_bindirs, jade_bindir) ++AC_FIND_PROGRAM(onsgmls, $jade_bindirs, jade_bindir) + AC_SUBST(jade_bindir) +=20 + perl_bindirs=3D"/usr/bin /usr/local/bin" +--- a/doc/refentry/docbook2man-spec.pl.sgml ++++ b/doc/refentry/docbook2man-spec.pl.sgml +@@ -19,7 +19,7 @@ + +=20 + +-nsgmls ++onsgmls + sgml document + | sgmlspl + docbook2man-spec.pl +@@ -35,7 +35,7 @@ + +=20 + +-The program reads ESIS produced by nsgmls (or other SGML parsers) from ++The program reads ESIS produced by onsgmls (or other SGML parsers) from= + standard input. Markup not found in RefEntry is discarded. + +=20 +--- a/doc/refentry/docbook2texi-spec.pl.sgml ++++ b/doc/refentry/docbook2texi-spec.pl.sgml +@@ -20,7 +20,7 @@ + +=20 + +-nsgmls ++onsgmls + sgml document + | sgmlspl + docbook2texi-spec.pl +@@ -37,7 +37,7 @@ + +=20 + +-The program reads ESIS produced by nsgmls (or other SGML parsers) from ++The program reads ESIS produced by onsgmls (or other SGML parsers) from= + standard input. Currently the document element must be Book, + otherwise the results are undefined. + +--- a/doc/refentry/jw.sgml ++++ b/doc/refentry/jw.sgml +@@ -630,7 +630,7 @@ + 1, + install-catalog + 8, +- nsgmls ++ onsgmls + 1, docbook-utils + homepage. +--- a/doc/refentry/sgmldiff.sgml ++++ b/doc/refentry/sgmldiff.sgml +@@ -238,10 +238,10 @@ + +