diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-08 23:58:22 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-08 23:58:22 +0200 |
| commit | 873325b0307a709be6f305472a5bfb9e07437aaa (patch) | |
| tree | b271f28b229f983841ca7b16c4d3cc52582c864e /gnu/local.mk | |
| parent | 68ee10da03b09c2acead8891e4b51c718c24d574 (diff) | |
| parent | 6a8299d267d111da4c80bbdfc83eb5cdfc072b4a (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 47963b6918..cde94f4cf8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -800,6 +800,8 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch \ %D%/packages/patches/icecat-use-system-graphite2.patch \ %D%/packages/patches/icecat-use-system-harfbuzz.patch \ + %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/ilmbase-fix-tests.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ @@ -859,7 +861,7 @@ dist_patch_DATA = \ %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/libgit2-0.25.1-mtime-0.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 \ @@ -1225,7 +1227,9 @@ dist_patch_DATA = \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xmodmap-asprintf.patch \ %D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \ - %D%/packages/patches/zathura-plugindir-environment-variable.patch + %D%/packages/patches/zathura-plugindir-environment-variable.patch \ + %D%/packages/patches/zstd-fix-stdin-list-without-tty.patch \ + %D%/packages/patches/zstd-fix-stdin-list-test.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in |