diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-06-18 01:49:47 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-06-18 02:25:49 -0400 |
| commit | 620796e66bb828ca22b5d4932275bc36a7b4706a (patch) | |
| tree | d8a26b358cd367c7bfce8ce3c82d78ffa8a676a1 /gnu/packages/graphics.scm | |
| parent | c7c7e115d0cd20b0af0df90d34a93270c79d55be (diff) | |
gnu: lib2geom: Fix tests on aarch64, i686-linux architectures.
Fixes <http://issues.guix.gnu.org/41827>.
This change also removes obsolete patches.
* gnu/packages/patches/lib2geom-fix-tests.patch: New file.
* gnu/packages/patches/lib2geom-link-tests-against-glib.patch: Delete file.
* gnu/packages/patches/lib2geom-use-system-googletest.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/graphics.scm (lib2geom)[origin]: Use new patch.
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 44d78c036b..0d768b8a0e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -405,9 +405,11 @@ exception-handling library.") (base32 "195rs0kdbs8w62irha1nwy83bccz04wglmk578qrj1mky7fc4rjv")) (patches - ;; Patch submitted to upstream (see: - ;; https://gitlab.com/inkscape/lib2geom/merge_requests/17). - (search-patches "lib2geom-enable-assertions.patch")) + ;; Patches submitted to upstream (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/17, + ;; https://gitlab.com/inkscape/lib2geom/-/merge_requests/32). + (search-patches "lib2geom-enable-assertions.patch" + "lib2geom-fix-tests.patch")) (modules '((guix build utils))) (snippet '(begin |