Merge branch 'master' into staging

diff --cc gnu/local.mk
index 7f69059,50bcab5..c6ddbf4
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1326,7 -1328,7 +1330,8 @@@ dist_patch_DATA =                                               
    %D%/packages/patches/scotch-build-parallelism.patch         \
    %D%/packages/patches/scotch-integer-declarations.patch      \
    %D%/packages/patches/sdl-libx11-1.6.patch                   \
 +  %D%/packages/patches/sdl2-mesa-compat.patch                 \
+   %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch        \
    %D%/packages/patches/seq24-rename-mutex.patch                       \
    %D%/packages/patches/sharutils-CVE-2018-1000097.patch               \
    %D%/packages/patches/shishi-fix-libgcrypt-detection.patch   \

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

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

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

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

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

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

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

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

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