diff options
| author | Leo Famulari <leo@famulari.name> | 2017-04-25 14:27:03 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-04-25 14:27:03 -0400 |
| commit | 39d2d9a7abdde28830c39c1128986cad539c081d (patch) | |
| tree | 980846ee567066b80e259e35bd1f39c388db583c /gnu/local.mk | |
| parent | 803067939718be1c17a40fa33a75eb65a3cece2f (diff) | |
| parent | 31c374e0816fc183e177d93257f90b3c02d517af (diff) | |
| download | guix-39d2d9a7abdde28830c39c1128986cad539c081d.tar guix-39d2d9a7abdde28830c39c1128986cad539c081d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index b374a641f0..7220c432a2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -691,6 +691,8 @@ dist_patch_DATA = \ %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 \ @@ -997,6 +999,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 \ |