diff options
author | Mark H Weaver <mhw@netris.org> | 2018-05-28 20:45:37 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-05-28 20:45:37 -0400 |
commit | 82b695b834f88c5561de40e68f3fe7aa24d3b796 (patch) | |
tree | 41743fff1013584ee4a50852a94cff01c3cc3d1c /gnu/local.mk | |
parent | fe365a3d0e4df7445bf16d3bb422a0bc6bb68ceb (diff) | |
parent | ee3c8fbee21299ce105bafca7dc63bfb096cd7c5 (diff) | |
download | patches-82b695b834f88c5561de40e68f3fe7aa24d3b796.tar patches-82b695b834f88c5561de40e68f3fe7aa24d3b796.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 6566226190..2e266af44d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -664,6 +664,8 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch \ %D%/packages/patches/fcgi-2.4.0-poll.patch \ + %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ + %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ %D%/packages/patches/file-CVE-2017-1000249.patch \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-test-xargs.patch \ @@ -865,6 +867,8 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-frame-length.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ + %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ + %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ |