[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/17: gnu: inkscape@1.1: Update to 1.1.1.
From: |
guix-commits |
Subject: |
15/17: gnu: inkscape@1.1: Update to 1.1.1. |
Date: |
Wed, 3 Nov 2021 06:20:49 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 0489e488de350cd06b95fa9dc72ba71d2e6550a4
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Wed Nov 3 04:43:42 2021 +0100
gnu: inkscape@1.1: Update to 1.1.1.
* gnu/packages/inkscape.scm (inkscape-1.1): Update to 1.1.1.
[source]: Remove patch. Don't explicitly return #t from snippet.
[arguments]: Don't explicitly return #t from phases.
* gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/inkscape.scm | 21 +++++++------------
.../inkscape-1.1-fix-build-witch-gcc7.5.patch | 24 ----------------------
3 files changed, 7 insertions(+), 39 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index b6cc3aa..5ae09d7d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1297,7 +1297,6 @@ dist_patch_DATA =
\
%D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/instead-use-games-path.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 46c8c4c..8747218 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -120,17 +120,15 @@ as the native format.")
(define-public inkscape-1.1
(package
(name "inkscape")
- (version "1.1")
+ (version "1.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
- "1rlm2wqg8bgdxkdvnadh49wfp0mrbrk7d8n4vdcjyw6z7z7firki"))
+ (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf"))
(modules '((guix build utils)
(ice-9 format)))
(snippet
@@ -211,8 +209,7 @@ endif()~%~%"
;; Lift the requirement on the double-conversion library, as
;; it is only needed by lib2geom, which is now unbundled.
(substitute* "CMakeScripts/DefineDependsandFlags.cmake"
- ((".*find_package\\(DoubleConversion.*") ""))
- #t))))
+ ((".*find_package\\(DoubleConversion.*") ""))))))
(build-system cmake-build-system)
(arguments
`(#:tests? #t
@@ -227,8 +224,7 @@ endif()~%~%"
(add-after 'unpack 'patch-icon-cache-generator
(lambda _
(substitute* "share/icons/application/CMakeLists.txt"
- (("gtk-update-icon-cache") "true"))
- #t))
+ (("gtk-update-icon-cache") "true"))))
(add-after 'unpack 'disable-latex-export-tests
;; FIXME: For some reason the test.pdf_tex file generated by the
;; "--export-latex" lacks "some text" in its content when run in
@@ -236,14 +232,12 @@ endif()~%~%"
(lambda _
(substitute* "testfiles/cli_tests/CMakeLists.txt"
(("add_cli_test\\(export-latex")
- "message(TEST_DISABLED: export-latex"))
- #t))
+ "message(TEST_DISABLED: export-latex"))))
(add-after 'unpack 'set-home
;; Mute Inkscape warnings during tests.
(lambda _
(setenv "HOME" (getcwd))
- (format #t "ARGS is set to: ~a" (getenv "ARGS"))
- #t))
+ (format #t "ARGS is set to: ~a" (getenv "ARGS"))))
;; Move the check phase after the install phase, as when run in the
;; tests, Inkscape relies on files that are not yet installed, such
;; as the "share/inkscape/ui/units.xml" file.
@@ -259,8 +253,7 @@ endif()~%~%"
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))
- #t)))))
+ `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))))))))
(inputs
`(("aspell" ,aspell)
("autotrace" ,autotrace)
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
deleted file mode 100644
index bd7b01f..0000000
--- a/gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
- 05/17: gnu: moreutils: Prepare for cross-compilation., (continued)
- 05/17: gnu: moreutils: Prepare for cross-compilation., guix-commits, 2021/11/03
- 07/17: gnu: mhonarc: Update to 2.6.24., guix-commits, 2021/11/03
- 09/17: gnu: procenv: Update to 0.60., guix-commits, 2021/11/03
- 13/17: gnu: lesspipe: Update to 1.90., guix-commits, 2021/11/03
- 10/17: gnu: cpuid: Update to 20211031., guix-commits, 2021/11/03
- 11/17: gnu: cpuid: This tool is not Linux-specific per se., guix-commits, 2021/11/03
- 12/17: gnu: libmtp: Update to 1.1.19., guix-commits, 2021/11/03
- 14/17: gnu: qiv: Update to 2.3.2., guix-commits, 2021/11/03
- 16/17: gnu: labelme: Update to 4.5.13., guix-commits, 2021/11/03
- 17/17: gnu: kirc: Update to 0.2.9., guix-commits, 2021/11/03
- 15/17: gnu: inkscape@1.1: Update to 1.1.1.,
guix-commits <=