diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 15:35:51 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 15:35:51 +0100 |
| commit | 0a83339bb1429332ee889e9a976aa214ae2ac0db (patch) | |
| tree | 9c3d2bcbdba2c670a5f8f98d3557f0444c357327 /gnu/local.mk | |
| parent | 20fe3cd761c286a27236d8fced4152a0ccdc547d (diff) | |
| parent | 75385105348066201ef898b934917eeb6ceab87a (diff) | |
| download | guix-0a83339bb1429332ee889e9a976aa214ae2ac0db.tar guix-0a83339bb1429332ee889e9a976aa214ae2ac0db.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 98b7395598..125118bc55 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1243,7 +1243,6 @@ dist_patch_DATA = \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openocd-nrf52.patch \ - %D%/packages/patches/opensmtpd-fix-crash.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ @@ -1257,6 +1256,12 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/pam-mount-luks2-support.patch \ + %D%/packages/patches/sdl-pango-api_additions.patch \ + %D%/packages/patches/sdl-pango-blit_overflow.patch \ + %D%/packages/patches/sdl-pango-fillrect_crash.patch \ + %D%/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapToSurface.patch \ + %D%/packages/patches/sdl-pango-matrix_declarations.patch \ + %D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ @@ -1403,7 +1408,6 @@ dist_patch_DATA = \ %D%/packages/patches/spice-fix-test-armhf.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ - %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/supertux-unbundle-squirrel.patch \ %D%/packages/patches/swig-guile-gc.patch \ @@ -1416,6 +1420,7 @@ dist_patch_DATA = \ %D%/packages/patches/t1lib-CVE-2010-2642.patch \ %D%/packages/patches/t1lib-CVE-2011-0764.patch \ %D%/packages/patches/t1lib-CVE-2011-1552+.patch \ + %D%/packages/patches/t4k-common-libpng16.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \ %D%/packages/patches/tcc-boot-0.9.27.patch \ @@ -1440,6 +1445,7 @@ dist_patch_DATA = \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/txr-shell.patch \ + %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ |