[bug#49022] [PATCH 1/2] gnu: inkscape: Update to version 1.1.

[bug#49022] [PATCH 1/2] gnu: inkscape: Update to version 1.1.

[Boris A. Dekshteyn]

* 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.
---
 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

diff --git a/gnu/local.mk b/gnu/local.mk
index fdbf2272ed..b1c5bebfa8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1241,6 +1241,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 @@ apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard,
 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 @@ endif()~%~%"
                          (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" <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
+
-- 
2.32.0

[bug#49022] [PATCH 2/2] gnu: lib2geom: Update to commit b29d60e4.

[Boris A. Dekshteyn]

* gnu/packages/graphics.scm (lib2geom): Update to commit
b29d60e49a58f4e8069544b44863b1a623e4ee59 (with inkscape 1.1 relased).
---
 gnu/packages/graphics.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 1006bb3cb4..23900fc4a6 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -826,8 +826,8 @@ exception-handling library.")
 
 (define-public lib2geom
   ;; Use the latest master commit, as the 1.0 release suffer build problems.
-  (let ((revision "3")
-        (commit "17e0d21f0afc8489656f9184bff7ad024a42394a"))
+  (let ((revision "4")
+        (commit "b29d60e49a58f4e8069544b44863b1a623e4ee59"))
     (package
       (name "lib2geom")
       (version (git-version "1.0" revision commit))
@@ -839,7 +839,7 @@ exception-handling library.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0waskrmdrrdjw8pr5cvlkrxywgf376viggpc2jzdqxxpy2k78fpr"))
+                  "0xd8f3cgfnipdav4w8j54r7hzy9f3m7xk42ppcfhdjz2hriggyk6"))
                 (patches
                  ;; Patch submitted to upstream (see:
                  ;; https://gitlab.com/inkscape/lib2geom/-/merge_requests/32).
-- 
2.32.0

bug#49022: [PATCH 1/2] gnu: inkscape: Update to version 1.1.

[Nicolas Goaziou]

Hello,

"Boris A. Dekshteyn" <boris.dekshteyn@gmail.com> writes:

> * 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.

Applied both patches. Thank you.

Regards,
-- 
Nicolas Goaziou