~ruther/guix-local

a5ff4d65170ccd8156489aa1741a85b94434fba3 — Mark H Weaver 9 years ago 8afabb2 + 2d5785a
Merge branch 'gnome-updates'
M gnu/local.mk => gnu/local.mk +0 -1
@@ 905,7 905,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/ttf2eot-cstddef.patch			\
  %D%/packages/patches/ttfautohint-source-date-epoch.patch	\
  %D%/packages/patches/tophat-build-with-later-seqan.patch	\
  %D%/packages/patches/totem-debug-format-fix.patch		\
  %D%/packages/patches/tuxpaint-stamps-path.patch		\
  %D%/packages/patches/unrtf-CVE-2016-10091.patch		\
  %D%/packages/patches/unzip-CVE-2014-8139.patch		\

M gnu/packages/fonts.scm => gnu/packages/fonts.scm +3 -3
@@ 1,6 1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Joshua Grant <tadni@riseup.net>
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>


@@ 241,7 241,7 @@ package provides the TrueType (TTF) files.")
(define-public font-cantarell
  (package
    (name "font-abattis-cantarell")
    (version "0.0.24")
    (version "0.0.25")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/cantarell-fonts/"


@@ 249,7 249,7 @@ package provides the TrueType (TTF) files.")
                                  "/cantarell-fonts-" version ".tar.xz"))
              (sha256
               (base32
                "0r4jnc2x9yncf40lixjb1pqgpq8rzbi2fz33pshlqzjgx2d69bcw"))))
                "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"))))
    (build-system gnu-build-system)
    (home-page "https://wiki.gnome.org/Projects/CantarellFonts")
    (synopsis "Cantarell sans-serif typeface")

M gnu/packages/freedesktop.scm => gnu/packages/freedesktop.scm +4 -3
@@ 7,6 7,7 @@
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 750,14 751,14 @@ messaging clients such as Empathy, GNOME Shell or KDE Telepathy.")
(define-public telepathy-mission-control
  (package
    (name "telepathy-mission-control")
    (version "5.16.3")
    (version "5.16.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://telepathy.freedesktop.org/releases/"
                                  name "/" name "-" version ".tar.bz2"))
                                  name "/" name "-" version ".tar.gz"))
              (sha256
               (base32
                "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi"))))
                "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.

M gnu/packages/gl.scm => gnu/packages/gl.scm +3 -3
@@ 2,7 2,7 @@
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Joshua Grant <tadni@riseup.net>
;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 David Thompson <davet@gnu.org>


@@ 197,7 197,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa
  (package
    (name "mesa")
    (version "13.0.2")
    (version "13.0.3")
    (source
      (origin
        (method url-fetch)


@@ 205,7 205,7 @@ also known as DXTn or DXTC) for Mesa.")
                            version "/mesa-" version ".tar.xz"))
        (sha256
         (base32
          "1m8n8kd8kcs5ddyvldiw09wvpi5wwpfmmxlb87d63vgl8lk65vd6"))
          "03m4gc6qc50lb0ic06f83r3yl0x4lmj2zjq3sl60vl3nq7jqpanr"))
        (patches
         (search-patches "mesa-wayland-egl-symbols-check-mips.patch"))))
    (build-system gnu-build-system)

M gnu/packages/glib.scm => gnu/packages/glib.scm +13 -11
@@ 2,7 2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;;


@@ 38,6 38,7 @@
  #:use-module (gnu packages gnome)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)


@@ 134,7 135,7 @@ shared NFS home directories.")
(define glib
  (package
   (name "glib")
   (version "2.48.2")
   (version "2.50.2")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/"


@@ 142,7 143,7 @@ shared NFS home directories.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1x6kwrk1zyd3csv0ca3pmwc4bnkc33agn95cds15h6nbi4apappj"))
              "1xgvmiqbhla6grpmbidqs3bl6zrb9mjknfsh7r4hb3163xy76s5y"))
            (patches (search-patches "glib-tests-timer.patch"))))
   (build-system gnu-build-system)
   (outputs '("out"           ; everything


@@ 152,6 153,7 @@ shared NFS home directories.")
    `(("pcre" ,pcre))) ; in the Requires.private field of glib-2.0.pc
   (inputs
    `(("coreutils" ,coreutils)
      ("util-linux" ,util-linux)  ; for libmount
      ("libffi" ,libffi)
      ("zlib" ,zlib)
      ("tzdata" ,tzdata)))     ; for tests/gdatetime.c


@@ 279,14 281,14 @@ dynamic loading, and an object system.")
(define gobject-introspection
  (package
    (name "gobject-introspection")
    (version "1.48.0")
    (version "1.50.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/"
                   "gobject-introspection/" (version-major+minor version)
                   "/gobject-introspection-" version ".tar.xz"))
             (sha256
              (base32 "0xsqwxhfqzr79av89mg766kxpb2i41bd0vwspk01xjdzrnn5l9zs"))
              (base32 "1i9pccig8mv6qf0c1z8fcapays190nmr7j6pyc7cfhzmcv39fr8w"))
             (modules '((guix build utils)))
             (snippet
              '(substitute* "tools/g-ir-tool-template.in"


@@ 427,7 429,7 @@ translated.")
(define dbus-glib
  (package
    (name "dbus-glib")
    (version "0.106")
    (version "0.108")
    (source (origin
             (method url-fetch)
             (uri


@@ 435,7 437,7 @@ translated.")
                             version ".tar.gz"))
             (sha256
              (base32
               "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk"))))
               "0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z"))))
    (build-system gnu-build-system)
    (propagated-inputs ; according to dbus-glib-1.pc
     `(("dbus" ,dbus)


@@ 482,7 484,7 @@ has an ease of use unmatched by other C++ callback libraries.")
(define glibmm
  (package
    (name "glibmm")
    (version "2.48.1")
    (version "2.50.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/glibmm/"


@@ 490,7 492,7 @@ has an ease of use unmatched by other C++ callback libraries.")
                                 "/glibmm-" version ".tar.xz"))
             (sha256
              (base32
               "1pvw2mrm03p51p03179rb6fk9p42iykkwj1jcdv7jr265xymy8nw"))))
               "152yz5w0lx0y5j9ml72az7pc83p4l92bc0sb8whpcazldqy6wwnz"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases (alist-cons-before


@@ 563,7 565,7 @@ useful for C++.")
(define-public python-pygobject
  (package
    (name "python-pygobject")
    (version "3.20.0")
    (version "3.22.0")
    (source
     (origin
       (method url-fetch)


@@ 572,7 574,7 @@ useful for C++.")
                           "/pygobject-" version ".tar.xz"))
       (sha256
        (base32
         "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari"))))
         "1ryblpc4wbhxcwf7grgib4drrab5xi6p78ihhrx0zj7g13xrrch8"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("which" ,which)

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +297 -136
@@ 9,7 9,7 @@
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>


@@ 82,6 82,7 @@
  #:use-module (gnu packages ibus)
  #:use-module (gnu packages iso-codes)
  #:use-module (gnu packages libcanberra)
  #:use-module (gnu packages libunistring)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages libusb)
  #:use-module (gnu packages lirc)


@@ 89,6 90,7 @@
  #:use-module (gnu packages image)
  #:use-module (gnu packages networking)
  #:use-module (gnu packages password-utils)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages photo)
  #:use-module (gnu packages pkg-config)


@@ 103,6 105,7 @@
  #:use-module (gnu packages tls)
  #:use-module (gnu packages web)
  #:use-module (gnu packages webkit)
  #:use-module (gnu packages xiph)
  #:use-module (gnu packages xorg)
  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages freedesktop)


@@ 117,6 120,8 @@
  #:use-module (gnu packages samba)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages qemu)
  #:use-module (gnu packages zip)
  #:use-module (srfi srfi-1))

(define-public brasero


@@ 242,7 247,7 @@ commonly used macros.")
(define-public gnome-desktop
  (package
    (name "gnome-desktop")
    (version "3.20.2")
    (version "3.22.2")
    (source
     (origin
      (method url-fetch)


@@ 251,7 256,7 @@ commonly used macros.")
                          name "-" version ".tar.xz"))
      (sha256
       (base32
        "1cp2c6q1ybirfq6rqyfj5lr5vyqdizy730bfg5jqnflcmakjsb29"))))
        "074yjz4g9gii045v2pl1ad34hcg92ci04ynxqcabwnf3lvvypmsi"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("gobject-introspection" ,gobject-introspection)


@@ 464,7 469,7 @@ forgotten when the session ends.")
(define-public evince
  (package
    (name "evince")
    (version "3.20.1")
    (version "3.22.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 472,7 477,7 @@ forgotten when the session ends.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "0m80s98k4i463dclpyk01fqb91cawbb6vvcz5vq2974k6qqc4ypw"))))
               "0713mcrym5ykhl5smqxi6m9578gz3nkibmkmc794amss7gdkkm7k"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:configure-flags '("--disable-nautilus")


@@ 536,7 541,7 @@ on the GNOME Desktop with a single simple application.")
(define-public gsettings-desktop-schemas
  (package
    (name "gsettings-desktop-schemas")
    (version "3.20.0")
    (version "3.22.0")
    (source
     (origin
      (method url-fetch)


@@ 545,7 550,7 @@ on the GNOME Desktop with a single simple application.")
                          name "-" version ".tar.xz"))
      (sha256
       (base32
        "1hfrqqsmqscgbnaikmyq4yq8h72554wdg13algh5bf8a7i9ip92m"))))
        "1qgalzqwg0fl0n22vslqcsnsmj9kc54qj25ib16rxaf36jxcf1hg"))))
    (build-system gnu-build-system)
    (inputs
     `(("glib" ,glib)))


@@ 602,14 607,14 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
(define-public desktop-file-utils
  (package
    (name "desktop-file-utils")
    (version "0.22")
    (version "0.23")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://www.freedesktop.org/software/" name
                                  "/releases/" name "-" version ".tar.xz"))
              (sha256
               (base32
                "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4"))))
                "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)))


@@ 666,7 671,7 @@ update-desktop-database: updates the database containing a cache of MIME types
(define-public adwaita-icon-theme
  (package (inherit gnome-icon-theme)
    (name "adwaita-icon-theme")
    (version "3.20")
    (version "3.22.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 674,21 679,21 @@ update-desktop-database: updates the database containing a cache of MIME types
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0ddfwwqx8s63qbqimmbb015lqsab4s0rvy1j81jdsh7k95rqh2ks"))))
                "1dyw8mm72wfpkn83vdqr0ifv5yhy565jhxrcjsd83nc7c3igd2y1"))))
    (native-inputs
     `(("gtk-encode-symbolic-svg" ,gtk+ "bin")))))

(define-public shared-mime-info
  (package
    (name "shared-mime-info")
    (version "1.7")
    (version "1.8")
    (source (origin
             (method url-fetch)
             (uri (string-append "https://freedesktop.org/~hadess/"
                                 "shared-mime-info-" version ".tar.xz"))
             (sha256
              (base32
               "0bjd2j1rqrj150mr04j7ib71lfdlgbf235fg8d70g8mszqf7ik7a"))))
               "1sc96lv9dp1lkvs8dh3ngm3hbjb274d363dl9avhb61il3qmxx9a"))))
    (build-system gnu-build-system)
    (arguments
     ;; The build system appears not to be parallel-safe.


@@ 712,15 717,15 @@ database is translated at Transifex.")
(define-public hicolor-icon-theme
  (package
    (name "hicolor-icon-theme")
    (version "0.12")
    (version "0.15")
    (source
     (origin
      (method url-fetch)
      (uri (string-append "https://icon-theme.freedesktop.org/releases/"
                          "hicolor-icon-theme-" version ".tar.gz"))
                          "hicolor-icon-theme-" version ".tar.xz"))
      (sha256
       (base32
        "0wzc7g4ldb2l8zc0x2785ck808c03i857jji942ikakyc68adp4y"))))
        "1k1kf2c5zbqh31nglc3nxs9j6wr083k9kjyql8p22ccc671mmi4w"))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f)) ; no check target


@@ 734,7 739,7 @@ database is translated at Transifex.")
(define-public libnotify
  (package
    (name "libnotify")
    (version "0.7.6")
    (version "0.7.7")
    (source
     (origin
      (method url-fetch)


@@ 743,7 748,7 @@ database is translated at Transifex.")
                          name "-" version ".tar.xz"))
      (sha256
       (base32
        "0dyq8zgjnnzcah31axnx6afb21kl7bks1gvrg4hjh3nk02j1rxhf"))))
        "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w"))))
    (build-system gnu-build-system)
    (inputs
     `(("gdk-pixbuf" ,gdk-pixbuf)


@@ 767,7 772,7 @@ some form of information without getting in the user's way.")
(define-public libpeas
  (package
    (name "libpeas")
    (version "1.18.0")
    (version "1.20.0")
    (source
     (origin
      (method url-fetch)


@@ 776,7 781,7 @@ some form of information without getting in the user's way.")
                          name "-" version ".tar.xz"))
      (sha256
       (base32
        "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz"))))
        "0m6k6fcrx40n92nc1cy3z72vs1ja49sb58dj3fjp40605pzgz4pk"))))
    (build-system gnu-build-system)
    (inputs
     `(("gtk+" ,gtk+)


@@ 904,7 909,7 @@ XML/CSS rendering engine.")
(define-public libgsf
  (package
    (name "libgsf")
    (version "1.14.40")
    (version "1.14.41")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 912,7 917,7 @@ XML/CSS rendering engine.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1q2i5p9s5zw0y0502risykrzkfma7p24n3mmh244scjy9f4kh1im"))))
                "1lq87wnrsjbjafpk3c8xwd56gqx319fhck9xkg2da88hd9c9h2qm"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("intltool" ,intltool)


@@ 1663,7 1668,7 @@ engineering.")
(define-public gnome-themes-standard
  (package
    (name "gnome-themes-standard")
    (version "3.20.2")
    (version "3.22.2")
    (source
     (origin
       (method url-fetch)


@@ 1672,7 1677,7 @@ engineering.")
                           version ".tar.xz"))
       (sha256
        (base32
         "05br99z67f82i18nljpxnwssfnaqp7mph61w3hq0i44z5i5rq3cx"))))
         "19bxw69ms46px5xgvwbjlhq2vkmrqfx2az49q63w2wxqb76icidk"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags


@@ 1735,7 1740,7 @@ passwords in the GNOME keyring.")
(define-public vala
  (package
    (name "vala")
    (version "0.32.1")
    (version "0.34.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 1743,7 1748,7 @@ passwords in the GNOME keyring.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx"))))
                "10vbd74jazc3vhfagzx8v197bshrg61hnjzna6y3wmhljhrvs5vb"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases


@@ 1777,7 1782,7 @@ libraries written in C.")
(define-public vte
  (package
    (name "vte")
    (version "0.44.2")
    (version "0.46.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 1785,7 1790,7 @@ libraries written in C.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0j899ccrkzh7208w29c835m1yms0cas5cxkck8x6l4xv2i45ksm1"))))
                "1ipmnfazvhzjp5pjw90mmxbkizivnh7gnlqqml94lw2rqa5wy048"))))
    (build-system gnu-build-system)
    (arguments
     ;; XXX: fails to compile tests with the default flags.


@@ 1804,7 1809,8 @@ libraries written in C.")
       ("xmllint" ,libxml2)))
    (propagated-inputs
     `(("gtk+" ,gtk+)                             ;required by vte-2.91.pc
       ("gnutls" ,gnutls)))                       ;ditto
       ("gnutls" ,gnutls)                         ;ditto
       ("pcre2" ,pcre2)))                         ;ditto
    (home-page "http://www.gnome.org/")
    (synopsis "Virtual Terminal Emulator")
    (description


@@ 2058,7 2064,7 @@ library.")
(define-public glib-networking
  (package
    (name "glib-networking")
    (version "2.48.2")
    (version "2.50.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/glib-networking/"


@@ 2066,7 2072,7 @@ library.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "111spcar6wbp6m0rdxzjscc7vfqx5nawscrfbxlvbf5jsr4hqp4j"))
                "1vkb53jxawy38y29635izlch64j9xmcwwcimk134jwra7hpl86iz"))
              (patches
               (search-patches "glib-networking-ssl-cert-file.patch"))))
    (build-system gnu-build-system)


@@ 2258,7 2264,7 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
(define-public gnome-mines
  (package
    (name "gnome-mines")
    (version "3.20.1")
    (version "3.22.2")
    (source
     (origin
       (method url-fetch)


@@ 2267,7 2273,7 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "0frb1r0f55giz7yqxl9920vvzqlirdivz54ygc9d85r8v63fh5aq"))))
         "1wia0nj5i244m6pq3lridvk3vx9yipsa9l921nsskd97115mnyza"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 2284,6 2290,7 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
       ("xmllint" ,libxml2)))
    (inputs
     `(("gtk+" ,gtk+)
       ("libgnome-games-support" ,libgnome-games-support)
       ("librsvg" ,librsvg)))
    (home-page "https://wiki.gnome.org/Apps/Mines")
    (synopsis "Minesweeper game")


@@ 2295,7 2302,7 @@ floating in an ocean using only your brain and a little bit of luck.")
(define-public gnome-sudoku
  (package
    (name "gnome-sudoku")
    (version "3.20.5")
    (version "3.22.2")
    (source
     (origin
       (method url-fetch)


@@ 2304,7 2311,7 @@ floating in an ocean using only your brain and a little bit of luck.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "166bbv5k50v7pjp3wbl2rmxcmv1adwr14hxg5rw2ws8kams8151k"))))
         "1sz2ln2nc9ff7zigghil32vbmr2qhb98dc0rbrz755rlrsh8pi08"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)


@@ 2330,7 2337,7 @@ more fun.")
(define-public gnome-terminal
  (package
    (name "gnome-terminal")
    (version "3.20.2")
    (version "3.22.1")
    (source
     (origin
       (method url-fetch)


@@ 2339,7 2346,7 @@ more fun.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "08ssch8h1y85wyhddkyr7ab4v8dnsn17z4ayyc5ff78gfdh30f7m"))))
         "1m5h3ck7wcvq1kfap05jwhnbpp3kmikc2qy822gnsbdjdqrm41xh"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:configure-flags


@@ 2526,14 2533,14 @@ faster results and to avoid unnecessary server load.")
(define-public upower
  (package
    (name "upower")
    (version "0.99.3")
    (version "0.99.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://upower.freedesktop.org/releases/"
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0f6x9mi1jzgqdpycaikyhjljnw3aacsl3gxndyg0dfqkq6y9jwb9"))
                "1c1ph1j1fnrf3vipxb7ncmdfc36dpvcvpsv8n8lmal7grjk2b8ww"))
              (patches (search-patches "upower-builddir.patch"))))
    (build-system glib-or-gtk-build-system)
    (arguments


@@ 2581,7 2588,7 @@ service via the system message bus.")
(define-public libgweather
  (package
    (name "libgweather")
    (version "3.20.3")
    (version "3.20.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 2589,7 2596,7 @@ service via the system message bus.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "02vcnlchcq3hxsm75x2szzkszg1yp1rg164p1b23vnzm9svcaszv"))))
                "1higj4nmn3srqjbzl4iva7c0b4fkdq74xi4b35xd0qc4qiawbkbx"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags


@@ 2636,7 2643,7 @@ services for numerous locations.")
(define-public gnome-settings-daemon
  (package
    (name "gnome-settings-daemon")
    (version "3.20.1")
    (version "3.22.1")
    (source
     (origin
       (method url-fetch)


@@ 2645,7 2652,7 @@ services for numerous locations.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "1rvqisrh3lridsb8rvm7spvncyq206ly0245zgpbm8swi5fhfjp8"))))
         "1finsr7yqvix6n3rdwclv4fpgagmz6xyrk3qzapkn9ljv76rfzdm"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(;; Color management test can't reach the colord system service.


@@ 2691,14 2698,15 @@ settings, themes, mouse settings, and startup of other daemons.")
(define-public totem-pl-parser
 (package
   (name "totem-pl-parser")
   (version "3.10.6")
   (version "3.10.7")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/totem-pl-parser/3.10/"
            (uri (string-append "mirror://gnome/sources/totem-pl-parser/"
                                (version-major+minor version) "/"
                                "totem-pl-parser-" version ".tar.xz"))
            (sha256
             (base32
              "0mv7aw9mw77w04zg95zjf0zmk6ckshpysbb9nap15h5is6zdk9cq"))))
              "17089sqyh6w6zr8ci865ihmvqshnslcsk9fbsl4s7yii66y8b0lw"))))
   (build-system gnu-build-system)
   (arguments
    ;; FIXME: Tests require gvfs.


@@ 2726,7 2734,7 @@ playlists in a variety of formats.")
(define-public aisleriot
  (package
    (name "aisleriot")
    (version "3.20.2")
    (version "3.22.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 2734,7 2742,7 @@ playlists in a variety of formats.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0vhpi7bzm4gbraky1d3ma26rbwnylcqdakav82j67bpqd7f6n0v2"))))
                "01ydq39kk8xvv8nbqqbh458gpmvx676sms71r1iix42z40a13caj"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:configure-flags


@@ 2762,7 2770,7 @@ which are easy to play with the aid of a mouse.")
(define-public devhelp
  (package
    (name "devhelp")
    (version "3.20.0")
    (version "3.22.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 2770,7 2778,7 @@ which are easy to play with the aid of a mouse.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "078zr92xs5ifp862v1vdmw1j9m6gr9zk5hjbk5065vxjwb17acx2"))))
                "1c7zqn8apm1lnpsp74bd880rga2vi5wxfjghqdgwqf6j28pf1jjr"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)


@@ 2789,7 2797,7 @@ throughout GNOME for API documentation).")
(define-public cogl
  (package
    (name "cogl")
    (version "1.22.0")
    (version "1.22.2")
    (source
     (origin
       (method url-fetch)


@@ 2798,7 2806,9 @@ throughout GNOME for API documentation).")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "14daxqrid5039xmq9yl4pk86awng1n9zgl6ysblhc4gw2ifzp7b8"))))
         "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"))))
    ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to
    ;; cogl, corresponding changes may be appropriate in mutter as well.
    (build-system gnu-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin")     ; for glib-mkenums


@@ 2866,6 2876,8 @@ without stepping on each others toes.")
       (sha256
        (base32
         "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7"))))
    ;; NOTE: mutter exports a bundled fork of clutter, so when making changes
    ;; to clutter, corresponding changes may be appropriate in mutter as well.
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"))                            ;9 MiB of gtk-doc HTML pages


@@ 2909,7 2921,7 @@ presentations, kiosk style applications and so on.")
(define-public clutter-gtk
  (package
    (name "clutter-gtk")
    (version "1.8.0")
    (version "1.8.2")
    (source
     (origin
       (method url-fetch)


@@ 2918,7 2930,7 @@ presentations, kiosk style applications and so on.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl"))))
         "153bl9256yjnfcplp7jmgf7lm2zb790zkayjclzsv42l6a3d89ys"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)


@@ 2938,7 2950,7 @@ presentations, kiosk style applications and so on.")
(define-public clutter-gst
  (package
    (name "clutter-gst")
    (version "3.0.18")
    (version "3.0.22")
    (source
     (origin
       (method url-fetch)


@@ 2947,7 2959,7 @@ presentations, kiosk style applications and so on.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "14w0pi9myvcn1yxzmk9sk8dghj17m5ji3aqdpfjikk90c060vv0a"))))
         "1m6zwc7xr7lmbwiqav961g7jhc7gp5gb73dm6j93szpa6bxmgz7i"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin")     ; for glib-mkenums


@@ 2969,7 2981,7 @@ GL based interactive canvas library.")
(define-public libchamplain
  (package
    (name "libchamplain")
    (version "0.12.13")
    (version "0.12.14")
    (source (origin
              (method url-fetch)
              (uri (string-append


@@ 2977,7 2989,7 @@ GL based interactive canvas library.")
                    version ".tar.xz"))
              (sha256
               (base32
                "1arzd1hsgq14rbiwa1ih2g250x6ljna2s2kiqfrw155c612s9cxk"))))
                "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi"))))
    (build-system gnu-build-system)
    (arguments '(#:configure-flags '("--enable-vala")))
    (native-inputs


@@ 3070,10 3082,24 @@ queries upon that data.")
GNOME Games, but it may be used by others.")
    (license license:lgpl3+)))

(define-public libgnome-games-support
  (package
    (inherit libgames-support)
    (name "libgnome-games-support")
    (version "1.2.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version) "/"
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6"))))))

(define-public gnome-klotski
  (package
    (name "gnome-klotski")
    (version "3.20.2")
    (version "3.22.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3081,7 3107,7 @@ GNOME Games, but it may be used by others.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "14w40a1gjlg4l1vhcy0qcf3scmwm2v3vhxnxj269pfqlv8s7alaw"))))
                "04ragvrz29sydi2kf1zk2aimi3b3hn34jrndfd2lx6h8l45anq3q"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("desktop-file-utils" ,desktop-file-utils)


@@ 3091,7 3117,7 @@ GNOME Games, but it may be used by others.")
       ("xmllint" ,libxml2)))
    (inputs
     `(("gtk+" ,gtk+)
       ("libgames-support" ,libgames-support)
       ("libgnome-games-support" ,libgnome-games-support)
       ("librsvg" ,librsvg)))
    (home-page "https://wiki.gnome.org/Apps/Klotski")
    (synopsis "Sliding block puzzles")


@@ 3105,7 3131,7 @@ as possible!")
(define-public grilo
  (package
    (name "grilo")
    (version "0.3.0")
    (version "0.3.2")
    (source
     (origin
       (method url-fetch)


@@ 3114,7 3140,7 @@ as possible!")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "0q5wcvnckpfks48hy0gvlfdmvqm67vnblm3912rssmkgc1ysil8z"))))
         "0nvzr2gfk2mpzf99442zawv0n5yjcyy50rqkrvdsibknbm56hvzj"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin")         ; for glib-mkenums and glib-genmarshal


@@ 3127,6 3153,7 @@ as possible!")
       ("libxml2" ,libxml2)
       ;; XXX TODO: Add oauth
       ("libsoup" ,libsoup)
       ("nettle" ,nettle)
       ("totem-pl-parser" ,totem-pl-parser)))
    (arguments
     `(#:phases


@@ 3156,7 3183,7 @@ for application developers.")
(define-public grilo-plugins
  (package
    (name "grilo-plugins")
    (version "0.3.1")
    (version "0.3.3")
    (source
     (origin
       (method url-fetch)


@@ 3165,7 3192,7 @@ for application developers.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "1akd7q6pqnkcnayrdfjb0qx5w5yyl06kxzwhqp2gxm4y1b208pb0"))))
         "172vr1y98d2mzlmg5akjn4ibrcj3gh22cwnb3cv9rvvzhj3yhrpy"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin")     ; for glib-mkenums and glib-genmarshal


@@ 3209,7 3236,7 @@ for application developers.")
(define-public totem
  (package
    (name "totem")
    (version "3.20.1")
    (version "3.22.0")
    (source
     (origin
       (method url-fetch)


@@ 3218,8 3245,7 @@ for application developers.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "09swnhp46cyy2svqx02fzy555pjgc61lyjw56v9rz1mfc41lh8kg"))
       (patches (search-patches "totem-debug-format-fix.patch"))))
         "1sjgjqhpsh3kipnbc8y31xz64s61xjayxq98pi0vkgbl2rdmnsh2"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)


@@ 3289,7 3315,7 @@ which can read a large number of file formats.")
(define-public rhythmbox
 (package
   (name "rhythmbox")
   (version "3.4")
   (version "3.4.1")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3297,7 3323,7 @@ which can read a large number of file formats.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1347747m90aiz47wny1f8rdk5195qf2ph0554c6y91711sm951gg"))))
              "1dj1hgdyhmwzs6h2zr89b1ipk0p6g7x74rfz56a5yjds3ik8d7q3"))))
   (build-system glib-or-gtk-build-system)
   (arguments
    `(#:configure-flags


@@ 3377,7 3403,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
(define-public eog
 (package
   (name "eog")
   (version "3.20.4")
   (version "3.20.5")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3385,7 3411,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1qsv3brhi8l8fr22nd3d0fwq5xhwspqw0bammhkkq3ga0z6791wn"))))
              "0fqvfc4y1lbv0awh8dbx9khfha0hdkmnj1lzw5jq0l7jmahwbrz6"))))
   (build-system glib-or-gtk-build-system)
   (arguments
    `(#:phases


@@ 3455,7 3481,7 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.")
(define-public gvfs
  (package
    (name "gvfs")
    (version "1.28.3")
    (version "1.30.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3463,7 3489,7 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "05xxy0ids310qy24vmkyl3hc6mq05p39aa8mkr5fzxkhhnv4r325"))))
                "0xgis1kgglnazy1vm66xiqyz8yvvmiad3h0g3agg7ryai6aa495q"))))
    (build-system gnu-build-system)
    (arguments
     '(#:tests? #f)) ; XXX: requiring `pidof'


@@ 3482,6 3508,7 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.")
       ("glib" ,glib)
       ("libarchive" ,libarchive)
       ("libbluray" ,libbluray)
       ("libcap" ,libcap)
       ("libcdio-paranoia" ,libcdio-paranoia)
       ("libgcrypt" ,libgcrypt)
       ("libgphoto2" ,libgphoto2)


@@ 3492,6 3519,7 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.")
       ("libsoup" ,libsoup)
       ("libxml2" ,libxml2)
       ("nettle" ,nettle) ; XXX: required by libarchive.pc
       ("polkit" ,polkit)
       ("udisks" ,udisks)))
    (home-page "https://wiki.gnome.org/gvfs/")
    (synopsis "Userspace virtual file system for GIO")


@@ 3508,7 3536,7 @@ DAV, and others.")
(define-public gusb
  (package
    (name "gusb")
    (version "0.2.6")
    (version "0.2.9")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/hughsie/libgusb/archive/"


@@ 3518,7 3546,7 @@ DAV, and others.")
                                  ".tar.gz"))
              (sha256
               (base32
                "0h9dzaza81b0mx5jfh5cnc31xdynl0jsxgwvl6vqyhy8mnwfi5nr"))))
                "1500mgpidmnjfkcz1fzqkbqv547iy1cvr8bwf3k9vqgqcjx3844n"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin")         ; for glib-genmarshal, etc.


@@ 3652,7 3680,7 @@ principles are simplicity and standards compliance.")
(define-public d-feet
  (package
    (name "d-feet")
    (version "0.3.10")
    (version "0.3.11")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3660,7 3688,7 @@ principles are simplicity and standards compliance.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0nb31bvwnj7pcpm85g8bvgjc6s5kbqy8g4qp7pzqf8w6rdgxzw48"))))
                "1hmrijm4d9vwzx2r8qzzsy8ccpj79l1y6cc569n9jjzqcq699p53"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:out-of-source? #f ; tests need to run in the source directory.


@@ 3734,7 3762,7 @@ to format Docbook and Mallard documents.")
(define-public yelp
  (package
    (name "yelp")
    (version "3.20.1")
    (version "3.22.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3742,7 3770,7 @@ to format Docbook and Mallard documents.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1hh8yqbv0scn9nksk9mq94cb4sdczlzxplclv2wqr41jmm8v186x"))))
                "13kpi0qmnfx2xwizyhmf5i5xaw9ckcn1k7v0289p7als4dybf5l6"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc.


@@ 3799,7 3827,7 @@ wraps things up in a developer-friendly way.")
(define-public libgee
  (package
    (name "libgee")
    (version "0.18.0")
    (version "0.18.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3807,7 3835,7 @@ wraps things up in a developer-friendly way.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "16a34js81w9m2bw4qd8csm4pcgr3zq5z87867j4b8wfh6zwrxnaa"))))
                "18ir5264bhdg76kcjn8i5bfs1vz89qqn2py20aavm2cwbaz6ns4r"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases


@@ 3912,7 3940,7 @@ share them with others via social networking and more.")
(define-public file-roller
  (package
    (name "file-roller")
    (version "3.20.3")
    (version "3.22.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3920,7 3948,7 @@ share them with others via social networking and more.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1sa46vjx78d670m6bikpibgz39a5zb6ri8yjmj632lmxqvj2sp3b"))))
                "1yaxd0lqhajszilblkidqfkaffhzml10l7ib64023y36qgf8q597"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 3954,7 3982,7 @@ such as gzip tarballs.")
(define-public gnome-session
  (package
    (name "gnome-session")
    (version "3.20.2")
    (version "3.22.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3962,7 3990,7 @@ such as gzip tarballs.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1npnjm6wirz2v0liv7n23ivp2w0y1q230qcdb681hhzmp7h9fpq2"))))
                "1xahljysbpnc1zafm1y2lqnmmqi2jh4fx7h2y48d9ipqnknk26in"))))
    (arguments
     '(#:phases
       (modify-phases %standard-phases


@@ 4033,7 4061,7 @@ configuration program to choose applications starting on login.")
(define-public gjs
  (package
    (name "gjs")
    (version "1.44.0")
    (version "1.46.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4041,7 4069,7 @@ configuration program to choose applications starting on login.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "106fgpr4y99sj68l72pnfa2za11ps4bn6p9z28fr79j7mpv61jc8"))
                "1m2ssa6qsipbp8lz4xbhf0nhadhv0xkdpmz1jcvl9187lwgmk0r2"))
              (modules '((guix build utils)))
              (snippet '(substitute* "test/run-with-dbus"
                          (("/bin/rm") "rm")))))


@@ 4052,6 4080,10 @@ configuration program to choose applications starting on login.")
         (add-before
          'check 'pre-check
          (lambda _
            ;; The test suite requires a running X server.
            (system "Xvfb :1 &")
            (setenv "DISPLAY" ":1")

            ;; For the missing /etc/machine-id.
            (setenv "DBUS_FATAL_WARNINGS" "0")



@@ 4086,7 4118,7 @@ javascript engine and the GObject introspection framework.")
(define-public gedit
  (package
    (name "gedit")
    (version "3.20.2")
    (version "3.22.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4094,7 4126,7 @@ javascript engine and the GObject introspection framework.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1y330hanqfld3kssf77wfphah2qpfg17pa109spsbm50f5m2g89j"))))
                "0i9z5d31vibb3dd329gwvyga38zq5k1a2glcdq7m93ycbl5mlfq6"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:configure-flags '("--disable-spell") ; XXX: gspell not packaged yet


@@ 4146,7 4178,7 @@ powerful general purpose text editor.")
(define-public zenity
  (package
    (name "zenity")
    (version "3.20.0")
    (version "3.22.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4154,7 4186,7 @@ powerful general purpose text editor.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0j2sy6imwp41l75hy3fwr68n35drvanbwgmr42kc04zqjy9pbs02"))))
                "0rp4l0vgyjhlkpk2imfwf7b05m1qxjrm8n8kp1rv70ykf48gmk8y"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("gettext" ,gettext-minimal)


@@ 4173,7 4205,7 @@ to display dialog boxes from the commandline and shell scripts.")
(define-public mutter
  (package
    (name "mutter")
    (version "3.20.3")
    (version "3.22.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4181,32 4213,69 @@ to display dialog boxes from the commandline and shell scripts.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "05pr78vgq52bkkqpbfnp9mxw14ij2wk91l2yfa69dpjbvxqm4b0l"))))
                "18lj80klfnkwh0cb3ab0i1vfvzbp0zjl73x9d7pna4dsdhsmi6ym"))))
     ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
     ;; versions of cogl and clutter.  As a result, many of the inputs,
     ;; propagated-inputs, and configure flags used in cogl and clutter are
     ;; needed here as well.
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags
       ;; XXX: build fails with [-Werror]:
       ;;    backends/meta-cursor-renderer.c:112:5: error:
       ;;      implicit declaration of function ?roundf?
       '("--enable-compile-warnings=minimum")))
       (list "--enable-compile-warnings=minimum"

             "--disable-wayland"           ; TODO enable wayland
             ;; "--enable-native-backend"  ; TODO enable the native backend

             ;; The following flags are needed for the bundled clutter
             "--enable-x11-backend=yes"

             ;; the remaining flags are needed for the bundled cogl
             "--enable-cogl-gst"
             (string-append "--with-gl-libname="
                            (assoc-ref %build-inputs "mesa")
                            "/lib/libGL.so"))))
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
       ("gobject-introspection" ,gobject-introspection)
       ("intltool" ,intltool)
       ("pkg-config" ,pkg-config)))
    (propagated-inputs
     ;; libmutter.pc refers to all these.
     `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
     `(;; libmutter.pc refers to these:
       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
       ("gtk+" ,gtk+)
       ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these:
       ("atk" ,atk)
       ("cairo" ,cairo)
       ("gdk-pixbuf" ,gdk-pixbuf)
       ("glib" ,glib)
       ("glib" ,glib)
       ("gtk+" ,gtk+)
       ("clutter" ,clutter)))
       ("json-glib" ,json-glib)
       ("libinput" ,libinput)
       ("libx11" ,libx11)
       ("libxcomposite" ,libxcomposite)
       ("libxdamage" ,libxdamage)
       ("libxext" ,libxext)
       ("libxfixes" ,libxfixes)
       ("libxkbcommon" ,libxkbcommon)
       ("libxrandr" ,libxrandr)
       ("mesa" ,mesa)
       ("pango" ,pango)
       ("udev" ,eudev)
       ("wayland" ,wayland)
       ("wayland-protocols" ,wayland-protocols)
       ("xinput" ,xinput)))
    (inputs
     `(("gnome-desktop" ,gnome-desktop)
       ("libcanberra-gtk" ,libcanberra)
       ("libgudev" ,libgudev)
       ("libice" ,libice)
       ("libsm" ,libsm)
       ("libxkbcommon" ,libxkbcommon)
       ("libxkbfile" ,libxkbfile)
       ("mesa-headers" ,mesa-headers)
       ("libxrandr" ,libxrandr)
       ("startup-notification" ,startup-notification)
       ("upower-glib" ,upower)
       ("xkeyboard-config" ,xkeyboard-config)


@@ 4223,7 4292,7 @@ window manager.")
(define-public gnome-online-accounts
  (package
    (name "gnome-online-accounts")
    (version "3.20.3")
    (version "3.22.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4231,7 4300,7 @@ window manager.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0ip0q539bik3wqwl867rjc63w2d5rjyvbqzwczkard70yd6c0kq9"))))
                "13wvnfh3hnasdnb6fhjssybj2327qihd32kpdjjb3r1qiyc8dvqb"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.


@@ 4261,7 4330,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(define-public evolution-data-server
  (package
    (name "evolution-data-server")
    (version "3.20.5")
    (version "3.22.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4269,7 4338,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0zmybf63y0d5zn48q3xjgkh2p2c3ka9xvzd6labp96bd6b6qc58d"))))
                "0kygd46s0is6i451bqykagrfx34wjvrgjbjyyszaabnppp1dyn0c"))))
    (build-system gnu-build-system)
    (arguments
     '(;; XXX: fails with:


@@ 4390,7 4459,7 @@ users.")
(define-public network-manager
  (package
    (name "network-manager")
    (version "1.4.2")
    (version "1.4.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/NetworkManager/"


@@ 4398,7 4467,7 @@ users.")
                                  "NetworkManager-" version ".tar.xz"))
              (sha256
               (base32
                "016jc21mwjxvnfiblp5lji55sr8aq6w8a08fsjmqvnpnvm3y6r58"))
                "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"))
              (snippet
              '(begin
                 (use-modules (guix build utils))


@@ 4563,7 4632,7 @@ the available networks and allows users to easily switch between them.")
(define-public libxml++
  (package
    (name "libxml++")
    (version "3.0.0")
    (version "3.0.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4571,7 4640,7 @@ the available networks and allows users to easily switch between them.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0lkrajbdys5f6w6qwfijih3hnbk4c6809qx2mmxkb7bj2w269wrg"))))
                "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r"))))
    (build-system gnu-build-system)
    ;; libxml++-3.0.pc refers to all these.
    (propagated-inputs


@@ 4604,7 4673,7 @@ libxml2.")
(define-public gdm
  (package
    (name "gdm")
    (version "3.20.1")
    (version "3.22.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4612,7 4681,7 @@ libxml2.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "17vqcnqnwx7s5xzgn358gsgbmpz7k90sh1qrwrh3wnj5r0pm38hh"))))
                "17wnsrv91mx14xp96wrc21g2hsjjc38yhbkw55kf7hk3yliychva"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags


@@ 4724,7 4793,7 @@ devices using the GNOME desktop.")
(define-public gnome-control-center
  (package
    (name "gnome-control-center")
    (version "3.20.1")
    (version "3.22.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4732,7 4801,7 @@ devices using the GNOME desktop.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1vd1h31vwyq7ss5f1151gx1vdsy35sjmapjmmz7x73ppc3y78r6f"))))
                "06h9937sjfrzjf36pxqybg4wmkc5xdhbxgdkclnkjxiiqidjjsax"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 4795,7 4864,7 @@ properties, screen resolution, and other GNOME parameters.")
(define-public gnome-shell
  (package
    (name "gnome-shell")
    (version "3.20.4")
    (version "3.22.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4803,7 4872,7 @@ properties, screen resolution, and other GNOME parameters.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0kd9y847pw9v3zl0g52ly7xdcjz0b9v37aqmi19iddfkxjjyn4qc"))))
                "16smvjfrpyfphv479hjky5261hgl4kli4q86bcb2b8xdcav4w3yq"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 4912,10 4981,98 @@ GTK-VNC implements client side RFB protocol and authentication extensions such
as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions.")
    (license license:lgpl2.1+)))

(define-public gnome-autoar
  (package
    (name "gnome-autoar")
    (version "0.1.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version) "/"
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1jcs6jgysg9n3zi3d1l4iqddzmczfdcvz7vkxn607p32nl8bhp7n"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("gnome-common" ,gnome-common)
       ("gobject-introspection" ,gobject-introspection)
       ("pkg-config" ,pkg-config)))
    (propagated-inputs
     `(("libarchive" ,libarchive)))  ; XXX document why
    (inputs
     `(("gtk+" ,gtk+)
       ("nettle" ,nettle))) ; XXX: required by libarchive.pc
    (synopsis "Archives integration support for GNOME")
    (home-page "https://git.gnome.org/browse/gnome-autoar/")
    (description
     "GNOME Autoar is a library which makes creating and extracting archives
easy, safe, and automatic.")
    (license license:lgpl2.1+)))

(define-public tracker
  (package
    (name "tracker")
    (version "1.10.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version) "/"
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "03ch3ndmxghfr9wnw9hfmpkjfa7k5v5cwwf3y1ja6ihk3c5avgbb"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("gnome-common" ,gnome-common)
       ("gobject-introspection" ,gobject-introspection)
       ("intltool" ,intltool)
       ("pkg-config" ,pkg-config)
       ("vala" ,vala)))
    (inputs
     `(("gtk+" ,gtk+)
       ("dbus" ,dbus)
       ("gstreamer" ,gstreamer)
       ("gst-plugins-base" ,gst-plugins-base)
       ("sqlite" ,sqlite)
       ("nettle" ,nettle)  ; XXX why is this needed?
       ("poppler" ,poppler)
       ("libgsf" ,libgsf)
       ("libexif" ,libexif)
       ("libpng" ,libpng)
       ("libtiff" ,libtiff)
       ("libvorbis" ,libvorbis)
       ("flac" ,flac)
       ("totem-pl-parser" ,totem-pl-parser)
       ("zlib" ,zlib)
       ("exempi" ,exempi)
       ("libxml2" ,libxml2)
       ("upower" ,upower)
       ("libgee" ,libgee)
       ("libunistring" ,libunistring)
       ("giflib" ,giflib)
       ("openjpeg" ,openjpeg-1)
       ("libosinfo" ,libosinfo)
       ("libcue" ,libcue)
       ("libseccomp" ,libseccomp)
       ("libuuid" ,util-linux)))
    (arguments `(#:tests? #f))  ; XXX FIXME enable tests (some fail)
    (synopsis "Metadata database, indexer and search tool")
    (home-page "https://wiki.gnome.org/Projects/Tracker")
    (description
     "Tracker is an advanced framework for first class objects with associated
metadata and tags.  It provides a one stop solution for all metadata, tags,
shared object databases, search tools and indexing.")
    ;; src/libtracker-*/* and src/tracker-extract/* are covered by lgpl2.1+,
    ;; src/gvdb/* are covered by lgpl2.0+, and the rest is gpl2+.
    (license (list license:gpl2+
                   license:lgpl2.1+
                   license:lgpl2.0+))))

(define-public nautilus
  (package
    (name "nautilus")
    (version "3.20.2")
    (version "3.22.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4923,11 5080,11 @@ as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1bnalv0ljdjzqzvh3rfyg7r4z8vdbq1gdard5q68riqdi2dnfvld"))))
                "1cv5xsah04svxx0b6di7iah9gcwk6na2c6lp442pal9v2ybrw76f"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:configure-flags
       '("--disable-tracker" "--disable-selinux") ; XXX: not packaged
       '("--disable-selinux") ; XXX: not packaged
       ;; XXX: FAIL: check-nautilus
       ;;   Settings schema 'org.gnome.nautilus.preferences' is not installed
       #:tests? #f))


@@ 4941,6 5098,9 @@ as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions.")
       ("gvfs" ,gvfs)
       ("exempi" ,exempi)
       ("gnome-desktop" ,gnome-desktop)
       ("gnome-autoar" ,gnome-autoar)
       ("nettle" ,nettle)    ; XXX required by libarchive.pc via gnome-autoar
       ("tracker" ,tracker)
       ;; XXX: gtk+ is required by libnautilus-extension.pc
       ;;
       ;; Don't propagate it to reduces "profile pollution" of the 'gnome' meta


@@ 4960,7 5120,7 @@ files.")
(define-public baobab
  (package
    (name "baobab")
    (version "3.20.1")
    (version "3.22.1")
    (source (origin
              (method url-fetch)
              (uri (string-append


@@ 4969,7 5129,7 @@ files.")
                    name "-" version ".tar.xz"))
              (sha256
               (base32
                "07wx4jb3nmipd4caybv21hl8h0gb282qc5a24b731mxhfqmg3pz9"))))
                "1zwpzj6hbvcyw1ymqzn3zw8w4h29ad7411crbkbh71c8jwbwpssv"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)


@@ 4992,7 5152,7 @@ is complete it provides a graphical representation of each selected folder.")
(define-public gnome-backgrounds
  (package
    (name "gnome-backgrounds")
    (version "3.20")
    (version "3.22.1")
    (source
     (origin
       (method url-fetch)


@@ 5001,7 5161,7 @@ is complete it provides a graphical representation of each selected folder.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "09viag7q53lfwrp074a1w7j0r8izlwpi10xbwjgbf5jwbqb6wv6n"))))
         "09gfdrm1kaz2knyghhjb0ka1kklgbcbnqgy4c90bg0v3n899ij5z"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)))


@@ 5020,7 5180,7 @@ can add your own files to the collection.")
(define-public gnome-screenshot
  (package
    (name "gnome-screenshot")
    (version "3.20.1")
    (version "3.22.0")
    (source
     (origin
       (method url-fetch)


@@ 5029,7 5189,7 @@ can add your own files to the collection.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "0hz1ywgb5vbfqr0p0cr20hmz5b11msyi3psanszdnv0lhxl9pa06"))))
         "0c02n1hgv21m4082jx399b1yazsc0cr07ba8k0pv8v3w7i5z21ca"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.


@@ 5051,7 5211,7 @@ beautifying border effects.")
(define-public dconf-editor
  (package
    (name "dconf-editor")
    (version "3.20.3")
    (version "3.22.1")
    (source
     (origin
       (method url-fetch)


@@ 5060,7 5220,7 @@ beautifying border effects.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "0yf553bd9l030shhs0jkl5gvkzkfxbxxm56xv0l0nmbplaci8wm8"))))
         "09n1ljryjgkmxwly542zb2dh9j7h76chc0br2bbhrhkwvjjmc3ha"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 5219,7 5379,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.")
(define-public gnome-calendar
  (package
    (name "gnome-calendar")
    (version "3.20.2")
    (version "3.22.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 5227,7 5387,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1vny8fclwglapdyxd2g9fbwdlk5hhnb993k2hvq3rf0hcgswycpi"))))
                "03wivk7hbyqrqcrd7jg0m2xj6q13248la2184qkf7zncnj72g5ih"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)


@@ 5236,7 5396,8 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.")
     `(("bdb" ,bdb)
       ("desktop-file-utils" ,desktop-file-utils)
       ("evolution-data-server" ,evolution-data-server)
       ("gnome-online-accounts" ,gnome-online-accounts)))
       ("gnome-online-accounts" ,gnome-online-accounts)
       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
    (home-page "https://wiki.gnome.org/Apps/Calendar")
    (synopsis "GNOME's calendar application")
    (description


@@ 5277,7 5438,7 @@ existing databases over the internet.")
(define-public gnome-tweak-tool
  (package
    (name "gnome-tweak-tool")
    (version "3.20.1")
    (version "3.22.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/gnome-tweak-tool/"


@@ 5287,7 5448,7 @@ existing databases over the internet.")
                        (search-patch "gnome-tweak-tool-search-paths.patch")))
              (sha256
               (base32
                "1fj6wjvnjygzm9br3sw9gya6d18yly1rm69yaiar9spfbkvv4wai"))))
                "1frs16p2284mdw65g1ldmf9cz5sn3rg16wz58gjrw5pn2cgf2six"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:configure-flags '("--localstatedir=/tmp"


@@ 5328,7 5489,7 @@ GNOME Shell appearance and extension, etc.")
(define-public gnome-shell-extensions
  (package
    (name "gnome-shell-extensions")
    (version "3.20.1")
    (version "3.22.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 5336,7 5497,7 @@ GNOME Shell appearance and extension, etc.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "18rr55krnqx1nzrzlj6kfzh4n67f3crakmwh28rr95y7cg0jwhxw"))))
                "11wa4f9arr89a4y8nsvla5j58dzwlawjb2q1lz0jn5i9kv324z6z"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags '("--enable-extensions=all")))


@@ 5523,7 5684,7 @@ GLib/GObject code.")
(define-public libgnomekbd
  (package
    (name "libgnomekbd")
    (version "3.6.0")
    (version "3.22.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 5531,7 5692,7 @@ GLib/GObject code.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "02bahnl3vaqyqyr99r9kwka84sxj8qdrz7x0bf97192dysqaa7n4"))))
                "1pvpbljvxc0riamraiflnm05dpb6i4vlmqqgdh74xggbpzd302rl"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)


@@ 5714,7 5875,7 @@ Bluefish supports many programming and markup languages.")
(define-public gnome-system-monitor
  (package
    (name "gnome-system-monitor")
    (version "3.20.1")
    (version "3.22.2")
    (source
     (origin
       (method url-fetch)


@@ 5723,7 5884,7 @@ Bluefish supports many programming and markup languages.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "1ya41b58syf8g5pc12gw1xm6jhdx3crap803bjwm086r7x2an8wv"))))
         "10n9bl2q9xxnd6mfi4scfw5x0xyyzvnblz26q9gl8vks2nbv19b8"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-mkenums.

M gnu/packages/gtk.scm => gnu/packages/gtk.scm +23 -46
@@ 70,7 70,7 @@
(define-public atk
  (package
   (name "atk")
   (version "2.20.0")
   (version "2.22.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 78,7 78,7 @@
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1w1q29yfxcq67j7fyqrfm0l0n1vy4zn539c0sf4ga9d0qkv50fj9"))))
              "1dj47ndvspa7lghw1jvjhv3v08q5f9ab5rb395mcgjbl975gajfk"))))
   (build-system gnu-build-system)
   (outputs '("out" "doc"))
   (arguments


@@ 168,7 168,7 @@ affine transformation (scale, rotation, shear, etc.).")
(define-public harfbuzz
  (package
   (name "harfbuzz")
   (version "1.3.4")
   (version "1.4.1")
   (source (origin
             (method url-fetch)
             (uri (string-append "https://www.freedesktop.org/software/"


@@ 176,7 176,7 @@ affine transformation (scale, rotation, shear, etc.).")
                                 version ".tar.bz2"))
             (sha256
              (base32
               "0ava7y24797k5ps3ghq2ccjjds97ri1gx32v6546a6pgmpyad2ki"))))
               "1g8mndf0p0fzjfvxrprga84zvqq186gbddnw6wbna7cscfmpz8l5"))))
   (build-system gnu-build-system)
   (outputs '("out"
              "bin")) ; 160K, only hb-view depend on cairo


@@ 206,7 206,7 @@ affine transformation (scale, rotation, shear, etc.).")
(define-public pango
  (package
   (name "pango")
   (version "1.40.1")
   (version "1.40.3")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/pango/"


@@ 214,7 214,7 @@ affine transformation (scale, rotation, shear, etc.).")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "0h0sbh0b5kh3lvrxrb82bs86rqakf33a9jakpv33lay7f90zayp2"))))
              "1lqi4yncw5q0v7g5makzxyp18g5cksqyld8m1wx0qli8wxf8pfmb"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("cairo" ,cairo)


@@ 377,7 377,7 @@ printing and other features typical of a source code editor.")
(define-public gtksourceview
 (package
   (name "gtksourceview")
   (version "3.20.4")
   (version "3.22.2")
   (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 385,7 385,7 @@ printing and other features typical of a source code editor.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "009xag7df07ngav2wzs0rdrrx4s2m6ahx93pxzc2p1pkbz4nl3ks"))))
               "0pmgff3p9q1z500aiqfn5l4mmij4yfi4qhq8fxscqc89vlql5s3c"))))
   (build-system gnu-build-system)
   (arguments
    '(#:phases


@@ 425,8 425,7 @@ highlighting and other features typical of a source code editor.")
(define-public gdk-pixbuf
  (package
   (name "gdk-pixbuf")
   (version "2.34.0")
   (replacement gdk-pixbuf/fixed)
   (version "2.36.3")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 434,7 433,7 @@ highlighting and other features typical of a source code editor.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm"))))
              "1v1rssjd8p5s3lymsfhiq5mbs2pc0h1r6jd0asrwdbrign7i68sj"))))
   (build-system gnu-build-system)
   (arguments
    '(#:configure-flags '("--with-x11")


@@ 475,35 474,11 @@ in the GNOME project.")
   (license license:lgpl2.0+)
   (home-page "https://developer.gnome.org/gdk-pixbuf/")))

(define gdk-pixbuf/fixed
  (package (inherit gdk-pixbuf)
    (name "gdk-pixbuf")
    (version "2.36.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version)  "/"
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1v1rssjd8p5s3lymsfhiq5mbs2pc0h1r6jd0asrwdbrign7i68sj"))))
    (replacement #f)))

(define-syntax-rule (package/inherit p overrides ...)
  "Like (package (inherit P) OVERRIDES ...), except that the same
transformation is done to the package replacement, if any.  P must be a bare
identifier, and will be bound to either P or its replacement when evaluating
OVERRIDES."
  (let loop ((p p))
    (package (inherit p)
      overrides ...
      (replacement (and=> (package-replacement p) loop)))))

;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends
;; on gdk-pixbuf, so this new varibale.  Also, librsvg adds 90MiB to the
;; closure size.
(define-public gdk-pixbuf+svg
  (package/inherit gdk-pixbuf
  (package (inherit gdk-pixbuf)
    (name "gdk-pixbuf+svg")
    (inputs
     `(("librsvg" ,librsvg)


@@ 531,7 506,7 @@ OVERRIDES."
(define-public at-spi2-core
  (package
   (name "at-spi2-core")
   (version "2.20.2")
   (version "2.22.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 539,7 514,7 @@ OVERRIDES."
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "0hx12snd9as4cq99ka3bn056xdf13f87pd1ilp6177qk8ffxx948"))))
              "02n8ybhg8344mpjwvkhnzvr0qbvvl6ryi2q9irwhi0ri46ps6pj1"))))
   (build-system gnu-build-system)
   (outputs '("out" "doc"))
   (arguments


@@ 576,7 551,7 @@ is part of the GNOME accessibility project.")
(define-public at-spi2-atk
  (package
   (name "at-spi2-atk")
   (version "2.20.1")
   (version "2.22.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 584,7 559,7 @@ is part of the GNOME accessibility project.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "13mzfwra0izmkzn7dsdgy5zj19n8izp0wdy7w1yg9s0qx6aafn13"))))
              "1h8k271ad78smm41c9bmw5dc4gki0wfy324cn2g25svkp2zfvgg8"))))
   (build-system gnu-build-system)
   (arguments
    '(#:phases


@@ 674,7 649,9 @@ application suites.")
(define-public gtk+
  (package (inherit gtk+-2)
   (name "gtk+")
   (version "3.20.9")
   ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
   ;;       mate.scm will also need to be updated.
   (version "3.22.6")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 682,7 659,7 @@ application suites.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3"))
              "0bqpx8825b1fdjmz14wq20zq58gq1yi1p5xjps8l6zqid8hmm9zb"))
            (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                     "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
   (outputs '("out" "bin" "doc"))


@@ 1031,7 1008,7 @@ toolkit.")
(define-public gtkmm
  (package
    (name "gtkmm")
    (version "3.20.1")
    (version "3.22.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 1039,7 1016,7 @@ toolkit.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "04n631a127pyidaz82ypdy9syq1hzj636r32y9hyr9kcfnwf2785"))))
               "1x8l0ny6r3ym53z82q9d5fan4m9vi93xy3b3hj1hrclgc95lvnh5"))))
    (build-system gnu-build-system)
    (native-inputs `(("pkg-config" ,pkg-config)
                     ("glib" ,glib "bin")        ;for 'glib-compile-resources'


@@ 1077,7 1054,7 @@ extensive documentation, including API reference and a tutorial.")
(define-public gtkmm-2
  (package (inherit gtkmm)
    (name "gtkmm")
    (version "2.24.4")
    (version "2.24.5")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 1085,7 1062,7 @@ extensive documentation, including API reference and a tutorial.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"))))
               "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006"))))
    (arguments
     '(#:configure-flags '("CPPFLAGS=-std=c++11"))) ; required by libsigc++
    (native-inputs `(("pkg-config" ,pkg-config)))

M gnu/packages/mail.scm => gnu/packages/mail.scm +3 -3
@@ 1,6 1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>


@@ 250,7 250,7 @@ operating systems.")
(define-public gmime
  (package
    (name "gmime")
    (version "2.6.20")
    (version "2.6.22")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/gmime/"


@@ 258,7 258,7 @@ operating systems.")
                                  "/gmime-" version ".tar.xz"))
              (sha256
               (base32
                "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"))))
                "0fjmsphvz8srsmcdl4v13p2z4jp2migaybyny444hal4snbr0py2"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)

M gnu/packages/mate.scm => gnu/packages/mate.scm +1 -1
@@ 70,7 70,7 @@
                                  ".tar.xz"))
              (sha256
               (base32
                "12p6xvqs8smbk9nivi43089fiw1jbb3g9836arr0sksmmziklnvy"))))
                "1gsfzrcbwp7835pbilk7cvda8hjsf9g3gl4llbm61y9j7a4x2kn6"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)

D gnu/packages/patches/totem-debug-format-fix.patch => gnu/packages/patches/totem-debug-format-fix.patch +0 -11
@@ 1,11 0,0 @@
--- totem-3.20.1/src/backend/bacon-video-widget.c.orig	2016-03-22 12:45:32.000000000 -0400
+++ totem-3.20.1/src/backend/bacon-video-widget.c	2016-05-11 02:49:55.299109551 -0400
@@ -2334,7 +2334,7 @@
     if (!gst_toc_entry_get_start_stop_times (entry, &start, &stop)) {
       GST_DEBUG ("Chapter #%d (couldn't get times)", i);
     } else {
-      GST_DEBUG ("Chapter #%d (start: %li stop: %li)", i, start, stop);
+      GST_DEBUG ("Chapter #%d (start: %li stop: %li)", i, (long) start, (long) stop);
     }
   }
 

M gnu/packages/patches/upower-builddir.patch => gnu/packages/patches/upower-builddir.patch +1 -1
@@ 37,7 37,7 @@ Patch by Andy Wingo <wingo@igalia.com>
-	if (g_file_test ("../etc/UPower.conf", G_FILE_TEST_EXISTS))
-		g_setenv ("UPOWER_CONF_FILE_NAME", "../etc/UPower.conf", TRUE);
-	else
-		g_setenv ("UPOWER_CONF_FILE_NAME", "../../etc/UPower.conf", TRUE);
-		g_setenv ("UPOWER_CONF_FILE_NAME", "../../../etc/UPower.conf", TRUE);
-
 	/* tests go here */
 	g_test_add_func ("/power/backend", up_test_backend_func);