diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-10-21 18:06:02 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-10-21 18:06:02 +0200 |
commit | ffddb42d6c510456997ee6de1c1b8026c9ce6d14 (patch) | |
tree | 5be4a965bb14f3de4af9f733f802b80840aff84c /gnu/local.mk | |
parent | e381ae317c054a8ac52037c3f0df72ca3c96b91f (diff) | |
parent | 3a69b59332f02805fde2aee22b8f622c651f7007 (diff) | |
download | gnu-guix-ffddb42d6c510456997ee6de1c1b8026c9ce6d14.tar gnu-guix-ffddb42d6c510456997ee6de1c1b8026c9ce6d14.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 4b8c4c3d69..befe3c4b33 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -886,7 +886,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ - %D%/packages/patches/libgxps-CVE-2017-11590.patch \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ @@ -1150,6 +1149,7 @@ dist_patch_DATA = \ %D%/packages/patches/slim-login.patch \ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ + %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \ %D%/packages/patches/soundtouch-CVE-2018-1000223.patch \ %D%/packages/patches/steghide-fixes.patch \ |