01/01: Merge branch 'staging'

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 6d15516dc6ffca3622ff49179c5c7c360c11b54b
Merge: 0ed75a5 982eff9
Author: Marius Bakke <address@hidden>
AuthorDate: Tue Jan 7 17:43:20 2020 +0100

    Merge branch 'staging'

 gnu/local.mk                                       |  4 ---
 gnu/packages/check.scm                             |  4 +--
 gnu/packages/cups.scm                              |  4 +--
 gnu/packages/databases.scm                         | 32 +++++++++++++-----
 gnu/packages/freedesktop.scm                       |  4 +--
 gnu/packages/gl.scm                                | 11 +++----
 gnu/packages/gstreamer.scm                         | 38 +++++++++-------------
 gnu/packages/gtk.scm                               | 16 ++++-----
 gnu/packages/image.scm                             |  3 +-
 gnu/packages/imagemagick.scm                       |  4 +--
 gnu/packages/linux.scm                             | 24 ++++++++------
 gnu/packages/nss.scm                               | 19 +++--------
 .../patches/mesa-timespec-test-32bit.patch         | 17 ----------
 gnu/packages/patches/nss-CVE-2019-11745.patch      | 24 --------------
 gnu/packages/patches/orc-typedef-enum.patch        | 17 ----------
 .../patches/pcre2-fix-jit_match-crash.patch        | 25 --------------
 gnu/packages/pcre.scm                              |  8 ++---
 gnu/packages/pdf.scm                               |  4 +--
 gnu/packages/statistics.scm                        |  4 +--
 gnu/packages/xdisorg.scm                           | 17 ++++++----
 gnu/packages/xiph.scm                              | 12 +++++--
 21 files changed, 109 insertions(+), 182 deletions(-)