diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-20 14:13:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-20 14:13:05 +0100 |
| commit | dc7e07c9b9780883a462c5973cd2ecad06fdb4ae (patch) | |
| tree | 14d185abfdd092a470e72ea27a3dad879145fb76 /gnu/local.mk | |
| parent | 616446ffbf9af9e8e5df0ef40c4e33dba9e25152 (diff) | |
| parent | dbc75dadb54dd0e6b3a125949c26aadfa3bff4ca (diff) | |
| download | gnu-guix-dc7e07c9b9780883a462c5973cd2ecad06fdb4ae.tar gnu-guix-dc7e07c9b9780883a462c5973cd2ecad06fdb4ae.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 490f07b9de..686595cd58 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -700,6 +700,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/ghostscript-runpath.patch \ + %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/gimp-CVE-2017-17784.patch \ %D%/packages/patches/gimp-CVE-2017-17785.patch \ %D%/packages/patches/gimp-CVE-2017-17786.patch \ @@ -728,6 +729,7 @@ dist_patch_DATA = \ %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-todo-libical-compat.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ @@ -754,7 +756,6 @@ 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/gtk2-fix-failing-test.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 \ @@ -796,6 +797,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jemalloc-arm-address-bits.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ + %D%/packages/patches/json-glib-fix-tests-32bit.patch \ %D%/packages/patches/jq-CVE-2015-8863.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch \ |