diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
| download | guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch')
| -rw-r--r-- | gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch b/gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch new file mode 100644 index 0000000000..bd7b01f856 --- /dev/null +++ b/gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch @@ -0,0 +1,24 @@ +From 0ae15d7e89b984f72780ff7afa8e57dd6ae7765a Mon Sep 17 00:00:00 2001 +From: "Boris A. Dekshteyn" <boris.dekshteyn@gmail.com> +Date: Mon, 14 Jun 2021 23:52:16 +1200 +Subject: [PATCH] Fix build witch GCC@7.5. + +--- + src/object/sp-use-reference.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/object/sp-use-reference.h b/src/object/sp-use-reference.h +index 5958632059..f07c2a3721 100644 +--- a/src/object/sp-use-reference.h ++++ b/src/object/sp-use-reference.h +@@ -14,6 +14,7 @@ + + #include "sp-item.h" + #include "uri-references.h" ++#include "display/curve.h" + + #include <memory> + +-- +2.32.0 + |