Merge branch 'master' into core-updates

diff --cc gnu/local.mk
index 4b8c4c3,1c48fd3..befe3c4
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -886,7 -882,7 +886,6 @@@ dist_patch_DATA =                                          
    %D%/packages/patches/libgdata-glib-duplicate-tests.patch    \
    %D%/packages/patches/libgnome-encoding.patch                        \
    %D%/packages/patches/libgnomeui-utf8.patch                  \
-   %D%/packages/patches/libgxps-CVE-2017-11590.patch           \
 -  %D%/packages/patches/libgpg-error-aarch64-logging-fix.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                 \
@@@ -1148,8 -1148,8 +1147,9 @@@
    %D%/packages/patches/slim-sigusr1.patch                     \
    %D%/packages/patches/slim-reset.patch                               \
    %D%/packages/patches/slim-login.patch                               \
 +  %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch     \
    %D%/packages/patches/sooperlooper-build-with-wx-30.patch    \
+   %D%/packages/patches/soundconverter-remove-gconf-dependency.patch   \
    %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch  \
    %D%/packages/patches/soundtouch-CVE-2018-1000223.patch      \
    %D%/packages/patches/steghide-fixes.patch                   \

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

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

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

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

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

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

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

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

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

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

diff --cc guix/gexp.scm
Simple merge