01/11: Merge branch 'staging' into core-updates

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 8505eb19a4071f563811d4fe33471441c2db58b7
Merge: 3b88f37 b097a33
Author: Marius Bakke <address@hidden>
Date:   Tue Feb 21 14:31:36 2017 +0100

    Merge branch 'staging' into core-updates
    
    Conflicts:
        gnu/local.mk: Missing mention of gdk-pixbuf-list-dir.patch in the
        commit log really confused me here... It's from 8c6b077bfae (staging).
        gnu/packages/xorg.scm: xkeyboard-config updated both places.

 gnu/local.mk                                   |  1 +
 gnu/packages/boost.scm                         |  4 +--
 gnu/packages/cups.scm                          |  2 +-
 gnu/packages/documentation.scm                 | 14 ++++++++++-
 gnu/packages/freedesktop.scm                   | 14 ++++++-----
 gnu/packages/gl.scm                            |  4 +--
 gnu/packages/gtk.scm                           |  3 ++-
 gnu/packages/patches/gdk-pixbuf-list-dir.patch | 35 ++++++++++++++++++++++++++
 gnu/packages/pulseaudio.scm                    |  4 +--
 gnu/packages/xdisorg.scm                       | 12 ++++-----
 gnu/packages/xiph.scm                          |  8 +++---
 gnu/packages/xorg.scm                          |  8 +++---
 12 files changed, 80 insertions(+), 29 deletions(-)

diff --cc gnu/local.mk
index 7ad66f5,34c4587..2ca90df
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -575,6 -568,9 +575,7 @@@ dist_patch_DATA =                                  
        
    %D%/packages/patches/gcc-6-arm-none-eabi-multilib.patch     \
    %D%/packages/patches/gcc-6-cross-environment-variables.patch        \
    %D%/packages/patches/gcj-arm-mode.patch                     \
+   %D%/packages/patches/gdk-pixbuf-list-dir.patch              \
 -  %D%/packages/patches/gd-CVE-2016-7568.patch                 \
 -  %D%/packages/patches/gd-CVE-2016-8670.patch                 \
    %D%/packages/patches/gd-fix-chunk-size-on-boundaries.patch  \
    %D%/packages/patches/gd-fix-gd2-read-test.patch             \
    %D%/packages/patches/gd-fix-tests-on-i686.patch             \