Merge branch 'master' into core-updates

diff --cc Makefile.am
Simple merge

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/build/cross-toolchain.scm
Simple merge

diff --cc gnu/local.mk
index 44a553d,2c02b85..fe47653
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1021,11 -1021,14 +1026,12 @@@ dist_patch_DATA =                                            
    %D%/packages/patches/libexif-CVE-2016-6328.patch            \
    %D%/packages/patches/libexif-CVE-2017-7544.patch            \
    %D%/packages/patches/libexif-CVE-2018-20030.patch           \
 -  %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch        \
+   %D%/packages/patches/libextractor-exiv2.patch                       \
    %D%/packages/patches/libgit2-avoid-python.patch             \
    %D%/packages/patches/libgit2-mtime-0.patch                  \
 -  %D%/packages/patches/libgdata-fix-tests.patch                       \
 -  %D%/packages/patches/libgdata-glib-duplicate-tests.patch    \
    %D%/packages/patches/libgnome-encoding.patch                        \
    %D%/packages/patches/libgnomeui-utf8.patch                  \
 +  %D%/packages/patches/libgpg-error-gawk-compat.patch         \
    %D%/packages/patches/libffi-3.2.1-complex-alpha.patch               \
    %D%/packages/patches/libjxr-fix-function-signature.patch    \
    %D%/packages/patches/libjxr-fix-typos.patch                 \

diff --cc gnu/packages/audio.scm
Simple merge

diff --cc gnu/packages/bittorrent.scm
Simple merge

diff --cc gnu/packages/chromium.scm
Simple merge

diff --cc gnu/packages/databases.scm
Simple merge

diff --cc gnu/packages/education.scm
Simple merge

diff --cc gnu/packages/emacs-xyz.scm
Simple merge

diff --cc gnu/packages/emulators.scm
Simple merge

diff --cc gnu/packages/ghostscript.scm
index 817104c,139682b..3239ab4
--- 1/gnu/packages/ghostscript.scm
--- 2/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@@ -137,7 -144,13 +137,13 @@@ printing, and psresize, for adjusting p
  (define-public ghostscript
    (package
      (name "ghostscript")
 -    (version "9.26")
 +    (version "9.27")
+ 
+     ;; The problems addressed by GHOSTSCRIPT/FIXED are not security-related,
+     ;; but they have a significant impact on usability, hence this graft.
+     ;; TODO: Ungraft on next update cycle.
+     (replacement ghostscript/fixed)
+ 
      (source
        (origin
          (method url-fetch)

diff --cc gnu/packages/glib.scm
index 3e17330,77b5715..3a50347
--- 1/gnu/packages/glib.scm
--- 2/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -9,7 -9,7 +9,8 @@@
  ;;; Copyright © 2017 Petter <petter@mykolab.ch>
  ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 +;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/gnome.scm
Simple merge

diff --cc gnu/packages/golang.scm
Simple merge

diff --cc gnu/packages/gsasl.scm
Simple merge

diff --cc gnu/packages/gtk.scm
Simple merge

diff --cc gnu/packages/guile.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/make-bootstrap.scm
index 2163b64,37bf4e9..4594e2f
--- 1/gnu/packages/make-bootstrap.scm
--- 2/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@@ -2,9 -2,8 +2,9 @@@
  ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
- ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ ;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org>
 -;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
++;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 +;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/maths.scm
Simple merge

diff --cc gnu/packages/package-management.scm
Simple merge

diff --cc gnu/packages/password-utils.scm
Simple merge

diff --cc gnu/packages/perl.scm
Simple merge

diff --cc gnu/packages/python-web.scm
Simple merge

diff --cc gnu/packages/python-xyz.scm
Simple merge

diff --cc gnu/packages/qt.scm
Simple merge

diff --cc gnu/packages/ruby.scm
Simple merge

diff --cc gnu/packages/tls.scm
Simple merge

diff --cc gnu/packages/video.scm
Simple merge

diff --cc gnu/packages/web-browsers.scm
Simple merge

diff --cc gnu/packages/web.scm
Simple merge

diff --cc gnu/packages/webkit.scm
index 538c976,2eca514..ea7cee5
--- 1/gnu/packages/webkit.scm
--- 2/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -59,14 -59,14 +59,14 @@@
  (define-public webkitgtk
    (package
      (name "webkitgtk")
-     (version "2.24.3")
 -    (version "2.20.5")
++    (version "2.24.4")
      (source (origin
                (method url-fetch)
                (uri (string-append "https://www.webkitgtk.org/releases/"
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
-                 "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl"))))
 -                "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
++                "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46"))))
      (build-system cmake-build-system)
      (outputs '("out" "doc"))
      (arguments

diff --cc gnu/packages/wm.scm
Simple merge

diff --cc guix/packages.scm
Simple merge

diff --cc guix/scripts/pack.scm
Simple merge

diff --cc po/doc/guix-manual.de.po
Simple merge