~ruther/guix-local

e969b140a4382fd91514439a57749379cf00f86b — Mark H Weaver 10 years ago 267061b
Revert "Merge branch 'gnome-updates'"

This reverts commit 63655d459e28b09cd8d58743dae14b3460f6c9da, reversing
changes made to 80627f51f0238b9450745f4e642172d059ca5bb5.
M gnu/local.mk => gnu/local.mk +4 -1
@@ 489,7 489,11 @@ dist_patch_DATA =						\
  gnu/packages/patches/ghostscript-CVE-2015-3228.patch		\
  gnu/packages/patches/ghostscript-runpath.patch		\
  gnu/packages/patches/glib-networking-ssl-cert-file.patch	\
  gnu/packages/patches/glib-tests-desktop.patch			\
  gnu/packages/patches/glib-tests-homedir.patch			\
  gnu/packages/patches/glib-tests-prlimit.patch			\
  gnu/packages/patches/glib-tests-timer.patch			\
  gnu/packages/patches/glib-tests-gapplication.patch		\
  gnu/packages/patches/glibc-CVE-2015-7547.patch		\
  gnu/packages/patches/glibc-bootstrap-system.patch		\
  gnu/packages/patches/glibc-hurd-extern-inline.patch		\


@@ 517,7 521,6 @@ dist_patch_DATA =						\
  gnu/packages/patches/guile-relocatable.patch			\
  gnu/packages/patches/guile-rsvg-pkgconfig.patch		\
  gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch	\
  gnu/packages/patches/gtk2-theme-paths.patch			\
  gnu/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch	\
  gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
  gnu/packages/patches/hop-bigloo-4.0b.patch			\

M gnu/packages/fontutils.scm => gnu/packages/fontutils.scm +16 -13
@@ 46,21 46,23 @@
(define-public freetype
  (package
   (name "freetype")
   (version "2.6.3")
   (version "2.6")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://savannah/freetype/freetype-"
                                version ".tar.bz2"))
            (sha256 (base32
                     "18k3b026762lmyrxfil5xv8qwnvj7hc12gz9bjqzbb12lmx707ip"))))
                     "0zilx15fwcpa8hmcxpc423jwb8ijw4qpq968kh18akvn4j0znsc4"))))
   (build-system gnu-build-system)
   (native-inputs
    `(("pkg-config" ,pkg-config)))
   (propagated-inputs
    ;; These are all in the Requires.private field of freetype2.pc.
    ;; XXX: add harfbuzz.
    `(("libpng" ,libpng)
      ("zlib" ,zlib)))
   (arguments
    `(#:phases
       ;; This should not be necessary; reported upstream as
       ;; https://savannah.nongnu.org/bugs/index.php?44261
       (alist-cons-before
        'configure 'set-paths
        (lambda _
          (setenv "CONFIG_SHELL" (which "bash")))
        %standard-phases)))
   (synopsis "Font rendering library")
   (description
    "Freetype is a library that can be used by applications to access the


@@ 359,15 361,16 @@ applications should be.")
(define-public graphite2
  (package
   (name "graphite2")
   (version "1.3.8")
   (version "1.3.6")
   (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/silnrsi/graphite/releases/"
                           "download/" version "/" name "-" version ".tgz"))
       (uri (string-append "https://github.com/silnrsi/graphite/archive/"
                           version ".tar.gz"))
       (file-name (string-append name "-" version ".tar.gz"))
       (sha256
        (base32
         "1hlc9j7w7gihy6gvzfa7902pr6yxq1sr1xkp5rwf0p29m2rjagwz"))))
         "1frd9mjaqzvh9gs74ngc43igi53vzjzlwr5chbrs6ii1hc4aa23s"))))
   (build-system cmake-build-system)
   (native-inputs
    `(("python" ,python-2) ; because of "import imap" in tests

M gnu/packages/glib.scm => gnu/packages/glib.scm +41 -97
@@ 35,7 35,6 @@
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)


@@ 60,7 59,7 @@
(define dbus
  (package
    (name "dbus")
    (version "1.10.8")
    (version "1.10.0")
    (source (origin
              (method url-fetch)
              (uri (string-append


@@ 68,7 67,7 @@
                    version ".tar.gz"))
              (sha256
               (base32
                "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs"))
                "0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx"))
              (patches (search-patches "dbus-helper-search-path.patch"))))
    (build-system gnu-build-system)
    (arguments


@@ 130,7 129,7 @@ shared NFS home directories.")
(define glib
  (package
   (name "glib")
   (version "2.48.0")
   (version "2.46.1")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/"


@@ 138,14 137,16 @@ shared NFS home directories.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "0d3w2hblrw7vvpx60l1kbvb830ygn3v8zhwdz65cc5593j9ycjvl"))
            (patches (search-patches "glib-tests-timer.patch"))))
              "1yzxr1ip3l0m9ydk5nq32piq70c9f17p5f0jyvlsghzbaawh67ss"))
            (patches (search-patches "glib-tests-homedir.patch"
                                     "glib-tests-desktop.patch"
                                     "glib-tests-prlimit.patch"
                                     "glib-tests-timer.patch"
                                     "glib-tests-gapplication.patch"))))
   (build-system gnu-build-system)
   (outputs '("out"           ; everything
              "bin"           ; glib-mkenums, gtester, etc.; depends on Python
              "doc"))         ; 20 MiB of GTK-Doc reference
   (propagated-inputs
    `(("pcre" ,pcre))) ; in the Requires.private field of glib-2.0.pc
   (inputs
    `(("coreutils" ,coreutils)
      ("libffi" ,libffi)


@@ 159,87 160,29 @@ shared NFS home directories.")
      ("perl" ,perl)                              ; needed by GIO tests
      ("bash" ,bash)))
   (arguments
    '(#:phases
      (modify-phases %standard-phases
        (add-before 'build 'pre-build
          (lambda* (#:key inputs outputs #:allow-other-keys)
            ;; For tests/gdatetime.c.
            (setenv "TZDIR"
                    (string-append (assoc-ref inputs "tzdata")
                                   "/share/zoneinfo"))

            ;; Some tests want write access there.
            (setenv "HOME" (getcwd))
            (setenv "XDG_CACHE_HOME" (getcwd))

            (substitute* '("glib/gspawn.c"
                           "glib/tests/utils.c"
                           "tests/spawn-test.c")
              (("/bin/sh")
               (string-append (assoc-ref inputs "bash") "/bin/sh")))))
        (add-before 'check 'disable-failing-tests
          (lambda _
            (let ((disable
                   (lambda (test-file test-paths)
                     (define pattern+procs
                       (map (lambda (test-path)
                              (cons
                               ;; XXX: only works for single line statements.
                               (format #f "g_test_add_func.*\"~a\".*" test-path)
                               (const "")))
                            test-paths))
                     (substitute test-file pattern+procs)))
                  (failing-tests
                   '(("glib/tests/thread.c"
                      (;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64
                       ;; as found on hydra.gnu.org, and strace(1) doesn't
                       ;; recognize it.
                       "/thread/thread4"))

                     ("glib/tests/timer.c"
                      (;; fails if compiler optimizations are enabled, which they
                       ;; are by default.
                       "/timer/stop"))

                     ("gio/tests/gapplication.c"
                      (;; XXX: proven to be unreliable.  See:
                       ;;  <https://bugs.debian.org/756273>
                       ;;  <http://bugs.gnu.org/18445>
                       "/gapplication/quit"

                       ;; XXX: fails randomly for unknown reason. See:
                       ;;  <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00215.html>
                       "/gapplication/local-actions"))

                     ("gio/tests/contenttype.c"
                      (;; XXX: requires shared-mime-info.
                       "/contenttype/guess"
                       "/contenttype/subtype"
                       "/contenttype/list"
                       "/contenttype/icon"
                       "/contenttype/symbolic-icon"
                       "/contenttype/tree"))

                     ("gio/tests/appinfo.c"
                      (;; XXX: requires update-desktop-database.
                       "/appinfo/associations"))

                     ("gio/tests/desktop-app-info.c"
                      (;; XXX: requires update-desktop-database.
                       "/desktop-app-info/delete"
                       "/desktop-app-info/default"
                       "/desktop-app-info/fallback"
                       "/desktop-app-info/lastused"
                       "/desktop-app-info/search"))

                     ("gio/tests/gdbus-peer.c"
                      (;; Requires /etc/machine-id.
                       "/gdbus/codegen-peer-to-peer"))

                     ("gio/tests/gdbus-unix-addresses.c"
                      (;; Requires /etc/machine-id.
                       "/gdbus/x11-autolaunch")))))
              (and-map (lambda (x) (apply disable x)) failing-tests)))))
    '(#:phases (alist-cons-before
                'build 'pre-build
                (lambda* (#:key inputs outputs #:allow-other-keys)
                  ;; For tests/gdatetime.c.
                  (setenv "TZDIR"
                          (string-append (assoc-ref inputs "tzdata")
                                         "/share/zoneinfo"))

                  ;; Some tests want write access there.
                  (setenv "XDG_CACHE_HOME" (getcwd))

                  (substitute* '("glib/gspawn.c"
                                 "glib/tests/utils.c"
                                 "tests/spawn-test.c")
                    (("/bin/sh")
                     (string-append (assoc-ref inputs "bash") "/bin/sh")))

                  ;; Disable a test that requires dbus.
                  (substitute* "gio/tests/gdbus-serialization.c"
                    (("g_test_add_func \
\\(\"/gdbus/message-serialize/double-array\", test_double_array\\);" all)
                     (string-append "/* " all " */"))))
                %standard-phases)

      ;; Note: `--docdir' and `--htmldir' are not honored, so work around it.
      #:configure-flags (list (string-append "--with-html-dir="


@@ 275,14 218,14 @@ dynamic loading, and an object system.")
(define gobject-introspection
  (package
    (name "gobject-introspection")
    (version "1.48.0")
    (version "1.46.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 "0cs27r18fga44ypp8icy62fwx6nh70r1bvhi4lzfn4w85cybsn36"))
             (modules '((guix build utils)))
             (snippet
              '(substitute* "tools/g-ir-tool-template.in"


@@ 294,6 237,7 @@ dynamic loading, and an object system.")
    (build-system gnu-build-system)
    (inputs
     `(("bison" ,bison)
       ("cairo" ,cairo)
       ("flex" ,flex)
       ("glib" ,glib)
       ("python-2" ,python-2)))


@@ 451,7 395,7 @@ by GDBus included in Glib.")
(define libsigc++
  (package
    (name "libsigc++")
    (version "2.8.0")
    (version "2.6.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/libsigc++/"


@@ 459,7 403,7 @@ by GDBus included in Glib.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "0lcnzzdq6718znfshs1hflpwqq6awbzwdyp4kv5lfaf54z880jbp"))))
               "06xyvxaaxh3nbpjg86gcq5zcc2qnpx354wcfrqlhbndkq5kj2vqq"))))
    (build-system gnu-build-system)
    (native-inputs `(("pkg-config" ,pkg-config)
                     ("m4" ,m4)))


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


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


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


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

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +146 -140
@@ 188,7 188,7 @@ commonly used macros.")
(define-public gnome-desktop
  (package
    (name "gnome-desktop")
    (version "3.20.0")
    (version "3.18.1")
    (source
     (origin
      (method url-fetch)


@@ 197,7 197,7 @@ commonly used macros.")
                          name "-" version ".tar.xz"))
      (sha256
       (base32
        "13dhvax8fy9qkna4dphb7b5fxn3dsk818p3q8b92a7nrrwcgiiqq"))))
        "0avpmyhzz5b3pyfpkp8iq5ym5r5w7zs3a396hqkdpdsiym0vrazc"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("gobject-introspection" ,gobject-introspection)


@@ 265,7 265,7 @@ and keep up to date translations of documentation.")
(define-public gcr
  (package
    (name "gcr")
    (version "3.20.0")
    (version "3.18.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 273,7 273,7 @@ and keep up to date translations of documentation.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "0ydk9dzxx6snxza7j5ps8x932hbr3x1b8hhcaqjq4w4admi2qmwh"))))
               "006f6xbd3jppkf9avg83mpqdld5d0z6mr0sm81lql52mmyjnvlfl"))))
    (build-system gnu-build-system)
    (arguments
     '(#:tests? #f ;25 of 598 tests fail because /var/lib/dbus/machine-id does


@@ 342,7 342,7 @@ GNOME Desktop.")
(define-public gnome-keyring
  (package
    (name "gnome-keyring")
    (version "3.20.0")
    (version "3.18.3")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 350,7 350,7 @@ GNOME Desktop.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "16gcwwcg91ipxjmiyi4c4njvnxixmv1i278p0bilc3lafk6ww5xw"))))
               "167dq1yvm080g5s38hqjl0xx5cgpkcl1xqy9p5sxmgc92zb0srrz"))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f ;48 of 603 tests fail because /var/lib/dbus/machine-id does


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


@@ 418,7 418,7 @@ forgotten when the session ends.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "1052lm4i5qq27sgk6ck5xc1cxh0qx4zzhifjhmzjlv38afj5i0yg"))))
               "0cccmbvl1b6d2976642iyfr8g3r69zf3mzl2ln6vjvvdbrv26l3v"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:configure-flags '("--disable-nautilus")


@@ 474,7 474,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.18.0")
    (source
     (origin
      (method url-fetch)


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


@@ 599,7 599,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.18.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 607,19 607,19 @@ update-desktop-database: updates the database containing a cache of MIME types
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0ddfwwqx8s63qbqimmbb015lqsab4s0rvy1j81jdsh7k95rqh2ks"))))))
                "0n0fqlg55krw8pgn4z2vxnxh65lyvcydqkrr7klqxp8z00kfg72y"))))))

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


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


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


@@ 760,7 760,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
(define-public glade3
  (package
    (name "glade")
    (version "3.20.0")
    (version "3.18.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 768,8 768,8 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1zhqvhagy0m85p54jfiayfl0v9af7g0lj7glw8sfwh7cbp56vnc2"))))
    (build-system glib-or-gtk-build-system)
                "0lk4nvd5s8px9i0pbq7bncikgn2lpx7vjh787d3cvzpvwx3cxnzc"))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f ; needs X, GL, and software rendering
       #:phases


@@ 804,7 804,7 @@ the GNOME desktop environment.")
(define-public libcroco
  (package
    (name "libcroco")
    (version "0.6.11")
    (version "0.6.8")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 812,7 812,7 @@ the GNOME desktop environment.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk"))))
                "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)))


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


@@ 842,7 842,7 @@ XML/CSS rendering engine.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0h19ssxzz0cmznwga2xy55kjibm24mwxqarnpd0w7xy0hrzm1dvi"))))
                "0a5m1i5gp4m2z0cn2x1rrdm8wgrr04bzv65l8pgp6jipw13s9zph"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("intltool" ,intltool)


@@ 867,7 867,7 @@ dealing with different structured file formats.")
(define-public librsvg
  (package
    (name "librsvg")
    (version "2.40.15")
    (version "2.40.13")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 875,7 875,7 @@ dealing with different structured file formats.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1x05vd2llpmskq3prkp7kbpmshmpp9whj4kfl99ybipf4fhw9jnr"))))
                "014q7gz6mgfa7pfn0lr13qqv568ad8j1sw9d4vksnpazq0zajvjd"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases


@@ 1339,7 1339,14 @@ widgets built in the loading process.")
                                  name "-" version ".tar.bz2"))
              (sha256
               (base32
                "129ka3nn8gx9dlfry17ib79azxk45wzfv5rgqzw6dwx2b5ns8phm"))))
                "129ka3nn8gx9dlfry17ib79azxk45wzfv5rgqzw6dwx2b5ns8phm"))
              (modules '((guix build utils)))
              (snippet
               ;; Adapt to newer freetype. As the package is deprecated, there
               ;; is no use in creating a patch and reporting it.
               '(substitute* '("libgnomeprint/gnome-font-face.c"
                               "libgnomeprint/gnome-rfont.c")
                  (("freetype/") "freetype2/")))))
    (build-system gnu-build-system)
    (inputs
     `(("popt" ,popt)


@@ 1436,14 1443,14 @@ controls using the Bonobo component framework.")
(define-public libwnck
  (package
    (name "libwnck")
    (version "3.14.1")
    (version "3.14.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version) "/"
                                  name "-" version ".tar.xz"))
              (sha256
               (base32 "1ymya8gkjygvg0i901wr3q6ihfqxx5yf4g4pb6fag2iw8af3qr5v"))))
               (base32 "074jww04z8g9r1acndqap79wx4kbm3rpkf4lcg1v82b66iv0027m"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)


@@ 1482,14 1489,14 @@ Hints specification (EWMH).")
(define-public goffice
  (package
    (name "goffice")
    (version "0.10.28")
    (version "0.10.24")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
                                  (version-major+minor version)  "/"
                                  name "-" version ".tar.xz"))
              (sha256
               (base32 "12rsgxrixkfpk420gv026i74pnlgqjzsvm6vffrmih54w46hd3q6"))))
               (base32 "0nmghi26dpjcw7knkviq031crhm0zjy4k650pv1jj3hb1fmhx9yd"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"))                            ;4.1 MiB of gtk-doc


@@ 1547,7 1554,7 @@ Hints specification (EWMH).")
(define-public gnumeric
  (package
    (name "gnumeric")
    (version "1.12.28")
    (version "1.12.24")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 1555,7 1562,7 @@ Hints specification (EWMH).")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1fsdp7r6fhc0m3fb4ly4xwh83v3hp2zrv9d0713g4lcy709svm02"))))
                "0lcm8k0jb8rd5y4ii803f21nv8rx6gc3mmdlrj5h0rkkn9qm57f5"))))
    (build-system gnu-build-system)
    (arguments
     `(;; The gnumeric developers don't worry much about failing tests.


@@ 1584,11 1591,10 @@ Hints specification (EWMH).")
       ("libxml2" ,libxml2)
       ("libxslt" ,libxslt)
       ("python" ,python-2)
       ("python2-pygobject" ,python2-pygobject)
       ("python2-pygobject" ,python2-pygobject-2)
       ("zlib" ,zlib)))
    (native-inputs
     `(("bison" ,bison)
       ("intltool" ,intltool)
     `(("intltool" ,intltool)
       ("glib:bin" ,glib "bin")
       ("pkg-config" ,pkg-config)))
    (home-page "http://www.gnumeric.org")


@@ 1606,7 1612,7 @@ engineering.")
(define-public gnome-themes-standard
  (package
    (name "gnome-themes-standard")
    (version "3.20")
    (version "3.18.0")
    (source
     (origin
       (method url-fetch)


@@ 1615,7 1621,7 @@ engineering.")
                           version ".tar.xz"))
       (sha256
        (base32
         "1p1vvmzfky1ax3yv9ld10xgqwydhmglxpgq3skrfc4539nrq9phw"))))
         "1jxss8kxszhf66vic9n1sagczm5amm0mgxpzyxyjna15q82fnip6"))))
    (build-system gnu-build-system)
    (inputs
     `(("gtk+" ,gtk+)


@@ 1648,7 1654,7 @@ engineering.")
(define-public seahorse
  (package
    (name "seahorse")
    (version "3.20.0")
    (version "3.18.0")
    (source
     (origin
       (method url-fetch)


@@ 1657,7 1663,7 @@ engineering.")
                           version ".tar.xz"))
       (sha256
        (base32
         "1py6fj19kb8aaxvg6yrpd0876azc2zjvis98aqz37a2lxmhp9c72"))))
         "0rxnq47xcagmpqb63g49ay3lfiyjjnmmiay9yifx5jn406d8h32k"))))
    (build-system glib-or-gtk-build-system)
    (inputs
     `(("gtk+" ,gtk+)


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


@@ 1692,7 1698,7 @@ passwords in the GNOME keyring.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0vpvq403vdd25irvgk7zibz3nw4x4i17m0dgnns8j1q4vr7am8h7"))))
                "1pyyhfw3zzbhxfscbn8xz70dg6vx0kh8gshzikpxczhg01xk7w31"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases


@@ 1724,7 1730,7 @@ libraries written in C.")
(define-public vte
  (package
    (name "vte")
    (version "0.44.0")
    (version "0.42.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 1732,16 1738,8 @@ libraries written in C.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1ahjxysiv38q91gfq2wddcbvndlggfr8ynls25m42pw83akv38wk"))))
                "1832mrw2hhgjipbsfsv2fmdnwnar4rkx589ciz008bg8x908mscn"))))
    (build-system gnu-build-system)
    (arguments
     ;; XXX: fails to compile tests with the default flags.
     ;; vteconv.cc:774:40:
     ;;    error: missing sentinel in function call [-Werror=format=]
     ;;    g_test_init (&argc, &argv, NULL);
     ;;
     ;; cc1plus: some warnings being treated as errors
     '(#:configure-flags '("CXXFLAGS=-Wformat=0")))
    (native-inputs
     `(("pkg-config" ,pkg-config)
       ("intltool" ,intltool)


@@ 1808,7 1806,7 @@ editors, IDEs, etc.")
(define-public dconf
  (package
    (name "dconf")
    (version "0.26.0")
    (version "0.24.0")
    (source (origin
              (method url-fetch)
              (uri (string-append


@@ 1817,7 1815,7 @@ editors, IDEs, etc.")
                    name "-" version ".tar.xz"))
              (sha256
               (base32
                "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6"))))
                "1hpy6336f0pbkyranywm4872i5in0xn7jf40a66xdmzls77f0ws3"))))
    (build-system glib-or-gtk-build-system)
    (inputs
     `(("gtk+" ,gtk+)


@@ 1862,7 1860,7 @@ configuration storage systems.")
(define-public json-glib
  (package
    (name "json-glib")
    (version "1.2.0")
    (version "1.0.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 1870,7 1868,7 @@ configuration storage systems.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1lx7p1c7cl21byvfgw92n8dhm09vi6qxrs0zkx9dg3y096zdzmlr"))
                "1k85vvb2prmk8aa8hmr2rp9rnbhffjgnmr18b13g24xxnqy5kww0"))
              (modules '((guix build utils)))
              (snippet
               ;; Don't duplicate test names.


@@ 1969,7 1967,7 @@ library.")
(define-public glib-networking
  (package
    (name "glib-networking")
    (version "2.48.0")
    (version "2.46.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/glib-networking/"


@@ 1977,7 1975,7 @@ library.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "094hwgnaqm0c7ggyqc9rk2603k5r9vqs3f1d9vwpmfapww9367vs"))
                "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym"))
              (patches
               (search-patches "glib-networking-ssl-cert-file.patch"))))
    (build-system gnu-build-system)


@@ 2051,7 2049,7 @@ libxml to ease remote use of the RESTful API.")
(define-public libsoup
  (package
    (name "libsoup")
    (version "2.54.0.1")
    (version "2.52.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/libsoup/"


@@ 2059,7 2057,7 @@ libxml to ease remote use of the RESTful API.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1q1qds87qya5cbx4jfcmf1v8fvb86p0wsjnhj246w0xxcq0r5r5d"))))
                "0j6cnnpqqgnb9nj2r0j8j6898np4z503hrnpis7b4l5d8yhbq68f"))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
    (arguments


@@ 2121,7 2119,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
(define-public libsecret
  (package
    (name "libsecret")
    (version "0.18.5")
    (version "0.18.3")
    (source (origin
              (method url-fetch)
              (uri (string-append


@@ 2130,7 2128,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
                    name "-" version ".tar.xz"))
              (sha256
               (base32
                "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"))))
                "1jc4pw6pb5igwasj0ms1zx80w63c11myziz3ydj0cr5lb861vgzj"))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
    (arguments


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


@@ 2178,7 2176,7 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "19khp4ckqbdgk6828gprxy52fsg8klf957dnwsin75nskk8whxbp"))))
         "0izkcf81rji4dj9k0k93ij4lp5iza2bh6jwlcdhbjfv2xdw0f7ky"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 2186,7 2184,16 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
         (add-before 'configure 'patch-/bin/true
                     (lambda _
                       (substitute* "configure"
                         (("/bin/true") (which "true"))))))))
                         (("/bin/true") (which "true")))))
         (add-after 'install 'wrap-pixbuf
                    ;; Use librsvg's loaders.cache to support SVG files.
                    (lambda* (#:key inputs outputs #:allow-other-keys)
                      (let* ((out    (assoc-ref outputs "out"))
                             (prog   (string-append out "/bin/gnome-mines"))
                             (rsvg   (assoc-ref inputs "librsvg"))
                             (pixbuf (find-files rsvg "^loaders\\.cache$")))
                        (wrap-program prog
                          `("GDK_PIXBUF_MODULE_FILE" = ,pixbuf))))))))
    (native-inputs
     `(("pkg-config" ,pkg-config)
       ("desktop-file-utils" ,desktop-file-utils)


@@ 2241,7 2248,7 @@ more fun.")
(define-public gnome-terminal
  (package
    (name "gnome-terminal")
    (version "3.20.0")
    (version "3.18.2")
    (source
     (origin
       (method url-fetch)


@@ 2250,7 2257,7 @@ more fun.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "0l21xcc2g56wkq83wq5wnrah2gwckqxnfgpqavhkrsd47jyzdrrg"))))
         "1ylyv0mla2ypms7iyxndbdjvha0q9jzglb4mhfmqn9cm2gxc0day"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:configure-flags


@@ 2400,7 2407,7 @@ permission from user.")
(define-public geocode-glib
  (package
    (name "geocode-glib")
    (version "3.20.0")
    (version "3.18.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/geocode-glib/"


@@ 2408,7 2415,7 @@ permission from user.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1fmn3gmifq8jbgnpv8jj33n4glpb5djjrfk0l9fak0cliqin88jz"))))
                "0pa9cgndycynipc6z8wzbvn2fi89ndf2gpqzm9m6krp3d7az1dwg"))))
    (build-system gnu-build-system)
    (arguments
     `(;; The tests want to write to $HOME/.cache/geocode-glib, which doesn't


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


@@ 2499,7 2506,7 @@ service via the system message bus.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1mmqg7wf0bhk450akyj0x71x75kh1v7j68isyivr75ydky79nqjj"))))
                "1l3sra84k5dnavbdbjyf1ar84xmjszpnnldih6mf45kniwpjkcll"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags


@@ 2541,7 2548,7 @@ services for numerous locations.")
(define-public gnome-settings-daemon
  (package
    (name "gnome-settings-daemon")
    (version "3.20.0")
    (version "3.18.2")
    (source
     (origin
       (method url-fetch)


@@ 2550,7 2557,7 @@ services for numerous locations.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "0v1c2vnpqw5pvx62jxvjfa2g5k29yx04vz35awqi943gasrl0bmv"))))
         "0vzwf875csyqx04fnra6zicmzcjc3s13bxxpcizlys12iwjwfw9h"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(;; Network manager not yet packaged.


@@ 2597,14 2604,14 @@ 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.5")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/totem-pl-parser/3.10/"
                                "totem-pl-parser-" version ".tar.xz"))
            (sha256
             (base32
              "0mv7aw9mw77w04zg95zjf0zmk6ckshpysbb9nap15h5is6zdk9cq"))))
              "0dw1kiwmjwdjrighri0j9nagsnj44dllm0mamnfh4y5nc47mhim7"))))
   (build-system gnu-build-system)
   (arguments
    ;; FIXME: Tests require gvfs.


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


@@ 2640,7 2647,7 @@ playlists in a variety of formats.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1nipky336jj81mhm8wwxp96zilgcrarihf95dnyj3r1pw8kpg7gy"))))
                "1qrgcj30hl0fgssspkwrad10lqy1bbsp7lfwxmxlwzp33jhqpb0b"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:configure-flags


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


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


@@ 2762,7 2769,7 @@ without stepping on each others toes.")
(define-public clutter
  (package
    (name "clutter")
    (version "1.26.0")
    (version "1.24.2")
    (source
     (origin
       (method url-fetch)


@@ 2771,7 2778,7 @@ without stepping on each others toes.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7"))))
         "0qyd0cw17wi8gl6y9z2j2lh2gwghxskfmsdvw4ayrgxwnj6cjccn"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"))                            ;9 MiB of gtk-doc HTML pages


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


@@ 2824,7 2831,7 @@ presentations, kiosk style applications and so on.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl"))))
         "0a2a8ci6in82l43zak3zj3cyms23i5rq6lzk1bz013gm023ach4l"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)


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


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


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


@@ 2883,7 2890,7 @@ GL based interactive canvas library.")
                    version ".tar.xz"))
              (sha256
               (base32
                "1arzd1hsgq14rbiwa1ih2g250x6ljna2s2kiqfrw155c612s9cxk"))))
                "19jlhbgfn9c9g40b3fa2x373s6rfcwx5i9lbpl3vl7d901r7kpp7"))))
    (build-system gnu-build-system)
    (native-inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs


@@ 2939,7 2946,7 @@ queries upon that data.")
(define-public gnome-klotski
  (package
    (name "gnome-klotski")
    (version "3.20.0")
    (version "3.18.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 2947,7 2954,7 @@ queries upon that data.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "00hs3ci8swmq12rmgidy7rf3ql9isbklhn114v8rzdfs46y5dzkp"))))
                "14l1fji0860yam41x2cy72nd9bljph385ynfm6k1lsv4qhv72az2"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("desktop-file-utils" ,desktop-file-utils)


@@ 2970,7 2977,7 @@ as possible!")
(define-public grilo
  (package
    (name "grilo")
    (version "0.2.15")
    (version "0.2.14")
    (source
     (origin
       (method url-fetch)


@@ 2979,7 2986,7 @@ as possible!")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "05b8sqfmywg45b9frya6xmw5l3c8vf5a1nhy51nyfs0a4n1japbg"))))
         "1k8wj8f7xfaw5hxypnmwd34li3fq8h76dacach547rvsfjhjxj3r"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin")         ; for glib-mkenums and glib-genmarshal


@@ 3021,7 3028,7 @@ for application developers.")
(define-public grilo-plugins
  (package
    (name "grilo-plugins")
    (version "0.2.17")
    (version "0.2.16")
    (source
     (origin
       (method url-fetch)


@@ 3030,7 3037,7 @@ for application developers.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "109pf4sz320jiqs1nzszpj2flkwrgwfsm64kza24mxnxih4njxik"))))
         "00sjmkzxc8w4qn4lp5yj65c4y83mwhp0zlvk11ghvpxnklgmgd40"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin")     ; for glib-mkenums and glib-genmarshal


@@ 3073,7 3080,7 @@ for application developers.")
(define-public totem
  (package
    (name "totem")
    (version "3.20.0")
    (version "3.18.1")
    (source
     (origin
       (method url-fetch)


@@ 3082,7 3089,7 @@ for application developers.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "1pq3fg4778qrylkg6lc4jcb3gvm46n5y7mfn26iihi23aj844yq7"))))
         "18h784c77m4h359j3xnlwqlfvnhbw7m052ahzm26r106jsp6x0fp"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)


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


@@ 3247,7 3254,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "0avy7sss6rf659rxipvp3gbqw083liq627lxjpfp1ij34hbmqwfv"))))
              "19wkawrcwjjcvlmizkj57qycnbgizhr8ck3j5qg70605d1xb8yvv"))))
   (build-system glib-or-gtk-build-system)
   (arguments
    `(#:phases


@@ 3317,7 3324,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.0")
    (version "1.26.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3325,7 3332,7 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "017pynx7rfrhgvg904kwxdw9dc26zb0v7ymkspm059qcvw5gqwng"))))
                "064dsjrdjcbi38zl38jhh4r9jcpiygg7x4c8s6s2rb757l7nwnv9"))))
    (build-system gnu-build-system)
    (arguments
     '(#:tests? #f)) ; XXX: requiring `pidof'


@@ 3469,7 3476,7 @@ work and the interface is well tested.")
(define-public epiphany
  (package
    (name "epiphany")
    (version "3.20.0")
    (version "3.18.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3477,7 3484,7 @@ work and the interface is well tested.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0x09dfc0zdxw93g1dcmxqpvy9vnv94bd27sfq23ix31z6i9fcs63"))))
                "1hm6bpdcc6nf3zamzkvjhpvxnpaxzbnxnacfgl5v8swn643ifdl4"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     ;; FIXME: tests run under Xvfb, but fail with:


@@ 3575,7 3582,7 @@ of running programs and invoke methods on those interfaces.")
(define-public yelp-xsl
  (package
    (name "yelp-xsl")
    (version "3.20.0")
    (version "3.18.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3583,7 3590,7 @@ of running programs and invoke methods on those interfaces.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0j288fw7bqbswl2vk73ihs0ngky0b3p8k1yy5lrxfh1whn3phclz"))))
                "0qmsq7qkc06gmnkvbs84qj3jjzlihriy3z45nfbpgg51b6z0z1q0"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("intltool" ,intltool)


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


@@ 3607,7 3614,7 @@ to format Docbook and Mallard documents.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0g404njlgr38nif9hb3krybavk56wplkafxvfibcg68iqp9465dz"))))
                "10384lr712xdr8zbi07vqh0cf4nd7ybg1vs05r5cy3kwf6s4wfms"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc.


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


@@ 3793,7 3800,7 @@ share them with others via social networking and more.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1a5598zyzdhdyk7sq59h8hqrjlacxw6wfdmgi0cs5kvbzjr9jnhq"))))
                "11a1g8f2700n2mz998wf40dz1rxjgap60mfns9iv0zlw5h5rhmal"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)


@@ 3818,7 3825,7 @@ such as gzip tarballs.")
(define-public gnome-session
  (package
    (name "gnome-session")
    (version "3.20.0")
    (version "3.18.1.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 3826,7 3833,7 @@ such as gzip tarballs.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0d0v60lmvr8wbrswfpc4f4jg2dhxj6nkgv7wnwdf2zifk8vp5zv6"))))
                "0icajbzqf5llvp5s8nafwkhwz6a6jmwn4hhs81bk0bpzawyq4zdk"))))
    (arguments
     '(#:phases
       (modify-phases %standard-phases


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


@@ 3950,7 3957,7 @@ javascript engine and the GObject introspection framework.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1i0x1jd9x1vpv8lwdlzwf0ml8jxh3b3l6nlg6pbnfjw47w3y6iws"))))
                "1rrjdkvwwjyj05jc9icifjm9v8sgs0wqgy555m57a3rvg46sqqk7"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:phases


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


@@ 4007,7 4014,7 @@ powerful general purpose text editor.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0j2sy6imwp41l75hy3fwr68n35drvanbwgmr42kc04zqjy9pbs02"))))
                "02m88dfm1rziqk2ywakwib06wl1rxangbzih6cp8wllbyl1plcg6"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("gettext" ,gnu-gettext)


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


@@ 4034,7 4041,7 @@ to display dialog boxes from the commandline and shell scripts.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1x8nhnili1bq3pnrvr3jsgchcz36jzi9infrbr3gplwxnsbx4i2n"))))
                "1ab959z5fgi4rq0ifxdqvpdbv99a2b1lfgvj327s9crdvk4ygpjg"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags


@@ 4076,7 4083,7 @@ window manager.")
(define-public gnome-online-accounts
  (package
    (name "gnome-online-accounts")
    (version "3.20.0")
    (version "3.18.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4084,7 4091,7 @@ window manager.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0q546q65ba537dbxqnvs27x6pvhvi394v43kihgw4pa59j8k70n9"))))
                "1hn2fvkr1f4qh4gix03avnvk7pklvv5272ns8ws56v4kcq4nppkc"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.


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


@@ 4122,7 4129,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0jsgzahaha6bxrm15da7c32m8ksnmx9rfm7xdx99lbxhsm7yiwh5"))))
                "16yfd2a00xqxikyf6pi2awfd0qfq4hwdhfar88axrb4mycfgqhjr"))))
    (build-system gnu-build-system)
    (arguments
     '(;; XXX: fails with:


@@ 4175,7 4182,7 @@ Evolution (hence the name), but is now used by other packages as well.")
(define-public caribou
  (package
    (name "caribou")
    (version "0.4.20")
    (version "0.4.19")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4183,7 4190,7 @@ Evolution (hence the name), but is now used by other packages as well.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1nahpfs5ap9f9wsvn93kg8isqffk60v785f1q6k64awcd7an8ris"))))
                "0i2s2xy9ami3wslam15cajhggpcsj4c70qm7qddcz52z9k0x02rg"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 4394,7 4401,7 @@ libxml2.")
(define-public gdm
  (package
    (name "gdm")
    (version "3.20.0")
    (version "3.18.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4402,7 4409,7 @@ libxml2.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1hnkv4j4m6z9l2y1rzxn674ir34k57apz1ybr15m11ksn05vlky6"))))
                "08pqhslwd487nh9w0jp4d0s4s2imm4ds0jjsbl6lzmqifqj3b4jl"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags


@@ 4454,7 4461,7 @@ providing graphical log-ins and managing local and remote displays.")
(define-public libgtop
  (package
    (name "libgtop")
    (version "2.34.0")
    (version "2.32.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4462,7 4469,7 @@ providing graphical log-ins and managing local and remote displays.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "0apfnh9k6vmbdm8ms5wxyhagrrl8r88fv48k7q5qq70df2gf72ld"))))
                "13hpml2vfm23816qggr5fvxj75ndb1dq4rgmi7ik6azj69ij8hw4"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("gobject-introspection" ,gobject-introspection)


@@ 4481,7 4488,7 @@ usage and information about running processes.")
(define-public gnome-bluetooth
  (package
    (name "gnome-bluetooth")
    (version "3.18.3")
    (version "3.18.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


@@ 4489,7 4496,7 @@ usage and information about running processes.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "1qwc9q7x22sc71zhqv4db78rqzxl6fqfw6d978ydqap54c2bg0g4"))))
                "0jaa9nbygdvcqp9k4p4iy2g8x3684s4x9k5nbcmmm11jdn4mn7f5"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.


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


@@ 4522,7 4529,7 @@ devices using the GNOME desktop.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "10yncjq5hmaqbr8kjf8s729kn11as705vfx32nxahi7229v31rxp"))))
                "1bgqg1sl3cp2azrwrjgwx3jzk9n3w76xpcyvk257qavx4ibn3zin"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


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


@@ 4592,7 4599,7 @@ properties, screen resolution, and other GNOME parameters.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
                "125qjrbw40r8rpri9y0yrl5yqs2q4x0l5inzi3vwl0rxvmhz8sgf"))))
                "16sicxdp08yfaj4hiyzvbspb5jk3fpmi291272zhx5vgc3wbl5w5"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     '(#:phases


@@ 4704,7 4711,7 @@ as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions.")
(define-public nautilus
  (package
    (name "nautilus")
    (version "3.20.0")
    (version "3.18.2") ; XXX: later version require gtk+-3.0 >= 3.18.5
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"


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


@@ 4749,7 4755,7 @@ files.")
(define-public baobab
  (package
    (name "baobab")
    (version "3.20.0")
    (version "3.18.1")
    (source (origin
              (method url-fetch)
              (uri (string-append


@@ 4758,7 4764,7 @@ files.")
                    name "-" version ".tar.xz"))
              (sha256
               (base32
                "01vxc9z87i2dsvydm6p1sh4m7bpbggy70q9bx6pxz707hyr6bpaw"))))
                "1da4bdkw5bnxansl1xr4lb03d6f4h0a0qaba8i3p3rwhcd191b62"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)


@@ 4781,7 4787,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.18.0")
    (source
     (origin
       (method url-fetch)


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


@@ 4840,7 4846,7 @@ beautifying border effects.")
(define-public dconf-editor
  (package
    (name "dconf-editor")
    (version "3.20.0")
    (version "3.18.2")
    (source
     (origin
       (method url-fetch)


@@ 4849,7 4855,7 @@ beautifying border effects.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
         "0q57wmlab01rmwbwlih5mh9fa1nwc2abfz0vl374lkljw9acim13"))))
         "0xdwi7g1xdmgrc9m8ii62fp2zj114gsfpmgazlnhrcmmfi97z5d7"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0.

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


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


@@ 95,14 95,14 @@ tools have full access to view and control running applications.")
(define-public cairo
  (package
   (name "cairo")
   (version "1.14.6")
   (version "1.14.2")
   (source (origin
            (method url-fetch)
            (uri (string-append "http://cairographics.org/releases/cairo-"
                                version ".tar.xz"))
            (sha256
             (base32
              "0lmjlzmghmr27y615px9hkm552x7ap6pmq9mfbzr6smp8y2b6g31"))))
              "1sycbq0agbwmg1bj9lhkgsf0glmblaf2jrdy9g6vxfxivncxj6f9"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("fontconfig" ,fontconfig)


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


@@ 155,7 155,7 @@ affine transformation (scale, rotation, shear, etc.).")
                                 version ".tar.bz2"))
             (sha256
              (base32
               "14g4kpph8hgplkm954daxiymxx0vicfq7b7svvdsx54g5bqvv7a4"))))
               "09ivk5m4y09ar4zi9r6db7gp234cy05h0ach7w22g9kqvkxsf5pn"))))
   (build-system gnu-build-system)
   (outputs '("out"
              "bin")) ; 160K, only hb-view depend on cairo


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


@@ 193,7 193,7 @@ affine transformation (scale, rotation, shear, etc.).")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "12qwa748wyady16xxdq5rqz9gki1kksj8m5bcv80gjqlydfrh5ys"))))
              "1dsf45m51i4rcyvh5wlxxrjfhvn5b67d5ckjc6vdcxbddjgmc80k"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("cairo" ,cairo)


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


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


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


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


@@ 415,12 415,9 @@ highlighting and other features typical of a source code editor.")
             ;; (gdk-pixbuf-error-quark, 0)
             (("pixbuf-jpeg\\$\\(EXEEXT\\) ") ""))
           #t)))))
   (propagated-inputs
    `(;; Required by gdk-pixbuf-2.0.pc
      ("glib" ,glib)
      ("libpng" ,libpng)
      ;; Used for testing and required at runtime.
      ("shared-mime-info" ,shared-mime-info)))
   (propagated-inputs ; required by gdk-pixbuf-2.0.pc
    `(("glib" ,glib)
      ("libpng" ,libpng)))
   (inputs
    `(("libjpeg" ,libjpeg)
      ("libtiff" ,libtiff)


@@ 468,7 465,7 @@ in the GNOME project.")
(define-public at-spi2-core
  (package
   (name "at-spi2-core")
   (version "2.20.0")
   (version "2.18.1")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 476,7 473,7 @@ in the GNOME project.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "16v09iwnd3895fshsvsci836dar21c8y9w8zn882jn4fq2vrzi6w"))))
              "1kq17w4fm51d49vzmglkxqdm6s0yvjvrpgw78r2hajf69jz5bmap"))))
   (build-system gnu-build-system)
   (outputs '("out" "doc"))
   (arguments


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


@@ 521,7 518,7 @@ is part of the GNOME accessibility project.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1lis9zj4r3d5ff3chs0r93gjkbp0wgflfx35gbax47cgdqmi8jx2"))))
              "0bf1g5cj84rmx7p1q547vwbc0hlpcs2wrxnmv96lckfkhs9mzcf4"))))
   (build-system gnu-build-system)
   (arguments
    '(#:phases


@@ 548,7 545,7 @@ is part of the GNOME accessibility project.")
(define-public gtk+-2
  (package
   (name "gtk+")
   (version "2.24.30")
   (version "2.24.28")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 556,14 553,13 @@ is part of the GNOME accessibility project.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "0l6aqk86aw5w132ygy6hv6nlxvd1h6xg7c85qbm60p6mnv1ww58d"))
            (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"
                                     "gtk2-theme-paths.patch"))))
              "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj"))
            (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"))))
   (build-system gnu-build-system)
   (outputs '("out" "doc"))
   (propagated-inputs
    `(("atk" ,atk)
      ("gdk-pixbuf" ,gdk-pixbuf+svg)
      ("gdk-pixbuf" ,gdk-pixbuf)
      ("pango" ,pango)))
   (inputs
    `(("cups" ,cups)


@@ 610,7 606,7 @@ application suites.")
(define-public gtk+
  (package (inherit gtk+-2)
   (name "gtk+")
   (version "3.20.2")
   (version "3.18.2")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/" name "/"


@@ 618,12 614,12 @@ application suites.")
                                name "-" version ".tar.xz"))
            (sha256
             (base32
              "1xv97zrngf47hyrxz7rfrdl5xpv4y61rkmipyi300pm5iq3d3c8s"))
              "0lp1hn0qydxx03bianzzr0a4maqzsvylrkzr7c3p0050qihwbgjx"))
            (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"))))
   (propagated-inputs
    `(("at-spi2-atk" ,at-spi2-atk)
      ("atk" ,atk)
      ("gdk-pixbuf" ,gdk-pixbuf+svg)
      ("gdk-pixbuf" ,gdk-pixbuf)
      ("libepoxy" ,libepoxy)
      ("libxcursor" ,libxcursor)
      ("libxi" ,libxi)


@@ 631,7 627,8 @@ application suites.")
      ("libxdamage" ,libxdamage)
      ("pango" ,pango)))
   (inputs
    `(("libxml2" ,libxml2)
    `(("librsvg" ,librsvg)                        ;for gtk-encode-symbolic-svg
      ("libxml2" ,libxml2)
      ;; XXX: colord depends on mozjs (through polkit), which fails on
      ;;      on non-intel systems now.
      ;;("colord" ,colord)


@@ 666,7 663,18 @@ application suites.")
           (("SUBDIRS = gdk gtk a11y css reftests")
            "SUBDIRS = gdk"))
         #t)
       %standard-phases)))
       (alist-cons-after
        'install 'wrap-gtk-encode-symbolic-svg
        ;; By using GdkPixbuf, gtk-encode-symbolic-svg needs to know
        ;; librsvg's loaders.cache to handle SVG files.
        (lambda* (#:key inputs outputs #:allow-other-keys)
          (let* ((out (assoc-ref outputs "out"))
                 (prog (string-append out "/bin/gtk-encode-symbolic-svg"))
                 (librsvg (assoc-ref inputs "librsvg"))
                 (loaders.cache (find-files librsvg "^loaders\\.cache$")))
            (wrap-program prog
              `("GDK_PIXBUF_MODULE_FILE" = ,loaders.cache))))
        %standard-phases))))
   (native-search-paths
    (list (search-path-specification
           (variable "GUIX_GTK3_PATH")


@@ 856,7 864,7 @@ library.")
(define-public pangomm
  (package
    (name "pangomm")
    (version "2.40.0")
    (version "2.38.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 864,7 872,7 @@ library.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "03fpqdjp7plybf4zsgszbm8yhgl28vmajzfpmaqcsmyfvjlszl3x"))))
               "12xwjvqfxhqblcv7641k0l6r8n3qifnrx8w9571izn1nbd81iyzg"))))
    (build-system gnu-build-system)
    (native-inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs


@@ 905,7 913,7 @@ toolkit.")
(define-public gtkmm
  (package
    (name "gtkmm")
    (version "3.20.0")
    (version "3.18.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"


@@ 913,7 921,7 @@ toolkit.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
               "12h2kd22iayvjfhmgjccm33igrbvqdj7hym31fsa1y0dhwzmf8gh"))))
               "0sxq700invkjpksn790gbnl8px8751kvgwn39663jx7dv89s37w2"))))
    (build-system gnu-build-system)
    (native-inputs `(("pkg-config" ,pkg-config)
                     ("glib" ,glib "bin")))      ;for 'glib-compile-resources'

A gnu/packages/patches/glib-tests-desktop.patch => gnu/packages/patches/glib-tests-desktop.patch +138 -0
@@ 0,0 1,138 @@
Some GLib tests expect desktop things, such as an xterm, a MIME
database, the `update-desktop-database' program, which we don't provide.

--- glib-2.37.1/gio/tests/appinfo.c	2013-06-07 23:44:44.000000000 +0200
+++ glib-2.37.1/gio/tests/appinfo.c	2013-06-07 23:44:56.000000000 +0200
@@ -497,16 +497,10 @@ main (int argc, char *argv[])
 
   g_test_add_func ("/appinfo/basic", test_basic);
   g_test_add_func ("/appinfo/text", test_text);
-  g_test_add_func ("/appinfo/launch", test_launch);
   g_test_add_func ("/appinfo/show-in", test_show_in);
   g_test_add_func ("/appinfo/commandline", test_commandline);
-  g_test_add_func ("/appinfo/launch-context", test_launch_context);
-  g_test_add_func ("/appinfo/launch-context-signals", test_launch_context_signals);
   g_test_add_func ("/appinfo/tryexec", test_tryexec);
-  g_test_add_func ("/appinfo/associations", test_associations);
   g_test_add_func ("/appinfo/environment", test_environment);
-  g_test_add_func ("/appinfo/startup-wm-class", test_startup_wm_class);
-  g_test_add_func ("/appinfo/supported-types", test_supported_types);
   g_test_add_func ("/appinfo/from-keyfile", test_from_keyfile);
 
   return g_test_run ();

--- glib-2.40.0/gio/tests/contenttype.c	2013-01-16 21:22:29.000000000 +0100
+++ glib-2.40.0/gio/tests/contenttype.c	2013-01-16 21:22:33.000000000 +0100
@@ -207,15 +207,6 @@ main (int argc, char *argv[])
 {
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_func ("/contenttype/guess", test_guess);
-  g_test_add_func ("/contenttype/unknown", test_unknown);
-  g_test_add_func ("/contenttype/subtype", test_subtype);
-  g_test_add_func ("/contenttype/list", test_list);
-  g_test_add_func ("/contenttype/executable", test_executable);
-  g_test_add_func ("/contenttype/description", test_description);
-  g_test_add_func ("/contenttype/icon", test_icon);
-  g_test_add_func ("/contenttype/symbolic-icon", test_symbolic_icon);
-  g_test_add_func ("/contenttype/tree", test_tree);
 
   return g_test_run ();
 }


--- glib-2.40.0/gio/tests/desktop-app-info.c	2014-03-19 22:50:45.000000000 -0500
+++ glib-2.40.0/gio/tests/desktop-app-info.c	2014-06-30 14:27:52.543358331 -0500
@@ -708,6 +708,8 @@
   g_setenv ("XDG_DATA_HOME", basedir, TRUE);
   cleanup_subdirs (basedir);
 
+  result = g_test_run ();
+  return result;
   g_test_add_func ("/desktop-app-info/delete", test_delete);
   g_test_add_func ("/desktop-app-info/default", test_default);
   g_test_add_func ("/desktop-app-info/fallback", test_fallback);


-----------------------------
The hunk below removes tests that depend on `gdbus-testserver.py',
because that script depends on python-gobject.  The second hunk
disables a test that expects /etc/machine-id in the build environment.
 
--- glib-2.46.0/gio/tests/Makefile.in	2015-10-14 14:11:00.928809504 +0200
+++ glib-2.46.0/gio/tests/Makefile.in	2015-10-14 14:12:13.157291092 +0200
@@ -186,20 +186,13 @@ check_PROGRAMS = $(am__EXEEXT_16)
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-auth				\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-bz627724				\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-close-pending			\
-@HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-connection			\
-@HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-connection-loss			\
-@HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-connection-slow			\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-error				\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-exit-on-close			\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-export				\
-@HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-introspection			\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-names				\
-@HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-proxy				\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-proxy-threads			\
-@HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-proxy-well-known-name		\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-test-codegen			\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-test-codegen-old			\
-@HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gdbus-threading				\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gmenumodel				\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	gnotification				\
 @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@	$(NULL)
@@ -321,8 +314,7 @@ libresourceplugin_la_LINK = $(LIBTOOL) $
 am__EXEEXT_1 =
 @OS_UNIX_TRUE@am__EXEEXT_2 = contenttype$(EXEEXT) file$(EXEEXT) \
 @OS_UNIX_TRUE@	gdbus-peer-object-manager$(EXEEXT) \
-@OS_UNIX_TRUE@	gdbus-unix-addresses$(EXEEXT) \
 @OS_UNIX_TRUE@	live-g-file$(EXEEXT) socket-address$(EXEEXT) \
 @OS_UNIX_TRUE@	stream-rw_all$(EXEEXT) unix-fd$(EXEEXT) \
 @OS_UNIX_TRUE@	unix-streams$(EXEEXT) $(am__EXEEXT_1) \
  

The test below depends on the availability /etc/passwd to dbus-daemon.

--- glib-2.40.0/gio/tests/gdbus-auth.c	2014-02-03 11:40:41.000000000 -0600
+++ glib-2.40.0/gio/tests/gdbus-auth.c	2014-06-30 15:08:43.719421893 -0500
@@ -286,6 +286,8 @@
 {
   gint ret;
 
+  g_test_init (&argc, &argv, NULL);
+  return g_test_run();
   setlocale (LC_ALL, "C");
 
   temp_dbus_keyrings_setup ();


The test dbus-appinfo is dropped as it hangs indefinitely since 2.37.5, see
   https://launchpad.net/ubuntu/+source/glib2.0/2.37.5-1ubuntu1

--- glib-2.40.0/gio/tests/dbus-appinfo.c	2014-02-03 11:40:41.000000000 -0600
+++ glib-2.40.0/gio/tests/dbus-appinfo.c	2014-06-30 14:44:08.215383632 -0500
@@ -278,7 +278,7 @@
 {
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_func ("/appinfo/dbusappinfo", test_dbus_appinfo);
+  return g_test_run();
 
   return session_bus_run ();
 }


The test below fails for unknown reasons (!).

--- glib-2.39.1/gio/tests/gsettings.c.orig	2014-01-20 00:45:04.000000000 +0100
+++ glib-2.39.1/gio/tests/gsettings.c	2014-01-20 00:45:10.000000000 +0100
@@ -2489,7 +2489,6 @@ main (int argc, char *argv[])
   g_test_add_func ("/gsettings/range/subprocess/high", test_range_high);
   g_test_add_func ("/gsettings/range/subprocess/low", test_range_low);
   g_test_add_func ("/gsettings/list-items", test_list_items);
-  g_test_add_func ("/gsettings/list-schemas", test_list_schemas);
   g_test_add_func ("/gsettings/mapped", test_get_mapped);
   g_test_add_func ("/gsettings/get-range", test_get_range);
   g_test_add_func ("/gsettings/schema-source", test_schema_source);


A gnu/packages/patches/glib-tests-gapplication.patch => gnu/packages/patches/glib-tests-gapplication.patch +28 -0
@@ 0,0 1,28 @@
This test has proven to be unreliable, often leading to things like this
in gapplication.log:

  PASS: gapplication 3 /gapplication/properties
  Failed to register: The connection is closed
  **
  GLib-GIO:ERROR:gapplication.c:564:test_quit: assertion failed: (activated)
  ok 4 /gapplication/app-id
  PASS: gapplication 4 /gapplication/app-id
  ../../tap-test: line 5: 24133 Aborted                 $1 -k --tap
  # GLib-GIO:ERROR:gapplication.c:564:test_quit: assertion failed: (activated)
  cleaning up pid 24154
  ERROR: gapplication - missing test plan
  ERROR: gapplication - exited with status 134 (terminated by signal 6?)

See <https://bugs.debian.org/756273> and <http://bugs.gnu.org/18445>.


--- glib-2.40.2/gio/tests/gapplication.c	2014-12-03 22:34:44.566667649 +0100
+++ glib-2.40.2/gio/tests/gapplication.c	2014-12-03 22:34:45.346674179 +0100
@@ -685,7 +685,6 @@ main (int argc, char **argv)
 /*  g_test_add_func ("/gapplication/non-unique", test_nonunique); */
   g_test_add_func ("/gapplication/properties", properties);
   g_test_add_func ("/gapplication/app-id", appid);
-  g_test_add_func ("/gapplication/quit", test_quit);
   g_test_add_func ("/gapplication/local-actions", test_local_actions);
 /*  g_test_add_func ("/gapplication/remote-actions", test_remote_actions); */
   g_test_add_func ("/gapplication/local-command-line", test_local_command_line);

A gnu/packages/patches/glib-tests-homedir.patch => gnu/packages/patches/glib-tests-homedir.patch +59 -0
@@ 0,0 1,59 @@
`g_get_home_dir' looks at /etc/passwd first, which fails in chroot builds.
The gdbus tests use it to lookup .dbus-keyrings, so they cannot run in our
chroot build environment.  Thus, disable them.

--- glib-2.34.3/gio/tests/gdbus-connection-flush.c	2013-01-16 17:29:46.000000000 +0100
+++ glib-2.34.3/gio/tests/gdbus-connection-flush.c	2013-01-16 17:29:47.000000000 +0100
@@ -373,10 +373,6 @@ main (int   argc,
   g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add ("/gdbus/connection/flush/busy", Fixture, NULL,
-              setup, test_flush_busy, teardown);
-  g_test_add ("/gdbus/connection/flush/idle", Fixture, NULL,
-              setup, test_flush_idle, teardown);
 
   ret = g_test_run();

--- glib-2.38.0.orig/gio/tests/gdbus-peer.c     2013-08-08 12:00:40.000000000 +0200
+++ glib-2.38.0/gio/tests/gdbus-peer.c  2013-09-30 19:36:40.000000000 +0200
@@ -1746,11 +1746,6 @@

   g_test_add_func ("/gdbus/peer-to-peer", test_peer);
   g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
-  g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
-
-  g_test_add_func ("/gdbus/tcp-anonymous", test_tcp_anonymous);
-  g_test_add_func ("/gdbus/credentials", test_credentials);
-  g_test_add_func ("/gdbus/codegen-peer-to-peer", codegen_test_peer);

   ret = g_test_run();
 
--- glib-2.37.1/gio/tests/gdbus-exit-on-close.c	2013-06-07 23:41:34.000000000 +0200
+++ glib-2.37.1/gio/tests/gdbus-exit-on-close.c	2013-06-07 23:41:40.000000000 +0200
@@ -211,6 +211,7 @@ main (int   argc,
 
   g_test_init (&argc, &argv, NULL);
 
+  return g_test_run();
   for (i = 0; cases[i].name != NULL; i++)
     {
       gchar *name;
@@ -224,5 +225,4 @@ main (int   argc,
       g_free (name);
     }
 
-  return g_test_run();
 }

--- glib-2.34.3/gio/tests/gdbus-non-socket.c	2013-01-16 18:13:25.000000000 +0100
+++ glib-2.34.3/gio/tests/gdbus-non-socket.c	2013-01-16 18:13:27.000000000 +0100
@@ -294,7 +294,6 @@ main (int   argc,
   g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_func ("/gdbus/non-socket", test_non_socket);
 
   ret = g_test_run();
 


A gnu/packages/patches/glib-tests-prlimit.patch => gnu/packages/patches/glib-tests-prlimit.patch +14 -0
@@ 0,0 1,14 @@
prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64 as found on
hydra.gnu.org, and strace(1) doesn't recognize it.

--- glib-2.34.3/glib/tests/thread.c	2012-11-20 15:27:12.000000000 +0100
+++ glib-2.34.3/glib/tests/thread.c	2013-03-27 14:48:31.000000000 +0100
@@ -130,7 +130,7 @@ test_thread3 (void)
 static void
 test_thread4 (void)
 {
-#ifdef HAVE_PRLIMIT
+#if 0
   struct rlimit ol, nl;
   GThread *thread;
   GError *error;

M gnu/packages/patches/glib-tests-timer.patch => gnu/packages/patches/glib-tests-timer.patch +11 -0
@@ 2,6 2,9 @@
  fail depending on the elapsed microseconds.  Improve rounding by adding a
  fractional bit.

* The /timer/stop test fails if compiler optimizations are enabled, which they
  are by default.  Disable that test.

--- glib-2.40.0/glib/tests/timer.c	2014-03-05 08:05:42.000000000 -0600
+++ glib-2.40.0/glib/tests/timer.c	2014-07-10 16:33:12.746862822 -0500
@@ -35,7 +35,7 @@


@@ 13,3 16,11 @@
 
   g_timer_destroy (timer);
 }
@@ -204,7 +204,6 @@
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/timer/basic", test_timer_basic);
-  g_test_add_func ("/timer/stop", test_timer_stop);
   g_test_add_func ("/timer/continue", test_timer_continue);
   g_test_add_func ("/timer/reset", test_timer_reset);
   g_test_add_func ("/timeval/add", test_timeval_add);

D gnu/packages/patches/gtk2-theme-paths.patch => gnu/packages/patches/gtk2-theme-paths.patch +0 -41
@@ 1,41 0,0 @@
From: Jookia <166291@gmail.com>
Subject: [PATCHv2] gtk: Patch GTK+ to look for themes in profiles.
To: guix-devel@gnu.org
Date: Sun, 13 Mar 2016 15:17:37 +1100
Url: https://lists.gnu.org/archive/html/guix-devel/2016-03/msg00492.html

diff -Naur gtk+-2.24.28.new/gtk/gtkrc.c gtk+-2.24.28/gtk/gtkrc.c
--- gtk+-2.24.28.new/gtk/gtkrc.c	2016-03-13 10:31:14.413644362 +1100
+++ gtk+-2.24.28/gtk/gtkrc.c	2016-03-13 12:51:34.723398423 +1100
@@ -808,6 +808,8 @@
   gchar *path = NULL;
   const gchar *home_dir;
   gchar *subpath;
+  const gchar * const *xdg_data_dirs;
+  gint i;
 
   if (type)
     subpath = g_strconcat ("gtk-2.0-", type,
@@ -830,6 +832,22 @@
     }
 
   if (!path)
+    {
+      xdg_data_dirs = g_get_system_data_dirs ();
+      for (i = 0; xdg_data_dirs[i]; i++)
+        {
+          path = g_build_filename (xdg_data_dirs[i], "themes", name, subpath, NULL);
+          if (g_file_test (path, G_FILE_TEST_EXISTS))
+            break;
+          else
+            {
+              g_free (path);
+              path = NULL;
+            }
+        }
+    }
+
+  if (!path)
     {
       gchar *theme_dir = gtk_rc_get_theme_dir ();
       path = g_build_filename (theme_dir, name, subpath, NULL);

M gnu/packages/pdf.scm => gnu/packages/pdf.scm +9 -7
@@ 52,16 52,19 @@
(define-public poppler
  (package
   (name "poppler")
   (version "0.42.0")
   (version "0.37.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "https://poppler.freedesktop.org/poppler-"
                                version ".tar.xz"))
            (sha256
             (base32
              "044084dbp804flwf7bw3lbwfdigm9s0psm6sw2j1hkrazrphgvwz"))))
            (sha256 (base32
                     "1vjvd0md8y37hlq3lsj0l01a3v3mzm572rzpn1311frvmrg9r7xq"))))
   (build-system gnu-build-system)
   ;; FIXME:
   ;; FIXME: more dependencies could  be added
   ;;  cairo output:       no (requires cairo >= 1.10.0)
   ;;  qt4 wrapper:        no
   ;;    introspection:    no
   ;;  use gtk-doc:        no
   ;;  use libcurl:        no
   (inputs `(("fontconfig" ,fontconfig)
             ("freetype" ,freetype)


@@ 80,8 83,7 @@
             ("glib" ,glib)))
   (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib "bin")                      ; glib-mkenums, etc.
        ("gobject-introspection" ,gobject-introspection)))
        ("glib" ,glib "bin")))                    ; glib-mkenums, etc.
   (arguments
    `(#:tests? #f ; no test data provided with the tarball
      #:configure-flags

M gnu/packages/xdisorg.scm => gnu/packages/xdisorg.scm +2 -2
@@ 196,7 196,7 @@ following the mouse.")
(define-public pixman
  (package
    (name "pixman")
    (version "0.34.0")
    (version "0.32.8")
    (source (origin
              (method url-fetch)
              (uri (string-append


@@ 204,7 204,7 @@ following the mouse.")
                    version ".tar.gz"))
              (sha256
               (base32
                "13m842m9ffac3m9r0b4lvwjhwzg3w4353djkjpf00s0wnm4v5di1"))))
                "0pfn0247sjsi95kwjih0wwqpp28wadihqk1bn28x6iqbqhbxwnjp"))))
    (build-system gnu-build-system)
    (inputs
     `(("libpng" ,libpng)