unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / Atom feed
From: Raghav Gururajan <raghavgururajan@disroot.org>
To: Danny Milosavljevic <dannym@scratchpost.org>
Cc: guix-devel@gnu.org
Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix
Date: Fri, 24 Jul 2020 14:29:24 -0400
Message-ID: <6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org> (raw)
In-Reply-To: <9859f0c6-473f-3191-189e-5b2aa6fd02f4@disroot.org>


[-- Attachment #1.1.1: Type: text/plain, Size: 21964 bytes --]

@Danny

Please find the attached patches.

@Others

Please find the following git-log.

*** START ***

commit dc979672cfb865073608aea2b443f326ceada3d1
Author: Raghav Gururajan <raghavgururajan@disroot.org>
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]<origin>[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 <raghavgururajan@disroot.org>
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]<origin>[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=]: 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 <raghavgururajan@disroot.org>
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=]: New flag.
    <#:phases>['patch-docbook-xml]: New phase.
    [native-inputs]: Add docbook-xml and gtk-doc.

commit 1bbadcc904f28c4761d49118b33bf287d547dd19
Author: Raghav Gururajan <raghavgururajan@disroot.org>
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=]: 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 <raghavgururajan@disroot.org>
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]<origin>[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, liboauth
    and sqlite.
    [synopsis]: Modify.
    [description]: Modify.

commit 493edd0a14c7a004b024d66d955b8065e0c7ba5e
Author: Raghav Gururajan <raghavgururajan@disroot.org>
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=]: 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 <raghavgururajan@disroot.org>
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]<origin>[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 <raghavgururajan@disroot.org>
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]<origin>[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 <raghavgururajan@disroot.org>
Date:   Fri Jul 24 08:55:56 2020 -0400

    gnu: Add libdmapsharing.

    * gnu/packages/gnome.scm (libdmapsharing): New variable.

commit b9576949759167e8803797fd24e5d04fd11ea78a
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Fri Jul 24 08:03:26 2020 -0400

    gnu: Add pedansee.

    * gnu/packages/check.scm (pedansee): New variable.

commit 2af3819e659c70c29385890f4fc5313c95653a89
Author: Raghav Gururajan <raghavgururajan@disroot.org>
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]<origin>[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 <raghavgururajan@disroot.org>
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]<origin>[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=]: 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 <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
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]<origin>[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 <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
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]<origin>[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 <raghavgururajan@disroot.org>
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=]: 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 <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
Date:   Tue Jul 21 08:12:34 2020 -0400

    gnu: Add openjade.

    * gnu/packages/xml.scm (openjade): New variable.

commit f02f44f066b5df67da5a9211f78771b9305f2ff9
Author: Raghav Gururajan <raghavgururajan@disroot.org>
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]<origin>[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 <raghavgururajan@disroot.org>
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]<origin>[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.

commit cffe17c384893d2a43156ebf0cc5780d6ccf2123
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Jul 21 03:45:21 2020 -0400

    gnu: gegl: Update package definition.

    * gnu/packages/gimp.scm (gegl): Update package definition.
    [source]<origin>[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,
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 <raghavgururajan@disroot.org>
Date:   Mon Jul 20 12:21:09 2020 -0400

    gnu: Add mrg.

    * gnu/packages/gimp.scm (mrg): New variable.

commit d95f0ab7fd46370eb80a6d821928c1d2f6c6c6ae
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Mon Jul 20 11:00:41 2020 -0400

    gnu: Add mmm.

    * gnu/packages/graphics.scm (mmm): New variable.

commit 46b13e21a57b04cf443d5823d2eea472f9d3d286
Author: Raghav Gururajan <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
Date:   Mon Jul 20 01:49:43 2020 -0400

    gnu: Add zeitgeist.

    * gnu/packages/gnome.scm (zeitgeist): New variable.

commit d939da668cdab3dc891773b78d25be8ccc5c99eb
Author: Raghav Gururajan <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
Date:   Sun Jul 19 06:11:54 2020 -0400

    gnu: Add gtx.

    * gnu/packages/gnome.scm (gtx): New variable.

commit 54f10ad0cdef2a02daa4c320e30f69e86ac0f748
Author: Raghav Gururajan <raghavgururajan@disroot.org>
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]<origin>[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
reference.

commit 0e10b61e461c607a01f90dca257ce9dba7965929
Author: Raghav Gururajan <raghavgururajan@disroot.org>
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 <raghavgururajan@disroot.org>
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.

[-- Attachment #1.1.2: 0001-gnu-amtk-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4085 bytes --]

From a178c52797dab6ad1eaa57148a8beced7e4446f8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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="
+                       (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 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.")
+    (home-page "https://wiki.gnome.org/Projects/Amtk")
     (license license:lgpl2.1+)))
 
 (define-public devhelp
-- 
2.27.0


[-- Attachment #1.1.3: 0002-gnu-babl-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4151 bytes --]

From 0e10b61e461c607a01f90dca257ce9dba7965929 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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))
 
@@ -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/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"))))
+    (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=false")))
+     `(#: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 ‘babl.pc’.
      `(("lcms" ,lcms)))
+    (synopsis "Pixel encoding and color space conversion engine in C")
+    (description "Babl is a pixel encoding and color space conversion engine,
+with format introspection, cached runtime self-benchmarking alternate and 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+)))
 
 (define-public gegl
-- 
2.27.0


[-- Attachment #1.1.4: 0003-gnu-evolution-data-server-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 16700 bytes --]

From 54f10ad0cdef2a02daa4c320e30f69e86ac0f748 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 19 Jul 2020 03:23:18 -0400
Subject: [PATCH 03/36] gnu: evolution-data-server: Update package definition.

* gnu/packages/gnome.scm (evolution-data-server) [version]: Update
to 3.36.4.
[source]<origin>[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 reference.
---
 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-compat.patch
 delete mode 100644 gnu/packages/patches/evolution-data-server-locales.patch

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 =						\
   %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 Kerberos.")
 (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.patch"
-                                       "evolution-data-server-libical-compat.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-server/" s))
-                             '("addressbook-backends" "calendar-backends"
-                               "camel-providers" "credential-modules"
-                               "registry-modules"))))
-         (list "-DENABLE_UOA=OFF"             ;disable Ubuntu Online Accounts support
-               "-DENABLE_GOOGLE=OFF"          ;disable Google Contacts support
-               "-DENABLE_GOOGLE_AUTH=OFF"     ;disable Google authentication
-               "-DENABLE_VALA_BINDINGS=ON"
-               (string-append "-DCMAKE_INSTALL_RPATH=" lib ";"
-                              (string-append lib "/evolution-data-server;")
-                              (string-join runpaths ";"))
-               "-DENABLE_INTROSPECTION=ON"))  ;required for Vala bindings
+     `(#: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="
+                       (assoc-ref %build-inputs "sendmail"))
+        "-DWITH_SYSTEMDUSERUNITDIR=OFF"
+        "-DENABLE_INTROSPECTION=ON"
+        "-DENABLE_GTK_DOC=ON"
+        "-DWITH_PRIVATE_DOCS=ON"
+        "-DENABLE_BACKEND_PER_PROCESS=ON"
+        "-DENABLE_VALA_BINDINGS=ON"
+        ;; Required for RUNPATH validation.
+        (string-append "-DCMAKE_INSTALL_RPATH="
+                       (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_contacts:
-             ;; assertion failed (g_slist_length (contacts) == 20): (0 == 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-server-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/evolution-data-server-docs.sgml.in"
+               (("<xi:include href=\"xml/e-cal-time-util.xml\"/>")
+                ""))
+             ;; 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.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-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 backend for
+programs that work with contacts, tasks, and calendar information.  It provides
+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 with
-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)))
 
 (define-public caribou
diff --git a/gnu/packages/patches/evolution-data-server-libical-compat.patch 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/77384ab552c19bf374dbeda53dc37f98d07bd4ec
-
-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=${soup_encoded_version})
- 
- 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/calendar/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;
- 
- 					base64 = g_base64_encode ((const guchar *) content, len);
--					new_attach = i_cal_attach_new_from_data (base64, NULL, NULL);
-+					new_attach = i_cal_attach_new_from_data (base64, (GFunc) g_free, NULL);
- 					g_free (content);
--					g_free (base64);
- 
- 					ecmb_remove_all_but_filename_parameter (prop);
diff --git a/gnu/packages/patches/evolution-data-server-locales.patch b/gnu/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 <mcrha@redhat.com>
-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-collator.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 = NULL;
- 
-+	if (posix_locale && (
-+	    g_ascii_strcasecmp (posix_locale, "C") == 0 ||
-+	    g_ascii_strcasecmp (posix_locale, "POSIX") == 0))
-+		posix_locale = "en_US_POSIX";
-+
- 	len = uloc_canonicalize (posix_locale, locale_buffer, LOCALE_BUFFER_LEN, &status);
- 
- 	if (U_FAILURE (status)) {
--- 
-2.22.0
-
-- 
2.27.0


[-- Attachment #1.1.5: 0004-gnu-Add-gtx.patch --]
[-- Type: text/x-patch, Size: 2075 bytes --]

From 60db9b21985945f42209d493e15433c27cf775eb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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+)))
 
+(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="
+                       (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 intended to
+enhance the GLib testing framework.  With specific emphasis on easing the pain
+of writing test cases for asynchronous interactions.")
+    (home-page "https://launchpad.net/gtx")
+    (license license:lgpl2.1+)))
+
 (define-public libcloudproviders
   (package
     (name "libcloudproviders")
-- 
2.27.0


[-- Attachment #1.1.6: 0005-gnu-Add-dee.patch --]
[-- Type: text/x-patch, Size: 5543 bytes --]

From d939da668cdab3dc891773b78d25be8ccc5c99eb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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 =						\
   %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+)))
 
+(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="
+                       (assoc-ref %outputs "out")
+                       "/lib/python"
+                       ,(version-major+minor
+                         (package-version python))
+                       "/site-packages/gi/overrides")
+        (string-append "--with-html-dir="
+                       (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 allowing
+you to create Model-View-Controller type programs across DBus.  It also consists
+of utility objects which extend DBus allowing for peer-to-peer discoverability
+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/dee-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
+===================================================================
+--- 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
+ 
+ FilterModel
+-	.filter unowned
++        .filter skip // unsupported type for construct property
++Index
++        .reader skip // unsupported type for construct property
+ Model
+ 	.append skip=false
+ 	.build_named_row skip
-- 
2.27.0


[-- Attachment #1.1.7: 0006-gnu-Add-zeitgeist.patch --]
[-- Type: text/x-patch, Size: 4311 bytes --]

From cc27746676b693a2898012e6652dcb0a1cefc24b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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.")
       license:lgpl3+
       license:gpl3+))))
 
+(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’s activities and
+events, anywhere from files opened to websites visited and conversations.  It
+makes this information readily available for other applications to use.  It is
+able to establish relationships between items based on similarity and usage
+patterns.")
+    (home-page "https://zeitgeist.freedesktop.org/")
+    (license
+     ;; Dual-licensed
+     (list
+      license:lgpl2.1+
+      license:gpl2+))))
+
 (define-public libcloudproviders
   (package
     (name "libcloudproviders")
-- 
2.27.0


[-- Attachment #1.1.8: 0007-gnu-folks-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5853 bytes --]

From e2a4c1746f91265d202b6d5258e9058c4ca6171e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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=true"
+        "-Dzeitgeist=true"
+        "-Ddocs=true")
+       #: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 about people
-from multiple sources (e.g., Telepathy connection managers for IM contacts,
-Evolution Data Server for local contacts, libsocialweb for web service contacts,
-etc.) to create metacontacts.  It's written in Vala, which generates C code 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 multiple
+sources (eg, Telepathy connection managers for IM contacts, Evolution Data
+Server for local contacts, etc.) to create metacontacts.  It's written in Vala,
+which generates C code when compiled.")
     (home-page "https://wiki.gnome.org/Projects/Folks")
     (license license:lgpl2.1+)))
 
-- 
2.27.0


[-- Attachment #1.1.9: 0008-gnu-Add-poly2tri-c.patch --]
[-- Type: text/x-patch, Size: 3673 bytes --]

From 46b13e21a57b04cf443d5823d2eea472f9d3d286 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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))
 
+(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 rendering
+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")
-- 
2.27.0


[-- Attachment #1.1.10: 0009-gnu-Add-mmm.patch --]
[-- Type: text/x-patch, Size: 2195 bytes --]

From d95f0ab7fd46370eb80a6d821928c1d2f6c6c6ae Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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))
 
+(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 access to
+framebuffer graphics, audio output and input event.")
+    (home-page "https://github.com/hodefoting/mrg")
+    (license license:isc)))
+
 (define-public directfb
   (package
     (name "directfb")
-- 
2.27.0


[-- Attachment #1.1.11: 0010-gnu-Add-mrg.patch --]
[-- Type: text/x-patch, Size: 2347 bytes --]

From af02e9eb2e681975c7b42a7e6a42ce5adff93a1e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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)))
 
+(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 can be
+used as an application writing environment or as an interactive canvas for part
+of a larger interface.")
+    (home-page "https://github.com/hodefoting/mrg")
+    (license license:lgpl2.0+)))
+
 (define-public babl
   (package
     (name "babl")
-- 
2.27.0


[-- Attachment #1.1.12: 0011-gnu-gegl-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 11470 bytes --]

From cffe17c384893d2a43156ebf0cc5780d6ccf2123 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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]<origin>[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, 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.
---
 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 =						\
   %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/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"))))
+    (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=false")))
-    ;; These are propagated to satisfy 'gegl-0.4.pc'.
+       (list
+        "-Ddocs=true"
+        "-Dworkshop=true"
+        "-Dsdl1=auto")
+       #: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 infrastructure to
-do demand based cached non destructive image editing on larger than RAM
-buffers.")
-    ;; The library itself is licensed under LGPL while the sample commandline
-    ;; application and GUI binary gegl is licensed under GPL.
-    (license (list license:lgpl3+ license:gpl3+))))
+    (license license:lgpl3+)))
 
 (define-public gimp
   (package
diff --git a/gnu/packages/patches/gegl-mrg.patch b/gnu/packages/patches/gegl-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 <raghavgururajan@disroot.org>
+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 @@
+ 
+ 
+ #ifdef MRG_PRINTF
+-#include <mrg.h>
+-#include <mrg-string.h>
++#include <mrg/mrg.h>
++#include <mrg/mrg-string.h>
+ 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 <unistd.h>
+ #include <dirent.h>
+ #include <math.h>
+-#include <mrg.h>
++#include <mrg/mrg.h>
+ #include <gegl.h>
+ #include <gexiv2/gexiv2.h>
+ #include <gegl-paramspecs.h>
+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 <unistd.h>
+ #include <dirent.h>
+ #include <math.h>
+-#include <mrg.h>
+-#include <mrg-string.h>
++#include <mrg/mrg.h>
++#include <mrg/mrg-string.h>
+ #include <gegl.h>
+ #include <gexiv2/gexiv2.h>
+ #include <gegl-paramspecs.h>
+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 =
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <math.h>
+-#include <mrg.h>
+-#include <mrg-string.h>
++#include <mrg/mrg.h>
++#include <mrg/mrg-string.h>
+ #include <gegl.h>
+ #include <gexiv2/gexiv2.h>
+ #include <gegl-paramspecs.h>
+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 <unistd.h>
+ #include <dirent.h>
+ #include <math.h>
+-#include <mrg.h>
+-#include <mrg-string.h>
++#include <mrg/mrg.h>
++#include <mrg/mrg-string.h>
+ #include <gegl.h>
+ #include <gexiv2/gexiv2.h>
+ #include <gegl-paramspecs.h>
+-- 
+GitLab
+
-- 
2.27.0


[-- Attachment #1.1.13: 0012-gnu-geocode-glib-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5083 bytes --]

From e4ba886dbc21e22556650552d55c8541e824c620 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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]<origin>[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=false")
+       #: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 longitude,
-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 (finding
+longitude, and latitude from an address) and reverse geocoding (finding an
+address from coordinates) using the Nominatim service.  It also caches requests
+for faster results and to avoid unnecessary server load.")
+    (home-page "https://developer.gnome.org/geocode-glib/")
     (license license:lgpl2.0+)))
 
 (define-public upower
-- 
2.27.0


[-- Attachment #1.1.14: 0013-gnu-gexiv2-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4332 bytes --]

From f02f44f066b5df67da5a9211f78771b9305f2ff9 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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]<origin>[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=true")
+       #: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 metadata
+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 library.  It
-allows for GNOME applications to easily inspect and update EXIF, IPTC, and XMP
-metadata in photo and video files of various formats.")
     (license license:gpl2+)))
 
 (define-public shotwell
-- 
2.27.0


[-- Attachment #1.1.15: 0014-gnu-Add-openjade.patch --]
[-- Type: text/x-patch, Size: 2672 bytes --]

From 8f97cf8ad6561e5072abb8723c058c09d5f7a796 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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))
 
+(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="
+                       (assoc-ref %build-inputs "opensp")
+                       "/include/OpenSP")
+        (string-append "--enable-splibdir="
+                       (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")
-- 
2.27.0


[-- Attachment #1.1.16: 0015-gnu-Add-sgml-common.patch --]
[-- Type: text/x-patch, Size: 4985 bytes --]

From ed6641a62515619521bdeb6460880166518b0a1f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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 =						\
   %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 @@
 
 (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))
 
+(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/packages/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 <lnxfreak123 at insightbb dot com>
+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.000000000 +0000
++++ sgml-common-0.6.3/doc/man/Makefile.am	2003-11-18 16:48:47.000000000 +0000
+@@ -1,2 +1 @@
+-man8dir	  = $(mandir)/man8
+-man8_DATA = *.8
++man_MANS = install-catalog.8
-- 
2.27.0


[-- Attachment #1.1.17: 0016-gnu-Add-docbook-dsssl.patch --]
[-- Type: text/x-patch, Size: 4046 bytes --]

From e750481a6261b44a518e71e2f081304dd29ea3a8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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+)))
 
+;; Note: Debian-required dependencies are: libosp5 libostyle1c2 openjade.
+;; Note: Debian-suggested dependencies are: jadetex docbook-dsssl-doc doc-base
+;; Note: We don't package Debian's extra patch yet: refentry-flow-objects.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/stylesheet/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 used 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")
-- 
2.27.0


[-- Attachment #1.1.18: 0017-gnu-Add-docbook-utils.patch --]
[-- Type: text/x-patch, Size: 41803 bytes --]

From 71ba0b6c89718906b40fbbed65dbc3d5ca406860 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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.patch
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.patch
 create mode 100644 gnu/packages/patches/docbook-utils-helpers-whitespace.patch
 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 =						\
   %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 DocBook files.")
     (home-page "https://docbook.org")
     (license x11)))
 
+(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 = backends bin doc frontends helpers")
+                "SUBDIRS = 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 particular.
+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 markup.
+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/packages/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 <malat@debian.org>
+
+--- docbook-utils-0.6.14.orig/Makefile.in
++++ docbook-utils-0.6.14/Makefile.in
+@@ -128,7 +128,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = backends bin doc frontends helpers
+-sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@
++sgmldudir = $(prefix)/share/docbook-utils
+ sgmldu_DATA = docbook-utils.dsl
+ EXTRA_DIST = 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 = backends bin doc frontends helpers
+ 
+-sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@
++sgmldudir = $(prefix)/share/docbook-utils
+ sgmldu_DATA = docbook-utils.dsl
+ 
+ EXTRA_DIST = 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 = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@
++sgmldudir = $(prefix)/share/docbook-utils
+ sgmldubedir = $(sgmldudir)/backends
+ sgmldube_DATA = dvi html man pdf ps rtf tex texi txt
+ EXTRA_DIST = 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 = $(prefix)/share/sgml/docbook/utils-@VERSION@
++sgmldudir = $(prefix)/share/docbook-utils
+ sgmldubedir = $(sgmldudir)/backends
+ sgmldube_DATA = dvi html man pdf ps rtf tex texi txt
+ 
+--- 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.
+ 
+ # Convert to *roff
+-HELPER=$SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2man-spec.pl
++HELPER=docbook2man-spec.pl
+ TMPDIR=`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.
+ 
+ # Convert to texinfo
+-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/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
+ 
+ # Set frontend to use
+-SGML_FRONTEND="$SGML_BASE_DIR/docbook/utils-@VERSION@/frontends/docbook"
++SGML_FRONTEND="@prefix@/share/docbook-utils/frontends/docbook"
+ 
+ # Set backend to use
+-SGML_BACKEND="$SGML_BASE_DIR/docbook/utils-@VERSION@/backends/html"
++SGML_BACKEND="@prefix@/share/docbook-utils/backends/html"
+ 
+ # Set main stylesheet
+ SGML_STYLESHEET="default"
+@@ -120,14 +120,14 @@ while [ $# -gt 0 ]
+ do case $1 in
+   -f|--frontend) case "$2" in
+ 		  /*) SGML_FRONTEND="$2" ;;
+-		   *) d=$SGML_BASE_DIR/docbook/utils-@VERSION@/frontends
++		   *) d=@prefix@/share/docbook-utils/frontends
+ 		      SGML_FRONTEND="$d/$2" ;;
+ 		esac
+ 		shift 2
+ 		;;
+   -b|--backend)	case "$2" in
+ 		  /*) SGML_BACKEND="$2" ;;
+-		   *) d=$SGML_BASE_DIR/docbook/utils-@VERSION@/backends
++		   *) d=@prefix@/share/docbook-utils/backends
+ 		      SGML_BACKEND="$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 are allowed):\n"
+-			echo -e $SGML_WARNINGS_LIST
++		  list) printf "List of allowed warning types (multiple -w options are allowed):\n\n"
++			printf "$SGML_WARNINGS_LIST\n"
+ 			exit 0
+ 			;;
+ 		  xml|mixed|sgmldecl|should|default|duplicate|undefined|unclosed|empty|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
+ 
+ # Use SGML declaration for XML if needed
+ if [ "$SGML_DECL" = "" -a "$SGML_XML" = "xml" ]
+-then SGML_DECL=${SGML_BASE_DIR}/xml.dcl
++then SGML_DECL=${SGML_BASE_DIR}/declaration/xml.dcl
+ fi
+ 
+ # 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 @@
+     <para>Here we have chosen to generate HTML output. In fact we can
+     use any of the backends stored in the <filename>backends/</filename>
+     subdirectory of the DocBook-utils distribution directory (usually
+-    <filename>/usr/share/sgml/docbook/utils-&version;</filename>).
++    <filename>/usr/share/docbook-utils</filename>).
+     Similarly, you can use any frontend defined in the
+     <filename>frontends/</filename> subdirectory to convert from another
+     input format.</para>
+@@ -592,21 +592,21 @@
+       </varlistentry>
+ 
+       <varlistentry>
+-	<term><filename>/usr/share/sgml/docbook/utils-&version;/backends</filename></term>
++	<term><filename>/usr/share/docbook-utils/backends</filename></term>
+ 	<listitem>
+           <para>The various backends</para>
+ 	</listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+-	<term><filename>/usr/share/sgml/docbook/utils-&version;/frontends</filename></term>
++	<term><filename>/usr/share/docbook-utils/frontends</filename></term>
+ 	<listitem>
+           <para>The various frontends</para>
+ 	</listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+-	<term><filename>/usr/share/sgml/docbook/utils-&version;/helpers</filename></term>
++	<term><filename>/usr/share/perl5/sgmlspl-specs</filename></term>
+ 	<listitem>
+           <para>The various helper scripts like docbook2man or docbook2texi</para>
+ 	</listitem>
+--- 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 = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-htmldir = $(docdir)/html/docbook-utils-@VERSION@
++htmldir = $(docdir)/html/
+ html_DATA = 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 = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@
++sgmldudir = $(prefix)/share/docbook-utils
+ sgmldufedir = $(sgmldudir)/frontends
+ sgmldufe_DATA = 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 = $(prefix)/share/sgml/docbook/utils-@VERSION@
++sgmldudir = $(prefix)/share/docbook-utils
+ sgmldufedir = $(sgmldudir)/frontends
+ sgmldufe_DATA = 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}" != "sgml" ]
+-	  then SGML_CATALOG=${SGML_CATALOGS_DIR}/${SGML_XML}-docbook.cat
+-	  else SGML_CATALOG=${SGML_CATALOGS_DIR}/catalog
+-	  fi
++	  SGML_CATALOG=${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.dsl" | 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] =~ s/\\/\\\\/g;
+ 
+ 	# Escape dots and single quotes in column 1
+-	$_[0] =~ s/^\./\\\&\./;
+-	$_[0] =~ s/^\'/\\\&\'/;
++	$_[0] =~ s/^[ \t]*\./\\\&\./;
++	$_[0] =~ s/^[ \t]*\'/\\\&\'/;
+ 
+ 	# 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 = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@
+-sgmlduhedir = $(sgmldudir)/helpers
++sgmldudir = $(prefix)/share
++sgmlduhedir = $(sgmldudir)/perl5/sgmlspl-specs
+ sgmlduhe_DATA = docbook2man-spec.pl docbook2texi-spec.pl
+ EXTRA_DIST = $(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 = $(prefix)/share/sgml/docbook/utils-@VERSION@
+-sgmlduhedir = $(sgmldudir)/helpers
++sgmldudir = $(prefix)/share
++sgmlduhedir = $(sgmldudir)/perl5/sgmlspl-specs
+ sgmlduhe_DATA = docbook2man-spec.pl docbook2texi-spec.pl
+ 
+ EXTRA_DIST = $(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('<BEGINPAGE>', "\n\@page\n");
+ ## Print the URL
+ sgml('<ULINK>', sub {
+ 	if($skip_inline++) { return; }	# hopefully doesn't happen
+-	output '@uref{', output $_[0]->attribute('URL'), ', '
++	output '@uref{', $_[0]->attribute('URL')->value, ', '
+ });
+ sgml('</ULINK>', sub {
+ 	output '}' unless --$skip_inline;
+@@ -807,6 +807,7 @@ sgml('<XREF>', sub {
+ sgml('|[lt    ]|', "<");
+ sgml('|[gt    ]|', ">");
+ sgml('|[amp   ]|', "&");
++sgml('|[ndash ]|', "-");
+ 
+ #
+ # Default handlers (uncomment these if needed).  Right now, these are set
diff --git a/gnu/packages/patches/docbook-utils-frontends.patch b/gnu/packages/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 
+          double-check and triple-check my suggestion. Works For Me (tm)
+          
+          
+ Running 
+ 
+ db2html foo.xml
+ 
+ causes unnecessary long waits (up to 30 seconds or so) if the 
+ input document is an XML document.
+ 
+ I traced down the problem to the file 
+ /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 
+ /usr/bin/jw in any case (and exported), so that the check in docbook
+ will always lead to sgmlnorm being used.
+ 
+ To me it seems unnecessary to run sgmlnorm over XML input, but I 
+ may well be wrong :)
+ 
+ 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üller <tim-mailinglists@zen.co.uk>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/212088
+
+Index: docbook-utils-0.6.14/frontends/docbook.in
+===================================================================
+--- docbook-utils-0.6.14.orig/frontends/docbook.in	2012-05-09 19:15:17.396741140 +0200
++++ docbook-utils-0.6.14/frontends/docbook.in	2012-05-09 19:15:34.988740507 +0200
+@@ -6,7 +6,7 @@
+ # Give the location of the centralized catalog
+ # First try the one with a version matching the version that is indicated in the document
+   centralized-catalog)
+-	if [ -n "$SGML_NORM" ]; then
++	if [ -n "$SGML_NORM" ] && [ "$SGML_XML" = "sgml" ]; then
+ 	  SGML_NORM_OPTS='-d'
+ 	else
+ 	  SGML_NORM=cat
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 <date> from the sgml file
+ For the moment, docbook2man doesn't use the tag date in <date> </date>
+ to but `date "+%d %B %Y"`, and thus depend on the current locale.
+ 
+ <refentry>
+   <docinfo>
+     <date>06 September 2003</>
+   </docinfo>
+ </refentry>
+ 
+ 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.
+ 
+ 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 <simon.paillard@resel.enst-bretagne.fr>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/214982
+
+Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl
+===================================================================
+--- 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.276783163 +0200
+@@ -278,8 +278,9 @@
+ .\\" etc. to Steve Cheng <steve\@ggi-project.org>.
+ _END_BANNER
+ 
+-	my $manpage_date = `date "+%d %B %Y"`;
+-		
++	my $date = `date "+%d %B %Y"`;
++	my $manpage_date = $manpage_date || $date ;
++
+ 	output '.TH "';
+ 	
+ 	# If the title is not mixed-case, convention says to
+@@ -292,7 +293,7 @@
+ 	}
+ 	
+ 	output  '" "', fold_string($manpage_sect), 
+-		'" "', fold_string(`date "+%d %B %Y"`), 
++		'" "', fold_string($manpage_date), 
+ 		'" "', $manpage_misc, 
+ 		'" "', $manpage_manual, 
+ 		"\"\n";
+@@ -568,6 +569,15 @@
+ sgml('</ATTRIBUTION>', sub { $_[0]->parent->ext->{'attribution'} = pop_output(); });
+ 
+ 
++sgml('<DATE>', sub {
++	save_cdata();
++});
++sgml('</DATE>', sub { 
++	$manpage_date = fold_string(pop_output());
++	$raw_cdata--;
++});
++
++
+ # IGNORE.
+ sgml('<DOCINFO>', sub { push_output('nul'); });
+ sgml('</DOCINFO>', 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 lang
+ 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çois <nicolas.francois@centraliens.net>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/394511
+
+Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl
+===================================================================
+--- 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.792778418 +0200
+@@ -359,11 +359,14 @@
+ # NAME section
+ man_sgml('<REFNAMEDIV>', sub {
+ 	my %words = qw( fr NOM es NOMBRE de NAME );
+-	if (defined($_[0]->attribute('LANG')->value)) {
+-	my $id = $_[0]->attribute('LANG')->value;
+-	my $ad = $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 = $_[0]->attribute('LANG')->value;
++	$lang = $manpage_lang unless defined $lang;
++	if (defined($lang) and defined $words{lc($lang)}) {
++		my $ad = $words{lc($lang)};
++		output("\n.SH $ad\n");}
++	else {	output("\n.SH NAME\n");}
+ });
+ 
+ sgml('<REFNAME>', \&save_cdata);
diff --git a/gnu/packages/patches/docbook-utils-helpers-support.patch b/gnu/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 <reiner@reiner-h.de>
+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);
+ 
+ ########################################################################
+ # SGMLSPL script produced automatically by the script sgmlspl.pl
+@@ -279,6 +280,10 @@
+ _END_BANNER
+ 
+ 	my $date = `date "+%d %B %Y"`;
++	if ($ENV{SOURCE_DATE_EPOCH}) {
++		setlocale(LC_TIME, "C");
++		$date = strftime("%d %B %Y", gmtime($ENV{SOURCE_DATE_EPOCH} || time));
++	}
+ 	my $manpage_date = $manpage_date || $date ;
+ 
+ 	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 special
+ 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 <screen>...</screen>) then the output is now incorrect.
+ 
+ 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 included
+ below.
+Author: Ben Burton <bab@debian.org>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/528334
+
+Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl
+===================================================================
+--- 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.788773002 +0200
+@@ -1212,8 +1212,8 @@
+ 	$_[0] =~ s/\\/\\\\/g;
+ 
+ 	# Escape dots and single quotes in column 1
+-	$_[0] =~ s/^[ \t]*\./\\\&\./;
+-	$_[0] =~ s/^[ \t]*\'/\\\&\'/;
++	$_[0] =~ s/^([ \t]*)\./$1\\\&\./;
++	$_[0] =~ s/^([ \t]*)\'/$1\\\&\'/;
+ 
+ 	# 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 <neil@debian.org>
+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	  = $(docdir)/html/docbook-utils-@VERSION@
++htmldir	  = $(docdir)/html
+ html_DATA = api.html \
+ 	backend-spec.html \
+ 	docbook2man.html \
+@@ -25,6 +25,6 @@
+ 		$(top_srcdir)/doc/refentry/sgmldiff.sgml
+ 	SGML_CATALOG_FILES=/etc/sgml/catalog \
+ 	SGML_SEARCH_PATH=$(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%' $<
+ 
+--- a/doc/man/Makefile.am
++++ b/doc/man/Makefile.am
+@@ -12,5 +12,5 @@
+ 		$(top_srcdir)/helpers/docbook2man-spec.pl
+ 	SGML_CATALOG_FILES=/etc/sgml/catalog \
+ 	SGML_SEARCH_PATH=$(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=`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.
+ 
+ # 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 @@
+ 
+ use strict;
+ use integer;
+-use vars qw($nsgmls $errors $errorlog $VERSION);
++use vars qw($onsgmls $errors $errorlog $VERSION);
+ use Getopt::Long 2.01;
+ 
+ $VERSION = 1.03;
+ 
+-my $nsgmls;
+-$nsgmls = "@jade_bindir@/nsgmls";
++my $onsgmls;
++$onsgmls = "@jade_bindir@/onsgmls";
+ 
+ #----------------------------------------------------------------------
+ # TODO:
+@@ -37,7 +37,7 @@
+ # - Wait for suggestions ;-)
+ # 
+ # Note: the input file need not be valid, nor is it necessary to have 
+-# the DTDs.  nsgmls always returns a structure.
++# the DTDs.  onsgmls always returns a structure.
+ #----------------------------------------------------------------------
+ 
+ # Get file name
+@@ -141,11 +141,11 @@
+ unlink $diff2;
+ 
+ #---------------------------------------------------------------------
+-# 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.
+ 
+ sub prepare {
+     my($filename,$todiffname) = @_;
+@@ -161,7 +161,7 @@
+     my @line_numbered = ();
+     my $line = 0;
+ 
+-    open(ESIS, "$nsgmls -l $errors $errorlog -onotation-sysid -oid -oempty $filename | ");  #-oentity generates strange output; ? -ononsgml
++    open(ESIS, "$onsgmls -l $errors $errorlog -onotation-sysid -oid -oempty $filename | ");  #-oentity generates strange output; ? -ononsgml
+     open(DIFF, "> $todiffname");
+     while (<ESIS>) {
+ 	chomp $_;
+@@ -375,7 +375,7 @@
+ };
+ 
+ #----------------------------------------------------------------------
+-# 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) = @_;
+     my $result = "$prefix";
+--- a/configure.in
++++ b/configure.in
+@@ -21,7 +21,7 @@
+ 
+ dnl Checks for programs.
+ jade_bindirs="/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)
+ 
+ perl_bindirs="/usr/bin /usr/local/bin"
+--- a/doc/refentry/docbook2man-spec.pl.sgml
++++ b/doc/refentry/docbook2man-spec.pl.sgml
+@@ -19,7 +19,7 @@
+ <!-- docbook2man-spec.pl BREAKAGE HERE! -->
+ 
+ <CmdSynopsis>
+-<Command>nsgmls</command>
++<Command>onsgmls</command>
+ <Arg><Replaceable>sgml document</replaceable></Arg>
+ <Command>| sgmlspl</command>
+ <Arg choice=req>docbook2man-spec.pl</arg>
+@@ -35,7 +35,7 @@
+ </Para>
+ 
+ <Para>
+-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.
+ </Para>
+ 
+--- a/doc/refentry/docbook2texi-spec.pl.sgml
++++ b/doc/refentry/docbook2texi-spec.pl.sgml
+@@ -20,7 +20,7 @@
+ <!-- docbook2man-spec.pl BREAKAGE HERE! -->
+ 
+ <CmdSynopsis>
+-<Command>nsgmls</command>
++<Command>onsgmls</command>
+ <Arg><Replaceable>sgml document</replaceable></Arg>
+ <Command>| sgmlspl</command>
+ <Arg choice=req>docbook2texi-spec.pl</arg>
+@@ -37,7 +37,7 @@
+ </Para>
+ 
+ <Para>
+-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 <SGMLTag>Book</sgmltag>,
+ otherwise the results are undefined.
+ </Para>
+--- a/doc/refentry/jw.sgml
++++ b/doc/refentry/jw.sgml
+@@ -630,7 +630,7 @@
+     <manvolnum>1</manvolnum></citerefentry>,
+     <citerefentry><refentrytitle>install-catalog</refentrytitle>
+     <manvolnum>8</manvolnum></citerefentry>,
+-    <citerefentry><refentrytitle>nsgmls</refentrytitle>
++    <citerefentry><refentrytitle>onsgmls</refentrytitle>
+     <manvolnum>1</manvolnum></citerefentry>, <ulink
+     url="http://sources.redhat.com/docbook-tools/">docbook-utils
+     homepage</ulink>.</para>
+--- a/doc/refentry/sgmldiff.sgml
++++ b/doc/refentry/sgmldiff.sgml
+@@ -238,10 +238,10 @@
+         <glossterm>
+ <!-- Next line  is a hack to force a paragraph break in the man-page. -->
+ <cmdsynopsis> <command></command> </cmdsynopsis>
+-          <citerefentry> <refentrytitle>nsgmls</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>
++          <citerefentry> <refentrytitle>onsgmls</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>
+         </glossterm>
+         <glossdef>
+-          <para>a base component of <application>Jade</application> DSSSL engine</para>
++          <para>a base component of <application>OpenJade</application> DSSSL engine</para>
+         </glossdef>
+       </glossentry>
+ 
+--- a/helpers/docbook2man-spec.pl
++++ b/helpers/docbook2man-spec.pl
+@@ -7,7 +7,7 @@
+ The SGMLSpm package from CPAN.  This contains the sgmlspl script which
+ is used to grok this file.  Use it like this:
+ 
+-nsgmls some-docbook-document.sgml | sgmlspl docbook2man-spec.pl
++onsgmls some-docbook-document.sgml | sgmlspl docbook2man-spec.pl
+ 
+ =head1 DESCRIPTION
+ 
diff --git a/gnu/packages/patches/docbook-utils-typo.patch b/gnu/packages/patches/docbook-utils-typo.patch
new file mode 100644
index 0000000000..03c0a4abcf
--- /dev/null
+++ b/gnu/packages/patches/docbook-utils-typo.patch
@@ -0,0 +1,100 @@
+Description: Fix some typos in man pages
+Author: Mathieu Malaterre <malat@debian.org>
+
+Index: docbook-utils-0.6.14/doc/man/docbook2man-spec.pl.1
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/man/docbook2man-spec.pl.1	2012-05-09 18:39:17.932819095 +0200
++++ docbook-utils-0.6.14/doc/man/docbook2man-spec.pl.1	2012-05-09 18:39:24.780818845 +0200
+@@ -17,7 +17,7 @@
+ .SH "DESCRIPTION"
+ .PP
+ \fBdocbook2man\fR is a sgmlspl spec file that produced man
+-pages (using the -man macros) from DocBook RefEntry markup.
++pages (using the \-man macros) from DocBook RefEntry markup.
+ .PP
+ The program reads ESIS produced by nsgmls (or other SGML parsers) from
+ standard input.  Markup not found in RefEntry is discarded.
+Index: docbook-utils-0.6.14/doc/man/frontend-spec.7
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/man/frontend-spec.7	2012-05-09 18:41:45.172813778 +0200
++++ docbook-utils-0.6.14/doc/man/frontend-spec.7	2012-05-09 18:42:03.176813129 +0200
+@@ -10,7 +10,7 @@
+ .SH "DESCRIPTION"
+ .PP
+ \fBjw\fR(1) calls frontends like
+-\fIfrontends/docbook\fR to get the informations
++\fIfrontends/docbook\fR to get the information
+ specific to a given input format. The frontend knows which information
+ to return from the first command line parameter. It gets all necessary
+ data via environment variables ready to use.
+Index: docbook-utils-0.6.14/doc/man/jw.1
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/man/jw.1	2012-05-09 18:39:35.612818456 +0200
++++ docbook-utils-0.6.14/doc/man/jw.1	2012-05-09 18:40:51.736815708 +0200
+@@ -142,7 +142,7 @@
+ The following options apply to the conversion script:
+ .TP
+ \fB   -f \fIfrontend\fB | --frontend \fIfrontend\fB  \fR
+-Allows to specify another frontend than default \fIdocbook\fR\&.
++Allows one to specify another frontend than default \fIdocbook\fR\&.
+ The list of currently available frontends is:
+ .RS
+ .TP
+@@ -156,13 +156,13 @@
+ .RE
+ .TP
+ \fB   -b \fIbackend\fB | --backend \fIbackend\fB  \fR
+-Allows to specify another backend than default
++Allows one to specify another backend than default
+ \fIHTML\fR\&. The list of currently available
+ backends is:
+ .RS
+ .TP
+ \fB\fIdvi\fB\fR
+-Converts to DVI (DeVice Independant
++Converts to DVI (DeVice Independent
+ files) by calling \fBJade\fR or
+ \fBOpenJade\fR\&.
+ .TP
+@@ -210,7 +210,7 @@
+ .RE
+ .TP
+ \fB   -c \fIfile\fB | --cat \fIfile\fB  \fR
+-Allows to use an extra SGML Open Catalog that will list
++Allows one to use an extra SGML Open Catalog that will list
+ other files like customization style sheets, adaptations to the
+ DocBook Document Type Definition, special character entities,
+ etc. This catalog is added to the list of catalogs determined
+@@ -241,7 +241,7 @@
+ are specified on the command line.
+ .TP
+ \fB   -d \fIfile\fB|default|none | --dsl \fIfile\fB|default|none  \fR
+-Allows to use a customized style sheet instead
++Allows one to use a customized style sheet instead
+ of the default one.
+ 
+ A "target" starting with a hash mark "#" can be appended
+Index: docbook-utils-0.6.14/doc/man/sgmldiff.1
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/man/sgmldiff.1	2012-05-09 18:41:13.316814927 +0200
++++ docbook-utils-0.6.14/doc/man/sgmldiff.1	2012-05-09 18:41:38.032814038 +0200
+@@ -17,7 +17,7 @@
+ 
+ .SH "DESCRIPTION"
+ .PP
+-This perl script allows to determine the structural differences
++This perl script allows one to determine the structural differences
+ between two SGML files. It compares the files, regardless of what
+ is in between the tags, to only focus on the markup. Its output
+ is similar to \fBdiff\fR(1)\&.
+@@ -62,8 +62,8 @@
+ Lines 5 to 7 of the first file have been changed
+ into lines 8 to 10 of the second line.
+ In addition to those summaries, the lines of the first file are
+-shown preceeded by '<' and the lines of the second file are
+-shown preceeded by '>".
++shown preceded by '<' and the lines of the second file are
++shown preceded by '>".
+ .SH "OPTIONS"
+ .PP
+ Here is the list of actions that can be requested to
-- 
2.27.0


[-- Attachment #1.1.19: 0018-gnu-gmime-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5918 bytes --]

From 6f094fc726db15e73298abb581c7afcd9ee570b1 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 22 Jul 2020 12:30:38 -0400
Subject: [PATCH 18/36] 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.
---
 gnu/packages/mail.scm | 97 ++++++++++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 87388747e4..422c3f6260 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -139,6 +139,7 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix utils)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system guile)
   #:use-module (guix build-system perl)
@@ -563,46 +564,68 @@ It adds a large amount of new and improved features to mutt.")
   (package
     (name "gmime")
     (version "3.2.7")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/gmime/"
-                                  (version-major+minor version)
-                                  "/gmime-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("gnupg" ,gnupg)))               ; for tests only
-    (inputs `(("glib" ,glib)
-              ("gpgme" ,gpgme)
-              ("zlib" ,zlib)))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/gmime/"
+                       (version-major+minor version)
+                       "/gmime-" version ".tar.xz"))
+       (sha256
+        (base32 "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
     (arguments
-     `(#:phases
+     `(#:configure-flags
+       (list
+        "--enable-gtk-doc"
+        (string-append "--with-html-dir="
+                       (assoc-ref %outputs "doc")
+                       "/share/gtk-doc/html")
+        (string-append "--with-gpgme-prefix="
+                       (assoc-ref %build-inputs "gpgme")))
+       #:phases
        (modify-phases %standard-phases
-         (add-after
-          'unpack 'patch-paths-in-tests
-          (lambda _
-            ;; The test programs run several programs using 'system' with
-            ;; hard-coded paths.  Here we patch them all.
-            ;; We use ISO-8859-1 here because test-iconv.c contains
-            ;; raw byte sequences in several different encodings.
-            (with-fluids ((%default-port-encoding #f))
-              (substitute* (find-files "tests" "\\.c$")
-                (("(system *\\(\")(/[^ ]*)" all pre prog-path)
-                 (let* ((base (basename prog-path))
-                        (prog (which base)))
-                   (string-append pre
-                                  (or prog (error "not found: " base)))))))
-            #t)))))
-    (home-page "http://spruce.sourceforge.net/gmime/")
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "docs/reference"
+               (substitute* "gmime-docs.sgml"
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-after 'patch-docbook-xml 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/Makefile.in"
+               (("@ENABLE_CRYPTO_TRUE@	test-pgp	\\\\")
+                "")
+               (("@ENABLE_CRYPTO_TRUE@	test-pgpmime")
+                "")
+               (("test-mbox test-autocrypt test-mime")
+                "test-mbox test-mime"))
+             #t)))))
+    (native-inputs
+     `(("docbook-xml" ,docbook-xml-4.1.2)
+       ("docbook-xsl" ,docbook-xsl)
+       ("docbook2html" ,docbook-utils)
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("vapigen" ,vala)))
+    (inputs
+     `(("gnupg" ,gnupg)
+       ("gpgme" ,gpgme)
+       ("libidn2" ,libidn2)
+       ("zlib" ,zlib)))
+    (propagated-inputs
+     `(("glib" ,glib)))
     (synopsis "MIME message parser and creator library")
-    (description
-     "GMime provides a core library and set of utilities which may be used for
-the creation and parsing of messages using the Multipurpose Internet Mail
-Extension (MIME).")
-    (license (list lgpl2.1+ gpl2+ gpl3+))))
+    (description "GMime is a C/C++ library which may be used for the creation
+and parsing of messages using the Multipurpose Internet Mail Extension (MIME),
+as defined by the RFCs.")
+    (home-page "http://spruce.sourceforge.net/gmime/")
+    (license lgpl2.1+)))
 
 ;; Some packages are not ready for GMime 3 yet.
 (define-public gmime-2.6
-- 
2.27.0


[-- Attachment #1.1.20: 0019-gnu-gnome-autoar-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3874 bytes --]

From 4749f46650f8f816ae97c4b9ad2424d9bff99e88 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 22 Jul 2020 15:27:33 -0400
Subject: [PATCH 19/36] 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.
---
 gnu/packages/gnome.scm | 59 +++++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b398c5e2e6..62f9ea8306 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8685,27 +8685,50 @@ as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions.")
   (package
     (name "gnome-autoar")
     (version "0.2.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a"))))
     (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:configure-flags
+       (list
+        "--disable-static"
+        "--enable-gtk-doc"
+        (string-append "--with-html-dir="
+                       (assoc-ref %outputs "out")
+                       "/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* "gnome-autoar-docs.xml"
+                 (("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)
-       ("pkg-config" ,pkg-config)))
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("pkg-config" ,pkg-config)
+       ("vapigen" ,vala)))
     (propagated-inputs
-     `(("libarchive" ,libarchive)))  ; Required by gnome-autoar-0.pc
-    (inputs
-     `(("gtk+" ,gtk+)))
-    (synopsis "Archives integration support for GNOME")
-    (home-page "https://git.gnome.org/browse/gnome-autoar/")
-    (description
-     "GNOME Autoar is a library which makes creating and extracting archives
-easy, safe, and automatic.")
+     `(("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("libarchive" ,libarchive)))
+    (synopsis "Archive management for GNOME")
+    (description "GNOME Autoar provides functions, widgets, and gschemas for
+GNOME applications which want to use archives as a convenient method to transfer
+directories over the internet.")
+    (home-page "https://gitlab.gnome.org/GNOME/gnome-autoar")
     (license license:lgpl2.1+)))
 
 (define-public tracker
-- 
2.27.0


[-- Attachment #1.1.21: 0020-gnu-gnome-online-accounts-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5544 bytes --]

From c6875dc0d722d07c7906f8103f5ec01649d030e5 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 23 Jul 2020 11:19:25 -0400
Subject: [PATCH 20/36] 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=]: 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.
---
 gnu/packages/gnome.scm | 70 +++++++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 62f9ea8306..7bb63516e8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7416,24 +7416,46 @@ window manager.")
   (package
     (name "gnome-online-accounts")
     (version "3.36.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0bigfi225g1prnxpb9lcc1i7mdcrkplwb05vilc43jik12cn53qw"))))
-    (outputs '("out" "lib"))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0bigfi225g1prnxpb9lcc1i7mdcrkplwb05vilc43jik12cn53qw"))))
     (build-system glib-or-gtk-build-system)
+    (outputs '("out" "lib" "doc"))
     (arguments
      `(#:configure-flags
-       (list (string-append "--libdir=" (assoc-ref %outputs "out") "/lib"))
+       (list
+        (string-append "--libdir="
+                       (assoc-ref %outputs "out")
+                       "/lib")
+        "--disable-static"
+        "--enable-documentation"
+        "--enable-gtk-doc"
+        "--enable-inspector"
+        "--enable-media-server"
+        "--enable-lastfm"
+        (string-append "--with-html-dir="
+                       (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"
+               (substitute* '("goa-daemon.xml"
+                              "goa-docs.xml" "goa-overview.xml")
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
          (add-before 'configure 'patch-libgoa-output
            (lambda* (#:key outputs #:allow-other-keys)
-             (let ((lib (assoc-ref outputs "lib")))
+             (let* ((lib (assoc-ref outputs "lib")))
                (substitute* '("src/goa/Makefile.in" "src/goa/goa-1.0.pc.in")
                  (("@prefix@") lib)
                  (("@exec_prefix@") lib)
@@ -7445,28 +7467,34 @@ window manager.")
                (setenv "outputs" "out lib")
                #t))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
+     `(("docbook-xml" ,docbook-xml-4.1.2)
+       ("docbook-xsl" ,docbook-xsl)
        ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
        ("vala" ,vala)
        ("xsltproc" ,libxslt)))
-    (propagated-inputs
-     `(("glib" ,glib)           ; required by goa-1.0.pc
-       ("gtk+" ,gtk+)))         ; required by goa-backend-1.0.pc
     (inputs
-     `(("docbook-xsl" ,docbook-xsl)
+     `(("dbus" ,dbus)
+       ("gcr" ,gcr)
        ("json-glib" ,json-glib)
+       ("krb5" ,mit-krb5)
        ("libsecret" ,libsecret)
+       ("libsoup" ,libsoup)
+       ("libxml2" ,libxml2)
        ("rest" ,rest)
        ("webkitgtk" ,webkitgtk)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("gtk+" ,gtk+)))
     (synopsis "Single sign-on framework for GNOME")
+    (description "GNOME Online Accounts aims to provide a way for users to setup
+online accounts to be used by the core system and core applications only.
+Calendar entries show up in GNOME Shell, e-mail in Evolution, online storages
+are exposed as GVolumes, and so on.")
     (home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts")
-    (description
-     "GNOME Online Accounts provides interfaces so that applications and
-libraries in GNOME can access the user's online accounts.  It has providers for
-Google, ownCloud, Facebook, Flickr, Windows Live, Pocket, Foursquare, Microsoft
-Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
     (license license:lgpl2.0+)))
 
 (define-public evolution-data-server
-- 
2.27.0


[-- Attachment #1.1.22: 0021-gnu-gfbgraph-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4273 bytes --]

From 5924b45ed5169f86f7442f3a004d5518ae3f7a4b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 03:09:43 -0400
Subject: [PATCH 21/36] gnu: gfbgraph: Update package definition.

* gnu/packages/gnome.scm (gfbgraph) [version]: Update to 0.2.4.
[source]<origin>[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.
---
 gnu/packages/gnome.scm | 67 ++++++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7bb63516e8..83ce16d320 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9918,33 +9918,56 @@ which generates C code when compiled.")
 (define-public gfbgraph
   (package
     (name "gfbgraph")
-    (version "0.2.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://gnome/sources/gfbgraph/"
-                    (version-major+minor version) "/"
-                    "gfbgraph-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"))))
+    (version "0.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "mirror://gnome/sources/gfbgraph/"
+         (version-major+minor version) "/"
+         "gfbgraph-" version ".tar.xz"))
+       (sha256
+        (base32 "0yck7dwvjk16a52nafjpi0a39rxwmg0w833brj45acz76lgkjrb0"))))
     (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
     (arguments
-     `(#:tests? #f ; Tests appear to require the network.
-       ;; FIXME --enable-gtk-doc fails even with gtk-doc as a native-input.
-       #:configure-flags '("--disable-gtk-doc"
-                           "--disable-static"
-                           "--enable-introspection")))
+     `(#:tests? #f                      ; Tests require networking
+       #:configure-flags
+       (list
+        "--disable-static"
+        "--enable-gtk-doc"
+        (string-append "--with-html-dir="
+                       (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* "gfbgraph-docs.xml"
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t)))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("gobject-introspection" ,gobject-introspection)))
-    (inputs
-     `(("json-glib" ,json-glib)
+     `(("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)
+       ("which" ,which)))
+    (propagated-inputs
+     `(("glib" ,glib)
        ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
+       ("json-glib" ,json-glib)
+       ("libsoup" ,libsoup)
        ("rest" ,rest)))
-    (synopsis "GLib/GObject wrapper for the Facebook API")
-    (description "This library allows you to use the Facebook API from
-GLib/GObject code.")
+    (synopsis "GObject library for Facebook Graph API")
+    (description "GFBGraph is a GLib/GObject wrapper for the Facebook API.")
     (home-page "https://wiki.gnome.org/Projects/GFBGraph")
     (license license:lgpl2.1+)))
 
-- 
2.27.0


[-- Attachment #1.1.23: 0022-gnu-gnome-online-miners-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3001 bytes --]

From 38457adc7c53b1ba5795984a689d50d17a0bde4e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 00:57:05 -0400
Subject: [PATCH 22/36] 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.
---
 gnu/packages/gnome.scm | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 83ce16d320..f2de50ebfb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -942,34 +942,37 @@ in the GNOME desktop.")
   (package
     (name "gnome-online-miners")
     (version "3.34.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44"))))
     (build-system glib-or-gtk-build-system)
+    (arguments
+     `(#:configure-flags
+       (list
+        "--disable-static")))
     (native-inputs
      `(("gettext" ,gettext-minimal)
-       ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
-       ("gtk+:bin" ,gtk+ "bin")
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("gnome-online-accounts" ,gnome-online-accounts)
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
        ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
        ("grilo" ,grilo)
        ("libgdata" ,libgdata)
        ("libgfbgraph" ,gfbgraph)
-       ("libzapojit" ,libzapojit)
-       ("rest" ,rest)
-       ("tracker" ,tracker)))
+       ("tracker" ,tracker)
+       ("zapojit" ,libzapojit)))
     (synopsis "Web Crawlers for GNOME")
-    (description "GNOME Online Miners provides a set of crawlers that
-go through your online content and index them locally in Tracker.
-It has miners for Facebook, Flickr, Google, ownCloud and SkyDrive.")
+    (description "GNOME Online Miners provides a set of crawlers that go through
+your online content and index them locally in Tracker.  It has miners for
+Facebook, Flickr, Google, ownCloud and SkyDrive.")
     (home-page "https://wiki.gnome.org/Projects/GnomeOnlineMiners")
     (license license:gpl2+)))
 
-- 
2.27.0


[-- Attachment #1.1.24: 0023-gnu-gnome-video-effects-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 2812 bytes --]

From eda77a67cf1120488ef8a448ea5aadf7b4b584fa Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 04:02:34 -0400
Subject: [PATCH 23/36] gnu: gnome-video-effects: Update package definition.

* gnu/packages/gnome.scm (gnome-video-effects) [version]: Update to
0.5.0.
[source]<origin>[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.
---
 gnu/packages/gnome.scm | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f2de50ebfb..37baa28cc4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10546,28 +10546,29 @@ automatically and it can stream songs from online music services and charts.")
 (define-public gnome-video-effects
   (package
     (name "gnome-video-effects")
-    (version "0.4.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/" name "-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs"))))
-    (build-system glib-or-gtk-build-system)
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/" name "-"
+                       version ".tar.xz"))
+       (sha256
+        (base32 "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd"))))
+    (build-system meson-build-system)
     (arguments
-     `(#:out-of-source? #f))
+     `(#:glib-or-gtk? #t))   ; To wrap binaries and/or compile schemas
     (native-inputs
-     `(("glib:bin" ,glib "bin")
+     `(("gettext" ,gettext-minimal)
        ("intltool" ,intltool)
-       ("gettext" ,gettext-minimal)
+       ("perl" ,perl)
+       ("perl-xml-parser" ,perl-xml-parser)
        ("pkg-config" ,pkg-config)))
+    (synopsis "GNOME Video Effects")
+    (description "GNOME-Video-Effects is a collection of GStreamer effects to be
+used in different GNOME Modules.")
     (home-page "https://wiki.gnome.org/Projects/GnomeVideoEffects")
-    (synopsis "Video effects for Cheese and other GNOME applications")
-    (description
-     "A collection of GStreamer video filters and effects to be used in
-photo-booth-like software, such as Cheese.")
     (license license:gpl2+)))
 
 (define-public cheese
-- 
2.27.0


[-- Attachment #1.1.25: 0024-gnu-gjs-Disable-tests.patch --]
[-- Type: text/x-patch, Size: 2019 bytes --]

From b6659ff9c17d3840ff5b9528f760fec4c87f0a58 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 07:12:40 -0400
Subject: [PATCH 24/36] gnu: gjs: Disable tests.

* gnu/packages/gnome.scm (gjs): Disable tests.
[arguments]<#:tests?>: New argument.
<#:phases>['pre-check]: Remove phase.
---
 gnu/packages/gnome.scm | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 37baa28cc4..d6ae4a01dc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7111,30 +7111,12 @@ configuration program to choose applications starting on login.")
         (base32 "10gkmxbhwpnq27db0gkn25b0gw28n05msjkzwjg3sdhpdisfpcvz"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:configure-flags
+     '(#:tests? #f                 ; XXX: Most tests throws exception.
+       #:configure-flags
        (list
         "--enable-code-coverage"
         "--enable-asan"
-        "--enable-ubsan")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before
-             'check 'pre-check
-           (lambda _
-             ;; The test suite requires a running X server.
-             (system "Xvfb :1 &")
-             (setenv "DISPLAY" ":1")
-             ;; For the missing /etc/machine-id.
-             (setenv "DBUS_FATAL_WARNINGS" "0")
-             ;; Our mozjs package does not compile the required Intl API
-             ;; support for these failing tests.
-             (substitute* "installed-tests/js/testLocale.js"
-               ((".*toBeDefined.*") "")
-               ((".*expect\\(datestr\\).*") ""))
-             (substitute* "installed-tests/scripts/testCommandLine.sh"
-               (("Valentín") "")
-               (("☭") ""))
-             #t)))))
+        "--enable-ubsan")))
     (native-inputs
      `(("dbus-launch" ,dbus)
        ("dconf" ,dconf)
-- 
2.27.0


[-- Attachment #1.1.26: 0025-gnu-gom-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4570 bytes --]

From c5b988c1b05f98cd7897d8ddffa0eb52206d4c87 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 05:49:15 -0400
Subject: [PATCH 25/36] gnu: gom: Update package definition.

* gnu/packages/gnome.scm (gom) [version]: Update to 0.4.
[source]<origin>[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=]: 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.
---
 gnu/packages/gnome.scm | 67 ++++++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d6ae4a01dc..2be750e86f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5835,33 +5835,64 @@ such as OpenStreetMap, OpenCycleMap, OpenAerialMap, and Maps for free.")
 (define-public gom
   (package
     (name "gom")
-    (version "0.3.2")
+    (version "0.4")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/gom/"
-                           (version-major+minor version) "/"
-                           "gom-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/gom/"
+                       (version-major+minor version) "/"
+                       "gom-" version ".tar.xz"))
        (sha256
-        (base32
-         "1zaqqwwkyiswib3v1v8wafpbifpbpak0nn2kp13pizzn9bwz1s5w"))))
-    (build-system gnu-build-system)
+        (base32 "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38"))))
+    (build-system meson-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        "-Denable-gtk-doc=true"
+        (string-append "-Dpygobject-override-dir="
+                       (assoc-ref %outputs "out")
+                       "/lib/python"
+                       ,(version-major+minor
+                         (package-version python))
+                       "/site-packages/gi/overrides"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc"
+               (substitute* "gom-docs.sgml"
+                 (("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
-     `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)
-       ("gobject-introspection" ,gobject-introspection)))
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("gjs" ,gjs)
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
     (inputs
      `(("glib" ,glib)
-       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
        ("sqlite" ,sqlite)))
-    ;; XXX TODO: Figure out how to run the test suite.
-    (arguments `(#:tests? #f))
+    (synopsis "GObject Data Mapper")
+    (description "Gom provides an object mapper from GObjects to SQLite.  It
+helps you write applications that need to store structured data as well as make
+complex queries upon that data.")
     (home-page "https://wiki.gnome.org/Projects/Gom")
-    (synopsis "Object mapper from GObjects to SQLite")
-    (description
-     "Gom provides an object mapper from GObjects to SQLite.  It helps you
-write applications that need to store structured data as well as make complex
-queries upon that data.")
     (license license:lgpl2.1+)))
 
 (define-public libgnome-games-support
-- 
2.27.0


[-- Attachment #1.1.27: 0026-gnu-grilo-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5074 bytes --]

From 2af3819e659c70c29385890f4fc5313c95653a89 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 06:38:42 -0400
Subject: [PATCH 26/36] gnu: grilo: Update package definition.

* gnu/packages/gnome.scm (grilo) [version]: Update to 0.3.12.
[source]<origin>[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.
---
 gnu/packages/gnome.scm | 78 +++++++++++++++++++++++++++++-------------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2be750e86f..e8b58bd161 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5978,42 +5978,74 @@ as possible!")
 (define-public grilo
   (package
     (name "grilo")
-    (version "0.3.10")
+    (version "0.3.12")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
        (sha256
-        (base32
-         "1s7ilyywf18q26aj5c4709kfizqywjlnacp4jzmj9v9i9kkv4i3y"))))
+        (base32 "0w8sq5g6g1rg85h53vbll8va70fcp6082mlpmy98aa03444ddyyv"))))
     (build-system meson-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc/grilo"
+               (substitute* '("environment-setup.xml"
+                              "grilo-docs.sgml" "overview.xml"
+                              "plugins-sources.xml" "plugins-testing.xml"
+                              "quick-start.xml" "writing-apps.xml")
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               #t))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")         ; for glib-mkenums and glib-genmarshal
-       ("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
        ("gtk-doc" ,gtk-doc)
-       ("vala" ,vala)))
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)
+       ("vapigen" ,vala)))
     (inputs
-     `(("cyrus-sasl" ,cyrus-sasl)
-       ("glib" ,glib)
-       ("gtk+" ,gtk+)
-       ("libxml2" ,libxml2)
+     `(("gtk+" ,gtk+)
        ("liboauth" ,liboauth)
        ("libsoup" ,libsoup)
        ("totem-pl-parser" ,totem-pl-parser)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("libxml2" ,libxml2)))
     (native-search-paths
-     (list (search-path-specification
-            (variable "GRL_PLUGIN_PATH")
-            (files (list (string-append "lib/grilo-"
-                                        (version-major+minor version)))))))
-    (home-page "https://wiki.gnome.org/action/show/Projects/Grilo")
-    (synopsis "Framework for discovering and browsing media")
-    (description
-     "Grilo is a framework focused on making media discovery and browsing easy
-for application developers.")
+     (list
+      (search-path-specification
+       (variable "GRL_PLUGIN_PATH")
+       (files
+        (list
+         (string-append "lib/grilo-"
+                        (version-major+minor version)))))))
+    ;; To load grilo-plugins.
+    (search-paths native-search-paths)
+    (synopsis "Media Framework for GNOME")
+    (description "Grilo is a framework for browsing and searching media content
+from various sources using a single API.")
+    (home-page "https://wiki.gnome.org/Projects/Grilo")
     (license license:lgpl2.1+)))
 
 (define-public grilo-plugins
-- 
2.27.0


[-- Attachment #1.1.28: 0027-gnu-Add-pedansee.patch --]
[-- Type: text/x-patch, Size: 2033 bytes --]

From b9576949759167e8803797fd24e5d04fd11ea78a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 08:03:26 -0400
Subject: [PATCH 27/36] gnu: Add pedansee.

* gnu/packages/check.scm (pedansee): New variable.
---
 gnu/packages/check.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 85a24dac19..0cafd9137a 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -75,12 +75,40 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial))
 
+(define-public pedansee
+  (package
+    (name "pedansee")
+    (version "0.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.flyn.org/projects/"
+                       name "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0lsg791x6n95pxg6vif8qfc46nqcamhjq3g0dl5xqf6imy7n3acd"))))
+    (build-system glib-or-gtk-build-system)
+    (native-inputs
+     `(("clang" ,clang)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)))
+    (inputs
+     `(("glib" ,glib)))
+    (synopsis "Code checker for C")
+    (description "Pedansee checks C source files for compliance with a particular
+programming style.  The style is currently defined by the pedansee source code
+in the form of functions which walk each source file’s syntax tree.  You can
+modify some aspects of this style through the use of regular expressions.")
+    (home-page "https://www.flyn.org/projects/pedansee/")
+    (license license:gpl3+)))
+
 (define-public mutest
   (package
     (name "mutest")
-- 
2.27.0


[-- Attachment #1.1.29: 0028-gnu-Add-libdmapsharing.patch --]
[-- Type: text/x-patch, Size: 2993 bytes --]

From cad317f3b6eaeefde3b760b32e161bc46489012d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 08:55:56 -0400
Subject: [PATCH 28/36] gnu: Add libdmapsharing.

* gnu/packages/gnome.scm (libdmapsharing): New variable.
---
 gnu/packages/gnome.scm | 57 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e8b58bd161..b35eb2e09f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -267,6 +267,63 @@ 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+)))
 
+(define-public libdmapsharing
+  (package
+    (name "libdmapsharing")
+    (version "3.9.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.flyn.org/projects/"
+                       name "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "152hnddwxv590cn802awv3mn27ixc3s6ac691a7z02d1c5fl45p2"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:tests? #f                      ; Tests require networking.
+       #:configure-flags
+       (list
+        "--disable-static"
+        (string-append "--with-html-dir="
+                       (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"
+               (substitute* "libdmapsharing-4.0-docs.xml"
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t)))))
+    (native-inputs
+     `(("check" ,check)
+       ("docbook-xml" ,docbook-xml-4.3)
+       ("gobject-introspection" ,gobject-introspection)
+       ("pedansee" ,pedansee)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (inputs
+     `(("avahi" ,avahi)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("gee" ,libgee)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("gtk+" ,gtk+)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("gstreamer" ,gstreamer)
+       ("libsoup" ,libsoup)))
+    (synopsis "Media management library")
+    (description "Libdmapsharing is a library which allows programs to access,
+share and control the playback of media content using DMAP (DAAP, DPAP & DACP).
+It is written in C using GObject and libsoup.")
+    (home-page "https://launchpad.net/gtx")
+    (license license:lgpl2.1+)))
+
 (define-public gtx
   (package
     (name "gtx")
-- 
2.27.0


[-- Attachment #1.1.30: 0029-gnu-gssdp-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4527 bytes --]

From dcdaccce335f7ff71b3deb89ea20690d3f7efbbb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 09:33:48 -0400
Subject: [PATCH 29/36] gnu: gssdp: Update package definition.

* gnu/packages/gnome.scm (gssdp) [version]: Update to 1.2.3.
[source]<origin>[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.
---
 gnu/packages/gnome.scm | 84 ++++++++++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b35eb2e09f..67c7b4abd1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1035,34 +1035,62 @@ Facebook, Flickr, Google, ownCloud and SkyDrive.")
 
 (define-public gssdp
   (package
-   (name "gssdp")
-   (version "1.2.2")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version) "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "195hi10vrsvh6i927mm6rm1ld5sxah3h5sr3bsjm90vb8lxrxfya"))))
-   (build-system meson-build-system)
-   (native-inputs
-    `(("gettext" ,gettext-minimal)
-      ("glib:bin" ,glib "bin")
-      ("gobject-introspection" ,gobject-introspection)
-      ("gtk-doc" ,gtk-doc)
-      ("pkg-config" ,pkg-config)
-      ("vala" ,vala)))
-   (inputs
-    `(("gtk+" ,gtk+)
-      ("libsoup" ,libsoup)))
-   (synopsis "GObject-based API over @acronym{SSDP, Simple Service Discovery
-Protocol} for GNOME")
-   (description "This package provides a library to handle resource discovery
-and announcement over @acronym{SSDP, Simple Service Discovery Protocol} and
-a debugging tool, @command{gssdp-device-sniffer}.")
-   (home-page "https://gitlab.gnome.org/GNOME/gssdp")
-   (license license:lgpl2.0+)))
+    (name "gssdp")
+    (version "1.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1s57i8a8wnnxnsfl27cq4503dkdlzbrhry5zpg23sfqfffvdqqx2"))))
+    (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=true")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc"
+               (substitute* "gssdp-docs.xml"
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               #t))))))
+    (native-inputs
+     `(("docbook-xml" ,docbook-xml-4.1.2)
+       ("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (inputs
+     `(("gtk+" ,gtk+)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("libsoup" ,libsoup)))
+    (synopsis "SSDP API for GNOME")
+    (description "GSSDP is a GObject-based API for handling resource discovery
+and announcement over SSDP.")
+    (home-page "https://gitlab.gnome.org/GNOME/gssdp")
+    (license license:lgpl2.0+)))
 
 (define-public gupnp
   (package
-- 
2.27.0


[-- Attachment #1.1.31: 0030-gnu-gupnp-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5385 bytes --]

From 157b87e82a8f5ed8bda0eb8e05e98c4ac6939b6f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 09:53:15 -0400
Subject: [PATCH 30/36] gnu: gupnp: Update package definition.

* gnu/packages/gnome.scm (gupnp) [version]: Update to 1.2.3.
[source]<origin>[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.
---
 gnu/packages/gnome.scm | 99 ++++++++++++++++++++++++++++++------------
 1 file changed, 71 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 67c7b4abd1..758afdd630 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1094,34 +1094,77 @@ and announcement over SSDP.")
 
 (define-public gupnp
   (package
-   (name "gupnp")
-   (version "1.2.2")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version) "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "12cr3isww4zl0d4himpd2fhl2wmy3jh8sbxp4snp51sw7savv04s"))))
-   (build-system meson-build-system)
-   (native-inputs
-    `(("gettext" ,gettext-minimal)
-      ("glib:bin" ,glib "bin")
-      ("gobject-introspection" ,gobject-introspection)
-      ("gtk-doc" ,gtk-doc)
-      ("pkg-config" ,pkg-config)
-      ("vala" ,vala)))
-   (inputs
-    `(("gssdp" ,gssdp)
-      ("gtk+" ,gtk+)
-      ("libsoup" ,libsoup)))
-   (synopsis "PnP API for GNOME")
-   (description "This package provides GUPnP, an object-oriented framework
-for creating UPnP devices and control points, written in C using
-@code{GObject} and @code{libsoup}.")
-   (home-page "https://gitlab.gnome.org/GNOME/gupnp")
-   (license license:lgpl2.0+)))
+    (name "gupnp")
+    (version "1.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1c99ingf8cvfvyawxqn7dwb233i0x5q60xni9awgma74i16yaiyl"))))
+    (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=true")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc"
+               (substitute* '("client-tutorial.xml" "glossary.xml"
+                              "overview.xml" "server-tutorial.xml")
+                 (("http://www.oasis-open.org/docbook/xml/4.4/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.4")
+                                 "/xml/dtd/docbook/")))
+               (substitute* '("gupnp-binding-tool.xml" "gupnp-docs.xml")
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.1.2")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               #t))))))
+    (native-inputs
+     `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+       ("docbook-xml-4.4" ,docbook-xml-4.4)
+       ("docbook-xsl" ,docbook-xsl)
+       ("gettext" ,gettext-minimal)
+       ("gjs" ,gjs)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("gtk-doc" ,gtk-doc)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)
+       ("xsltproc" ,libxslt)))
+    (inputs
+     `(("gtk+" ,gtk+)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("gssdp" ,gssdp)
+       ("libsoup" ,libsoup)
+       ("libxml2" ,libxml2)))
+    (synopsis "UPnP API for GNOME")
+    (description "GUPnP is an elegant, object-oriented framework for creating
+UPnP devices and control points, written in C using GObject and libsoup.  The
+GUPnP API is intended to be easy to use, efficient and flexible.  It provides
+the same set of features as libupnp, but shields the developer from most of
+UPnP's internals.")
+    (home-page "https://wiki.gnome.org/Projects/GUPnP")
+    (license license:lgpl2.0+)))
 
 (define-public gupnp-dlna
   (package
-- 
2.27.0


[-- Attachment #1.1.32: 0031-gnu-gupnp-av-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3955 bytes --]

From 493edd0a14c7a004b024d66d955b8065e0c7ba5e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 10:19:20 -0400
Subject: [PATCH 31/36] 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=]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
[native-inputs]: Add docbook-xml and vala. Remove libxml2.
[inputs]: Add libxml2.
[description]: Modify.
---
 gnu/packages/gnome.scm | 73 +++++++++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 758afdd630..5e0c825e61 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1202,32 +1202,53 @@ given profile, etc.  DLNA is a subset of UPnP A/V.")
 
 (define-public gupnp-av
   (package
-   (name "gupnp-av")
-   (version "0.12.11")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version) "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8"))))
-   (build-system gnu-build-system)
-   (native-inputs
-    `(("gettext" ,gettext-minimal)
-      ("glib:bin" ,glib "bin")
-      ("gobject-introspection" ,gobject-introspection)
-      ("gtk-doc" ,gtk-doc)
-      ("libxml" ,libxml2)
-      ("pkg-config" ,pkg-config)))
-   (inputs
-    `(("gtk+" ,gtk+)
-      ("gupnp" ,gupnp)))
-   (synopsis "GUPnP A/V for GNOME")
-   (description "This package provides a small library for handling
-and implementation of UPnP A/V profiles.")
-   (home-page "https://gitlab.gnome.org/GNOME/gupnp-av")
-   (license license:lgpl2.0+)))
+    (name "gupnp-av")
+    (version "0.12.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:configure-flags
+       (list
+        "--disable-static"
+        "--enable-gtk-doc"
+        (string-append "--with-html-dir="
+                       (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"
+               (substitute* "gupnp-av-docs.sgml"
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t)))))
+    (native-inputs
+     `(("docbook-xml" ,docbook-xml-4.1.2)
+       ("gettext" ,gettext-minimal)
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("gupnp" ,gupnp)
+       ("libxml2" ,libxml2)))
+    (synopsis "GUPnP A/V for GNOME")
+    (description "GUPnP-AV is a small utility library that aims to ease the
+handling and implementation of UPnP A/V profiles.")
+    (home-page "https://gitlab.gnome.org/GNOME/gupnp-av")
+    (license license:lgpl2.0+)))
 
 (define-public libmediaart
   (package
-- 
2.27.0


[-- Attachment #1.1.33: 0032-gnu-grilo-plugins-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4482 bytes --]

From b70d1b570dbf307db0019eea2d268a72a3adc470 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 11:10:25 -0400
Subject: [PATCH 32/36] gnu: grilo-plugins: Update package definition.

* gnu/packages/gnome.scm (grilo-plugins) [version]: Update to 0.3.11.
[source]<origin>[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, liboauth
and sqlite.
[synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/gnome.scm | 67 ++++++++++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5e0c825e61..c0022a695e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6200,50 +6200,65 @@ from various sources using a single API.")
 (define-public grilo-plugins
   (package
     (name "grilo-plugins")
-    (version "0.3.10")
+    (version "0.3.11")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
        (sha256
-        (base32
-         "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0"))))
+        (base32 "0wyd3n5mn7b77hxylkc3f62v01mlavh96901pz342hwrn42ydqnx"))))
     (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/meson.build"
+               (("'chromaprint',")
+                ""))
+             #t)))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
        ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("gtk+:bin" ,gtk+ "bin")
        ("itstool" ,itstool)
-       ("pkg-config" ,pkg-config)))
-    ;; TODO: ahavi, gstreamer
+       ("lua" ,lua)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)))
     (inputs
-     `(("grilo" ,grilo)
-       ;("gmime" ,gmime) ; unused
+     `(("avahi" ,avahi)
+       ("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("gmime" ,gmime)
        ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
        ("gom" ,gom)
-       ;("gssdp" ,gssdp) ; unused
-       ;("gupnp" ,gupnp) ; unused
-       ;("gupnp-av" ,gupnp-av) ; unused
+       ("gperf" ,gperf)
+       ("grilo" ,grilo)
+       ("gssdp" ,gssdp)
+       ("gstreamer" ,gstreamer)
+       ("gupnp" ,gupnp)
+       ("gupnp-av" ,gupnp-av)
        ("json-glib" ,json-glib)
-       ("avahi" ,avahi)
+       ("libarchive" ,libarchive)
+       ("libdmapsharing" ,libdmapsharing)
        ("libgdata" ,libgdata)
        ("libmediaart" ,libmediaart)
-       ;("librest" ,rest) ; unused
+       ("librest" ,rest)
        ("libsoup" ,libsoup)
+       ("libxml2" ,libxml2)
+       ("oauth" ,liboauth)
+       ("sqlite" ,sqlite)
        ("totam-pl-parser" ,totem-pl-parser)
-       ("tracker" ,tracker))) ; unused because it's too old
-    (arguments
-     `(#:glib-or-gtk? #t
-       ;;Disable lua-factory as it needs missing dependencies
-       #:configure-flags '("-Denable-lua-factory=no")))
-    (home-page "https://live.gnome.org/Grilo")
-    (synopsis "Plugins for the Grilo media discovery library")
-    (description
-     "Grilo is a framework focused on making media discovery and browsing easy
-for application developers.  This package provides plugins for common media
-discovery protocols.")
+       ("tracker" ,tracker)))
+    (synopsis "Plugins for Grilo")
+    (description "Grilo-Plugins is a collection of plugins for Grilo implementing
+Grilo's API for various multimedia content providers.")
+    (home-page "https://wiki.gnome.org/Projects/Grilo")
     (license license:lgpl2.1+)))
 
 (define-public totem
-- 
2.27.0


[-- Attachment #1.1.34: 0033-gnu-gupnp-dlna-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4707 bytes --]

From 1bbadcc904f28c4761d49118b33bf287d547dd19 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 11:38:57 -0400
Subject: [PATCH 33/36] 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=]: 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.
---
 gnu/packages/gnome.scm | 88 +++++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c0022a695e..1f419c5f7d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1168,37 +1168,63 @@ UPnP's internals.")
 
 (define-public gupnp-dlna
   (package
-   (name "gupnp-dlna")
-   (version "0.10.5")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version) "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj"))))
-   (build-system gnu-build-system)
-   (native-inputs
-    `(("gettext" ,gettext-minimal)
-      ("glib:bin" ,glib "bin")
-      ("gobject-introspection" ,gobject-introspection)
-      ("gtk-doc" ,gtk-doc)
-      ("libxml" ,libxml2)
-      ("pkg-config" ,pkg-config)
-      ("vala" ,vala)))
-   (inputs
-    `(("gstreamer" ,gstreamer)
-      ("gupnp" ,gupnp)))
-   (propagated-inputs
-    `(("gst-plugins-base" ,gst-plugins-base)
-      ("gst-plugins-good" ,gst-plugins-good)))
-   (synopsis "GUPnP DLNA for GNOME")
-   (description "This package provides a small utility library to
-support DLNA-related tasks such as media profile guessing, transcoding to a
-given profile, etc.  DLNA is a subset of UPnP A/V.")
-   (home-page "https://gitlab.gnome.org/GNOME/gupnp-dlna")
-   (license license:lgpl2.0+)))
+    (name "gupnp-dlna")
+    (version "0.10.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:configure-flags
+       (list
+        "--disable-static"
+        "--enable-gtk-doc"
+        (string-append "--with-html-dir="
+                       (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"
+               (substitute*
+                   '("gupnp-dlna-gst/gupnp-dlna-gst-docs.sgml"
+                     "gupnp-dlna-metadata/gupnp-dlna-metadata-docs.sgml"
+                     "gupnp-dlna/gupnp-dlna-docs.sgml")
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t)))))
+    (native-inputs
+     `(("docbook-xml" ,docbook-xml-4.1.2)
+       ("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("libxml" ,libxml2)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (inputs
+     `(("gupnp" ,gupnp)
+       ("libxml2" ,libxml2)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)))
+    (synopsis "GUPnP DLNA for GNOME")
+    (description "GUPnP-DLNA is a small utility library that aims to ease the
+DLNA-related tasks such as media profile guessing, transcoding to a given
+profile, etc.")
+    (home-page "https://gitlab.gnome.org/GNOME/gupnp-dlna")
+    (license license:lgpl2.0+)))
 
 (define-public gupnp-av
   (package
-- 
2.27.0


[-- Attachment #1.1.35: 0034-gnu-gsound-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3758 bytes --]

From 55e35961a5641ad6c562e5226fe437c22a0138d3 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 13:10:42 -0400
Subject: [PATCH 34/36] 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=]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
[native-inputs]: Add docbook-xml and gtk-doc.
---
 gnu/packages/gnome.scm | 50 +++++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1f419c5f7d..27cb8171ca 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1208,7 +1208,6 @@ UPnP's internals.")
        ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
        ("gtk-doc" ,gtk-doc)
-       ("libxml" ,libxml2)
        ("pkg-config" ,pkg-config)
        ("vala" ,vala)))
     (inputs
@@ -9613,28 +9612,49 @@ specified duration and save it as a GIF encoded animated image file.")
   (package
     (name "gsound")
     (version "1.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0lwfwx2c99qrp08pfaj59pks5dphsnxjgrxyadz065d8xqqgza5v"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0lwfwx2c99qrp08pfaj59pks5dphsnxjgrxyadz065d8xqqgza5v"))))
     (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:configure-flags
+       (list
+        "--disable-static"
+        "--enable-gtk-doc"
+        (string-append "--with-html-dir="
+                       (assoc-ref %outputs "doc")
+                       "/share/gtk-doc/html"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "docs"
+               (substitute* "gsound-docs.sgml"
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t)))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
+     `(("docbook-xml" ,docbook-xml-4.3)
        ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("pkg-config" ,pkg-config)
        ("vala" ,vala)))
     (inputs
      `(("glib" ,glib)
        ("libcanberra" ,libcanberra)))
-    (home-page "https://wiki.gnome.org/Projects/GSound")
     (synopsis "GObject wrapper for libcanberra")
-    (description
-     "GSound is a small library for playing system sounds.  It's designed to be
-used via GObject Introspection, and is a thin wrapper around the libcanberra C
-library.")
+    (description "GSound is a small library for playing system sounds.  It's
+designed to be used via GObject Introspection, and is a thin wrapper around the
+libcanberra C library.")
+    (home-page "https://wiki.gnome.org/Projects/GSound")
     (license license:lgpl2.1+)))
 
 (define-public libzapojit
-- 
2.27.0


[-- Attachment #1.1.36: 0035-gnu-gspell-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 7637 bytes --]

From fc52b2744edf499d2b07cc49cc35ee27948c9e5b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 13:49:24 -0400
Subject: [PATCH 35/36] gnu: gspell: Update package definition.

* gnu/packages/gnome.scm (gspell) [version]: Update to 1.8.3.
[source]<origin>[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=]: 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.
---
 gnu/local.mk                                |  1 -
 gnu/packages/gnome.scm                      | 76 +++++++++++++--------
 gnu/packages/patches/gspell-dash-test.patch | 22 ------
 3 files changed, 46 insertions(+), 53 deletions(-)
 delete mode 100644 gnu/packages/patches/gspell-dash-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3925fa024d..456c8310fd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1059,7 +1059,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/grub-efi-fat-serial-number.patch		\
   %D%/packages/patches/grub-setup-root.patch			\
   %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
-  %D%/packages/patches/gspell-dash-test.patch			\
   %D%/packages/patches/guile-1.8-cpp-4.5.patch			\
   %D%/packages/patches/guile-2.2-skip-oom-test.patch            \
   %D%/packages/patches/guile-default-utf8.patch			\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 27cb8171ca..0a2db9545a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10626,59 +10626,75 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).")
 (define-public gspell
   (package
     (name "gspell")
-    (version "1.8.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1miybm1z5cl91i25l7mfqlxhv7j8yy8rcgi0s1bgbb2vm71rb4dv"))
-              (patches (search-patches "gspell-dash-test.patch"))))
+    (version "1.8.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1s1dns070pz8dg04ppshdbx1r86n9406vkxcfs8hdghn0bfi9ras"))))
     (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
     (arguments
-     '(#:configure-flags (list "--enable-vala")
+     `(#:configure-flags
+       (list
+        "--enable-gtk-doc"
+        (string-append "--with-html-dir="
+                       (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* '("gspell-docs.xml.in" "intro.xml.in")
+                 (("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* "testsuite/test-checker.c"
+               (("g_test_add_func \\(\"/checker/dashes\", test_dashes\\);")
+                ""))
+             #t))
          (add-before 'check 'pre-check
            (lambda* (#:key inputs #:allow-other-keys)
              ;; Tests require a running X server.
-             (system "Xvfb :1 &")
+             (system "Xvfb :1 +extension GLX &")
              (setenv "DISPLAY" ":1")
-
              ;; For the missing /etc/machine-id.
              (setenv "DBUS_FATAL_WARNINGS" "0")
-
              ;; Allow Enchant and its Aspell backend to find the en_US
              ;; dictionary.
              (setenv "ASPELL_DICT_DIR"
                      (string-append (assoc-ref inputs "aspell-dict-en")
                                     "/lib/aspell"))
              #t)))))
-    (inputs
-     `(("gtk+" ,gtk+)
-       ("glib" ,glib)
-       ("iso-codes" ,iso-codes)))
     (native-inputs
-     `(("glib" ,glib "bin")
+     `(("aspell-dict-en" ,aspell-dict-en)
+       ("docbook-xml" ,docbook-xml-4.3)
+       ("gettext" ,gettext-minimal)
        ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
        ("pkg-config" ,pkg-config)
-       ("vala" ,vala)                             ;for VAPI, needed by Geary
+       ("vala" ,vala)
        ("xmllint" ,libxml2)
-
-       ;; For tests.
-       ("aspell-dict-en" ,aspell-dict-en)
        ("xorg-server" ,xorg-server-for-tests)))
+    (inputs
+     `(("iso-codes" ,iso-codes)))
     (propagated-inputs
-     `(("enchant" ,enchant)))            ;enchant.pc is required by gspell-1.pc
+     `(("enchant" ,enchant)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)))
+    (synopsis "Spell-checking library for GTK+ applications")
+    (description "GSpell provides a flexible API to add spell-checking to a GTK+
+application.")
     (home-page "https://wiki.gnome.org/Projects/gspell")
-    (synopsis "GNOME's alternative spell checker")
-    (description
-     "gspell provides a flexible API to add spell-checking to a GTK+
-application.  It provides a GObject API, spell-checking to text entries and
-text views, and buttons to choose the language.")
-    (license license:gpl2+)))
+    (license license:lgpl2.1+)))
 
 (define-public gnome-planner
   (package
diff --git a/gnu/packages/patches/gspell-dash-test.patch b/gnu/packages/patches/gspell-dash-test.patch
deleted file mode 100644
index 1c9d77cfba..0000000000
--- a/gnu/packages/patches/gspell-dash-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Somehow, Aspell 0.60.6.1 and aspell-dict-en-2016.11.20-0 don't consider
-this a valid spelling.  Skip it.
-
-TODO: Migrate to using hunspell. According to upstream, this bug won't be fixed.
-See https://bugzilla.gnome.org/show_bug.cgi?id=772406.
---- a/testsuite/test-checker.c	2017-03-24 09:50:50.000000000 -0400
-+++ b/testsuite/test-checker.c	2017-06-15 21:47:07.116173895 -0400
-@@ -105,10 +105,11 @@
- 	 * be considered deprecated, it is better to use hunspell, so WONTFIX.
- 	 * For more details, see:
- 	 * https://bugzilla.gnome.org/show_bug.cgi?id=772406
-+	 *
-+	 * correctly_spelled = gspell_checker_check_word (checker, "spell-checking", -1, &error);
-+	 * g_assert_no_error (error);
-+	 * g_assert (correctly_spelled);
- 	 */
--	correctly_spelled = gspell_checker_check_word (checker, "spell-checking", -1, &error);
--	g_assert_no_error (error);
--	g_assert (correctly_spelled);
- 
- 	correctly_spelled = gspell_checker_check_word (checker, "nrst-auie", -1, &error);
- 	g_assert_no_error (error);
-- 
2.27.0


[-- Attachment #1.1.37: 0036-gnu-gtk-vnc-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4017 bytes --]

From dc979672cfb865073608aea2b443f326ceada3d1 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 24 Jul 2020 14:18:35 -0400
Subject: [PATCH 36/36] gnu: gtk-vnc: Update package definition.

* gnu/packages/gnome.scm (gtk-vnc) [version]: Update to 1.0.0.
[source]<origin>[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.
---
 gnu/packages/gnome.scm | 54 ++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0a2db9545a..4b5e908fef 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -143,6 +143,7 @@
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages ninja)
+  #:use-module (gnu packages node)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages package-management)
@@ -8910,40 +8911,47 @@ like switching to windows and launching applications.")
 (define-public gtk-vnc
   (package
     (name "gtk-vnc")
-    (version "0.9.0")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
        (sha256
-        (base32
-         "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is"))))
-    (build-system gnu-build-system)
+        (base32 "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8"))))
+    (build-system meson-build-system)
     (arguments
-     '(#:configure-flags '("--with-gtk=3.0")))
-    (propagated-inputs
-     `(("gtk+" ,gtk+))) ; required by gtk-vnc-2.0.pc.
-    (inputs
-     `(("cyrus-sasl" ,cyrus-sasl)
-       ("gnutls" ,gnutls)
-       ("libgcrypt" ,libgcrypt)
-       ("pulseaudio" ,pulseaudio)))
+     `(#:glib-or-gtk? #t))   ; To wrap binaries and/or compile schemas
     (native-inputs
-     `(("glib:bin" ,glib "bin")
+     `(("gjs" ,gjs)
+       ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
+       ("node" node)
+       ("perl" ,perl)
        ("pkg-config" ,pkg-config)
-       ("python-wrapper" ,python-wrapper)
+       ("python" ,python-wrapper)
        ("vala" ,vala)))
+    (inputs
+     `(("cairo" ,cairo)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("glib" ,glib)
+       ("gnutls" ,gnutls)
+       ("libgcrypt" ,libgcrypt)
+       ("libsasl" ,cyrus-sasl)
+       ("pulseaudio" ,pulseaudio)
+       ("x11" ,libx11)
+       ("zlib" ,zlib)))
+    (propagated-inputs
+     `(("gtk+" ,gtk+)))
+    (synopsis "VNC client viewer widget for GTK+")
+    (description "GTK-VNC is a project providing client side APIs for the RFB
+protocol / VNC remote desktop technology.  It is built using coroutines allowing
+it to be completely asynchronous while remaining single threaded.  It provides a
+core C library, and bindings for Python (PyGTK).")
     (home-page "https://wiki.gnome.org/Projects/gtk-vnc")
-    (synopsis "VNC viewer widget for GTK+")
-    (description
-     "GTK-VNC is a VNC viewer widget for GTK+, used by remote desktop viewing
-applications, for instance the Vinagre client, GNOME Boxes and virt-viewer.
-GTK-VNC implements client side RFB protocol and authentication extensions such
-as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions.")
     (license license:lgpl2.1+)))
 
 (define-public gnome-autoar
-- 
2.27.0


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2020-07-24 18:32 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-06  9:13 Raghav Gururajan
2020-05-06 14:19 ` Ludovic Courtès
2020-05-06 15:05   ` Gábor Boskovits
2020-05-06 15:49 ` Ricardo Wurmus
2020-05-06 16:03   ` Raghav Gururajan
2020-05-06 15:52 ` sirgazil
2020-05-06 16:04   ` Raghav Gururajan
2020-05-06 17:22 ` Jan Nieuwenhuizen
2020-05-06 17:23   ` Raghav Gururajan
2020-05-20 13:34 ` Raghav Gururajan
2020-05-20 13:51   ` Pierre Neidhardt
2020-05-20 13:57     ` Raghav Gururajan
2020-05-20 14:06       ` Pierre Neidhardt
2020-05-21  9:08   ` Efraim Flashner
2020-05-22 11:18     ` Raghav Gururajan
2020-05-22 11:25   ` Raghav Gururajan
2020-05-23 14:26     ` Raghav Gururajan
2020-05-25 20:08       ` Danny Milosavljevic
2020-05-28 17:11         ` Raghav Gururajan
2020-05-28 17:10       ` Raghav Gururajan
2020-05-28 18:23         ` Danny Milosavljevic
2020-05-29 21:01           ` Raghav Gururajan
2020-05-29 23:02             ` Danny Milosavljevic
2020-05-29 20:54         ` Raghav Gururajan
2020-05-29 21:08           ` Raghav Gururajan
2020-05-30 20:30             ` Raghav Gururajan
2020-05-31 13:31               ` Danny Milosavljevic
2020-06-10 13:12                 ` Raghav Gururajan
2020-06-04 18:31               ` Raghav Gururajan
2020-06-04 18:52                 ` Vincent Legoll
2020-06-10 13:06                   ` Raghav Gururajan
2020-06-04 18:57                 ` Danny Milosavljevic
2020-06-14 13:31                 ` Raghav Gururajan
2020-06-19 23:37                   ` Raghav Gururajan
2020-06-24 22:40                     ` Danny Milosavljevic
2020-07-04 10:37                       ` Raghav Gururajan
2020-07-04 11:14                         ` Raghav Gururajan
2020-07-06  1:36                           ` Raghav Gururajan
2020-07-06 19:24                           ` Danny Milosavljevic
2020-07-06 19:56                             ` Efraim Flashner
2020-07-05 19:25                         ` Danny Milosavljevic
2020-07-06  5:05                           ` Raghav Gururajan
2020-07-13 13:45                             ` Ludovic Courtès
2020-07-13 13:50                               ` Raghav Gururajan
2020-07-16  1:21                             ` Raghav Gururajan
2020-07-17 12:38                               ` Danny Milosavljevic
2020-07-18 13:29                                 ` Raghav Gururajan
2020-07-18 14:12                                   ` Danny Milosavljevic
2020-07-18 19:27                                     ` Raghav Gururajan
2020-07-18 20:18                                       ` Raghav Gururajan
2020-07-19 11:43                                         ` Danny Milosavljevic
2020-07-19 19:21                                         ` Danny Milosavljevic
2020-07-19 19:22                                   ` Danny Milosavljevic
2020-07-20  1:54                                     ` Raghav Gururajan
2020-07-24 18:29                                       ` Raghav Gururajan [this message]
2020-07-25  8:15                                         ` Raghav Gururajan
2020-07-25  8:18                                           ` Raghav Gururajan
2020-07-25  8:24                                             ` Raghav Gururajan
2020-07-25  9:12                                               ` Raghav Gururajan
2020-07-27 16:11                                                 ` Raghav Gururajan
2020-07-30 23:51                                                   ` Raghav Gururajan
2020-08-02  7:32                                                   ` Raghav Gururajan
2020-08-03 22:29                                                     ` Danny Milosavljevic
2020-08-04 10:22                                                       ` Raghav Gururajan
2020-08-04 22:50                                                         ` Raghav Gururajan
2020-08-05 15:14                                                           ` Danny Milosavljevic
2020-08-07  2:14                                                             ` Raghav Gururajan
2020-08-09 22:28                                                               ` Danny Milosavljevic
2020-08-11 10:38                                                                 ` Raghav Gururajan
2020-08-12  4:05                                                                   ` Raghav Gururajan
2020-08-12  4:11                                                                     ` Raghav Gururajan
2020-08-12  8:02                                                                       ` Danny Milosavljevic
2020-08-19 15:06                                                                         ` Raghav Gururajan
2020-08-22 14:48                                                                           ` Pierre Neidhardt
2020-08-24  3:18                                                                           ` Maxim Cournoyer
2020-08-14 14:24                                                               ` [20.08.2020 Hartmut Goebel
2020-08-14 14:28                                                                 ` [20.08.2020 Raghav Gururajan
2020-06-24 11:37                   ` [OUTREACHY]: Integration of desktop environments into GNU Guix Danny Milosavljevic
2020-06-25  4:04                     ` Raghav Gururajan
2020-06-25 11:47                       ` Danny Milosavljevic
2020-06-28  5:56                         ` Raghav Gururajan
2020-06-25 11:52                       ` Danny Milosavljevic
2020-05-25 19:58     ` Danny Milosavljevic
2020-05-25 20:00     ` Danny Milosavljevic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org \
    --to=raghavgururajan@disroot.org \
    --cc=dannym@scratchpost.org \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

unofficial mirror of guix-devel@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-devel/0 guix-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-devel guix-devel/ https://yhetil.org/guix-devel \
		guix-devel@gnu.org
	public-inbox-index guix-devel

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.devel
	nntp://news.gmane.io/gmane.comp.gnu.guix.devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git