diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-09 07:46:25 +0100 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-09 07:46:25 +0100 |
commit | 058532bdd8953feefbd84fd7514822886c7f1a7e (patch) | |
tree | dd29b23b04df1e30a03b93d53a339f6fcd817285 /gnu/local.mk | |
parent | 19fc252ab7e86ad1443a8d16f68467c61bf23179 (diff) | |
parent | 1bc05c6f6d56ad9e0e31d7f1cc75545a65e3d0f3 (diff) | |
download | guix-058532bdd8953feefbd84fd7514822886c7f1a7e.tar.gz |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index c4ee25875f..57f0c12820 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1444,7 +1444,6 @@ dist_patch_DATA = \ %D%/packages/patches/http-parser-CVE-2020-8287.patch \ %D%/packages/patches/htslib-for-stringtie.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ - %D%/packages/patches/hubbub-maybe-uninitialized.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ %D%/packages/patches/hurd-add-without-rump-configure-option.patch \ %D%/packages/patches/hurd-fix-rumpdisk-build.patch \ @@ -1514,6 +1513,7 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \ + %D%/packages/patches/libcss-check-format.patch \ %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch \ @@ -1610,8 +1610,6 @@ dist_patch_DATA = \ %D%/packages/patches/libtiff-CVE-2022-34526.patch \ %D%/packages/patches/libtirpc-CVE-2021-46828.patch \ %D%/packages/patches/libtirpc-hurd.patch \ - %D%/packages/patches/libtommath-fix-linkage.patch \ - %D%/packages/patches/libtommath-integer-overflow.patch \ %D%/packages/patches/libtool-grep-compat.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libtree-fix-check-non-x86.patch \ @@ -1792,6 +1790,7 @@ dist_patch_DATA = \ %D%/packages/patches/plasp-fix-normalization.patch \ %D%/packages/patches/plasp-include-iostream.patch \ %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \ + %D%/packages/patches/podman-program-lookup.patch \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ @@ -1822,11 +1821,6 @@ dist_patch_DATA = \ %D%/packages/patches/quodlibet-fix-invalid-glob.patch \ %D%/packages/patches/quodlibet-fix-mtime-tests.patch \ %D%/packages/patches/qxlsx-fix-include-directory.patch \ - %D%/packages/patches/scribus-1.5.8-poppler-22.03.0.patch \ - %D%/packages/patches/scribus-1.5.8-poppler-22.04.0.patch \ - %D%/packages/patches/scribus-1.5.8-poppler-22.09.0.patch \ - %D%/packages/patches/scribus-1.5.8-poppler-22.2.0-1.patch \ - %D%/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch \ %D%/packages/patches/sdcc-disable-non-free-code.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-blit_overflow.patch \ @@ -1834,6 +1828,7 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-pango-header-guard.patch \ %D%/packages/patches/sdl-pango-matrix_declarations.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \ + %D%/packages/patches/sioyek-fix-build.patch \ %D%/packages/patches/smalltalk-multiplication-overflow.patch \ %D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/strace-readlink-tests.patch \ @@ -2020,6 +2015,7 @@ dist_patch_DATA = \ %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch \ %D%/packages/patches/s7-flint-3.patch \ %D%/packages/patches/sajson-for-gemmi-numbers-as-strings.patch \ + %D%/packages/patches/sajson-build-with-gcc10.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \ |