gnu: texlive-bin: Remove GCC5 workaround.
[jackhill/guix/guix.git] / gnu / local.mk
index a835388..7c68b40 100644 (file)
@@ -17,7 +17,7 @@
 # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 # Copyright © 2017, 2018 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>
 #
@@ -121,6 +121,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                  \
@@ -261,6 +262,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                  \
@@ -374,6 +376,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/php.scm                         \
   %D%/packages/pkg-config.scm                  \
   %D%/packages/plotutils.scm                   \
+  %D%/packages/poedit.scm                              \
   %D%/packages/polkit.scm                      \
   %D%/packages/popt.scm                                \
   %D%/packages/printers.scm                    \
@@ -433,8 +436,10 @@ GNU_SYSTEM_MODULES =                               \
   %D%/packages/smalltalk.scm                   \
   %D%/packages/sml.scm                         \
   %D%/packages/speech.scm                      \
+  %D%/packages/sphinx.scm                      \
   %D%/packages/spice.scm                       \
   %D%/packages/sqlite.scm                      \
+  %D%/packages/squirrel.scm                    \
   %D%/packages/ssh.scm                         \
   %D%/packages/sssd.scm                                \
   %D%/packages/stalonetray.scm                 \
@@ -465,6 +470,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             \
@@ -493,10 +499,12 @@ GNU_SYSTEM_MODULES =                              \
   %D%/packages/xorg.scm                                \
   %D%/packages/xfce.scm                                \
   %D%/packages/zile.scm                                \
+  %D%/packages/zwave.scm                       \
                                                \
   %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                     \
@@ -512,6 +520,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              \
@@ -520,6 +529,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                    \
@@ -581,6 +591,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                 \
@@ -622,17 +633,17 @@ INSTALLER_MODULES =                             \
 # ENABLE_INSTALLER is true.
 if ENABLE_INSTALLER
 GNU_SYSTEM_MODULES += $(INSTALLER_MODULES)
-elif !ENABLE_INSTALLER
+else !ENABLE_INSTALLER
 MODULES_NOT_COMPILED += $(INSTALLER_MODULES)
 endif
 
 installerdir = $(guilemoduledir)/%D%/installer
 dist_installer_DATA =                          \
-  %D%/installer/aux-files/logo.txt             \
-  %D%/installer/aux-files/SUPPORTED
+  %D%/installer/aux-files/logo.txt
 
 # Modules that do not need to be compiled.
 MODULES_NOT_COMPILED +=                                \
+  %D%/build/locale.scm                         \
   %D%/build/shepherd.scm                       \
   %D%/build/svg.scm
 
@@ -644,8 +655,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/a2ps-CVE-2014-0466.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               \
@@ -663,6 +672,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/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                \
@@ -680,6 +690,7 @@ 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/binutils-boot-2.20.1a.patch             \
   %D%/packages/patches/biber-fix-encoding-write.patch          \
   %D%/packages/patches/binutils-loongson-workaround.patch      \
   %D%/packages/patches/blender-2.79-newer-ffmpeg.patch         \
@@ -687,7 +698,9 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/boost-fix-icu-build.patch               \
   %D%/packages/patches/byobu-writable-status.patch             \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
-  %D%/packages/patches/calibre-use-packaged-feedparser.patch   \
+  %D%/packages/patches/calibre-remove-test-bs4.patch           \
+  %D%/packages/patches/calibre-remove-test-sqlite.patch                \
+  %D%/packages/patches/calibre-remove-test-unrar.patch         \
   %D%/packages/patches/casync-renameat2-declaration.patch      \
   %D%/packages/patches/catdoc-CVE-2017-11110.patch             \
   %D%/packages/patches/cdparanoia-fpic.patch                   \
@@ -730,7 +743,6 @@ dist_patch_DATA =                                           \
   %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                        \
@@ -740,7 +752,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
   %D%/packages/patches/doxygen-test.patch                      \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
-  %D%/packages/patches/efl-mesa-compat.patch                   \
   %D%/packages/patches/elfutils-tests-ptrace.patch             \
   %D%/packages/patches/elixir-path-length.patch                        \
   %D%/packages/patches/einstein-build.patch                    \
@@ -750,7 +761,6 @@ 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-undohist-ignored.patch    \
   %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch       \
   %D%/packages/patches/emacs-zones-called-interactively.patch  \
@@ -792,6 +802,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          \
@@ -810,9 +822,10 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/gcc-6-cross-environment-variables.patch \
   %D%/packages/patches/gcc-6-source-date-epoch-1.patch         \
   %D%/packages/patches/gcc-6-source-date-epoch-2.patch         \
+  %D%/packages/patches/gcc-8-cross-environment-variables.patch \
   %D%/packages/patches/gcc-8-strmov-store-file-names.patch     \
-  %D%/packages/patches/gcr-disable-failing-tests.patch         \
-  %D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch      \
+  %D%/packages/patches/gcc-9-asan-fix-limits-include.patch     \
+  %D%/packages/patches/gcc-9-strmov-store-file-names.patch     \
   %D%/packages/patches/gd-CVE-2018-5711.patch                  \
   %D%/packages/patches/gd-CVE-2018-1000222.patch               \
   %D%/packages/patches/gd-CVE-2019-6977.patch                  \
@@ -841,6 +854,9 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/glibc-CVE-2018-11236.patch              \
   %D%/packages/patches/glibc-CVE-2018-11237.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              \
@@ -852,14 +868,13 @@ dist_patch_DATA =                                         \
   %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-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-todo-libical-compat.patch         \
-  %D%/packages/patches/gnome-tweak-tool-search-paths.patch     \
-  %D%/packages/patches/gnucash-fix-test-transaction-failure.patch \
+  %D%/packages/patches/gnome-tweaks-search-paths.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          \
@@ -868,15 +883,15 @@ 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              \
@@ -887,11 +902,12 @@ dist_patch_DATA =                                         \
   %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                  \
-  %D%/packages/patches/gtk3-fix-deprecation-macro-use.patch    \
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch       \
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
   %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                \
@@ -919,6 +935,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch  \
   %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch  \
   %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/intltool-perl-compatibility.patch       \
@@ -948,7 +965,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/kio-search-smbd-on-PATH.patch           \
   %D%/packages/patches/kmod-module-directory.patch             \
   %D%/packages/patches/kmscon-runtime-keymap-switch.patch      \
-  %D%/packages/patches/knot-include-system-lmdb-header.patch   \
   %D%/packages/patches/kpackage-allow-external-paths.patch     \
   %D%/packages/patches/kobodeluxe-paths.patch                  \
   %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch      \
@@ -966,11 +982,6 @@ dist_patch_DATA =                                          \
   %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    \
@@ -978,16 +989,9 @@ dist_patch_DATA =                                          \
   %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/libevent-2.1-dns-tests.patch            \
-  %D%/packages/patches/libevent-2.1-skip-failing-test.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/libgpg-error-gawk-compat.patch          \
   %D%/packages/patches/libgit2-avoid-python.patch              \
   %D%/packages/patches/libgit2-mtime-0.patch                   \
   %D%/packages/patches/libgdata-fix-tests.patch                        \
@@ -1030,7 +1034,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/lierolibre-newer-libconfig.patch                \
   %D%/packages/patches/lierolibre-remove-arch-warning.patch    \
   %D%/packages/patches/lierolibre-try-building-other-arch.patch        \
-  %D%/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch      \
+  %D%/packages/patches/linkchecker-tests-require-network.patch \
   %D%/packages/patches/linux-pam-no-setfsuid.patch             \
   %D%/packages/patches/lirc-localstatedir.patch                        \
   %D%/packages/patches/lirc-reproducible-build.patch           \
@@ -1060,6 +1064,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                \
@@ -1076,6 +1081,8 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/mozjs38-tracelogger.patch               \
   %D%/packages/patches/mozjs38-version-detection.patch         \
   %D%/packages/patches/mrrescue-support-love-11.patch          \
+  %D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \
+  %D%/packages/patches/mtools-mformat-uninitialized.patch      \
   %D%/packages/patches/mumble-1.2.19-abs.patch                 \
   %D%/packages/patches/mumps-build-parallelism.patch           \
   %D%/packages/patches/mupen64plus-ui-console-notice.patch     \
@@ -1105,6 +1112,11 @@ dist_patch_DATA =                                                \
   %D%/packages/patches/ocaml-CVE-2015-8869.patch               \
   %D%/packages/patches/ocaml-Add-a-.file-directive.patch       \
   %D%/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch     \
+  %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch   \
+  %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch    \
+  %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch   \
+  %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch   \
+  %D%/packages/patches/ocaml-piqilib-Update-base64.patch       \
   %D%/packages/patches/omake-fix-non-determinism.patch \
   %D%/packages/patches/ola-readdir-r.patch                     \
   %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch      \
@@ -1114,7 +1126,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/openjdk-10-idlj-reproducibility.patch   \
   %D%/packages/patches/openocd-nrf52.patch                     \
   %D%/packages/patches/opensmtpd-fix-crash.patch               \
-  %D%/packages/patches/openssh-CVE-2018-20685.patch            \
   %D%/packages/patches/openssl-runpath.patch                   \
   %D%/packages/patches/openssl-1.1-c-rehash-in.patch           \
   %D%/packages/patches/openssl-c-rehash-in.patch               \
@@ -1158,7 +1169,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/plink-endian-detection.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       \
@@ -1178,8 +1188,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           \
@@ -1192,10 +1200,10 @@ 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      \
+  %D%/packages/patches/python-pyfakefs-remove-bad-test.patch   \
   %D%/packages/patches/python-flint-includes.patch             \
   %D%/packages/patches/python-mox3-python3.6-compat.patch      \
   %D%/packages/patches/python-testtools.patch                  \
@@ -1203,6 +1211,7 @@ dist_patch_DATA =                                         \
   %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/python2-subprocess32-disable-input-test.patch   \
   %D%/packages/patches/python-unittest2-python3-compat.patch   \
   %D%/packages/patches/python-unittest2-remove-argparse.patch  \
@@ -1216,9 +1225,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch       \
-  %D%/packages/patches/quilt-test-fix-regex.patch              \
-  %D%/packages/patches/quilt-getopt-nondigit-param.patch       \
-  %D%/packages/patches/quilt-getopt-second-separator.patch     \
   %D%/packages/patches/qtwebkit-pbutils-include.patch          \
   %D%/packages/patches/randomjungle-disable-static-build.patch \
   %D%/packages/patches/rapicorn-isnan.patch                    \
@@ -1253,6 +1259,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                \
@@ -1262,37 +1269,36 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/slim-sigusr1.patch                      \
   %D%/packages/patches/slim-reset.patch                                \
   %D%/packages/patches/slim-login.patch                                \
+  %D%/packages/patches/slim-display.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/sssd-curl-compat.patch                  \
   %D%/packages/patches/steghide-fixes.patch                    \
   %D%/packages/patches/streamlink-update-test.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          \
+  %D%/packages/patches/supertux-fix-build-with-gcc5.patch      \
+  %D%/packages/patches/supertux-unbundle-squirrel.patch                \
   %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/synfigstudio-fix-ui-with-gtk3.patch     \
   %D%/packages/patches/stumpwm-fix-broken-read-one-line.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 \
-  %D%/packages/patches/texlive-bin-pdftex-poppler-compat.patch \
-  %D%/packages/patches/texlive-bin-xetex-poppler-compat.patch  \
   %D%/packages/patches/telegram-purple-adjust-test.patch       \
   %D%/packages/patches/texi2html-document-encoding.patch       \
   %D%/packages/patches/texi2html-i18n.patch                    \
@@ -1305,9 +1311,12 @@ dist_patch_DATA =                                                \
   %D%/packages/patches/tk-find-library.patch                   \
   %D%/packages/patches/ttf2eot-cstddef.patch                   \
   %D%/packages/patches/ttfautohint-source-date-epoch.patch     \
+  %D%/packages/patches/totem-meson-compat.patch                        \
   %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               \
   %D%/packages/patches/unzip-CVE-2014-8141.patch               \
@@ -1325,8 +1334,8 @@ 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/valgrind-glibc-compat.patch             \
   %D%/packages/patches/vboot-utils-fix-format-load-address.patch       \
   %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch       \
   %D%/packages/patches/vboot-utils-skip-test-workbuf.patch     \
@@ -1342,6 +1351,7 @@ 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     \
@@ -1361,53 +1371,14 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
   %D%/packages/patches/xf86-video-sis-xorg-compat.patch        \
   %D%/packages/patches/xf86-video-tga-remove-mibstore.patch    \
+  %D%/packages/patches/xf86-video-voodoo-pcitag.patch          \
   %D%/packages/patches/xfce4-panel-plugins.patch               \
   %D%/packages/patches/xfce4-session-fix-xflock4.patch         \
   %D%/packages/patches/xfce4-settings-defaults.patch           \
   %D%/packages/patches/xinetd-fix-fd-leak.patch                        \
-  %D%/packages/patches/xinetd-CVE-2013-4342.patch
+  %D%/packages/patches/xinetd-CVE-2013-4342.patch              \
+  %D%/packages/patches/xorriso-no-partition-table-in-inner-efi.patch \
+  %D%/packages/patches/xorriso-no-mbr-in-inner-efi.patch
 
 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}