diff options
| author | Marius Bakke <marius@gnu.org> | 2022-08-04 10:40:56 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-04 12:30:13 +0200 |
| commit | 1892f5539ef1cdccd201785767db3ca9913c2dbe (patch) | |
| tree | f3a0780a98cb8c387f0a4e3212e73b81a1cffe19 | |
| parent | 20d1e2ffb0cd4860faeabc8f5c2b4afde99c7a1b (diff) | |
| download | guix-1892f5539ef1cdccd201785767db3ca9913c2dbe.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/graphics.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/inkscape.scm | 11 |
2 files changed, 15 insertions, 10 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index fc90c72bed..4920f613a5 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -849,6 +849,20 @@ basic geometries.") ;; 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") diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 9cab43c911..2e43835e4f 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -259,16 +259,6 @@ as the native format.") (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 @@ as the native format.") `("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))))) |