01/01: Merge branch 'staging'

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit f484a50d50c3778df76d63533634a71cd7301558
Merge: 0efea21 de6f6ef
Author: Marius Bakke <address@hidden>
Date:   Mon Jun 5 00:36:11 2017 +0200

    Merge branch 'staging'

 gnu/local.mk                                       |   3 +-
 gnu/packages/geo.scm                               |   4 +-
 gnu/packages/gl.scm                                |   4 +-
 gnu/packages/glib.scm                              |  34 +-
 gnu/packages/gnome.scm                             | 345 ++++++++++++---------
 gnu/packages/gtk.scm                               |  42 ++-
 gnu/packages/linux.scm                             |   4 +-
 gnu/packages/mate.scm                              |   4 +-
 .../patches/gnome-shell-CVE-2017-8288.patch        |  54 ----
 gnu/packages/patches/libgdata-fix-tests.patch      | 325 +++++++++++++++++++
 .../patches/libgdata-glib-duplicate-tests.patch    |  16 +
 gnu/packages/ruby.scm                              |  93 ++++--
 gnu/packages/video.scm                             |   4 +-
 gnu/packages/web.scm                               |  30 ++
 gnu/packages/xorg.scm                              |   4 +-
 15 files changed, 679 insertions(+), 287 deletions(-)

diff --cc gnu/local.mk
index bf8143c,922c33a..cb8fbc5
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -729,7 -729,8 +728,9 @@@ dist_patch_DATA =                                  
        
    %D%/packages/patches/libevent-2.1-dns-tests.patch           \
    %D%/packages/patches/libevent-2.1-skip-failing-test.patch   \
    %D%/packages/patches/libextractor-ffmpeg-3.patch            \
 +  %D%/packages/patches/libgit2-0.25.1-mtime-0.patch           \
+   %D%/packages/patches/libgdata-fix-tests.patch                       \
+   %D%/packages/patches/libgdata-glib-duplicate-tests.patch    \
    %D%/packages/patches/libgit2-use-after-free.patch           \
    %D%/packages/patches/libjxr-fix-function-signature.patch    \
    %D%/packages/patches/libjxr-fix-typos.patch                 \
diff --cc gnu/packages/gnome.scm
index c1c73f0,59ce258..84ae1cf
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -11,10 -11,10 +11,10 @@@
  ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
  ;;; Copyright © 2015, 2016, 2017 Mark H Weaver <address@hidden>
  ;;; Copyright © 2015 David Thompson <address@hidden>
 -;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
 +;;; Copyright © 2015, 2016, 2017 Efraim Flashner <address@hidden>
  ;;; Copyright © 2016, 2017 Rene Saavedra <address@hidden>
  ;;; Copyright © 2016 Jochem Raat <address@hidden>
- ;;; Copyright © 2016 Kei Kebreau <address@hidden>
+ ;;; Copyright © 2016, 2017 Kei Kebreau <address@hidden>
  ;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
  ;;; Copyright © 2016 Roel Janssen <address@hidden>
  ;;; Copyright © 2016 Leo Famulari <address@hidden>