Merge branch 'master' into staging

[jackhill/guix/guix.git] / gnu / local.mk

diff --git a/gnu/local.mk b/gnu/local.mk
index ae8a227..120d68c 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -801,7 +801,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/bitcoin-core-python-compat.patch                \
   %D%/packages/patches/blender-2.79-newer-ffmpeg.patch         \
   %D%/packages/patches/blender-2.79-python-3.7-fix.patch       \
-  %D%/packages/patches/bluez-CVE-2020-0556.patch               \
   %D%/packages/patches/byobu-writable-status.patch             \
   %D%/packages/patches/calibre-msgpack-compat.patch            \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
@@ -1169,7 +1168,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/libextractor-exiv2.patch                        \
   %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch         \
   %D%/packages/patches/libgit2-mtime-0.patch                   \
@@ -1448,7 +1447,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/qt4-ldflags.patch                       \
   %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch       \
   %D%/packages/patches/qtbase-use-TZDIR.patch                  \
-  %D%/packages/patches/qtbase-QTBUG-81715.patch                        \
   %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch       \