Merge branch 'master' into staging

diff --cc gnu/local.mk
index 7c83412,ef4c5d2..2e97309
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1166,10 -1166,7 +1165,7 @@@ dist_patch_DATA =                                              
    %D%/packages/patches/libbase-use-own-logging.patch          \
    %D%/packages/patches/libbonobo-activation-test-race.patch   \
    %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
 -  %D%/packages/patches/libdrm-symbol-check.patch              \
 +  %D%/packages/patches/libdrm-realpath-virtio.patch           \
-   %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/libextractor-exiv2.patch                       \
    %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch                \
    %D%/packages/patches/libgit2-mtime-0.patch                  \

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

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

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

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

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

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

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

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