From 698ace461f37ef581179493d864b28285f826a90 Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Tue, 19 Mar 2024 11:58:06 +0100 Subject: [PATCH] Put in earplugs --- channel/zzkt/packages/inkscape.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/channel/zzkt/packages/inkscape.scm b/channel/zzkt/packages/inkscape.scm index f83f0b4..5d8ae38 100644 --- a/channel/zzkt/packages/inkscape.scm +++ b/channel/zzkt/packages/inkscape.scm @@ -186,20 +186,22 @@ endif()~%~%" (substitute* "testfiles/cli_tests/CMakeLists.txt" (("add_cli_test\\(export-latex") "message(TEST_DISABLED: export-latex")))) - (add-after 'unpack 'disable-vertical-glyph-tests - (lambda _ - ;; FIXME: These tests fail with newer Pango and Harfbuzz: - ;; https://gitlab.com/inkscape/inkscape/-/issues/2917 - ;; https://gitlab.com/inkscape/inkscape/-/issues/3554 - ;; Simply providing older versions don't work, as we need - ;; the full GTK stack; we could use package-input-rewriting - ;; but then have to also downgrade pangomm and disable tests - ;; in librsvg and GTK+. Just ignore for now. - (substitute* "testfiles/rendering_tests/CMakeLists.txt" - (("test-glyph-y-pos") "") - (("text-glyphs-combining") "") - (("text-glyphs-vertical") "") - (("test-rtl-vertical") "")))) + + ;; (add-after 'unpack 'disable-vertical-glyph-tests + ;; (lambda _ + ;; ;; FIXME: These tests fail with newer Pango and Harfbuzz: + ;; ;; https://gitlab.com/inkscape/inkscape/-/issues/2917 + ;; ;; https://gitlab.com/inkscape/inkscape/-/issues/3554 + ;; ;; Simply providing older versions don't work, as we need + ;; ;; the full GTK stack; we could use package-input-rewriting + ;; ;; but then have to also downgrade pangomm and disable tests + ;; ;; in librsvg and GTK+. Just ignore for now. + ;; (substitute* "testfiles/rendering_tests/CMakeLists.txt" + ;; (("test-glyph-y-pos") "") + ;; (("text-glyphs-combining") "") + ;; (("text-glyphs-vertical") "") + ;; (("test-rtl-vertical") "")))) + ,@(if (or (target-aarch64?) (target-ppc64le?) (target-riscv64?))