From 624a6b60b5f4051ec38829e9c9d2adbc54a093f9 Mon Sep 17 00:00:00 2001 From: "Boris A. Dekshteyn" Date: Tue, 15 Jun 2021 01:27:44 +1200 Subject: gnu: inkscape: Update to version 1.1. * gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/inkscape.scm (inkscape-1.0) Rename to inkscape-1.1. * gnu/packages/inkscape.scm (inkscape-1.1) Update to version 1.1. Signed-off-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/inkscape.scm | 9 ++++---- .../inkscape-1.1-fix-build-witch-gcc7.5.patch | 24 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ac292334b5..918c8515ac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1245,6 +1245,7 @@ dist_patch_DATA = \ %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ + %D%/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/iputils-libcap-compat.patch \ diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 075f901b2d..46c8c4cc34 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -117,19 +117,20 @@ (define-public inkscape as the native format.") (license license:gpl2+))) -(define-public inkscape-1.0 +(define-public inkscape-1.1 (package (name "inkscape") - (version "1.0.2") + (version "1.1") (source (origin (method url-fetch) (uri (string-append "https://media.inkscape.org/dl/" "resources/file/" "inkscape-" version ".tar.xz")) + (patches (search-patches "inkscape-1.1-fix-build-witch-gcc7.5.patch")) (sha256 (base32 - "12krl97a00gdcxxibsb7g2lgx5458mhx2437x0hvz350242j6gns")) + "1rlm2wqg8bgdxkdvnadh49wfp0mrbrk7d8n4vdcjyw6z7z7firki")) (modules '((guix build utils) (ice-9 format))) (snippet @@ -188,7 +189,7 @@ (define-public inkscape-1.0 (string-append "#include " quote (basename source-dir))) ...)))))) - (unbundle ("2geom" "src/2geom" #t) + (unbundle ("2geom" "src/3rdparty/2geom" #t) ;; libcroco cannot be unbundled as it is heavily ;; modified (see: ;; https://gitlab.com/inkscape/inkscape/issues/876#note_276114904). 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" +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 + +-- +2.32.0 + -- cgit v1.2.3