gnu: abiword: Update to 3.0.2.
[jackhill/guix/guix.git] / gnu / local.mk
index 65be56a..97c291d 100644 (file)
@@ -11,7 +11,9 @@
 # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 # Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
 # Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 # Copyright © 2017 Clément Lassieur <clement@lassieur.org>
+# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -43,6 +45,7 @@ GNU_SYSTEM_MODULES =                          \
   %D%/packages/adns.scm                                \
   %D%/packages/algebra.scm                     \
   %D%/packages/aidc.scm                                \
+  %D%/packages/android.scm                     \
   %D%/packages/animation.scm                   \
   %D%/packages/anthy.scm                       \
   %D%/packages/apl.scm                         \
@@ -51,7 +54,6 @@ GNU_SYSTEM_MODULES =                          \
   %D%/packages/assembly.scm                    \
   %D%/packages/astronomy.scm                   \
   %D%/packages/attr.scm                                \
-  %D%/packages/audacity.scm                    \
   %D%/packages/audio.scm                       \
   %D%/packages/augeas.scm                      \
   %D%/packages/autogen.scm                     \
@@ -69,6 +71,7 @@ GNU_SYSTEM_MODULES =                          \
   %D%/packages/boost.scm                       \
   %D%/packages/bootloaders.scm                 \
   %D%/packages/bootstrap.scm                   \
+  %D%/packages/build-tools.scm                 \
   %D%/packages/busybox.scm                     \
   %D%/packages/c.scm                           \
   %D%/packages/calcurse.scm                    \
@@ -104,7 +107,6 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/dejagnu.scm                     \
   %D%/packages/dico.scm                                \
   %D%/packages/dictionaries.scm                        \
-  %D%/packages/dillo.scm                       \
   %D%/packages/disk.scm                                \
   %D%/packages/display-managers.scm            \
   %D%/packages/django.scm                      \
@@ -130,6 +132,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/fcitx.scm                       \
   %D%/packages/figlet.scm                      \
   %D%/packages/file.scm                                \
+  %D%/packages/file-systems.scm                        \
   %D%/packages/finance.scm                     \
   %D%/packages/firmware.scm                    \
   %D%/packages/flashing-tools.scm              \
@@ -253,6 +256,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/maths.scm                       \
   %D%/packages/mc.scm                          \
   %D%/packages/mcrypt.scm                      \
+  %D%/packages/mes.scm                         \
   %D%/packages/messaging.scm                   \
   %D%/packages/mingw.scm                       \
   %D%/packages/mg.scm                          \
@@ -340,6 +344,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/sdl.scm                         \
   %D%/packages/search.scm                      \
   %D%/packages/security-token.scm              \
+  %D%/packages/selinux.scm                     \
   %D%/packages/serialization.scm               \
   %D%/packages/serveez.scm                     \
   %D%/packages/shells.scm                      \
@@ -354,6 +359,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/ssh.scm                         \
   %D%/packages/stalonetray.scm                 \
   %D%/packages/statistics.scm                  \
+  %D%/packages/storage.scm                     \
   %D%/packages/suckless.scm                    \
   %D%/packages/swig.scm                                \
   %D%/packages/sync.scm                        \
@@ -386,6 +392,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/w3m.scm                         \
   %D%/packages/wdiff.scm                       \
   %D%/packages/web.scm                         \
+  %D%/packages/web-browsers.scm                        \
   %D%/packages/webkit.scm                      \
   %D%/packages/wget.scm                                \
   %D%/packages/wicd.scm                                \
@@ -424,6 +431,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/services/nfs.scm                 \
   %D%/services/shepherd.scm                    \
   %D%/services/herd.scm                                \
+  %D%/services/pm.scm                          \
   %D%/services/sddm.scm                                \
   %D%/services/spice.scm                               \
   %D%/services/ssh.scm                         \
@@ -455,18 +463,22 @@ GNU_SYSTEM_MODULES =                              \
   %D%/build/linux-modules.scm                  \
   %D%/build/marionette.scm                     \
   %D%/build/shepherd.scm                       \
-  %D%/build/svg.scm                            \
   %D%/build/vm.scm                             \
                                                \
   %D%/tests.scm                                        \
   %D%/tests/base.scm                           \
+  %D%/tests/dict.scm                           \
   %D%/tests/nfs.scm                            \
   %D%/tests/install.scm                                \
   %D%/tests/mail.scm                           \
   %D%/tests/messaging.scm                      \
+  %D%/tests/networking.scm                     \
   %D%/tests/ssh.scm                            \
   %D%/tests/web.scm
 
+# Modules that do not need to be compiled.
+MODULES_NOT_COMPILED +=                                \
+  %D%/build/svg.scm
 
 patchdir = $(guilemoduledir)/%D%/packages/patches
 dist_patch_DATA =                                              \
@@ -475,6 +487,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/a2ps-CVE-2014-0466.patch        \
   %D%/packages/patches/abiword-explictly-cast-bools.patch      \
   %D%/packages/patches/abiword-wmf-version-lookup-fix.patch    \
+  %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \
   %D%/packages/patches/acl-hurd-path-max.patch                 \
   %D%/packages/patches/aegis-constness-error.patch             \
   %D%/packages/patches/aegis-perl-tempdir1.patch               \
@@ -488,7 +501,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/ath9k-htc-firmware-binutils.patch       \
   %D%/packages/patches/ath9k-htc-firmware-gcc.patch            \
   %D%/packages/patches/ath9k-htc-firmware-objcopy.patch                \
-  %D%/packages/patches/audacity-fix-ffmpeg-binding.patch       \
   %D%/packages/patches/automake-skip-amhello-tests.patch       \
   %D%/packages/patches/automake-regexp-syntax.patch            \
   %D%/packages/patches/automake-test-gzip-warning.patch                \
@@ -506,7 +518,11 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/calibre-drop-unrar.patch                        \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
   %D%/packages/patches/cdparanoia-fpic.patch                   \
-  %D%/packages/patches/chicken-CVE-2016-6830+CVE-2016-6831.patch       \
+  %D%/packages/patches/ceph-disable-cpu-optimizations.patch    \
+  %D%/packages/patches/ceph-disable-unittest-throttle.patch    \
+  %D%/packages/patches/ceph-skip-collect-sys-info-test.patch   \
+  %D%/packages/patches/ceph-skip-unittest_blockdev.patch       \
+  %D%/packages/patches/chicken-CVE-2017-6949.patch             \
   %D%/packages/patches/chmlib-inttypes.patch                   \
   %D%/packages/patches/clang-libc-search-path.patch            \
   %D%/packages/patches/clang-3.8-libc-search-path.patch                \
@@ -514,6 +530,11 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/clx-remove-demo.patch                   \
   %D%/packages/patches/cmake-fix-tests.patch                   \
   %D%/packages/patches/coda-use-system-libs.patch              \
+  %D%/packages/patches/cool-retro-term-dont-check-uninit-member.patch  \
+  %D%/packages/patches/cool-retro-term-fix-array-size.patch    \
+  %D%/packages/patches/cool-retro-term-memory-leak-1.patch     \
+  %D%/packages/patches/cool-retro-term-remove-non-free-fonts.patch     \
+  %D%/packages/patches/coreutils-cut-huge-range-test.patch     \
   %D%/packages/patches/coreutils-fix-cross-compilation.patch    \
   %D%/packages/patches/cpio-CVE-2016-2037.patch                        \
   %D%/packages/patches/cpufrequtils-fix-aclocal.patch          \
@@ -526,8 +547,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/cursynth-wave-rand.patch                        \
   %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch          \
   %D%/packages/patches/dbus-helper-search-path.patch           \
-  %D%/packages/patches/devil-CVE-2009-3994.patch               \
-  %D%/packages/patches/devil-fix-libpng.patch                  \
   %D%/packages/patches/dfu-programmer-fix-libusb.patch         \
   %D%/packages/patches/diffutils-gets-undeclared.patch         \
   %D%/packages/patches/doc++-include-directives.patch          \
@@ -544,6 +563,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/eudev-conflicting-declaration.patch     \
   %D%/packages/patches/evilwm-lost-focus-bug.patch             \
   %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch        \
+  %D%/packages/patches/fabric-tests.patch                      \
   %D%/packages/patches/fastcap-mulGlobal.patch                 \
   %D%/packages/patches/fastcap-mulSetup.patch                  \
   %D%/packages/patches/fasthenry-spAllocate.patch              \
@@ -563,11 +583,14 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/fontforge-svg-modtime.patch             \
   %D%/packages/patches/freeimage-CVE-2015-0852.patch           \
   %D%/packages/patches/freeimage-CVE-2016-5684.patch           \
+  %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch    \
+  %D%/packages/patches/freetype-CVE-2017-8105.patch            \
+  %D%/packages/patches/freetype-CVE-2017-8287.patch            \
+  %D%/packages/patches/fuse-overlapping-headers.patch                          \
   %D%/packages/patches/gawk-shell.patch                                \
   %D%/packages/patches/gcc-arm-bug-71399.patch                 \
   %D%/packages/patches/gcc-arm-link-spec-fix.patch             \
   %D%/packages/patches/gcc-cross-environment-variables.patch   \
-  %D%/packages/patches/gcc-libiberty-printf-decl.patch         \
   %D%/packages/patches/gcc-libvtv-runpath.patch                        \
   %D%/packages/patches/gcc-strmov-store-file-names.patch       \
   %D%/packages/patches/gcc-4.9.3-mingw-gthr-default.patch      \
@@ -591,30 +614,32 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ghostscript-CVE-2016-7978.patch         \
   %D%/packages/patches/ghostscript-CVE-2016-7979.patch         \
   %D%/packages/patches/ghostscript-CVE-2016-8602.patch         \
+  %D%/packages/patches/ghostscript-CVE-2017-8291.patch         \
   %D%/packages/patches/ghostscript-runpath.patch               \
   %D%/packages/patches/glib-networking-ssl-cert-file.patch     \
   %D%/packages/patches/glib-tests-timer.patch                  \
   %D%/packages/patches/glibc-bootstrap-system.patch            \
   %D%/packages/patches/glibc-ldd-x86_64.patch                  \
   %D%/packages/patches/glibc-locales.patch                     \
+  %D%/packages/patches/glibc-memchr-overflow-i686.patch                \
   %D%/packages/patches/glibc-o-largefile.patch                 \
   %D%/packages/patches/glibc-versioned-locpath.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-tweak-tool-search-paths.patch     \
   %D%/packages/patches/gnucash-price-quotes-perl.patch         \
-  %D%/packages/patches/gnupg-2.1-fix-Y2038-test-failure.patch  \
   %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   %D%/packages/patches/gobject-introspection-cc.patch          \
   %D%/packages/patches/gobject-introspection-girepository.patch        \
+  %D%/packages/patches/graphite2-CVE-2017-5436.patch           \
+  %D%/packages/patches/graphite2-check-code-point-limit.patch  \
   %D%/packages/patches/graphite2-ffloat-store.patch            \
+  %D%/packages/patches/graphite2-fix-32-bit-wrap-arounds.patch \
+  %D%/packages/patches/graphite2-non-linear-classes-even-number.patch \
   %D%/packages/patches/grep-timing-sensitive-test.patch                \
-  %D%/packages/patches/grub-CVE-2015-8370.patch                        \
-  %D%/packages/patches/grub-gets-undeclared.patch              \
-  %D%/packages/patches/grub-freetype.patch                     \
   %D%/packages/patches/gsl-test-i686.patch                     \
   %D%/packages/patches/guile-1.8-cpp-4.5.patch                 \
-  %D%/packages/patches/guile-arm-fixes.patch                   \
   %D%/packages/patches/guile-default-utf8.patch                        \
   %D%/packages/patches/guile-linux-syscalls.patch              \
   %D%/packages/patches/guile-present-coding.patch              \
@@ -641,22 +666,25 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/higan-remove-march-native-flag.patch    \
   %D%/packages/patches/hop-linker-flags.patch                  \
   %D%/packages/patches/hubbub-sort-entities.patch              \
+  %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
   %D%/packages/patches/hydra-disable-darcs-test.patch          \
-  %D%/packages/patches/hypre-doc-tables.patch                  \
-  %D%/packages/patches/hypre-ldflags.patch                     \
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch    \
-  %D%/packages/patches/icecat-binutils.patch                   \
-  %D%/packages/patches/icu4c-CVE-2014-6585.patch               \
-  %D%/packages/patches/icu4c-CVE-2015-1270.patch               \
-  %D%/packages/patches/icu4c-CVE-2015-4760.patch               \
+  %D%/packages/patches/icecat-bug-1299500-pt10.patch           \
+  %D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
+  %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch                      \
   %D%/packages/patches/ilmbase-fix-tests.patch                 \
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch        \
+  %D%/packages/patches/jasper-CVE-2017-6850.patch              \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
+  %D%/packages/patches/jbig2dec-CVE-2016-9601.patch            \
   %D%/packages/patches/jq-CVE-2015-8863.patch                  \
   %D%/packages/patches/kdbusaddons-kinit-file-name.patch       \
   %D%/packages/patches/khmer-use-libraries.patch                \
-  %D%/packages/patches/kio-CVE-2017-6410.patch                 \
+  %D%/packages/patches/kiki-level-selection-crash.patch                \
+  %D%/packages/patches/kiki-makefile.patch                     \
+  %D%/packages/patches/kiki-missing-includes.patch             \
+  %D%/packages/patches/kiki-portability-64bit.patch            \
   %D%/packages/patches/kmod-module-directory.patch             \
   %D%/packages/patches/kobodeluxe-paths.patch                  \
   %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch      \
@@ -673,9 +701,14 @@ 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/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/libetonyek-build-with-mdds-1.2.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       \
@@ -684,6 +717,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libevent-2.1-dns-tests.patch            \
   %D%/packages/patches/libevent-2.1-skip-failing-test.patch    \
   %D%/packages/patches/libextractor-ffmpeg-3.patch             \
+  %D%/packages/patches/libgit2-use-after-free.patch            \
   %D%/packages/patches/libjxr-fix-function-signature.patch     \
   %D%/packages/patches/libjxr-fix-typos.patch                  \
   %D%/packages/patches/liboop-mips64-deplibs-fix.patch         \
@@ -693,6 +727,9 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libmad-armv7-thumb-pt2.patch            \
   %D%/packages/patches/libmad-frame-length.patch               \
   %D%/packages/patches/libmad-mips-newgcc.patch                        \
+  %D%/packages/patches/libsndfile-armhf-type-checks.patch      \
+  %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch        \
+  %D%/packages/patches/libsndfile-CVE-2017-8362.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            \
@@ -712,6 +749,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libtiff-invalid-read.patch              \
   %D%/packages/patches/libtiff-null-dereference.patch          \
   %D%/packages/patches/libtiff-tiffcp-underflow.patch          \
+  %D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \
   %D%/packages/patches/libtool-skip-tests2.patch               \
   %D%/packages/patches/libunwind-CVE-2015-3239.patch           \
   %D%/packages/patches/libvpx-CVE-2016-2818.patch              \
@@ -735,6 +773,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libxt-guix-search-paths.patch           \
   %D%/packages/patches/linux-pam-no-setfsuid.patch             \
   %D%/packages/patches/lirc-localstatedir.patch                        \
+  %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/lua-CVE-2014-5461.patch                      \
@@ -745,7 +784,10 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/luajit-no_ldconfig.patch                        \
   %D%/packages/patches/luajit-symlinks.patch                   \
   %D%/packages/patches/luit-posix.patch                                \
+  %D%/packages/patches/luminance-hdr-qt-printer.patch          \
   %D%/packages/patches/lvm2-static-link.patch                  \
+  %D%/packages/patches/lxsession-use-gapplication.patch         \
+  %D%/packages/patches/lz4-fix-test-failures.patch             \
   %D%/packages/patches/make-impure-dirs.patch                  \
   %D%/packages/patches/mars-install.patch                      \
   %D%/packages/patches/mars-sfml-2.3.patch                     \
@@ -754,20 +796,19 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/mcrypt-CVE-2012-4409.patch                      \
   %D%/packages/patches/mcrypt-CVE-2012-4426.patch                      \
   %D%/packages/patches/mcrypt-CVE-2012-4527.patch                      \
+  %D%/packages/patches/mesa-fix-32bit-test-failures.patch      \
+  %D%/packages/patches/mesa-skip-disk-cache-test.patch         \
   %D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch       \
   %D%/packages/patches/metabat-remove-compilation-date.patch   \
   %D%/packages/patches/mhash-keygen-test-segfault.patch                \
   %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch                \
   %D%/packages/patches/mpc123-initialize-ao.patch              \
-  %D%/packages/patches/mplayer2-theora-fix.patch               \
   %D%/packages/patches/module-init-tools-moduledir.patch       \
+  %D%/packages/patches/mozjs17-aarch64-support.patch           \
+  %D%/packages/patches/mozjs24-aarch64-support.patch           \
   %D%/packages/patches/multiqc-fix-git-subprocess-error.patch  \
   %D%/packages/patches/mumps-build-parallelism.patch           \
   %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch     \
-  %D%/packages/patches/mupdf-mujs-CVE-2016-10132.patch         \
-  %D%/packages/patches/mupdf-mujs-CVE-2016-10133.patch         \
-  %D%/packages/patches/mupdf-CVE-2017-5896.patch               \
-  %D%/packages/patches/mupdf-CVE-2017-5991.patch               \
   %D%/packages/patches/mupen64plus-ui-console-notice.patch     \
   %D%/packages/patches/musl-CVE-2016-8859.patch                        \
   %D%/packages/patches/mutt-store-references.patch             \
@@ -777,10 +818,12 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/netsurf-system-utf8proc.patch           \
   %D%/packages/patches/netsurf-y2038-tests.patch               \
   %D%/packages/patches/netsurf-longer-test-timeout.patch       \
+  %D%/packages/patches/networkmanager-qt-activeconnection-test-1.patch \
+  %D%/packages/patches/networkmanager-qt-activeconnection-test-2.patch \
   %D%/packages/patches/ngircd-handle-zombies.patch             \
-  %D%/packages/patches/ngircd-no-dns-in-tests.patch            \
   %D%/packages/patches/ninja-zero-mtime.patch                  \
   %D%/packages/patches/node-9077.patch                         \
+  %D%/packages/patches/nss-disable-long-b64-tests.patch                \
   %D%/packages/patches/nss-increase-test-timeout.patch         \
   %D%/packages/patches/nss-pkgconfig.patch                     \
   %D%/packages/patches/ntfs-3g-CVE-2017-0358.patch             \
@@ -805,11 +848,12 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ots-no-include-missing-file.patch       \
   %D%/packages/patches/p7zip-CVE-2016-9296.patch                       \
   %D%/packages/patches/p7zip-remove-unused-code.patch          \
-  %D%/packages/patches/password-store-gnupg-compat.patch       \
   %D%/packages/patches/patchelf-page-size.patch                        \
   %D%/packages/patches/patchelf-rework-for-arm.patch           \
   %D%/packages/patches/patchutils-xfail-gendiff-tests.patch    \
   %D%/packages/patches/patch-hurd-path-max.patch               \
+  %D%/packages/patches/pcre-CVE-2017-7186.patch                        \
+  %D%/packages/patches/pcre2-CVE-2017-7186.patch               \
   %D%/packages/patches/perl-autosplit-default-time.patch       \
   %D%/packages/patches/perl-deterministic-ordering.patch       \
   %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
@@ -834,6 +878,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/plink-endian-detection.patch            \
   %D%/packages/patches/plotutils-libpng-jmpbuf.patch           \
   %D%/packages/patches/polkit-drop-test.patch                  \
+  %D%/packages/patches/policycoreutils-make-sepolicy-use-python3.patch \
   %D%/packages/patches/portaudio-audacity-compat.patch         \
   %D%/packages/patches/portmidi-modular-build.patch            \
   %D%/packages/patches/procmail-ambiguous-getline-debian.patch  \
@@ -862,34 +907,24 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   %D%/packages/patches/python-statsmodels-fix-tests.patch      \
   %D%/packages/patches/python-configobj-setuptools.patch       \
+  %D%/packages/patches/python-cython-fix-tests-32bit.patch     \
   %D%/packages/patches/python-fake-factory-fix-build-32bit.patch       \
   %D%/packages/patches/python-faker-fix-build-32bit.patch      \
   %D%/packages/patches/python-pandas-skip-failing-tests.patch  \
   %D%/packages/patches/python-paste-remove-website-test.patch  \
   %D%/packages/patches/python-paste-remove-timing-test.patch   \
+  %D%/packages/patches/python-pillow-freetype-2.7-test-failure.patch   \
   %D%/packages/patches/python-pygit2-disable-network-tests.patch       \
   %D%/packages/patches/python-pyopenssl-skip-network-test.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/python2-subprocess32-disable-input-test.patch   \
-  %D%/packages/patches/qemu-CVE-2016-10155.patch                       \
-  %D%/packages/patches/qemu-CVE-2017-2615.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-2620.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-2630.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-5525.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-5526.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-5552.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-5578.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-5579.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-5667.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-5856.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-5898.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-5931.patch                        \
   %D%/packages/patches/qt4-ldflags.patch                       \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch       \
   %D%/packages/patches/rapicorn-isnan.patch                    \
   %D%/packages/patches/ratpoison-shell.patch                   \
+  %D%/packages/patches/rcs-5.9.4-noreturn.patch                        \
   %D%/packages/patches/readline-link-ncurses.patch             \
   %D%/packages/patches/readline-6.2-CVE-2014-2524.patch                \
   %D%/packages/patches/readline-7.0-mingw.patch                        \
@@ -897,15 +932,15 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/rpm-CVE-2014-8118.patch                 \
   %D%/packages/patches/rsem-makefile.patch                     \
   %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch        \
+  %D%/packages/patches/ruby-concurrent-test-arm.patch          \
   %D%/packages/patches/ruby-puma-ignore-broken-test.patch       \
   %D%/packages/patches/ruby-rack-ignore-failing-test.patch      \
   %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
   %D%/packages/patches/scheme48-tests.patch                    \
   %D%/packages/patches/scotch-test-threading.patch             \
+  %D%/packages/patches/screen-fix-info-syntax-error.patch      \
   %D%/packages/patches/sdl-libx11-1.6.patch                    \
   %D%/packages/patches/seq24-rename-mutex.patch                        \
-  %D%/packages/patches/serf-comment-style-fix.patch            \
-  %D%/packages/patches/serf-deflate-buckets-test-fix.patch     \
   %D%/packages/patches/shadow-4.4-su-snprintf-fix.patch         \
   %D%/packages/patches/shadow-CVE-2017-2616.patch              \
   %D%/packages/patches/slim-session.patch                      \
@@ -914,7 +949,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/slim-reset.patch                                \
   %D%/packages/patches/slim-login.patch                                \
   %D%/packages/patches/slurm-configure-remove-nonfree-contribs.patch \
-  %D%/packages/patches/soprano-find-clucene.patch              \
   %D%/packages/patches/spice-CVE-2016-9577.patch               \
   %D%/packages/patches/spice-CVE-2016-9578-1.patch             \
   %D%/packages/patches/spice-CVE-2016-9578-2.patch             \
@@ -933,9 +967,11 @@ dist_patch_DATA =                                          \
   %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/texlive-texmf-CVE-2016-10243.patch      \
   %D%/packages/patches/texi2html-document-encoding.patch       \
   %D%/packages/patches/texi2html-i18n.patch                    \
+  %D%/packages/patches/thefuck-test-environ.patch              \
   %D%/packages/patches/tidy-CVE-2015-5522+5523.patch           \
   %D%/packages/patches/tinyxml-use-stl.patch                   \
   %D%/packages/patches/tipp10-fix-compiling.patch              \
@@ -959,11 +995,10 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/unzip-initialize-symlink-flag.patch     \
   %D%/packages/patches/unzip-overflow-long-fsize.patch         \
   %D%/packages/patches/unzip-remove-build-date.patch           \
+  %D%/packages/patches/ustr-fix-build-with-gcc-5.patch         \
   %D%/packages/patches/util-linux-tests.patch                  \
-  %D%/packages/patches/util-linux-CVE-2017-2616.patch          \
   %D%/packages/patches/upower-builddir.patch                   \
   %D%/packages/patches/valgrind-enable-arm.patch               \
-  %D%/packages/patches/vim-CVE-2017-5953.patch                 \
   %D%/packages/patches/virglrenderer-CVE-2017-6386.patch       \
   %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch          \
   %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch                \
@@ -979,6 +1014,7 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/wicd-urwid-1.3.patch                    \
   %D%/packages/patches/wicd-wpa2-ttls.patch                    \
   %D%/packages/patches/wmctrl-64-fix.patch                     \
+  %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch        \
   %D%/packages/patches/woff2-libbrotli.patch                   \
   %D%/packages/patches/wordnet-CVE-2008-2149.patch                     \
   %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch                 \
@@ -992,8 +1028,6 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/xf86-video-ast-remove-mibstore.patch    \
   %D%/packages/patches/xf86-video-geode-glibc-2.20.patch       \
   %D%/packages/patches/xf86-video-i128-remove-mibstore.patch   \
-  %D%/packages/patches/xf86-video-intel-compat-api.patch       \
-  %D%/packages/patches/xf86-video-intel-glibc-2.20.patch       \
   %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch      \
   %D%/packages/patches/xf86-video-tga-remove-mibstore.patch    \
   %D%/packages/patches/xfce4-panel-plugins.patch               \
@@ -1063,13 +1097,15 @@ nodist_bootstrap_mips64el_linux_DATA =                                  \
 set-bootstrap-executable-permissions:
        chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
 
-DISTCLEANFILES =                               \
+BOOTSTRAP_GUILE_TARBALLS =                     \
   $(nodist_bootstrap_x86_64_linux_DATA)                \
   $(nodist_bootstrap_i686_linux_DATA)          \
   $(nodist_bootstrap_armhf_linux_DATA)         \
-  $(nodist_bootstrap_aarch64_linux_DATA)               \
+  $(nodist_bootstrap_aarch64_linux_DATA)       \
   $(nodist_bootstrap_mips64el_linux_DATA)
 
+DISTCLEANFILES = $(BOOTSTRAP_GUILE_TARBALLS)
+
 # Method to download a file from an external source.
 DOWNLOAD_FILE =                                                                \
   GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH"        \