Merge branch 'master' into staging

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

diff --git a/gnu/local.mk b/gnu/local.mk
index 50bcab5..c6ddbf4 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -945,7 +945,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/guile-relocatable.patch                 \
   %D%/packages/patches/guile-rsvg-pkgconfig.patch              \
   %D%/packages/patches/guile-emacs-fix-configure.patch         \
-  %D%/packages/patches/gstreamer-buffer-reset-offset.patch     \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch       \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
   %D%/packages/patches/gtk2-theme-paths.patch                  \
@@ -1024,6 +1023,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/kodi-increase-test-timeout.patch                \
   %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch           \
   %D%/packages/patches/kodi-skip-test-449.patch                \
+  %D%/packages/patches/kwindowsystem-qt-compat.patch           \
   %D%/packages/patches/laby-make-install.patch                 \
   %D%/packages/patches/lcalc-default-parameters-1.patch                \
   %D%/packages/patches/lcalc-default-parameters-2.patch                \
@@ -1122,6 +1122,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/mcrypt-CVE-2012-4426.patch                      \
   %D%/packages/patches/mcrypt-CVE-2012-4527.patch                      \
   %D%/packages/patches/mesa-skip-disk-cache-test.patch         \
+  %D%/packages/patches/mesa-timespec-test-32bit.patch          \
   %D%/packages/patches/mescc-tools-boot.patch                  \
   %D%/packages/patches/meson-for-build-rpath.patch             \
   %D%/packages/patches/metabat-fix-compilation.patch           \
@@ -1195,6 +1196,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/openssl-c-rehash-in.patch               \
   %D%/packages/patches/openssl-CVE-2019-1559.patch             \
   %D%/packages/patches/open-zwave-hidapi.patch                 \
+  %D%/packages/patches/orc-typedef-enum.patch                  \
   %D%/packages/patches/orpheus-cast-errors-and-includes.patch  \
   %D%/packages/patches/osip-CVE-2017-7853.patch                        \
   %D%/packages/patches/ots-no-include-missing-file.patch       \
@@ -1254,6 +1256,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/pygpgme-disable-problematic-tests.patch  \
   %D%/packages/patches/pyqt-configure.patch                    \
   %D%/packages/patches/pyqt-public-sip.patch                   \
+  %D%/packages/patches/pyqt-unbundled-qt.patch                 \
   %D%/packages/patches/python-2-deterministic-build-info.patch \
   %D%/packages/patches/python-2.7-adjust-tests.patch           \
   %D%/packages/patches/python-2.7-search-paths.patch           \
@@ -1288,7 +1291,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python-waitress-fix-tests.patch         \
   %D%/packages/patches/qemu-glibc-2.27.patch                   \
   %D%/packages/patches/qt4-ldflags.patch                       \
-  %D%/packages/patches/qtbase-old-kernel.patch                 \
   %D%/packages/patches/qtbase-use-TZDIR.patch                  \
   %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quagga-reproducible-build.patch          \
@@ -1328,6 +1330,7 @@ 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                \