Merge branch 'master' into core-updates
[jackhill/guix/guix.git] / gnu / local.mk
index 55fa90f..b9575ad 100644 (file)
 # Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 # Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
 # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
-# Copyright © 2017, 2018 Gábor Boskovits <boskovits@gmail.com>
+# Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
 # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
-# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
+# Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com>
 # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
 # Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+# Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
 #
 # This file is part of GNU Guix.
 #
@@ -121,6 +122,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/cpp.scm                                 \
   %D%/packages/cppi.scm                                \
   %D%/packages/cran.scm                                \
+  %D%/packages/crates-io.scm                   \
   %D%/packages/cross-base.scm                  \
   %D%/packages/crypto.scm                      \
   %D%/packages/cryptsetup.scm                  \
@@ -194,6 +196,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/gcc.scm                         \
   %D%/packages/gd.scm                          \
   %D%/packages/gdb.scm                         \
+  %D%/packages/genealogy.scm                   \
   %D%/packages/genimage.scm                    \
   %D%/packages/geo.scm                         \
   %D%/packages/gettext.scm                     \
@@ -261,6 +264,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/jrnl.scm                                \
   %D%/packages/jose.scm                                \
   %D%/packages/julia.scm                       \
+  %D%/packages/kawa.scm                                \
   %D%/packages/kde.scm                         \
   %D%/packages/kde-frameworks.scm              \
   %D%/packages/kde-plasma.scm                  \
@@ -295,6 +299,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/llvm.scm                                \
   %D%/packages/lout.scm                                \
   %D%/packages/logging.scm                     \
+  %D%/packages/logo.scm                                \
   %D%/packages/lolcode.scm                      \
   %D%/packages/lsof.scm                                \
   %D%/packages/lua.scm                         \
@@ -468,6 +473,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/uml.scm                         \
   %D%/packages/unrtf.scm                       \
   %D%/packages/upnp.scm                                \
+  %D%/packages/usb-modeswitch.scm              \
   %D%/packages/uucp.scm                                \
   %D%/packages/valgrind.scm                    \
   %D%/packages/version-control.scm             \
@@ -484,6 +490,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/wget.scm                                \
   %D%/packages/wicd.scm                                \
   %D%/packages/wine.scm                                \
+  %D%/packages/wireservice.scm                         \
   %D%/packages/wm.scm                          \
   %D%/packages/wordnet.scm                     \
   %D%/packages/wv.scm                          \
@@ -501,6 +508,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/services.scm                             \
   %D%/services/admin.scm                       \
   %D%/services/audio.scm                        \
+  %D%/services/auditd.scm                      \
   %D%/services/avahi.scm                       \
   %D%/services/base.scm                                \
   %D%/services/certbot.scm                     \
@@ -516,6 +524,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/services/docker.scm                      \
   %D%/services/authentication.scm              \
   %D%/services/games.scm                       \
+  %D%/services/getmail.scm                             \
   %D%/services/kerberos.scm                    \
   %D%/services/lirc.scm                                \
   %D%/services/virtualization.scm              \
@@ -524,6 +533,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/services/messaging.scm                   \
   %D%/services/monitoring.scm                  \
   %D%/services/networking.scm                  \
+  %D%/services/nix.scm                         \
   %D%/services/nfs.scm                 \
   %D%/services/security-token.scm              \
   %D%/services/shepherd.scm                    \
@@ -556,6 +566,9 @@ GNU_SYSTEM_MODULES =                                \
   %D%/system/uuid.scm                          \
   %D%/system/vm.scm                            \
                                                \
+  %D%/machine.scm                              \
+  %D%/machine/ssh.scm                          \
+                                               \
   %D%/build/accounts.scm                       \
   %D%/build/activation.scm                     \
   %D%/build/bootloader.scm                     \
@@ -585,6 +598,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/tests/networking.scm                     \
   %D%/tests/rsync.scm                          \
   %D%/tests/security-token.scm                 \
+  %D%/tests/singularity.scm                    \
   %D%/tests/ssh.scm                            \
   %D%/tests/version-control.scm                        \
   %D%/tests/virtualization.scm                 \
@@ -620,7 +634,7 @@ INSTALLER_MODULES =                             \
   %D%/installer/newt/user.scm                  \
   %D%/installer/newt/utils.scm                 \
   %D%/installer/newt/welcome.scm               \
-  %D%/installer/newt/wifi.scm  
+  %D%/installer/newt/wifi.scm
 
 # Always ship the installer modules but compile them only when
 # ENABLE_INSTALLER is true.
@@ -636,6 +650,7 @@ dist_installer_DATA =                               \
 
 # Modules that do not need to be compiled.
 MODULES_NOT_COMPILED +=                                \
+  %D%/build/locale.scm                         \
   %D%/build/shepherd.scm                       \
   %D%/build/svg.scm
 
@@ -645,10 +660,9 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/4store-unset-preprocessor-directive.patch       \
   %D%/packages/patches/a2ps-CVE-2001-1593.patch        \
   %D%/packages/patches/a2ps-CVE-2014-0466.patch        \
+  %D%/packages/patches/a2ps-CVE-2015-8107.patch        \
   %D%/packages/patches/abiword-explictly-cast-bools.patch      \
   %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \
-  %D%/packages/patches/acl-fix-perl-regex.patch                \
-  %D%/packages/patches/acl-hurd-path-max.patch                 \
   %D%/packages/patches/adb-add-libraries.patch                 \
   %D%/packages/patches/aegis-constness-error.patch             \
   %D%/packages/patches/aegis-perl-tempdir1.patch               \
@@ -666,7 +680,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/apr-skip-getservbyname-test.patch       \
   %D%/packages/patches/aria2-CVE-2019-3500.patch               \
   %D%/packages/patches/aspell-default-dict-dir.patch           \
-  %D%/packages/patches/at-spi2-core-meson-compat.patch         \
+  %D%/packages/patches/aspell-gcc-compat.patch                 \
   %D%/packages/patches/ath9k-htc-firmware-binutils.patch       \
   %D%/packages/patches/ath9k-htc-firmware-gcc.patch            \
   %D%/packages/patches/ath9k-htc-firmware-objcopy.patch                \
@@ -684,12 +698,12 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/bazaar-CVE-2017-14176.patch             \
   %D%/packages/patches/beets-python-3.7-fix.patch              \
   %D%/packages/patches/beignet-correct-file-names.patch                \
+  %D%/packages/patches/benchmark-unbundle-googletest.patch     \
   %D%/packages/patches/biber-fix-encoding-write.patch          \
+  %D%/packages/patches/binutils-boot-2.20.1a.patch             \
   %D%/packages/patches/binutils-loongson-workaround.patch      \
   %D%/packages/patches/blender-2.79-newer-ffmpeg.patch         \
   %D%/packages/patches/blender-2.79-python-3.7-fix.patch       \
-  %D%/packages/patches/boost-fix-icu-build.patch               \
-  %D%/packages/patches/borg-fix-hard-link-preloading.patch     \
   %D%/packages/patches/byobu-writable-status.patch             \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
   %D%/packages/patches/calibre-remove-test-bs4.patch           \
@@ -720,7 +734,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/clementine-use-openssl.patch            \
   %D%/packages/patches/clisp-remove-failing-test.patch         \
   %D%/packages/patches/clucene-pkgconfig.patch                 \
-  %D%/packages/patches/clx-remove-demo.patch                   \
   %D%/packages/patches/coda-use-system-libs.patch              \
   %D%/packages/patches/combinatorial-blas-awpm.patch           \
   %D%/packages/patches/combinatorial-blas-io-fix.patch         \
@@ -728,16 +741,16 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/cpufrequtils-fix-aclocal.patch          \
   %D%/packages/patches/crawl-upgrade-saves.patch               \
   %D%/packages/patches/crda-optional-gcrypt.patch              \
+  %D%/packages/patches/csvkit-fix-tests.patch                  \
   %D%/packages/patches/clucene-contribs-lib.patch               \
   %D%/packages/patches/cube-nocheck.patch                      \
   %D%/packages/patches/cursynth-wave-rand.patch                        \
-  %D%/packages/patches/cvs-2017-12836.patch                    \
+  %D%/packages/patches/cvs-CVE-2017-12836.patch                \
   %D%/packages/patches/dbus-helper-search-path.patch           \
   %D%/packages/patches/dealii-mpi-deprecations.patch           \
   %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
   %D%/packages/patches/dfu-programmer-fix-libusb.patch         \
   %D%/packages/patches/diffutils-gets-undeclared.patch         \
-  %D%/packages/patches/diffutils-getopt.patch                  \
   %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch     \
   %D%/packages/patches/doc++-include-directives.patch          \
   %D%/packages/patches/doc++-segfault-fix.patch                        \
@@ -746,6 +759,8 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/docker-use-fewer-modprobes.patch                \
   %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
   %D%/packages/patches/doxygen-test.patch                      \
+  %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch     \
+  %D%/packages/patches/dstat-skip-devices-without-io.patch     \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
   %D%/packages/patches/elfutils-tests-ptrace.patch             \
   %D%/packages/patches/elixir-path-length.patch                        \
@@ -756,7 +771,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/emacs-highlight-stages-add-gexp.patch   \
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch    \
   %D%/packages/patches/emacs-source-date-epoch.patch           \
-  %D%/packages/patches/emacs-realgud-fix-configure-ac.patch    \
+  %D%/packages/patches/emacs-unpackaged-req.patch              \
   %D%/packages/patches/emacs-undohist-ignored.patch    \
   %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch       \
   %D%/packages/patches/emacs-zones-called-interactively.patch  \
@@ -766,6 +781,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/evilwm-lost-focus-bug.patch             \
   %D%/packages/patches/exiv2-CVE-2017-14860.patch              \
   %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch  \
+  %D%/packages/patches/expat-CVE-2018-20843.patch              \
   %D%/packages/patches/extundelete-e2fsprogs-1.44.patch                \
   %D%/packages/patches/fastcap-mulGlobal.patch                 \
   %D%/packages/patches/fastcap-mulSetup.patch                  \
@@ -798,6 +814,8 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gcc-arm-bug-71399.patch                 \
   %D%/packages/patches/gcc-arm-link-spec-fix.patch             \
   %D%/packages/patches/gcc-asan-missing-include.patch          \
+  %D%/packages/patches/gcc-boot-2.95.3.patch                   \
+  %D%/packages/patches/gcc-boot-4.7.4.patch                    \
   %D%/packages/patches/gcc-cross-environment-variables.patch   \
   %D%/packages/patches/gcc-fix-texi2pod.patch                  \
   %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch          \
@@ -826,7 +844,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gd-CVE-2019-6978.patch                  \
   %D%/packages/patches/gd-fix-tests-on-i686.patch              \
   %D%/packages/patches/gd-freetype-test-failure.patch          \
-  %D%/packages/patches/gdm-CVE-2018-14424.patch                        \
   %D%/packages/patches/geoclue-config.patch                    \
   %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
   %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch     \
@@ -836,7 +853,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/giflib-make-reallocarray-private.patch  \
   %D%/packages/patches/glib-tests-timer.patch                  \
-  %D%/packages/patches/glib-networking-connection.patch        \
   %D%/packages/patches/glibc-CVE-2015-5180.patch               \
   %D%/packages/patches/glibc-CVE-2015-7547.patch               \
   %D%/packages/patches/glibc-CVE-2016-3075.patch               \
@@ -847,25 +863,34 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch                \
   %D%/packages/patches/glibc-CVE-2018-11236.patch              \
   %D%/packages/patches/glibc-CVE-2018-11237.patch              \
+  %D%/packages/patches/glibc-CVE-2019-7309.patch               \
+  %D%/packages/patches/glibc-CVE-2019-9169.patch               \
   %D%/packages/patches/glibc-allow-kernel-2.6.32.patch         \
+  %D%/packages/patches/glibc-boot-2.16.0.patch                 \
+  %D%/packages/patches/glibc-boot-2.2.5.patch                  \
+  %D%/packages/patches/glibc-bootstrap-system-2.16.0.patch     \
   %D%/packages/patches/glibc-bootstrap-system.patch            \
   %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch  \
   %D%/packages/patches/glibc-hurd-magic-pid.patch              \
   %D%/packages/patches/glibc-ldd-x86_64.patch                  \
   %D%/packages/patches/glibc-locales.patch                     \
+  %D%/packages/patches/glibc-locales-2.28.patch                        \
   %D%/packages/patches/glibc-o-largefile.patch                 \
   %D%/packages/patches/glibc-reinstate-prlimit64-fallback.patch        \
   %D%/packages/patches/glibc-vectorized-strcspn-guards.patch   \
   %D%/packages/patches/glibc-versioned-locpath.patch           \
   %D%/packages/patches/glibc-2.27-git-fixes.patch              \
   %D%/packages/patches/glibc-2.28-git-fixes.patch              \
+  %D%/packages/patches/glibc-2.28-supported-locales.patch      \
+  %D%/packages/patches/glibc-2.29-git-updates.patch            \
+  %D%/packages/patches/glibc-supported-locales.patch           \
+  %D%/packages/patches/glibc-2.27-supported-locales.patch      \
   %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch           \
   %D%/packages/patches/glog-gcc-5-demangling.patch             \
   %D%/packages/patches/gmp-arm-asm-nothumb.patch               \
   %D%/packages/patches/gmp-faulty-test.patch                   \
   %D%/packages/patches/gnome-shell-theme.patch                 \
   %D%/packages/patches/gnome-tweaks-search-paths.patch         \
-  %D%/packages/patches/gnucash-fix-test-transaction-failure.patch \
   %D%/packages/patches/gnutls-skip-trust-store-test.patch      \
   %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   %D%/packages/patches/gobject-introspection-cc.patch          \
@@ -874,16 +899,13 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/gpsbabel-minizip.patch                  \
   %D%/packages/patches/gpsbabel-qstring.patch                  \
   %D%/packages/patches/grep-timing-sensitive-test.patch                \
-  %D%/packages/patches/groff-source-date-epoch.patch           \
   %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch        \
-  %D%/packages/patches/grub-binutils-compat.patch              \
-  %D%/packages/patches/grub-check-error-efibootmgr.patch       \
   %D%/packages/patches/grub-efi-fat-serial-number.patch                \
   %D%/packages/patches/gsl-test-i686.patch                     \
   %D%/packages/patches/gspell-dash-test.patch                  \
-  %D%/packages/patches/gst-plugins-good-libvpx-compat.patch    \
   %D%/packages/patches/guile-1.8-cpp-4.5.patch                 \
   %D%/packages/patches/guile-2.2-default-utf8.patch            \
+  %D%/packages/patches/guile-2.2-skip-oom-test.patch            \
   %D%/packages/patches/guile-default-utf8.patch                        \
   %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch  \
   %D%/packages/patches/guile-linux-syscalls.patch              \
@@ -891,6 +913,7 @@ 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                  \
@@ -899,6 +922,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
   %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
   %D%/packages/patches/gzdoom-search-in-installed-share.patch  \
+  %D%/packages/patches/handbrake-opt-in-nvenc.patch            \
   %D%/packages/patches/haskell-mode-unused-variables.patch     \
   %D%/packages/patches/haskell-mode-make-check.patch           \
   %D%/packages/patches/hdf4-architectures.patch                \
@@ -928,7 +952,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch                      \
   %D%/packages/patches/idris-test-no-node.patch                        \
   %D%/packages/patches/ilmbase-fix-tests.patch                 \
-  %D%/packages/patches/inkscape-poppler-compat3.patch          \
+  %D%/packages/patches/inkscape-poppler-0.76.patch             \
   %D%/packages/patches/intltool-perl-compatibility.patch       \
   %D%/packages/patches/irrlicht-use-system-libs.patch          \
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch        \
@@ -944,7 +968,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/java-xerces-xjavac_taskdef.patch        \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
   %D%/packages/patches/kdbusaddons-kinit-file-name.patch       \
-  %D%/packages/patches/khmer-use-libraries.patch                \
   %D%/packages/patches/libziparchive-add-includes.patch                \
   %D%/packages/patches/localed-xorg-keyboard.patch             \
   %D%/packages/patches/kiki-level-selection-crash.patch                \
@@ -966,39 +989,31 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch           \
   %D%/packages/patches/kodi-skip-test-449.patch                \
   %D%/packages/patches/laby-make-install.patch                 \
+  %D%/packages/patches/lcalc-default-parameters-1.patch                \
+  %D%/packages/patches/lcalc-default-parameters-2.patch                \
+  %D%/packages/patches/lcalc-lcommon-h.patch                   \
+  %D%/packages/patches/lcalc-using-namespace-std.patch                 \
   %D%/packages/patches/lcms-CVE-2018-16435.patch               \
   %D%/packages/patches/ldc-bootstrap-disable-tests.patch       \
   %D%/packages/patches/ldc-disable-phobos-tests.patch          \
+  %D%/packages/patches/leela-zero-gtest.patch                  \
   %D%/packages/patches/liba52-enable-pic.patch                 \
   %D%/packages/patches/liba52-link-with-libm.patch             \
   %D%/packages/patches/liba52-set-soname.patch                 \
   %D%/packages/patches/liba52-use-mtune-not-mcpu.patch         \
-  %D%/packages/patches/libarchive-CVE-2017-14166.patch         \
-  %D%/packages/patches/libarchive-CVE-2017-14502.patch         \
-  %D%/packages/patches/libarchive-CVE-2018-1000877.patch       \
-  %D%/packages/patches/libarchive-CVE-2018-1000878.patch       \
-  %D%/packages/patches/libarchive-CVE-2018-1000880.patch       \
   %D%/packages/patches/libbase-fix-includes.patch              \
   %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/libcroco-CVE-2017-7960.patch            \
-  %D%/packages/patches/libcroco-CVE-2017-7961.patch            \
   %D%/packages/patches/libdrm-symbol-check.patch               \
-  %D%/packages/patches/libevent-dns-tests.patch                        \
-  %D%/packages/patches/libevent-2.0-CVE-2016-10195.patch       \
-  %D%/packages/patches/libevent-2.0-CVE-2016-10196.patch       \
-  %D%/packages/patches/libevent-2.0-CVE-2016-10197.patch       \
-  %D%/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch     \
   %D%/packages/patches/libexif-CVE-2016-6328.patch             \
   %D%/packages/patches/libexif-CVE-2017-7544.patch             \
-  %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \
+  %D%/packages/patches/libexif-CVE-2018-20030.patch            \
   %D%/packages/patches/libgit2-avoid-python.patch              \
   %D%/packages/patches/libgit2-mtime-0.patch                   \
-  %D%/packages/patches/libgdata-fix-tests.patch                        \
-  %D%/packages/patches/libgdata-glib-duplicate-tests.patch     \
   %D%/packages/patches/libgnome-encoding.patch                 \
   %D%/packages/patches/libgnomeui-utf8.patch                   \
+  %D%/packages/patches/libgpg-error-gawk-compat.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                  \
@@ -1016,7 +1031,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch        \
   %D%/packages/patches/libsndfile-CVE-2017-8362.patch          \
   %D%/packages/patches/libsndfile-CVE-2017-12562.patch         \
-  %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch     \
   %D%/packages/patches/libtar-CVE-2013-4420.patch              \
   %D%/packages/patches/libtheora-config-guess.patch            \
   %D%/packages/patches/libtommath-fix-linkage.patch            \
@@ -1042,6 +1056,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch        \
   %D%/packages/patches/llvm-for-extempore.patch                        \
   %D%/packages/patches/lm-sensors-hwmon-attrs.patch            \
+  %D%/packages/patches/lrcalc-includes.patch                   \
   %D%/packages/patches/lrzip-CVE-2017-8842.patch               \
   %D%/packages/patches/lua-CVE-2014-5461.patch                      \
   %D%/packages/patches/lua-pkgconfig.patch                      \
@@ -1065,6 +1080,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/mescc-tools-boot.patch                  \
   %D%/packages/patches/meson-for-build-rpath.patch             \
   %D%/packages/patches/metabat-fix-compilation.patch           \
   %D%/packages/patches/mhash-keygen-test-segfault.patch                \
@@ -1130,6 +1146,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/openssl-1.1-c-rehash-in.patch           \
   %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/orpheus-cast-errors-and-includes.patch  \
   %D%/packages/patches/osip-CVE-2017-7853.patch                        \
   %D%/packages/patches/ots-no-include-missing-file.patch       \
@@ -1167,9 +1184,10 @@ dist_patch_DATA =                                                \
   %D%/packages/patches/pixman-CVE-2016-5296.patch              \
   %D%/packages/patches/plink-1.07-unclobber-i.patch            \
   %D%/packages/patches/plink-endian-detection.patch            \
+  %D%/packages/patches/plib-CVE-2011-4620.patch                \
+  %D%/packages/patches/plib-CVE-2012-4552.patch                \
   %D%/packages/patches/plotutils-libpng-jmpbuf.patch           \
   %D%/packages/patches/podofo-cmake-3.12.patch                 \
-  %D%/packages/patches/polkit-CVE-2018-19788.patch             \
   %D%/packages/patches/portaudio-audacity-compat.patch         \
   %D%/packages/patches/portmidi-modular-build.patch            \
   %D%/packages/patches/postgresql-disable-resolve_symlinks.patch       \
@@ -1189,8 +1207,6 @@ 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/python2-CVE-2018-14647.patch            \
-  %D%/packages/patches/python2-CVE-2018-1000802.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           \
@@ -1203,7 +1219,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python-axolotl-AES-fix.patch            \
   %D%/packages/patches/python-cairocffi-dlopen-path.patch      \
   %D%/packages/patches/python-cffi-x87-stack-clean.patch       \
-  %D%/packages/patches/python-fix-tests.patch                  \
   %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
   %D%/packages/patches/python-configobj-setuptools.patch       \
   %D%/packages/patches/python-faker-fix-build-32bit.patch      \
@@ -1212,10 +1227,12 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/python-mox3-python3.6-compat.patch      \
   %D%/packages/patches/python-testtools.patch                  \
   %D%/packages/patches/python-paste-remove-timing-test.patch   \
+  %D%/packages/patches/python-pyatspi-python-37.patch  \
   %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch     \
   %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
   %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \
+  %D%/packages/patches/python-slugify-depend-on-unidecode.patch        \
   %D%/packages/patches/python2-subprocess32-disable-input-test.patch   \
   %D%/packages/patches/python-unittest2-python3-compat.patch   \
   %D%/packages/patches/python-unittest2-remove-argparse.patch  \
@@ -1232,7 +1249,9 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/qtwebkit-pbutils-include.patch          \
   %D%/packages/patches/randomjungle-disable-static-build.patch \
   %D%/packages/patches/rapicorn-isnan.patch                    \
+  %D%/packages/patches/rapidjson-gcc-compat.patch              \
   %D%/packages/patches/raptor2-heap-overflow.patch             \
+  %D%/packages/patches/ratpoints-sturm_and_rp_private.patch    \
   %D%/packages/patches/ratpoison-shell.patch                   \
   %D%/packages/patches/rcs-5.9.4-noreturn.patch                        \
   %D%/packages/patches/rct-add-missing-headers.patch           \
@@ -1240,6 +1259,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/readline-6.2-CVE-2014-2524.patch                \
   %D%/packages/patches/red-eclipse-remove-gamma-name-hack.patch        \
   %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch     \
+  %D%/packages/patches/ri-li-modernize_cpp.patch               \
   %D%/packages/patches/ripperx-missing-file.patch              \
   %D%/packages/patches/rpcbind-CVE-2017-8779.patch             \
   %D%/packages/patches/rtags-separate-rct.patch                        \
@@ -1255,7 +1275,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
   %D%/packages/patches/rust-bootstrap-stage0-test.patch                \
   %D%/packages/patches/rust-coresimd-doctest.patch             \
-  %D%/packages/patches/rust-1.30-gdb-llvm.patch                        \
   %D%/packages/patches/rust-reproducible-builds.patch           \
   %D%/packages/patches/rxvt-unicode-escape-sequences.patch     \
   %D%/packages/patches/scalapack-blacs-mpi-deprecations.patch  \
@@ -1263,6 +1282,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/scotch-build-parallelism.patch          \
   %D%/packages/patches/scotch-integer-declarations.patch       \
   %D%/packages/patches/scribus-poppler.patch                   \
+  %D%/packages/patches/scribus-poppler-0.73.patch              \
   %D%/packages/patches/sdl-libx11-1.6.patch                    \
   %D%/packages/patches/seq24-rename-mutex.patch                        \
   %D%/packages/patches/sharutils-CVE-2018-1000097.patch                \
@@ -1279,6 +1299,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/sssd-curl-compat.patch                  \
   %D%/packages/patches/steghide-fixes.patch                    \
   %D%/packages/patches/streamlink-update-test.patch            \
+  %D%/packages/patches/stumpwm-fix-broken-read-one-line.patch  \
   %D%/packages/patches/superlu-dist-awpm-grid.patch            \
   %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch \
   %D%/packages/patches/superlu-dist-scotchmetis.patch          \
@@ -1287,18 +1308,21 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/swig-guile-gc.patch                     \
   %D%/packages/patches/swish-e-search.patch                    \
   %D%/packages/patches/swish-e-format-security.patch           \
-  %D%/packages/patches/stumpwm-fix-broken-read-one-line.patch  \
+  %D%/packages/patches/symmetrica-bruch.patch                  \
+  %D%/packages/patches/symmetrica-int32.patch                  \
+  %D%/packages/patches/symmetrica-return_values.patch          \
+  %D%/packages/patches/symmetrica-sort_sum_rename.patch        \
   %D%/packages/patches/t1lib-CVE-2010-2642.patch               \
   %D%/packages/patches/t1lib-CVE-2011-0764.patch               \
   %D%/packages/patches/t1lib-CVE-2011-1552+.patch              \
   %D%/packages/patches/tar-remove-wholesparse-check.patch      \
   %D%/packages/patches/tar-skip-unreliable-tests.patch         \
+  %D%/packages/patches/tcc-boot-0.9.27.patch                   \
   %D%/packages/patches/tclxml-3.2-install.patch                        \
   %D%/packages/patches/tcsh-fix-autotest.patch                 \
   %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch       \
   %D%/packages/patches/teensy-loader-cli-help.patch            \
   %D%/packages/patches/teeworlds-use-latest-wavpack.patch      \
-  %D%/packages/patches/texinfo-perl-compat.patch               \
   %D%/packages/patches/texinfo-5-perl-compat.patch             \
   %D%/packages/patches/texlive-bin-CVE-2018-17407.patch                \
   %D%/packages/patches/texlive-bin-luatex-poppler-compat.patch \
@@ -1318,6 +1342,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/totem-meson-easy-codec.patch            \
   %D%/packages/patches/tuxpaint-stamps-path.patch              \
   %D%/packages/patches/twinkle-include-qregexpvalidator.patch  \
+  %D%/packages/patches/txr-shell.patch                         \
   %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch    \
   %D%/packages/patches/unzip-CVE-2014-8139.patch               \
   %D%/packages/patches/unzip-CVE-2014-8140.patch               \
@@ -1336,6 +1361,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/util-linux-tests.patch                  \
   %D%/packages/patches/upower-builddir.patch                   \
   %D%/packages/patches/upx-fix-CVE-2017-15056.patch            \
+  %D%/packages/patches/usb-modeswitch-accept-config-arg.patch  \
   %D%/packages/patches/valgrind-enable-arm.patch               \
   %D%/packages/patches/vboot-utils-fix-format-load-address.patch       \
   %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch       \
@@ -1352,7 +1378,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/wavpack-CVE-2018-6767.patch             \
   %D%/packages/patches/wavpack-CVE-2018-7253.patch             \
   %D%/packages/patches/wavpack-CVE-2018-7254.patch             \
-  %D%/packages/patches/webkitgtk-sans-gstreamer-gl.patch       \
   %D%/packages/patches/weechat-python.patch                    \
   %D%/packages/patches/wicd-bitrate-none-fix.patch             \
   %D%/packages/patches/wicd-get-selected-profile-fix.patch     \
@@ -1383,45 +1408,3 @@ dist_patch_DATA =                                                \
 
 MISC_DISTRO_FILES =                            \
   %D%/packages/ld-wrapper.in
-
-bootstrapdir = $(guilemoduledir)/%D%/packages/bootstrap
-bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
-bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
-bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux
-bootstrap_aarch64_linuxdir = $(bootstrapdir)/aarch64-linux
-bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux
-
-dist_bootstrap_x86_64_linux_DATA =             \
-  %D%/packages/bootstrap/x86_64-linux/bash     \
-  %D%/packages/bootstrap/x86_64-linux/mkdir    \
-  %D%/packages/bootstrap/x86_64-linux/tar      \
-  %D%/packages/bootstrap/x86_64-linux/xz
-
-dist_bootstrap_i686_linux_DATA =               \
-  %D%/packages/bootstrap/i686-linux/bash       \
-  %D%/packages/bootstrap/i686-linux/mkdir      \
-  %D%/packages/bootstrap/i686-linux/tar                \
-  %D%/packages/bootstrap/i686-linux/xz
-
-dist_bootstrap_armhf_linux_DATA =              \
-  %D%/packages/bootstrap/armhf-linux/bash      \
-  %D%/packages/bootstrap/armhf-linux/mkdir     \
-  %D%/packages/bootstrap/armhf-linux/tar       \
-  %D%/packages/bootstrap/armhf-linux/xz
-
-dist_bootstrap_aarch64_linux_DATA =            \
-  %D%/packages/bootstrap/aarch64-linux/bash    \
-  %D%/packages/bootstrap/aarch64-linux/mkdir   \
-  %D%/packages/bootstrap/aarch64-linux/tar     \
-  %D%/packages/bootstrap/aarch64-linux/xz
-
-dist_bootstrap_mips64el_linux_DATA =           \
-  %D%/packages/bootstrap/mips64el-linux/bash   \
-  %D%/packages/bootstrap/mips64el-linux/mkdir  \
-  %D%/packages/bootstrap/mips64el-linux/tar    \
-  %D%/packages/bootstrap/mips64el-linux/xz
-
-# Those files must remain executable, so they remain executable once
-# imported into the store.
-set-bootstrap-executable-permissions:
-       chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}