gnu: inkscape: Build with lib2geom 1.2.

* gnu/packages/graphics.scm (lib2geom-1.2): New variable.
* gnu/packages/inkscape.scm (inkscape)[arguments]: Enable previously failing
test.
[inputs]: Replace "lib2geom" with LIB2GEOM-1.2.
This commit is contained in:
Marius Bakke 2022-08-04 10:40:56 +02:00
parent 20d1e2ffb0
commit 1892f5539e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 15 additions and 10 deletions

View file

@ -849,6 +849,20 @@ (define-public lib2geom
;; https://gitlab.com/inkscape/inkscape/issues/784).
(license license:gpl3+)))
(define-public lib2geom-1.2
(package
(inherit lib2geom)
(version "1.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/inkscape/lib2geom")
(commit version)))
(file-name (git-file-name "lib2geom" version))
(sha256
(base32
"0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))))
(define-public python-booleanoperations
(package
(name "python-booleanoperations")

View file

@ -259,16 +259,6 @@ (define-public inkscape
(substitute-keyword-arguments (package-arguments inkscape/stable)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-problematic-tests
;; The UnionOutside and UnionOutsideSwap tests fail, comparing
;; e.g. the result "M 0 1.5 V 0 H 2 V 2 H 0.5 V 2.5 H 0 V 2 V 1.5 H
;; 0.5 V 2 z" to the expected string "M 0 0 V 1.5 V 2 V 2.5 H 0.5 V
;; 2 H 2 V 0 z" (see:
;; https://gitlab.com/inkscape/inkscape/-/issues/3689).
(lambda _
(substitute* "testfiles/src/path-boolop-test.cpp"
(("PathBoolopTest, UnionOutside(Swap)?.*" all)
(string-append all " GTEST_SKIP();\n")))))
(replace 'wrap-program
;; Ensure Python is available at runtime.
(lambda* (#:key outputs #:allow-other-keys)
@ -281,6 +271,7 @@ (define-public inkscape
`("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))))
(inputs (modify-inputs (package-inputs inkscape/stable)
(replace "lib2geom" lib2geom-1.2)
(append bash-minimal
librsvg))) ;for the pixbuf loader
(properties (alist-delete 'hidden? (package-properties inkscape/stable)))))