diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-27 10:17:14 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-27 10:17:14 +0100 |
| commit | a557810ac72effd6841b76772195b10c03dee345 (patch) | |
| tree | 26a4d7c1684d4c6fea155bfe05aa3b305499e36f /gnu/local.mk | |
| parent | 4c1918db34e09f0da793c607acc161bdf9ec5535 (diff) | |
| parent | 2a19c0deb1da3a9afa8960367a5b84321386ceae (diff) | |
| download | patches-a557810ac72effd6841b76772195b10c03dee345.tar patches-a557810ac72effd6841b76772195b10c03dee345.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index c6ddbf4e99..683bcc5f45 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -769,7 +769,6 @@ dist_patch_DATA = \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ - %D%/packages/patches/dav1d-aarch64-symbol-alignment.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ @@ -976,6 +975,8 @@ dist_patch_DATA = \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-makeicecat.patch \ + %D%/packages/patches/icecat-default-search-ddg.patch \ + %D%/packages/patches/icecat-disable-sync.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ |