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: Tue, 4 Aug 2020 18:50:38 -0400
Message-ID: <d24f02b1-6aa2-7f34-8d5b-c39a617e1a25@disroot.org> (raw)
In-Reply-To: <abd708e1-5e60-480d-ad5c-e91605c703a2@disroot.org>


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

@Danny

Please find the attached patches.

@Others

Please find the following git-log.

*** START ***

commit b02a3f0d0fba7d2f7d6c1809e4ca66e2a9dbf82f
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 18:28:39 2020 -0400

    gnu: gnome-control-center: Update package definition.

    * gnu/packages/gnome.scm (gnome-control-center) [version]: Update
    to 3.36.4.
    [source]<origin>[sha256]: Modify base32.
    [arguments]<#:glib-or-gtk?>: New argument.
    <#:configure-flags>[-Dcheese]: Remove flag.
    [-Ddocumentation]: New flag.
    [-Dgnome_session_libexec_dir]: Remove flag.
    <#:phases>['patch-docbook]: New phase.
    ['patch-paths]: Modify phase.
    [native-inputs]: Add docbook-xml, gobject-introspection and
    python-wrapper.
    [inputs]: Add cairo, cheese, colord, libepoxy, fontconfig, glib,
    gsettings-desktop-schemas, gtk+, libhandy, network-manager, libx11
    and libxi. Remove clutter-gtk, dconf, gnome-session, libcanberra
    and mesa. Change gdk-pixbuf to gdk-pixbuf+svg.
    [synopsis]: Modify.
    [description]: Modify.
    [home-page]: Modify.

commit 7e653124b6689a3c77babb7fce785f9304d88c81
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 15:27:33 2020 -0400

    gnu: gnome-contacts: Update package definition.

    * gnu/packages/gnome.scm (gnome-contacts) [version]: Update to
    3.36.2.
    [source]<origin>[sha256]: Modify base32.
    [arguments]<#:glib-or-gtk?>: New argument.
    <#:configure-flags>['-Dcheese]: Remove flag.
    [-Ddocs]: New flag.
    <#:phases>['patch-docbook]: New phase.
    ['generate-vapis]: Remove phase.
    [native-inputs]: Add desktop-file-utils, docbook-xml, docbook-xsl,
    gettext-minimal, gobject-introspection, libxslt and vala.
    [inputs]: Add appstream-glib, cheese, folks, glib and libhandy.
    Remove docbook-xml, docbook-xsl, gettext-minimal, gobject-introspection,
    gst-plugins-base, libxslt and vala.
    [propagated-inputs]: Remove folks and telepathy-mission-control.
    [synopsis]: Modify.
    [description]: Modify.

commit 91fd32d40d0b81bc700b3cab7e20498f5d2067f6
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 13:35:40 2020 -0400

    gnu: gnome-color-manager: Update package definition.

    * gnu/packages/gnome.scm (gnome-color-manager) [version]: Update to
    3.36.0.
    [source]<origin>[sha256]: Modify base32.
    [outputs]: New output "help".
    [arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase.
    ['pre-check]: Modify phase.
    ['move-help]: New phase.
    [native-inputs]: Add python-wrapper.
    [inputs]: Add colord, glib, gtk+ and lcms. Remove adwaita-icon-theme,
    appstream-glib, colord-gtk, exiv2, gnome-desktop, libexif, libtiff,
    libxrandr, libxtst, libxxf86vm, vte and xorgproto.

commit afd112c60ed22bdbf79be5dd3761ed418fa14e40
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 11:45:20 2020 -0400

    gnu: gnome-clocks: Update package definition.

    * gnu/packages/gnome.scm (gnome-clocks) [version]: Update to 3.36.2.
    [source]<origin>[sha256]: Modify base32.
    [outputs]: New output "help".
    [arguments]<#:configure-flags>['move-help]: New phase.
    [native-inputs]: Add gobject-introspection.
    [inputs]: Add appstream-glib, glib and libhandy.
    [synopsis]: Modify.
    [description]: Modify.
    [license]: Modify.

commit 3eda5fc8e59ac4d93ae3c352395777e7fdb8a47a
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 11:23:51 2020 -0400

    gnu: gnome-characters: Update package definition.

    * gnu/packages/gnome.scm (gnome-characters) [version]: Update to
    3.34.0.
    [source]<origin>[sha256]: Modify base32.
    [arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase.
    [native-inputs]: Add gobject-introspection, ruby and libxml2.
    Change python-minimal to python-wrapper. Remove gtk+:bin.
    [inputs]: Add glib and pango.
    [synopsis]: Modify.
    [description]: Modify.
    [home-page]: Modify.
    [license]: Add gpl2+.

commit a9bf121a704e1b5f30f19efdf2a20ce1a2392ff8
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 10:59:51 2020 -0400

    gnu: gnome-calendar: Update package definition.

    * gnu/packages/gnome.scm (gnome-calendar) [version]: Update to 3.36.2.
    [propagated-inputs]: Move evolution-data-server to ...
    [inputs]: ... here. Add geocode-glib, glib, gtk+, libhandy, libical and
    libsoup.
    [synopsis]: Modify.
    [description]: Modify.

commit 4444c742902b140042c325466afd544b2b686e15
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 10:16:18 2020 -0400

    gnu: gnome-calculator: Update package definition.

    * gnu/packages/gnome.scm (gnome-calculator) [version]: Update to
    3.36.0.
    [source]<origin>[sha256]: Modify base32.
    [outputs]: New output "help".
    [arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase.
    ['move-help]: New phase.
    [native-inputs]: Add gobject-introspection.
    [inputs]: Move libgee to ...
    [propagated-inputs]: ... here. Add glib and gtk+.
    [synopsis]: Modify.
    [license]: Modify.

commit bdb09ca575873ea116d1da2e3d46547e3bf0dd53
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 09:41:32 2020 -0400

    gnu: gnome-boxes: Update package definition.

    * gnu/packages/gnome.scm (gnome-boxes): Update package definition.
    [outputs]: New output "help".
    [arguments]<#:configure-flags>[-Drdp]: Remove flag.
    <#:phases>['skip-gtk-update-icon-cache]: New phase.
    ['move-help]: New phase.
    [native-inputs]: Add gobject-introspection and python-wrapper.
    [inputs]: Add appstream-glib and freerdp.
    [propagated-inputs]: Add glib and glib-networking.
    [synopsis]: Modify.
    [description]: Modify.

commit 108603d00b4702245d119e334e1307e8693a5b47
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 08:03:22 2020 -0400

    gnu: gnome-bluetooth: Update package definition.

    * gnu/packages/gnome.scm (gnome-bluetooth) [version]: Update to
    3.34.1.
    [source]<origin>[sha256]: Modify base32.
    [outputs]: New output "doc".
    [arguments]<#:glib-or-gtk?>: New argument.
    <#:configure-flags>[-Dicon_update]: New flag.
    [-Dgtk_doc]: New flag.
    <#:phases>['patch-docbook-xml]: New phase.
    ['move-doc]: New phase.
    [native-inputs]: Add docbook-xml and gtk-doc. Remove gtk+:bin.
    [inputs]: Add bluez, dbus-glib, gconf and libunique.
    [synopsis]: Modify.
    [description]: Modify.
    [home-page]: Modify.
    [license]: Add gpl2+.

commit 41a75c65eda696087daf2afd287be95116e27b64
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 07:51:25 2020 -0400

    gnu: gnome-backgrounds: Update package definition.

    * gnu/packages/gnome.scm (gnome-backgrounds) [version]: Update to
    3.36.0.
    [source]<origin>[sha256]: Modify base32.
    [synopsis]: Modify.
    [description]: Modify.

commit 2a659e1327bd6b304ec2a908a5d50ecbd807dc4b
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Tue Aug 4 07:37:39 2020 -0400

    gnu: gedit: Update package definition.

    * gnu/packages/gnome.scm (gedit) [version]: Update to 3.36.2.
    [source]<origin>[sha256]: Modify base32.
    [outputs]: New outputs "help" and "doc".
    [arguments]<#:glib-or-gtk?>: New argument.
    <#:parallel-build?>: Remove argument.
    <#:configure-flags>[-Dgtk_doc]: New flag.
    <#:phases>['patch-libgd-fetch]: Modify phase.
    ['patch-docbook-xml]: New phase.
    ['move-doc]: New phase.
    ['move-help]: New phase.
    ['wrap-gedit]: Modify phase.
    [native-inputs]: Add docbook-xml, gtk-doc, python-wrapper, libxml2
    and vala.
    [inputs]: Remove python, python-pygobject, libxml2 and vala.
    Add appstream-glib and tepl. Move gtksourceview and libpeas to ...
    [propagated-inputs]: ... here. Remove dconf.
    [description]: Modify.

commit 41eed86f665d1a00caee0d3930dea399ee02807f
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Mon Aug 3 12:42:58 2020 -0400

    gnu: file-roller: Update package definition.

    * gnu/packages/gnome.scm (file-roller) [version]: Update to 3.36.2.
    [source]<origin>[sha256]: Modify base32.
    [outputs]: New output "help".
    [arguments]<#:glib-or-gtk?>: New argument.
    <#:phases>['patch-nautilus-extension]: New phase.
    ['skip-gtk-update-icon-cache]: New phase.
    ['move-help]: New phase.
    [native-inputs]: Add gobject-introspection and vala.
    [inputs]: Add cpio, glib, gtk+ and nautilus. Change gdk-pixbuf to
    gdk-pixbuf+svg.
    [synopsis]: Modify.
    [description]: Modify.
    [home-page]: Modify.

commit f96191e1783926f5266370ec203b42a65287f7eb
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Mon Aug 3 09:59:41 2020 -0400

    gnu: evince: Update package definition.

    * gnu/packages/gnome.scm (evince) [version]: Update to 3.36.7.
    [source]<origin>[sha256]: Modify base32.
    [build-system]: Change from glib-or-gtk to meson.
    [outputs]: New outputs "help" and "doc".
    [arguments]<#:glib-or-gtk?>: New argument.
    <#:configure-flags>[--diable-nautilus]: Remove flag.
    [--enable-introspection]: Remove flag.
    [-Dbrowser_plugin]: New flag.
    [-Dps]: New flag.
    [-DDsystemduserunitdir]: New flag.
    <#:phases>['patch-docbook-xml]: New phase.
    ['skip-gtk-update-icon-cache]: Modify phase.
    ['move-doc]: New phase.
    ['move-help]: New phase.
    [native-inputs]: Add docbook-xml and gtk-doc. Change python2-dogtail
    to python-dogtail.
    [inputs]: Add cairo, dbus, gstreamer, gst-plugins-base, nautilus,
    t1lib, texlive-bin and zlib. Move glib and gtk+ to ...
    [propagated-inputs]: ... here.
    [synopsis]: Modify.
    [description]: Modify.
    [home-page]: Modify.

commit a0a3c53d3598d443fa6f767ea8c9782464e8a062
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Sun Aug 2 05:00:52 2020 -0400

    gnu: texlive-bin: Recompile with -fPIC.

    * gnu/packages/tex.scm (texlive-bin) [arguments]<#:configure-flags>
    [CFLAGS]: New flag.

commit 2a8611050d9843a6330955d4662adc34ae6e5e2e
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Sun Aug 2 03:08:55 2020 -0400

    gnu: epiphany: Update package definition.

    * gnu/packages/gnome.scm (epiphany) [version]: Update to 3.36.3.
    [outputs]: New output "help".
    [arguments]<#:phases>['pre-check]: Modify phase.
    ['move-help]: New phase.
    [native-inputs]: Add gobject-introspection and libxslt.
    [inputs]: Add appstream-glib, glib, gtk+, libhandy and libsoup.
    Remove libxslt.
    [propagated-inputs]: Remove dconf.
    [description]: Modify.
    [license]: Update to gpl3+.

commit 18cd31c95fcc9ac797efc7cad8ee960587499c99
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Sun Aug 2 00:04:15 2020 -0400

    gnu: eog: Update package definition.

    * gnu/packages/gnome.scm (eog) [version]: Update to 3.36.3.
    [source]<origin>[sha256]: Modify base32.
    [outputs]: New outputs "help" and "doc".
    [arguments]<#:glib-or-gtk?>: New argument.
    <#:configure-flags>[-Dgtk_doc]: New flag.
    <#:phases>['patch-docbook-xml]: New phase.
    ['move-doc]: New phase.
    ['move-help]: New phase.
    ['wrap-eog]: Modify phase.
    [native-inputs]: Add docbook-xml and gtk-doc.
    [inputs]: Add gconf, gdk-pixbuf+svg, glib, libart-lgpl, libx11 and zlib.
    Move gtk+ to ...
    [propagated-inputs]: ... here. Remove dconf.
    [synopsis]: Modify.
    [description]: Modify.

commit 9f2534ef1c474d8abaf7f03a54e79137914dd8b1
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Sat Aug 1 10:10:24 2020 -0400

    gnu: cheese: Update package definition.

    * gnu/packages/gnome.scm (cheese): Update package definition.
    [outputs]: New outputs "help" and "doc".
    [arguments]<#:phases>['patch-docbook-xml]: New phase.
    ['move-doc]: New phase.
    ['move-help]: New phase.
    ['wrap-cheese]: Modify phase.
    [native-inputs]: Add docbook-xml and gobject-introspection.
    [inputs]: Add dbus, gnome-video-effects, libcanberra and libxext.
    Remove gst-plugins-base, gst-plugins-bad, gtk+ and libx11.
    [propagated-inputs]: Add gst-plugins-base, gst-plugins-bad,
gst-plugins-good,
    gtk+ and libx11. Change gdk-pixbuf to gdk-pixbuf+svg. Remove
gnome-video-effects
    and libcanberra.
    [synopsis]: Modify.
    [description]: Modify.

commit d563462c25f68817f3327ab7d27bbfcfdb2612d7
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Sat Aug 1 07:07:23 2020 -0400

    gnu: opencv: Disable structured_light test.

    * gnu/packages/image-processing.scm (opencv): Disable
tructured_light test.
    [arguments]<#:phases>['disable-broken-tests]: Modify phase.

commit aa8bf26303dfa0014e24e6b14b9006a2270fd7f6
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date:   Fri Jul 31 16:59:57 2020 -0400

    gnu: baobab: Update package definition.

    * gnu/packages/gnome.scm (baobab) [version]: Update to 3.34.1.
    [source]<origin>[sha256]: Modify base32.
    [outputs]: New output "help".
    [arguments]<#:phases>['move-help]: New phase.
    [native-inputs]: Add gobject-introspection.
    [inputs]: Add glib.
    [synopsis]: Modify.
    [description]: Modify.
    [home-page]: Modify.
    [license]: Add fdl1.1+.

*** END ***

Regards,
RG.

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

From aa8bf26303dfa0014e24e6b14b9006a2270fd7f6 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 31 Jul 2020 16:59:57 -0400
Subject: [PATCH 01/19] gnu: baobab: Update package definition.

* gnu/packages/gnome.scm (baobab) [version]: Update to 3.34.1.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "help".
[arguments]<#:phases>['move-help]: New phase.
[native-inputs]: Add gobject-introspection.
[inputs]: Add glib.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Add fdl1.1+.
---
 gnu/packages/gnome.scm | 72 ++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5f53b626f7..5f240d2ce6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10001,38 +10001,56 @@ files.")
 (define-public baobab
   (package
     (name "baobab")
-    (version "3.32.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://gnome/sources/" name "/"
-                    (version-major+minor version) "/"
-                    name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r"))))
+    (version "3.34.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "mirror://gnome/sources/" name "/"
+         (version-major+minor version) "/"
+         name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1i90gc1cpw5507zn54k46hj4mjgdxsq8cvpnlgxq0ksy2d7iv63z"))))
     (build-system meson-build-system)
+    (outputs '("out" "help"))
     (arguments
-     '(#:glib-or-gtk? #t))
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t))))))
     (native-inputs
-     `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)
-       ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
-       ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache
-       ("itstool" ,itstool)
-       ("xmllint" ,libxml2)
+     `(("desktop-file-utils" ,desktop-file-utils)
        ("glib" ,glib "bin")
-       ("vala" ,vala)))
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk+-bin" ,gtk+ "bin")
+       ("intltool" ,intltool)
+       ("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)
+       ("xmllint" ,libxml2)))
     (inputs
-     `(("gtk+" ,gtk+)))
-    (synopsis "Disk usage analyzer for GNOME")
-    (description
-     "Baobab (Disk Usage Analyzer) is a graphical application to analyse disk
-usage in the GNOME desktop environment.  It can easily scan device volumes or
-a specific user-requested directory branch (local or remote).  Once the scan
-is complete it provides a graphical representation of each selected folder.")
-    (home-page "https://wiki.gnome.org/Apps/Baobab")
-    (license license:gpl2+)))
+     `(("glib" ,glib)
+       ("gtk+" ,gtk+)))
+    (synopsis "Disk Usage Analyzer")
+    (description "Baobab scans folders, devices or remote locations and reports
+on the disk space consumed by each element.  It provides both a tree-like and a
+graphical representation.")
+    (home-page "https://wiki.gnome.org/Apps/DiskUsageAnalyzer")
+    (license
+     (list
+      ;; Documentation
+      license:fdl1.1+
+      ;; Others
+      license:gpl2+))))
 
 (define-public gnome-backgrounds
   (package
-- 
2.28.0


[-- Attachment #1.1.3: 0002-gnu-opencv-Disable-structured_light-test.patch --]
[-- Type: text/x-patch, Size: 1200 bytes --]

From d563462c25f68817f3327ab7d27bbfcfdb2612d7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 1 Aug 2020 07:07:23 -0400
Subject: [PATCH 02/19] gnu: opencv: Disable structured_light test.

* gnu/packages/image-processing.scm (opencv): Disable tructured_light test.
[arguments]<#:phases>['disable-broken-tests]: Modify phase.
---
 gnu/packages/image-processing.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index a11b1b89d3..2523fa91fa 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -329,6 +329,8 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
                (("(TEST\\(Viz, )([a-z].*\\).*)" all pre post)
                 (string-append pre "DISABLED_" post)))
 
+             (delete-file-recursively "../opencv-contrib/modules/structured_light/test")
+
              ;; This one fails with "unknown file: Failure"
              ;; But I couldn't figure out which file was missing:
              (substitute* "../opencv-contrib/modules/face/test/test_face_align.cpp"
-- 
2.28.0


[-- Attachment #1.1.4: 0003-gnu-cheese-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 6772 bytes --]

From 9f2534ef1c474d8abaf7f03a54e79137914dd8b1 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 1 Aug 2020 10:10:24 -0400
Subject: [PATCH 03/19] gnu: cheese: Update package definition.

* gnu/packages/gnome.scm (cheese): Update package definition.
[outputs]: New outputs "help" and "doc".
[arguments]<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
['move-help]: New phase.
['wrap-cheese]: Modify phase.
[native-inputs]: Add docbook-xml and gobject-introspection.
[inputs]: Add dbus, gnome-video-effects, libcanberra and libxext.
Remove gst-plugins-base, gst-plugins-bad, gtk+ and libx11.
[propagated-inputs]: Add gst-plugins-base, gst-plugins-bad, gst-plugins-good,
gtk+ and libx11. Change gdk-pixbuf to gdk-pixbuf+svg. Remove gnome-video-effects
and libcanberra.
[synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/gnome.scm | 101 ++++++++++++++++++++++++++---------------
 1 file changed, 65 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5f240d2ce6..55c79a784b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11692,66 +11692,95 @@ used in different GNOME Modules.")
   (package
     (name "cheese")
     (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
-                "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/" name "-"
+                       version ".tar.xz"))
+       (sha256
+        (base32 "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni"))))
+    (build-system meson-build-system)
+    (outputs '("out" "help" "doc"))
     (arguments
-     `(#:glib-or-gtk? #t
-       ;; Tests require GDK.
-       #:tests? #f
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'skip-gtk-update-icon-cache
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "docs/reference"
+               (substitute* '("cheese-docs.xml" "cheese.xml")
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-before 'configure 'skip-gtk-update-icon-cache
            (lambda _
-             ;; Don't create 'icon-theme.cache'
              (substitute* "meson_post_install.py"
-               (("gtk-update-icon-cache") (which "true")))
+               (("gtk-update-icon-cache")
+                (which "true")))
              #t))
-         (add-after 'install 'wrap-cheese
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               #t)))
+         (add-after 'move-doc 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t)))
+         (add-after 'move-doc 'wrap-cheese
            (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out             (assoc-ref outputs "out"))
-                   (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+             (let* ((out (assoc-ref outputs "out"))
+                    (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
                (wrap-program (string-append out "/bin/cheese")
                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
              #t)))))
-    (build-system meson-build-system)
     (native-inputs
-     `(("docbook-xsl" ,docbook-xsl)
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("docbook-xsl" ,docbook-xsl)
        ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("gtk-doc" ,gtk-doc)
        ("intltool" ,intltool)
        ("itstool" ,itstool)
-       ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
        ("pkg-config" ,pkg-config)
-       ("vala" ,vala)))
+       ("vala" ,vala)
+       ("xmllint" ,libxml2)))
+    (inputs
+     `(("dbus" ,dbus)
+       ("gnome-desktop" ,gnome-desktop)
+       ("gnome-video-effects" ,gnome-video-effects)
+       ("libcanberra" ,libcanberra)
+       ("xext" ,libxext)
+       ("xtst" ,libxtst)))
     (propagated-inputs
-     `(("gnome-video-effects" ,gnome-video-effects)
-       ("clutter" ,clutter)
-       ("clutter-gst" ,clutter-gst)
+     `(("clutter" ,clutter)
        ("clutter-gtk" ,clutter-gtk)
-       ("libcanberra" ,libcanberra)
-       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("clutter-gst" ,clutter-gst)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
        ("glib" ,glib)
-       ("gstreamer" ,gstreamer)))
-    (inputs
-     `(("gnome-desktop" ,gnome-desktop)
-       ("gobject-introspection" ,gobject-introspection)
+       ("gstreamer" ,gstreamer)
        ("gst-plugins-base" ,gst-plugins-base)
        ("gst-plugins-bad" ,gst-plugins-bad)
+       ("gst-plugins-good" ,gst-plugins-good)
        ("gtk+" ,gtk+)
-       ("libx11" ,libx11)
-       ("libxtst" ,libxtst)))
+       ("x11" ,libx11)))
+    (synopsis "Webcam application")
+    (description "Cheese is a program for the GNOME Desktop which allows you to
+take photos, videos, and anything else you can think of with your webcam.")
     (home-page "https://wiki.gnome.org/Apps/Cheese")
-    (synopsis "Webcam photo booth software for GNOME")
-    (description
-     "Cheese uses your webcam to take photos and videos.  Cheese can also
-apply fancy special effects and lets you share the fun with others.")
     (license license:gpl2+)))
 
 (define-public sound-juicer
-- 
2.28.0


[-- Attachment #1.1.5: 0004-gnu-eog-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 7530 bytes --]

From 18cd31c95fcc9ac797efc7cad8ee960587499c99 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 2 Aug 2020 00:04:15 -0400
Subject: [PATCH 04/19] gnu: eog: Update package definition.

* gnu/packages/gnome.scm (eog) [version]: Update to 3.36.3.
[source]<origin>[sha256]: Modify base32.
[outputs]: New outputs "help" and "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Dgtk_doc]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
['move-help]: New phase.
['wrap-eog]: Modify phase.
[native-inputs]: Add docbook-xml and gtk-doc.
[inputs]: Add gconf, gdk-pixbuf+svg, glib, libart-lgpl, libx11 and zlib.
Move gtk+ to ...
[propagated-inputs]: ... here. Remove dconf.
[synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/gnome.scm | 146 ++++++++++++++++++++++++++---------------
 1 file changed, 92 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 55c79a784b..21b2fbf593 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7105,64 +7105,102 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
    (license license:gpl2+)))
 
 (define-public eog
- (package
-   (name "eog")
-   (version "3.34.1")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version) "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "0b7ld4azs9xbdjsk9b91ywhdzvxgajhndiwiivxjzbr0hjgp7c7x"))))
-   (build-system meson-build-system)
-   (arguments
-    `(#:configure-flags
-      ;; Otherwise, the RUNPATH will lack the final 'eog' path component.
-      (list (string-append "-Dc_link_args=-Wl,-rpath="
-                           (assoc-ref %outputs "out") "/lib/eog"))
-      #:phases
-      (modify-phases %standard-phases
-         (add-after 'unpack 'skip-gtk-update-icon-cache
+  (package
+    (name "eog")
+    (version "3.36.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1p1lrnsgk5iyw7h02qzax4s74dqqsh5lk85b0qsj7hwx91qm61xp"))))
+    (build-system meson-build-system)
+    (outputs '("out" "help" "doc"))
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       ;; Otherwise, the RUNPATH will lack the final 'eog' path component.
+       (list
+        "-Dgtk_doc=true"
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out")
+                       "/lib/eog"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc/reference"
+               (substitute* '("eog-docs.xml" "eog-docs.xml.in")
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-before 'configure 'skip-gtk-update-icon-cache
            ;; Don't create 'icon-theme.cache'.
            (lambda _
              (substitute* "meson_post_install.py"
-               (("gtk-update-icon-cache") "true"))
+               (("gtk-update-icon-cache")
+                "true"))
              #t))
-        (add-after 'install 'wrap-eog
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out               (assoc-ref outputs "out"))
-                  (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
-              (wrap-program (string-append out "/bin/eog")
-                `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
-            #t)))))
-   (propagated-inputs
-    `(("dconf" ,dconf)))
-   (native-inputs
-    `(("intltool" ,intltool)
-      ("itstool" ,itstool)
-      ("glib" ,glib "bin")
-      ("gobject-introspection" ,gobject-introspection)
-      ("pkg-config" ,pkg-config)
-      ("xmllint" ,libxml2)))
-   (inputs
-    `(("gnome-desktop" ,gnome-desktop)
-      ("shared-mime-info" ,shared-mime-info)
-      ("adwaita-icon-theme" ,adwaita-icon-theme)
-      ("exempi" ,exempi)
-      ("lcms" ,lcms)
-      ("libexif" ,libexif)
-      ("libpeas" ,libpeas)
-      ("libjpeg" ,libjpeg-turbo)
-      ("librsvg" ,librsvg-next)
-      ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-      ("gtk+" ,gtk+)))
-   (home-page "https://wiki.gnome.org/Apps/EyeOfGnome")
-   (synopsis "GNOME image viewer")
-   (description "Eye of GNOME is the GNOME image viewer.  It
-supports image conversion, rotation, and slideshows.")
-   (license license:gpl2+)))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               #t)))
+         (add-after 'move-doc 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t)))
+         (add-after 'move-help 'wrap-eog
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+               (wrap-program (string-append out "/bin/eog")
+                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
+             #t)))))
+    (native-inputs
+     `(("docbook-xml" ,docbook-xml-4.1.2)
+       ("glib" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("intltool" ,intltool)
+       ("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
+       ("xmllint" ,libxml2)))
+    (inputs
+     `(("exempi" ,exempi)
+       ("gconf" ,gconf)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("glib" ,glib)
+       ("gnome-desktop" ,gnome-desktop)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("lcms" ,lcms)
+       ("libart" ,libart-lgpl)
+       ("libexif" ,libexif)
+       ("libjpeg" ,libjpeg-turbo)
+       ("libpeas" ,libpeas)
+       ("librsvg" ,librsvg-next)
+       ("shared-mime-info" ,shared-mime-info)
+       ("x11" ,libx11)
+       ("zlib" ,zlib)))
+    (propagated-inputs
+     `(("gtk+" ,gtk+)))
+    (synopsis "Eye of GNOME")
+    (description "EoG is the GNOME image viewer.")
+    (home-page "https://wiki.gnome.org/Apps/EyeOfGnome")
+    (license license:gpl2+)))
 
 (define-public eog-plugins
   ;; Note: EOG looks for its plugins (via libpeas) in ~/.local as well as
-- 
2.28.0


[-- Attachment #1.1.6: 0005-gnu-epiphany-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5998 bytes --]

From 2a8611050d9843a6330955d4662adc34ae6e5e2e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 2 Aug 2020 03:08:55 -0400
Subject: [PATCH 05/19] gnu: epiphany: Update package definition.

* gnu/packages/gnome.scm (epiphany) [version]: Update to 3.36.3.
[outputs]: New output "help".
[arguments]<#:phases>['pre-check]: Modify phase.
['move-help]: New phase.
[native-inputs]: Add gobject-introspection and libxslt.
[inputs]: Add appstream-glib, glib, gtk+, libhandy and libsoup.
Remove libxslt.
[propagated-inputs]: Remove dconf.
[description]: Modify.
[license]: Update to gpl3+.
---
 gnu/packages/gnome.scm | 86 +++++++++++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 21b2fbf593..fd65c01b1c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7512,28 +7512,35 @@ a secret password store, an adblocker, and a modern UI.")
 (define-public epiphany
   (package
     (name "epiphany")
-    (version "3.34.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/epiphany/"
-                                  (version-major+minor version) "/"
-                                  "epiphany-" version ".tar.xz"))
-              (sha256
-               (base32
-                "13ar3s40cds1rplwbzx0fzigf120w0rydiv05r3k6zpc0zy91qb0"))))
-
+    (version "3.36.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/epiphany/"
+                       (version-major+minor version) "/"
+                       "epiphany-" version ".tar.xz"))
+       (sha256
+        (base32 "0vz1j6yrjv0nmf5lk8prkkm10fbcmd35khy9zsd7d4a86wk5c6v2"))))
     (build-system meson-build-system)
+    (outputs '("out" "help"))
     (arguments
-     '(#:glib-or-gtk? #t
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       ;; Otherwise, the RUNPATH will lack the final 'epiphany' path component.
+       (list
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out")
+                       "/lib/epiphany"))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'skip-gtk-update-icon-cache
-           ;; Don't create 'icon-theme.cache'.
            (lambda _
              (substitute* "post_install.py"
-               (("gtk-update-icon-cache") "true"))
+               (("gtk-update-icon-cache")
+                "true"))
              #t))
-         (add-after 'unpack 'disable-failing-tests
+         (add-before 'configure 'disable-failing-tests
            (lambda _
              (substitute* "tests/meson.build"
                ;; embed_shell fails, because webkitgtk apparently no longer supports
@@ -7545,45 +7552,54 @@ a secret password store, an adblocker, and a modern UI.")
          (add-before 'check 'pre-check
            (lambda _
              ;; Tests require a running X server.
-             (system "Xvfb :1 &")
+             (system "Xvfb :1 +extension GLX &")
              (setenv "DISPLAY" ":1")
-             #t)))
-       #:configure-flags
-       ;; Otherwise, the RUNPATH will lack the final 'epiphany' path component.
-       (list (string-append "-Dc_link_args=-Wl,-rpath="
-                            (assoc-ref %outputs "out") "/lib/epiphany"))))
-    (propagated-inputs
-     `(("dconf" ,dconf)))
+             #t))
+       (add-after 'install 'move-help
+         (lambda* (#:key outputs #:allow-other-keys)
+           (let* ((out (assoc-ref outputs "out"))
+                  (help (assoc-ref outputs "help")))
+             (mkdir-p (string-append help "/share"))
+             (rename-file
+              (string-append out "/share/help")
+              (string-append help "/share/help"))
+             #t))))))
     (native-inputs
-     `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
-       ("glib:bin" ,glib "bin") ; for glib-mkenums
+     `(("desktop-file-utils" ,desktop-file-utils)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
        ("itstool" ,itstool)
        ("pkg-config" ,pkg-config)
-       ("xmllint" ,libxml2)
-       ("xorg-server" ,xorg-server-for-tests)))
+       ("xorg-server" ,xorg-server-for-tests)
+       ("xsltproc" ,libxslt)))
     (inputs
-     `(("avahi" ,avahi)
+     `(("appstream-util" ,appstream-glib)
+       ("avahi" ,avahi)
+       ("cairo" ,cairo)
        ("gcr" ,gcr)
-       ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) ; for loading SVG files
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("glib" ,glib)
        ("glib-networking" ,glib-networking)
        ("gnome-desktop" ,gnome-desktop)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("gtk+" ,gtk+)
        ("json-glib" ,json-glib)
        ("iso-codes" ,iso-codes)
        ("libdazzle" ,libdazzle)
+       ("libhandy" ,libhandy)
        ("libnotify" ,libnotify)
        ("libsecret" ,libsecret)
-       ("libxslt" ,libxslt)
-       ("nettle" ,nettle) ; for hogweed
+       ("libsoup" ,libsoup)
+       ("libxml2" ,libxml2)
+       ("nettle" ,nettle)
        ("sqlite" ,sqlite)
        ("webkitgtk" ,webkitgtk)))
-    (home-page "https://wiki.gnome.org/Apps/Web")
     (synopsis "GNOME web browser")
-    (description
-     "Epiphany is a GNOME web browser targeted at non-technical users.  Its
-principles are simplicity and standards compliance.")
-    (license license:gpl2+)))
+    (description "Epiphany is a GNOME web browser based on the WebKit rendering
+engine.")
+    (home-page "https://wiki.gnome.org/Apps/Web")
+    (license license:gpl3+)))
 
 (define-public d-feet
   (package
-- 
2.28.0


[-- Attachment #1.1.7: 0006-gnu-texlive-bin-Recompile-with-fPIC.patch --]
[-- Type: text/x-patch, Size: 945 bytes --]

From a0a3c53d3598d443fa6f767ea8c9782464e8a062 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 2 Aug 2020 05:00:52 -0400
Subject: [PATCH 06/19] gnu: texlive-bin: Recompile with -fPIC.

* gnu/packages/tex.scm (texlive-bin) [arguments]<#:configure-flags>
[CFLAGS]: New flag.
---
 gnu/packages/tex.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 47645a3e34..fd69e57e8c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -320,7 +320,8 @@ files from LOCATIONS with expected checksum HASH.  CODE is not currently in use.
    (arguments
     `(#:out-of-source? #t
       #:configure-flags
-       '("--disable-static"
+       '("CFLAGS=-fPIC"
+         "--disable-static"
          "--disable-native-texlive-build"
          "--with-system-cairo"
          "--with-system-freetype2"
-- 
2.28.0


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

From f96191e1783926f5266370ec203b42a65287f7eb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 3 Aug 2020 09:59:41 -0400
Subject: [PATCH 07/19] gnu: evince: Update package definition.

* gnu/packages/gnome.scm (evince) [version]: Update to 3.36.7.
[source]<origin>[sha256]: Modify base32.
[build-system]: Change from glib-or-gtk to meson.
[outputs]: New outputs "help" and "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[--diable-nautilus]: Remove flag.
[--enable-introspection]: Remove flag.
[-Dbrowser_plugin]: New flag.
[-Dps]: New flag.
[-DDsystemduserunitdir]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['skip-gtk-update-icon-cache]: Modify phase.
['move-doc]: New phase.
['move-help]: New phase.
[native-inputs]: Add docbook-xml and gtk-doc. Change python2-dogtail
to python-dogtail.
[inputs]: Add cairo, dbus, gstreamer, gst-plugins-base, nautilus,
t1lib, texlive-bin and zlib. Move glib and gtk+ to ...
[propagated-inputs]: ... here.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
---
 gnu/packages/gnome.scm | 141 ++++++++++++++++++++++++++---------------
 1 file changed, 89 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fd65c01b1c..7acc0d7078 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2783,71 +2783,108 @@ forgotten when the session ends.")
 (define-public evince
   (package
     (name "evince")
-    (version "3.36.5")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnome/sources/evince/"
-                                 (version-major+minor version) "/"
-                                 "evince-" version ".tar.xz"))
-             (sha256
-              (base32
-               "0z79jl0j9xq9wgwkfr0d1w1qrdy4447y8shs407n5srr0vixc3bg"))))
-    (build-system glib-or-gtk-build-system)
+    (version "3.36.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/evince/"
+                       (version-major+minor version) "/"
+                       "evince-" version ".tar.xz"))
+       (sha256
+        (base32 "0clg9fhgjyj23mmcmw7dp512wzgv5m18fppn05qf1frz7r11mmk5"))))
+    (build-system meson-build-system)
+    (outputs '("out" "help" "doc"))
     (arguments
-     `(#:configure-flags '("--disable-nautilus" "--enable-introspection")
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        "-Dbrowser_plugin=true"
+        "-Dps=auto"
+        "-Dsystemduserunitdir=no")
        #:phases
        (modify-phases %standard-phases
-         (add-before 'install 'skip-gtk-update-icon-cache
-           ;; Don't create 'icon-theme.cache'.
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "help/reference"
+               (substitute* '("libdocument/libevdocument-docs.xml"
+                              "libview/libevview-docs.xml" "shell/evince-docs.xml")
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-before 'configure 'skip-gtk-update-icon-cache
            (lambda _
-             (substitute* "data/Makefile"
-               (("gtk-update-icon-cache") "true"))
-             #t)))))
+             (substitute* "meson_post_install.py"
+               (("gtk-update-icon-cache")
+                "true"))
+             #t))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               #t)))
+         (add-after 'move-doc 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t))))))
+    (native-inputs
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("dogtail" ,python-dogtail)
+       ("glib" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("intltool" ,intltool)
+       ("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
+       ("xmllint" ,libxml2)))
     (inputs
-     `(("libarchive" ,libarchive)
-       ("libgxps" ,libgxps)
-       ("libspectre" ,libspectre)
+     `(("adwaita-icon-theme" ,adwaita-icon-theme)
+       ("atk" ,atk)
+       ("cairo" ,cairo)
+       ("dbus" ,dbus)
        ("djvulibre" ,djvulibre)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
        ("ghostscript" ,ghostscript)
-       ("poppler" ,poppler)
-       ("libtiff" ,libtiff)
-       ;; TODO:
-       ;;   Build libkpathsea as a shared library for DVI support.
-       ;; ("libkpathsea" ,texlive-bin)
        ("gnome-desktop" ,gnome-desktop)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gspell" ,gspell)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("libarchive" ,libarchive)
+       ("libcanberra" ,libcanberra)
        ("libgnome-keyring" ,libgnome-keyring)
-       ("adwaita-icon-theme" ,adwaita-icon-theme)
-       ("gdk-pixbuf" ,gdk-pixbuf)
-       ("atk" ,atk)
-       ("pango" ,pango)
-       ("gtk+" ,gtk+)
-       ("glib" ,glib)
-       ("libxml2" ,libxml2)
-       ("libsm" ,libsm)
+       ("libgxps" ,libgxps)
        ("libice" ,libice)
-       ("shared-mime-info" ,shared-mime-info)
-       ("dconf" ,dconf)
-       ("libcanberra" ,libcanberra)
+       ("libnautilus-extension" ,nautilus)
        ("libsecret" ,libsecret)
-
-       ;; For tests.
-       ("dogtail" ,python2-dogtail)))
-    (native-inputs
-     `(("itstool" ,itstool)
-       ("intltool" ,intltool)
-       ("glib" ,glib "bin")
-       ("gobject-introspection" ,gobject-introspection)
-       ("pkg-config" ,pkg-config)
-       ("xmllint" ,libxml2)))
-    (home-page "https://www.gnome.org/projects/evince/")
-    (synopsis "GNOME's document viewer")
-    (description
-     "Evince is a document viewer for multiple document formats.  It
-currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
-of Evince is to replace the multiple document viewers that exist
-on the GNOME Desktop with a single simple application.")
+       ("libsm" ,libsm)
+       ("libspectre" ,libspectre)
+       ("libtiff" ,libtiff)
+       ("libxml2" ,libxml2)
+       ("pango" ,pango)
+       ("poppler" ,poppler)
+       ("shared-mime-info" ,shared-mime-info)
+       ("t1lib" ,t1lib)
+       ("texlive-bin" ,texlive-bin)
+       ("zlib" ,zlib)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("gtk+" ,gtk+)))
+    (synopsis "Document viewer")
+    (description "Evince is a document viewer for multiple document formats.
+The goal of evince is to replace the multiple document viewers that exist on
+the GNOME Desktop with a single simple application.")
+    (home-page "https://wiki.gnome.org/Apps/Evince")
     (license license:gpl2+)))
 
 (define-public gsettings-desktop-schemas
-- 
2.28.0


[-- Attachment #1.1.9: 0008-gnu-file-roller-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5389 bytes --]

From 41eed86f665d1a00caee0d3930dea399ee02807f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 3 Aug 2020 12:42:58 -0400
Subject: [PATCH 08/19] gnu: file-roller: Update package definition.

* gnu/packages/gnome.scm (file-roller) [version]: Update to 3.36.2.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "help".
[arguments]<#:glib-or-gtk?>: New argument.
<#:phases>['patch-nautilus-extension]: New phase.
['skip-gtk-update-icon-cache]: New phase.
['move-help]: New phase.
[native-inputs]: Add gobject-introspection and vala.
[inputs]: Add cpio, glib, gtk+ and nautilus. Change gdk-pixbuf to
gdk-pixbuf+svg.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
---
 gnu/packages/gnome.scm | 80 ++++++++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7acc0d7078..002274b6c0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -89,6 +89,7 @@
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpio)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages cups)
   #:use-module (gnu packages curl)
@@ -7977,37 +7978,72 @@ share them with others via social networking and more.")
 (define-public file-roller
   (package
     (name "file-roller")
-    (version "3.32.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/file-roller/"
-                                  (version-major+minor version) "/"
-                                  "file-roller-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0ap2hxvjljh4p6wsd9ikh2my3vsxp9r2nvjxxj3v87nwfyw1y4dy"))))
+    (version "3.36.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/file-roller/"
+                       (version-major+minor version) "/"
+                       "file-roller-" version ".tar.xz"))
+       (sha256
+        (base32 "1lkb0m8ys13sy3b6c1kj3cqrqf5d1dqvhbp8spz8v9yjv3d7z3r6"))))
     (build-system meson-build-system)
+    (outputs '("out" "help"))
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-nautilus-extension
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (substitute* "nautilus/meson.build"
+               (("libnautilus_extension_dep\\.get_pkgconfig_variable\\('extensiondir'\\)")
+                (string-append "'"
+                               (assoc-ref outputs "out")
+                               "/lib/nautilus/extensions-"
+                               ,(version-major (package-version nautilus))
+                               ".0" "'")))
+             #t))
+         (add-before 'configure 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "postinstall.py"
+               (("gtk-update-icon-cache")
+                "true"))
+             #t))
+         (add-after 'install 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t))))))
     (native-inputs
-     `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
+     `(("desktop-file-utils" ,desktop-file-utils)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
        ("itstool" ,itstool)
        ("pkg-config" ,pkg-config)
-       ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
-       ("glib:bin" ,glib "bin")))
-    ;; TODO: Add libnautilus.
+       ("vala" ,vala)
+       ("xmllint" ,libxml2)))
     (inputs
-     `(("gtk+" ,gtk+)
-       ("gdk-pixbuf" ,gdk-pixbuf)
+     `(("cpio" ,cpio)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)
        ("json-glib" ,json-glib)
        ("libarchive" ,libarchive)
+       ("libnautilus-extension" ,nautilus)
        ("libnotify" ,libnotify)
-       ("nettle" ,nettle)
-       ("libxml2" ,libxml2)))
-    (synopsis "Graphical archive manager for GNOME")
-    (description "File Roller is an archive manager for the GNOME desktop
-environment that allows users to view, unpack, and create compressed archives
-such as gzip tarballs.")
-    (home-page "http://fileroller.sourceforge.net/")
+       ("nettle" ,nettle)))
+    (synopsis "Archive management utility")
+    (description "File Roller is an archive manager for the GNOME environment.
+This means that you can create and modify archives; view the content of an
+archive; view and modify a file contained in the archive; extract files from
+the archive.")
+    (home-page "https://wiki.gnome.org/Apps/FileRoller")
     (license license:gpl2+)))
 
 (define-public gnome-session
-- 
2.28.0


[-- Attachment #1.1.10: 0009-gnu-gedit-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 9522 bytes --]

From 2a659e1327bd6b304ec2a908a5d50ecbd807dc4b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 07:37:39 -0400
Subject: [PATCH 09/19] gnu: gedit: Update package definition.

* gnu/packages/gnome.scm (gedit) [version]: Update to 3.36.2.
[source]<origin>[sha256]: Modify base32.
[outputs]: New outputs "help" and "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:parallel-build?>: Remove argument.
<#:configure-flags>[-Dgtk_doc]: New flag.
<#:phases>['patch-libgd-fetch]: Modify phase.
['patch-docbook-xml]: New phase.
['move-doc]: New phase.
['move-help]: New phase.
['wrap-gedit]: Modify phase.
[native-inputs]: Add docbook-xml, gtk-doc, python-wrapper, libxml2
and vala.
[inputs]: Remove python, python-pygobject, libxml2 and vala.
Add appstream-glib and tepl. Move gtksourceview and libpeas to ...
[propagated-inputs]: ... here. Remove dconf.
[description]: Modify.
---
 gnu/packages/gnome.scm | 140 ++++++++++++++++++++++++++---------------
 1 file changed, 88 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 002274b6c0..fb2ed1e111 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8189,49 +8189,80 @@ spidermonkey javascript engine and the GObject introspection framework.")
 (define-public gedit
   (package
     (name "gedit")
-    (version "3.34.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1inm50sdfw63by1lf4f1swb59mpyxlly0g5rdg99j5l3357fzygb"))))
+    (version "3.36.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "15s1almlhjlgl3m8lxg6jpzln8jhgdxxjr635a3b7cf58d35b1v8"))))
     (build-system meson-build-system)
+    (outputs '("out" "help" "doc"))
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
        #:configure-flags
-       ;; Otherwise, the RUNPATH will lack the final path component.
-       (list (string-append "-Dc_link_args=-Wl,-rpath="
-                            (assoc-ref %outputs "out") "/lib/gedit"))
-
-       ;; XXX: Generated .h files are sometimes used before being built.
-       #:parallel-build? #f
-
+       (list
+        "-Dgtk_doc=true"
+        ;; Otherwise, the RUNPATH will lack the final path component.
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out")
+                       "/lib/gedit"))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           ;; Don't create 'icon-theme.cache'.
-           (lambda _
-             (substitute* "build-aux/meson/post_install.py"
-               (("gtk-update-icon-cache") (which "true")))
-             #t))
          (add-after 'unpack 'patch-libgd-fetch
            (lambda* (#:key inputs #:allow-other-keys)
-             (let ((libgd (assoc-ref inputs "libgd")))
+             (let* ((libgd (assoc-ref inputs "libgd")))
                ;; Calling git is unnecessary because libgd is fetched as a
                ;; native input to this package.
                (substitute* "meson.build"
-                 ((".*git.*") ""))
+                 ((".*git.*")
+                  ""))
                (copy-recursively libgd "subprojects/libgd")
                #t)))
-         (add-after 'install 'wrap-gedit
+         (add-after 'patch-libgd-fetch 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "docs/reference"
+               (substitute* '("api-breaks.xml" "gedit-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/"))
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.3")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-before 'configure 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "build-aux/meson/post_install.py"
+               (("gtk-update-icon-cache")
+                (which "true")))
+             #t))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               #t)))
+         (add-after 'move-doc 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t)))
+         (add-after 'move-help 'wrap-gedit
            (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out               (assoc-ref outputs "out"))
-                   (gtksourceview     (assoc-ref inputs "gtksourceview"))
-                   (gi-typelib-path   (getenv "GI_TYPELIB_PATH"))
-                   (python-path       (getenv "PYTHONPATH")))
+             (let* ((out (assoc-ref outputs "out"))
+                    (gtksourceview (assoc-ref inputs "gtksourceview"))
+                    (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+                    (python-path (getenv "PYTHONPATH")))
                (wrap-program (string-append out "/bin/gedit")
                  ;; For plugins.
                  `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
@@ -8240,44 +8271,49 @@ spidermonkey javascript engine and the GObject introspection framework.")
                  `("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview
                                                                "/share")))))
              #t)))))
-    (propagated-inputs
-     `(("dconf" ,dconf)))
     (native-inputs
-     `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
+     `(("desktop-file-utils" ,desktop-file-utils)
+       ("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+       ("docbook-xml-4.3" ,docbook-xml-4.3)
        ("intltool" ,intltool)
        ("itstool" ,itstool)
-       ("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
+       ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
        ("libgd"
         ,(origin
            (method git-fetch)
-           (uri (git-reference
-                 (url "https://gitlab.gnome.org/GNOME/libgd")
-                 (commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0")))
+           (uri
+            (git-reference
+             (url "https://gitlab.gnome.org/GNOME/libgd")
+             (commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0")))
            (file-name (git-file-name "libgd" version))
            (sha256
             (base32 "16yld0ap7qj1n96h4f2sqkjmibg7xx5xwkqxdfzam2nmyfdlrrrs"))))
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)
+       ("vala" ,vala)
+       ("xmllint" ,libxml2)))
     (inputs
-     `(("glib" ,glib)
+     `(("adwaita-icon-theme" ,adwaita-icon-theme)
+       ("appstream-util" ,appstream-glib)
+       ("glib" ,glib)
+       ("gnome-desktop" ,gnome-desktop)
        ("gspell" ,gspell)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gtk+" ,gtk+)
-       ("gtksourceview" ,gtksourceview)
-       ("libpeas" ,libpeas)
-       ("libxml2" ,libxml2)
        ("iso-codes" ,iso-codes)
-       ("python-pygobject" ,python-pygobject)
-       ("python" ,python)
-       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("libx11" ,libx11)
-       ("vala" ,vala)
-       ("adwaita-icon-theme" ,adwaita-icon-theme)
        ("libsoup" ,libsoup)
-       ("gnome-desktop" ,gnome-desktop)))
-    (home-page "https://wiki.gnome.org/Apps/Gedit")
+       ("tepl" ,tepl)
+       ("x11" ,libx11)))
+    (propagated-inputs
+     `(("gtksourceview" ,gtksourceview)
+       ("libpeas" ,libpeas)))
     (synopsis "GNOME text editor")
-    (description "While aiming at simplicity and ease of use, gedit is a
-powerful general purpose text editor.")
+    (description "Gedit is the text editor of the GNOME desktop environment.
+The first goal of gedit is to be easy to use, with a simple interface by default.
+More advanced features are available by enabling plugins.")
+    (home-page "https://wiki.gnome.org/Apps/Gedit")
     (license license:gpl2+)))
 
 (define-public zenity
-- 
2.28.0


[-- Attachment #1.1.11: 0010-gnu-gnome-backgrounds-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 2529 bytes --]

From 41a75c65eda696087daf2afd287be95116e27b64 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 07:51:25 -0400
Subject: [PATCH 10/19] gnu: gnome-backgrounds: Update package definition.

* gnu/packages/gnome.scm (gnome-backgrounds) [version]: Update to
3.36.0.
[source]<origin>[sha256]: Modify base32.
[synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/gnome.scm | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fb2ed1e111..67c45aa388 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10218,30 +10218,29 @@ graphical representation.")
 (define-public gnome-backgrounds
   (package
     (name "gnome-backgrounds")
-    (version "3.34.0")
+    (version "3.36.0")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
        (sha256
-        (base32
-         "0zxlwy55fz7i582hch2wnj8zy1kzikssgaix0l2y41ccp5nzpdy2"))))
+        (base32 "02xvfwfi3133mjljl731z2hj9hfmjas3a1jl4fxmy24xrzj83jxq"))))
     (build-system meson-build-system)
     (native-inputs
      `(("intltool" ,intltool)))
+    (synopsis "Default wallpaper set for GNOME")
+    (description "GNOME backgrounds package contains a set of backgrounds
+packaged with the GNOME desktop.")
     (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
-    (synopsis "Background images for the GNOME desktop")
-    (description
-     "GNOME backgrounds package contains a collection of graphics files which
-can be used as backgrounds in the GNOME Desktop environment.  Additionally,
-the package creates the proper framework and directory structure so that you
-can add your own files to the collection.")
-    (license (list license:gpl2+
-                   license:cc-by2.0
-                   license:cc-by-sa2.0
-                   license:cc-by-sa3.0))))
+    (license
+     (list
+      license:gpl2+
+      license:cc-by2.0
+      license:cc-by-sa2.0
+      license:cc-by-sa3.0))))
 
 (define-public gnome-screenshot
   (package
-- 
2.28.0


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

From 108603d00b4702245d119e334e1307e8693a5b47 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 08:03:22 -0400
Subject: [PATCH 11/19] gnu: gnome-bluetooth: Update package definition.

* gnu/packages/gnome.scm (gnome-bluetooth) [version]: Update to
3.34.1.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Dicon_update]: New flag.
[-Dgtk_doc]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml and gtk-doc. Remove gtk+:bin.
[inputs]: Add bluez, dbus-glib, gconf and libunique.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Add gpl2+.
---
 gnu/packages/gnome.scm | 77 ++++++++++++++++++++++++++++++------------
 1 file changed, 56 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 67c45aa388..72fa261dcb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9503,37 +9503,72 @@ providing graphical log-ins and managing local and remote displays.")
 (define-public gnome-bluetooth
   (package
     (name "gnome-bluetooth")
-    (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
-                "1bvbxcsjkyl0givy8nfm7112bq3c0vn1v89fdk2pip714dsfcrz8"))))
+    (version "3.34.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "11nk8nvz5yrbx7wp75vsiaf4rniv7ik2g3nwmgwx2b42q9v11j9y"))))
     (build-system meson-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        "-Dicon_update=false"
+        "-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/libgnome-bluetooth"
+               (substitute* "gnome-bluetooth-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
-     `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
-       ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
+     `(("docbook-xml" ,docbook-xml-4.3)
+       ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
        ("xmllint" ,libxml2)))
+    (inputs
+     `(("bluez" ,bluez)
+       ("dbus-glib" ,dbus-glib)
+       ("gconf" ,gconf)
+       ("libcanberra" ,libcanberra)
+       ("libnotify" ,libnotify)
+       ("libunique" ,libunique)
+       ("udev" ,eudev)))
     (propagated-inputs
-     ;; gnome-bluetooth-1.0.pc refers to all these.
      `(("glib" ,glib)
        ("gtk+" ,gtk+)))
-    (inputs
-     `(("eudev" ,eudev)
-       ("libcanberra" ,libcanberra)
-       ("libnotify" ,libnotify)))
-    (synopsis "GNOME Bluetooth subsystem")
+    (synopsis "GNOME Bluetooth")
+    (description "GNOME-Bluetooth is a fork of bluez-gnome focused on
+integration with the GNOME desktop environment.")
     (home-page "https://wiki.gnome.org/Projects/GnomeBluetooth")
-    (description
-     "This package contains tools for managing and manipulating Bluetooth
-devices using the GNOME desktop.")
-    (license license:lgpl2.1+)))
+    (license
+     (list
+      ;; Library
+      license:lgpl2.1+
+      ;; Others
+      license:gpl2+))))
 
 (define-public gnome-control-center
   (package
-- 
2.28.0


[-- Attachment #1.1.13: 0012-gnu-gnome-boxes-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5175 bytes --]

From bdb09ca575873ea116d1da2e3d46547e3bf0dd53 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 09:41:32 -0400
Subject: [PATCH 12/19] gnu: gnome-boxes: Update package definition.

* gnu/packages/gnome.scm (gnome-boxes): Update package definition.
[outputs]: New output "help".
[arguments]<#:configure-flags>[-Drdp]: Remove flag.
<#:phases>['skip-gtk-update-icon-cache]: New phase.
['move-help]: New phase.
[native-inputs]: Add gobject-introspection and python-wrapper.
[inputs]: Add appstream-glib and freerdp.
[propagated-inputs]: Add glib and glib-networking.
[synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/gnome.scm | 80 ++++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 72fa261dcb..fe21f55bdc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12785,52 +12785,80 @@ integrate seamlessly with the GNOME desktop.")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/gnome-boxes/"
-                           (version-major+minor version) "/"
-                           "gnome-boxes-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/gnome-boxes/"
+                       (version-major+minor version) "/"
+                       "gnome-boxes-" version ".tar.xz"))
        (sha256
         (base32 "1khvyhgd3p41fvvknga1hdl0p1ks4kj4cwsiaw28v1sy6nzclm2c"))))
     (build-system meson-build-system)
+    (outputs '("out" "help"))
     (arguments
-     '(#:glib-or-gtk? #t
-       #:configure-flags (list "-Drdp=false"
-                               (string-append "-Dc_link_args=-Wl,-rpath="
-                                              (assoc-ref %outputs "out")
-                                              "/lib/gnome-boxes"))))
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        ;; For run-path validation.
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out")
+                       "/lib/gnome-boxes"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "build-aux/post_install.py"
+               (("gtk-update-icon-cache")
+                "true"))
+             #t))
+         (add-after 'install 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")             ; for glib-compile-resources
-       ("gtk+:bin" ,gtk+ "bin")             ; for gtk-update-icon-cache
-       ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
-       ("itstool" ,itstool)
+     `(("desktop-file-utils" ,desktop-file-utils)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
-       ("vala" ,vala)
-       ("pkg-config" ,pkg-config)))
+       ("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)
+       ("vala" ,vala)))
     (inputs
-     `(("libarchive" ,libarchive)
+     `(("appstream-util" ,appstream-glib)
        ("gtk" ,gtk+)
        ("gtk-vnc" ,gtk-vnc)
+       ("gudev" ,libgudev)
+       ("libarchive" ,libarchive)
        ("libosinfo" ,libosinfo)
        ("libsecret" ,libsecret)
        ("libsoup" ,libsoup)
        ("libusb" ,libusb)
        ("libvirt" ,libvirt)
        ("libvirt-glib" ,libvirt-glib)
-       ("libxml" ,libxml2)
-       ("spice-gtk" ,spice-gtk)
+       ("libxml2" ,libxml2)
        ("sparql-query" ,sparql-query)
+       ("spice-gtk" ,spice-gtk)
+       ("tracker" ,tracker)
        ("vte" ,vte)
        ("webkitgtk" ,webkitgtk)
-       ("tracker" ,tracker)
-       ("libgudev" ,libgudev)))
-    (home-page "https://wiki.gnome.org/Apps/Boxes")
-    (synopsis "View, access, and manage remote and virtual systems")
+       ("winpr" ,freerdp)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)))
+    (synopsis "Virtualization made simple")
     (description "GNOME Boxes is a simple application to view, access, and
 manage remote and virtual systems.")
-    (license (list
-              ;; For data/icons/empty-boxes.png.
-              license:cc-by2.0
-              ;; For all others.
-              license:lgpl2.0+))))
+    (home-page "https://wiki.gnome.org/Apps/Boxes")
+    (license
+     (list
+      ;; Icons
+      license:cc-by2.0
+      ;; Others.
+      license:lgpl2.0+))))
 
 (define-public geary
   (package
-- 
2.28.0


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

From 4444c742902b140042c325466afd544b2b686e15 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 10:16:18 -0400
Subject: [PATCH 13/19] gnu: gnome-calculator: Update package definition.

* gnu/packages/gnome.scm (gnome-calculator) [version]: Update to
3.36.0.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "help".
[arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase.
['move-help]: New phase.
[native-inputs]: Add gobject-introspection.
[inputs]: Move libgee to ...
[propagated-inputs]: ... here. Add glib and gtk+.
[synopsis]: Modify.
[license]: Modify.
---
 gnu/packages/gnome.scm | 61 +++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fe21f55bdc..20b83ac050 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11344,39 +11344,62 @@ handling the startup notification side.")
 (define-public gnome-calculator
   (package
     (name "gnome-calculator")
-    (version "3.34.1")
+    (version "3.36.0")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
        (sha256
-        (base32
-         "0lbh87255zzggqzai6543qg920y52bl4vs5m5h5087ghzg14hlsd"))))
+        (base32 "1cqd4b25qp1i0p04m669jssg1l5sdapc1mniv9jssvw5r7wk1s52"))))
     (build-system meson-build-system)
-    (arguments '(#:glib-or-gtk? #t))
+    (outputs '("out" "help"))
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "meson_post_install.py"
+               (("gtk-update-icon-cache")
+                "true"))
+             #t))
+         (add-after 'install 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               (rename-file
+                (string-append out "/share/devhelp")
+                (string-append help "/share/devhelp"))
+               #t))))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
-       ("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0.
-       ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("itstool" ,itstool)
-       ("vala" ,vala)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
     (inputs
-     `(("glib" ,glib)
-       ("gtksourceview" ,gtksourceview)
-       ("libgee" ,libgee)
+     `(("gtksourceview" ,gtksourceview)
        ("libsoup" ,libsoup)
        ("libxml2" ,libxml2)
        ("mpc" ,mpc)
        ("mpfr" ,mpfr)))
+    (propagated-inputs
+     `(("gee" ,libgee)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)))
+    (synopsis "GNOME Calculator")
+    (description "GNOME-Calculator is an application that solves mathematical
+equations and is suitable as a default application in a Desktop environment.")
     (home-page "https://wiki.gnome.org/Apps/Calculator")
-    (synopsis "Desktop calculator")
-    (description
-     "Calculator is an application that solves mathematical equations and
-is suitable as a default application in a Desktop environment.")
-    (license license:gpl3)))
+    (license license:gpl3+)))
 
 (define-public xpad
   (package
-- 
2.28.0


[-- Attachment #1.1.15: 0014-gnu-gnome-calendar-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4090 bytes --]

From a9bf121a704e1b5f30f19efdf2a20ce1a2392ff8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 10:59:51 -0400
Subject: [PATCH 14/19] gnu: gnome-calendar: Update package definition.

* gnu/packages/gnome.scm (gnome-calendar) [version]: Update to 3.36.2.
[propagated-inputs]: Move evolution-data-server to ...
[inputs]: ... here. Add geocode-glib, glib, gtk+, libhandy, libical and
libsoup.
[synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/gnome.scm | 54 +++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 20b83ac050..f327d92f97 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10772,47 +10772,51 @@ desktop.  It supports world clock, stop watch, alarms, and count down timer.")
 (define-public gnome-calendar
   (package
     (name "gnome-calendar")
-    (version "3.34.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1bnmd191044zn2kr6f5vg7sm5q59qf7z652awll1f7s6ahijr8rw"))))
+    (version "3.36.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "07sc1kn65dzxsxpv0vl5dj1a5awljjsfl9jldrg0hnjmq12m7c6h"))))
     (build-system meson-build-system)
     (arguments
-     '(#:glib-or-gtk? #t
-       ;; gnome-calendar has to be installed before the tests can be run
-       ;; https://bugzilla.gnome.org/show_bug.cgi?id=788224
-       #:tests? #f
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'skip-gtk-update-icon-cache
-           ;; Don't create 'icon-theme.cache'.
            (lambda _
              (substitute* "build-aux/meson/meson_post_install.py"
-               (("gtk-update-icon-cache") "true"))
+               (("gtk-update-icon-cache")
+                "true"))
              #t)))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
-       ("glib-bin" ,glib "bin")         ; For glib-compile-schemas
+       ("glib-bin" ,glib "bin")
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
+     `(("evolution-data-server" ,evolution-data-server)
+       ("geocode-glib" ,geocode-glib)
+       ("glib" ,glib)
+       ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("gtk+" ,gtk+)
        ("libdazzle" ,libdazzle)
+       ("libgeoclue" ,geoclue)
+       ("libhandy" ,libhandy)
+       ("libical" ,libical)
+       ("libsoup", libsoup)
        ("libedataserverui" ,evolution-data-server)
-       ("libgweather" ,libgweather)
-       ("geoclue" ,geoclue)))
-    (propagated-inputs
-     `(("evolution-data-server" ,evolution-data-server)))
+       ("libgweather" ,libgweather)))
+    (synopsis "Calendar application for GNOME")
+    (description "GNOME Calendar is a simple and beautiful calendar application
+designed to perfectly fit the GNOME desktop.  By reusing the components which
+the GNOME desktop is build on, Calendar nicely integrates with the GNOME
+ecosystem.")
     (home-page "https://wiki.gnome.org/Apps/Calendar")
-    (synopsis "GNOME's calendar application")
-    (description
-     "GNOME Calendar is a simple calendar application designed to fit the GNOME
-desktop.  It supports multiple calendars, month, week and year view.")
     (license license:gpl3+)))
 
 (define-public gnome-todo
-- 
2.28.0


[-- Attachment #1.1.16: 0015-gnu-gnome-characters-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4691 bytes --]

From 3eda5fc8e59ac4d93ae3c352395777e7fdb8a47a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 11:23:51 -0400
Subject: [PATCH 15/19] gnu: gnome-characters: Update package definition.

* gnu/packages/gnome.scm (gnome-characters) [version]: Update to
3.34.0.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase.
[native-inputs]: Add gobject-introspection, ruby and libxml2.
Change python-minimal to python-wrapper. Remove gtk+:bin.
[inputs]: Add glib and pango.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Add gpl2+.
---
 gnu/packages/gnome.scm | 68 ++++++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f327d92f97..c681ed1b04 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2213,46 +2213,62 @@ documents.")
 (define-public gnome-characters
   (package
     (name "gnome-characters")
-    (version "3.30.0")
+    (version "3.34.0")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/"
-                           "gnome-characters/" (version-major+minor version)
-                           "/gnome-characters-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/"
+                       "gnome-characters/" (version-major+minor version)
+                       "/gnome-characters-" version ".tar.xz"))
        (sha256
-        (base32
-         "08cwz39iwgsyyb2wqhb8vfbmh1cwfkgfiy7adp08w7rwqi99x3dp"))))
+        (base32 "0mqaxsa7hcmvid3zbzvxpfkp7s01ghiq6kaibmd3169axrr8ahql"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
-       #:phases (modify-phases %standard-phases
-                  (add-after 'install 'wrap
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      ;; GNOME Characters needs Typelib files from GTK and
-                      ;; gnome-desktop.
-                      (wrap-program (string-append (assoc-ref outputs "out")
-                                                   "/bin/gnome-characters")
-                        `("GI_TYPELIB_PATH" ":" prefix
-                          (,(getenv "GI_TYPELIB_PATH"))))
-                      #t)))))
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "meson_post_install.py"
+               (("gtk-update-icon-cache")
+                "true"))
+             #t))
+         (add-after 'install 'wrap
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; GNOME Characters needs Typelib files from GTK and
+             ;; gnome-desktop.
+             (wrap-program
+                 (string-append (assoc-ref outputs "out")
+                                "/bin/gnome-characters")
+               `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
+             #t)))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
        ("glib:bin" ,glib "bin")
-       ("gtk+:bin" ,gtk+ "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("pkg-config" ,pkg-config)
-       ("python" ,python-minimal)))
+       ("python" ,python-wrapper)
+       ("ruby" ,ruby)
+       ("xmllint" ,libxml2)))
     (inputs
      `(("gjs" ,gjs)
+       ("glib" ,glib)
+       ("gnome-desktop" ,gnome-desktop)
        ("gtk+" ,gtk+)
        ("libunistring" ,libunistring)
-       ("gnome-desktop" ,gnome-desktop)))
-    (home-page "https://wiki.gnome.org/Apps/CharacterMap")
-    (synopsis "Find and insert unusual characters")
-    (description "Characters is a simple utility application to find
-and insert unusual characters.  It allows you to quickly find the
-character you are looking for by searching for keywords.")
-    (license license:bsd-3)))
+       ("pango" ,pango)))
+    (synopsis "Browse and search for non-standard characters")
+    (description "GNOME-Characters is a simple utility application to find and
+insert unusual characters.  It allows you to quickly find the character you are
+looking for by searching for keywords.")
+    (home-page "https://wiki.gnome.org/Apps/Characters")
+    (license
+     (list
+      ;; GTK-JS-App
+      license:bsd-3
+      ;; Others
+      license:gpl2+))))
 
 (define-public gnome-common
   (package
-- 
2.28.0


[-- Attachment #1.1.17: 0016-gnu-gnome-clocks-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4354 bytes --]

From afd112c60ed22bdbf79be5dd3761ed418fa14e40 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 11:45:20 -0400
Subject: [PATCH 16/19] gnu: gnome-clocks: Update package definition.

* gnu/packages/gnome.scm (gnome-clocks) [version]: Update to 3.36.2.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "help".
[arguments]<#:configure-flags>['move-help]: New phase.
[native-inputs]: Add gobject-introspection.
[inputs]: Add appstream-glib, glib and libhandy.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
---
 gnu/packages/gnome.scm | 67 +++++++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c681ed1b04..e2dc7ec64f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10743,47 +10743,60 @@ Hotmail REST APIs.")
 (define-public gnome-clocks
   (package
     (name "gnome-clocks")
-    (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
-                "0g7hjk55smhkd09hwa9kag3h5a12l494wj89w9smpdk3ghsmy6b1"))))
+    (version "3.36.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1rjicycgh9jvkqir2m8hx9m4jlaa3w5lqs43k185wa0zxhi1n6zi"))))
     (build-system meson-build-system)
+    (outputs '("out" "help"))
     (arguments
-     '(#:glib-or-gtk? #t
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'skip-gtk-update-icon-cache
-           ;; Don't create 'icon-theme.cache'.
            (lambda _
              (substitute* "build-aux/post-install.py"
-               (("gtk-update-icon-cache") "true"))
-             #t)))))
+               (("gtk-update-icon-cache")
+                "true"))
+             #t))
+         (add-after 'install 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t))))))
     (native-inputs
-     `(("vala" ,vala)
-       ("pkg-config" ,pkg-config)
-       ("glib" ,glib "bin")             ; for glib-compile-resources
-       ("desktop-file-utils" ,desktop-file-utils)
+     `(("desktop-file-utils" ,desktop-file-utils)
        ("gettext" ,gettext-minimal)
-       ("itstool" ,itstool)))
+       ("glib" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
     (inputs
-     `(("glib" ,glib)
+     `(("appstream-util" ,appstream-glib)
+       ("geocode-glib" ,geocode-glib)
+       ("glib" ,glib)
+       ("gnome-desktop" ,gnome-desktop)
        ("gtk+" ,gtk+)
        ("gsound" ,gsound)
-       ("geoclue" ,geoclue)
-       ("geocode-glib" ,geocode-glib)
+       ("libgeoclue" ,geoclue)
        ("libgweather" ,libgweather)
-       ("gnome-desktop" ,gnome-desktop)))
+       ("libhandy" ,libhandy)))
+    (synopsis "Time for Clocks")
+    (description "GNOME-Clocks is a simple clock application for GNOME.
+It includes world clocks, alarms, a stopwatch and a timer.")
     (home-page "https://wiki.gnome.org/Apps/Clocks")
-    (synopsis "GNOME's clock application")
-    (description
-     "GNOME Clocks is a simple clocks application designed to fit the GNOME
-desktop.  It supports world clock, stop watch, alarms, and count down timer.")
-    (license license:gpl3+)))
+    (license license:gpl2+)))
 
 (define-public gnome-calendar
   (package
-- 
2.28.0


[-- Attachment #1.1.18: 0017-gnu-gnome-color-manager-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5320 bytes --]

From 91fd32d40d0b81bc700b3cab7e20498f5d2067f6 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 13:35:40 -0400
Subject: [PATCH 17/19] gnu: gnome-color-manager: Update package definition.

* gnu/packages/gnome.scm (gnome-color-manager) [version]: Update to
3.36.0.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "help".
[arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase.
['pre-check]: Modify phase.
['move-help]: New phase.
[native-inputs]: Add python-wrapper.
[inputs]: Add colord, glib, gtk+ and lcms. Remove adwaita-icon-theme,
appstream-glib, colord-gtk, exiv2, gnome-desktop, libexif, libtiff,
libxrandr, libxtst, libxxf86vm, vte and xorgproto.
---
 gnu/packages/gnome.scm | 106 ++++++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 49 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e2dc7ec64f..be1f5bc51c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1207,56 +1207,64 @@ documentation.")
 
 (define-public gnome-color-manager
   (package
-   (name "gnome-color-manager")
-   (version "3.32.0")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/" name "/"
-                                (version-major+minor version) "/"
-                                name "-" version ".tar.xz"))
-            (sha256
-             (base32
-              "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"))))
-   (build-system meson-build-system)
-   (arguments
-    `(#:glib-or-gtk? #t
-      #:phases
+    (name "gnome-color-manager")
+    (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 "0fxdng74d8hwhfx1nwl1i4jx9h9f6c2hkyc12f01kqbjcimrxnwx"))))
+    (build-system meson-build-system)
+    (outputs '("out" "help"))
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:phases
        (modify-phases %standard-phases
-        (add-before
-         'check 'pre-check
-         (lambda _
-           ;; Tests require a running X server.
-           (system "Xvfb :1 &")
-           (setenv "DISPLAY" ":1")
-           #t)))))
-   (native-inputs
-    `(("desktop-file-utils" ,desktop-file-utils)
-      ("gettext" ,gettext-minimal)
-      ("glib:bin" ,glib "bin")
-      ("gtk+:bin" ,gtk+ "bin")
-      ("itstool" ,itstool)
-      ("pkg-config" ,pkg-config)
-      ("xorg-server" ,xorg-server-for-tests)))
-   (inputs
-    `(("adwaita-icon-theme" ,adwaita-icon-theme)
-      ("appstream-glib" ,appstream-glib)
-      ("colord-gtk" ,colord-gtk)
-      ("exiv2" ,exiv2)
-      ("gnome-desktop" ,gnome-desktop)
-      ("libcanberra" ,libcanberra)
-      ("libexif" ,libexif)
-      ("libtiff" ,libtiff)
-      ("libxrandr" ,libxrandr)
-      ("libxtst" ,libxtst)
-      ("libxxf86vm" ,libxxf86vm)
-      ("vte" ,vte)
-      ("xorgproto" ,xorgproto)))
-   (synopsis "Color profile manager for the GNOME desktop")
-   (description "GNOME Color Manager is a session framework that makes
-it easy to manage, install and generate color profiles
-in the GNOME desktop.")
-   (home-page "https://gitlab.gnome.org/GNOME/gnome-color-manager")
-   (license license:gpl2+)))
+         (add-before 'configure 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "meson_post_install.sh"
+               (("gtk-update-icon-cache")
+                "true"))
+             #t))
+         (add-before 'check 'pre-check
+           (lambda _
+             ;; Tests require a running X server.
+             (system "Xvfb :1 +extension GLX &")
+             (setenv "DISPLAY" ":1")
+             #t))
+         (add-after 'install 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t))))))
+    (native-inputs
+     `(("desktop-file-utils" ,desktop-file-utils)
+       ;; ("docbook2man" ,docbook-utils)
+       ("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)
+       ("xorg-server" ,xorg-server-for-tests)))
+    (inputs
+     `(("colord" ,colord)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("libcanberra" ,libcanberra)
+       ("lcms" ,lcms)))
+    (synopsis "Color profile manager for the GNOME desktop")
+    (description "GNOME Color Manager is a session framework that makes it easy
+to manage, install and generate color profiles in the GNOME desktop.")
+    (home-page "https://gitlab.gnome.org/GNOME/gnome-color-manager")
+    (license license:gpl2+)))
 
 (define-public gnome-online-miners
   (package
-- 
2.28.0


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

From 7e653124b6689a3c77babb7fce785f9304d88c81 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 15:27:33 -0400
Subject: [PATCH 18/19] gnu: gnome-contacts: Update package definition.

* gnu/packages/gnome.scm (gnome-contacts) [version]: Update to
3.36.2.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>['-Dcheese]: Remove flag.
[-Ddocs]: New flag.
<#:phases>['patch-docbook]: New phase.
['generate-vapis]: Remove phase.
[native-inputs]: Add desktop-file-utils, docbook-xml, docbook-xsl,
gettext-minimal, gobject-introspection, libxslt and vala.
[inputs]: Add appstream-glib, cheese, folks, glib and libhandy.
Remove docbook-xml, docbook-xsl, gettext-minimal, gobject-introspection,
gst-plugins-base, libxslt and vala.
[propagated-inputs]: Remove folks and telepathy-mission-control.
[synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/gnome.scm | 88 +++++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index be1f5bc51c..d0d4de46e6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2303,60 +2303,70 @@ commonly used macros.")
 (define-public gnome-contacts
   (package
     (name "gnome-contacts")
-    (version "3.34")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/gnome-contacts/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "04igc9xvyc4kb5xf5g2missnvyvj9zv5cqxf5k4z7hb0sv42wq4r"))))
+    (version "3.36.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/gnome-contacts/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "048l07biy8xrfidfyzrjd5lrnfzqhb767ih2gl7w6c4mmhj4g2dy"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Dcheese=false")
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        ;; To enabled after upstream fixes the bug,
+        ;; https://gitlab.gnome.org/GNOME/gnome-contacts/-/issues/176
+        ;; "-Dtelepathy=true"
+        "-Ddocs=true")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'generate-vapis
+         (add-after 'unpack 'patch-docbook
            (lambda* (#:key inputs #:allow-other-keys)
-             ;; To generate goa's missing .vapi file
-             (define goa
-               (assoc-ref inputs "gnome-online-accounts:lib"))
-
-             (invoke "vapigen" "--directory=vapi" "--pkg=gio-2.0"
-                     "--library=goa-1.0"
-                     (string-append goa "/share/gir-1.0/Goa-1.0.gir"))
+             (with-directory-excursion "man"
+               (substitute* '("gnome-contacts.xml" "meson.build")
+                 (("http://docbook.sourceforge.net/release/xsl/current")
+                  (string-append (assoc-ref inputs "docbook-xsl")
+                                 "/xml/xsl/docbook-xsl-"
+                                 ,(package-version docbook-xsl)))
+                 (("http://www.oasis-open.org/docbook/xml/4.2/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
              #t))
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           ;; Don't create 'icon-theme.cache'.
+         (add-before 'configure 'skip-gtk-update-icon-cache
            (lambda _
              (substitute* "build-aux/meson_post_install.py"
-               (("gtk-update-icon-cache") "true"))
+               (("gtk-update-icon-cache")
+                "true"))
              #t)))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")
-       ("pkg-config" ,pkg-config)))
+     `(("desktop-file-utils" ,desktop-file-utils)
+       ("docbook-xml" ,docbook-xml-4.2)
+       ("docbook-xsl" ,docbook-xsl)
+       ("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)
+       ("xsltproc" ,libxslt)))
     (inputs
-     `(("docbook-xml" ,docbook-xml)
-       ("dockbook-xsl" ,docbook-xsl)
+     `(("appstream-util" ,appstream-glib)
+       ("cheese" ,cheese)
        ("evolution-data-server" ,evolution-data-server)
-       ("gettext" ,gettext-minimal)
+       ("folks" ,folks)
+       ("gee" ,libgee)
+       ("glib" ,glib)
        ("gnome-desktop" ,gnome-desktop)
        ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
-       ("gobject-introspection" ,gobject-introspection)
-       ("gst-plugins-base" ,gst-plugins-base)
        ("gtk+" ,gtk+)
-       ("libgee" ,libgee)
-       ("libxslt" ,libxslt)
-       ("telepathy-glib" ,telepathy-glib)
-       ("vala" ,vala)))
-    (propagated-inputs
-     `(("folks", folks)
-       ("telepathy-mission-control" ,telepathy-mission-control)))
-    (synopsis "GNOME's integrated address book")
-    (description
-     "GNOME Contacts organizes your contact information from online and
-offline sources, providing a centralized place for managing your contacts.")
+       ("libhandy" ,libhandy)
+       ("telepathy-glib" ,telepathy-glib)))
+    (synopsis "Contact manager for GNOME")
+    (description "GNOME-Contacts organizes your contact information from online
+and offline sources, providing a centralized place for managing your contacts.")
     (home-page "https://wiki.gnome.org/Apps/Contacts")
     (license license:gpl2+)))
 
-- 
2.28.0


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

From b02a3f0d0fba7d2f7d6c1809e4ca66e2a9dbf82f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 4 Aug 2020 18:28:39 -0400
Subject: [PATCH 19/19] gnu: gnome-control-center: Update package definition.

* gnu/packages/gnome.scm (gnome-control-center) [version]: Update
to 3.36.4.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Dcheese]: Remove flag.
[-Ddocumentation]: New flag.
[-Dgnome_session_libexec_dir]: Remove flag.
<#:phases>['patch-docbook]: New phase.
['patch-paths]: Modify phase.
[native-inputs]: Add docbook-xml, gobject-introspection and
python-wrapper.
[inputs]: Add cairo, cheese, colord, libepoxy, fontconfig, glib,
gsettings-desktop-schemas, gtk+, libhandy, network-manager, libx11
and libxi. Remove clutter-gtk, dconf, gnome-session, libcanberra
and mesa. Change gdk-pixbuf to gdk-pixbuf+svg.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
---
 gnu/packages/gnome.scm | 116 +++++++++++++++++++++++------------------
 1 file changed, 64 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d0d4de46e6..7fe43541c0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9607,32 +9607,43 @@ integration with the GNOME desktop environment.")
 (define-public gnome-control-center
   (package
     (name "gnome-control-center")
-    (version "3.34.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "054igagvmyzpaa5nwzz98gv7bk7l5dwp6g813707132si3szlpx8"))))
+    (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 "0m7pxjgymc7aqqz0vcmlq91nxnwzd1v7v1gdhrfam49krxmk80mc"))))
     (build-system meson-build-system)
     (arguments
-     '(#:glib-or-gtk? #t
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
        #:configure-flags
-       (list "-Dcheese=false"
-             (string-append "-Dgnome_session_libexecdir="
-                            (assoc-ref %build-inputs "gnome-session")
-                            "/libexec"))
+       (list
+        "-Ddocumentation=true")
        #:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'patch-paths
+         (add-after 'unpack 'patch-docbook
            (lambda* (#:key inputs #:allow-other-keys)
-             (let ((libc   (assoc-ref inputs "libc"))
-                   (tzdata (assoc-ref inputs "tzdata"))
-                   (libgnomekbd (assoc-ref inputs "libgnomekbd"))
-                   (nm-applet   (assoc-ref inputs "network-manager-applet"))
-                   (gnome-desktop (assoc-ref inputs "gnome-desktop")))
+             (with-directory-excursion "man"
+               (substitute* '("gnome-control-center.xml" "meson.build")
+                 (("http://docbook.sourceforge.net/release/xsl/current")
+                  (string-append (assoc-ref inputs "docbook-xsl")
+                                 "/xml/xsl/docbook-xsl-"
+                                 ,(package-version docbook-xsl)))
+                 (("http://www.oasis-open.org/docbook/xml/4.2/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-after 'patch-docbook 'patch-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((libc (assoc-ref inputs "libc"))
+                    (tzdata (assoc-ref inputs "tzdata"))
+                    (libgnomekbd (assoc-ref inputs "libgnomekbd"))
+                    (nm-applet (assoc-ref inputs "network-manager-applet"))
+                    (gnome-desktop (assoc-ref inputs "gnome-desktop")))
                (substitute* "panels/datetime/tz.h"
                  (("/usr/share/zoneinfo/zone.tab")
                   (string-append tzdata "/share/zoneinfo/zone.tab")))
@@ -9644,7 +9655,6 @@ integration with the GNOME desktop environment.")
                   (string-append "\"" libgnomekbd
                                  "/bin/gkbd-keyboard-display")))
                (substitute* '("panels/network/net-device-wifi.c"
-                              "panels/network/net-device.c"
                               "panels/network/connection-editor/net-connection-editor.c")
                  (("\"nm-connection-editor")
                   (string-append "\"" nm-applet
@@ -9652,70 +9662,72 @@ integration with the GNOME desktop environment.")
                (substitute* '("panels/user-accounts/run-passwd.c")
                  (("/usr/bin/passwd")
                   "/run/setuid-programs/passwd"))
-               (substitute* "panels/info/cc-info-overview-panel.c"
-                 (("DATADIR \"/gnome/gnome-version.xml\"")
-                  (string-append "\"" gnome-desktop
-                                 "/share/gnome/gnome-version.xml\"")))
                #t)))
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           ;; Don't create 'icon-theme.cache'.
+         (add-before 'configure 'skip-gtk-update-icon-cache
            (lambda _
              (substitute* "build-aux/meson/meson_post_install.py"
-               (("gtk-update-icon-cache") (which "true")))
+               (("gtk-update-icon-cache")
+                (which "true")))
              #t)))))
     (native-inputs
-     `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
+     `(("docbook-xml" ,docbook-xml-4.2)
+       ("docbook-xsl" ,docbook-xsl)
+       ("hicolor-icon-theme" ,hicolor-icon-theme)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
-       ("xsltproc" ,libxslt)
-       ;; For tests
-       ("hicolor-icon-theme" ,hicolor-icon-theme)
+       ("python" ,python-wrapper)
        ("python-dbusmock" ,python-dbusmock)
-       ("xorg-server" ,xorg-server-for-tests)))
+       ("xorg-server" ,xorg-server-for-tests)
+       ("xsltproc" ,libxslt)))
     (inputs
      `(("accountsservice" ,accountsservice)
-       ("clutter-gtk" ,clutter-gtk)
+       ("cairo" ,cairo)
+       ("cheese" ,cheese)
+       ("colord" ,colord)
        ("colord-gtk" ,colord-gtk)
        ("cups" ,cups)
-       ("dconf" ,dconf)
-       ("docbook-xsl" ,docbook-xsl)
-       ("gdk-pixbuf" ,gdk-pixbuf) ; for loading SVG files
+       ("epoxy" ,libepoxy)
+       ("fontconfig" ,fontconfig)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("glib" ,glib)
        ("gnome-bluetooth" ,gnome-bluetooth)
        ("gnome-desktop" ,gnome-desktop)
        ("gnome-online-accounts" ,gnome-online-accounts)
        ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
-       ("gnome-session" ,gnome-session)
        ("gnome-settings-daemon" ,gnome-settings-daemon)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("grilo" ,grilo)
        ("gsound" ,gsound)
+       ("gtk+" ,gtk+)
+       ("gudev" ,libgudev)
        ("ibus" ,ibus)
-       ("libcanberra" ,libcanberra)
+       ("krb5" ,mit-krb5)
        ("libgnomekbd" ,libgnomekbd)
-       ("libgudev" ,libgudev)
        ("libgtop" ,libgtop)
+       ("libhandy" ,libhandy)
+       ("libnm" ,network-manager)
        ("libnma" ,libnma)
+       ("libpulse" ,pulseaudio)
        ("libpwquality" ,libpwquality)
        ("libsecret" ,libsecret)
        ("libsoup" ,libsoup)
        ("libxml2" ,libxml2)
        ("libwacom" ,libwacom)
-       ("mesa" ,mesa)
-       ("mit-krb5" ,mit-krb5)
-       ("modem-manager" ,modem-manager)
+       ("mm-glib" ,modem-manager)
        ("network-manager-applet" ,network-manager-applet)
        ("polkit" ,polkit)
-       ("pulseaudio" ,pulseaudio)
        ("smbclient" ,samba)
        ("tzdata" ,tzdata)
        ("udisks" ,udisks)
-       ("upower" ,upower)))
-    (synopsis "Utilities to configure the GNOME desktop")
-    (home-page "https://www.gnome.org/")
-    (description
-     "This package contains configuration applets for the GNOME desktop,
-allowing to set accessibility configuration, desktop fonts, keyboard and mouse
-properties, sound setup, desktop theme and background, user interface
-properties, screen resolution, and other GNOME parameters.")
+       ("upower-glib" ,upower)
+       ("x11" ,libx11)
+       ("xi" ,libxi)))
+    (synopsis "GNOME Settings")
+    (description "GNOME-Control-Center is the GNOME's main interface for
+configuration of various aspects of your desktop.")
+    (home-page "https://gitlab.gnome.org/GNOME/gnome-control-center/")
     (license license:gpl2+)))
 
 (define-public gnome-shell
-- 
2.28.0


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

  reply	other threads:[~2020-08-04 22:53 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
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 [this message]
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=d24f02b1-6aa2-7f34-8d5b-c39a617e1a25@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