From nobody Thu Apr 16 10:10:19 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fxDKR2kH3z6ZMRW for ; Thu, 16 Apr 2026 10:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxDKR24KTz3NNd for ; Thu, 16 Apr 2026 10:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776334219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QLu+aBp9v+5KuZLXhasSKnuEsEHFltvSoHQ/YuLGZU=; b=kxeJ5MUG8Ma8BBBs4AETTJAiBAKz8ROPq2a1iUXh9mRjMChr0fpF7Qpx4rbiZT6U1UPiAO tOpvaw14fiGGEKIF/2VxnY978gHmlkYNgJ2IVhp1WNsKy5nUclkA5/N+BIzZl2b1JBy8gg u5OPaobtnZMj4Zh93v2RPgqWMyjdYDQgZHl8IBe3NgMskRRfJta481ILNeZDSMxzm9wYx0 2+MXm0s4GIHfUNmLkv+uSSF/vcY0TMwTk9W6sjvRjdsXOW78C/jmsucl+6gkhHL8zUnQ7E APHRypl7BkH7SWCC+aMFGVQythUi/NuEZnJ6FEIWV9iPrdLTURtUb3Bs7LLsZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776334219; a=rsa-sha256; cv=none; b=WHbRuWlTFEljTYTXzqSkiH0klVfcSWI4X2eOJZk3mejw8A8tQapDRj+CRzh/jnORIgMIMY mVLpulsa+i+clnFku1H+dqOrh1kuAHHUXzhiqF+2SCNsjdYOOx7rFN+Qwt+7pZCZm30w5o K5juz9CjQQpy1r32V4c+CQ4H63av6Pu7JecNLx7uayFD8Ou8ylzIxPzG7LIP3wlPtHkcNM kzFZ/ATncWtFFrgD5Ktdxcwda/AfH5qdzjo3AGHzv/Mjkz90nZhDMmx4mdFUJRkOEi1Yqj DCsf/dORKg51+ZC8Dh+KzAhjhvnsOu8HLA/aL0H5vXhZCrGydp3/ybxgTKFV1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776334219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QLu+aBp9v+5KuZLXhasSKnuEsEHFltvSoHQ/YuLGZU=; b=Y3EfNqGNL+FbGUQHMppvct/4py48Sb1wWqTtzX8xRuimsiVrCujtzSeWvIrjvj+wJzjpXJ wyrXwNSGddMeyh27lrcOLSXhf1DCQp0KW3yydJIxBsHbBYyMA/KB2Q9mEgB1q4ctwLxoNP 8nC+sLNAwthMqOggrSQKgSMeenRdTbhFu+v5icCjtTbhPf5OHpPk2WrOkAmXIoQbldT18l JmvKX4ONIN/+1Ip2cvU+ZxNDJgw8xPp+wn4Bd/9KL+LjP3f2U8VBSiSe/kbA3yG4H7bZ9y 4WclFPWSnUfYzjt1QULry7MVhOdgLN6RuweJpPH9/fZbhRlLhp6WgM6/UrSiRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxDKR1Rdhz12yw for ; Thu, 16 Apr 2026 10:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27880 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 10:10:19 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 294cedf501f1 - main - graphics/inkscape: Enable testing List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294cedf501f169e6bf84d8d94c5822f81d79708e Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 10:10:19 +0000 Message-Id: <69e0b58b.27880.659c0a6@gitrepo.freebsd.org> The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=294cedf501f169e6bf84d8d94c5822f81d79708e commit 294cedf501f169e6bf84d8d94c5822f81d79708e Author: Gleb Popov AuthorDate: 2026-04-15 18:40:13 +0000 Commit: Gleb Popov CommitDate: 2026-04-16 10:10:11 +0000 graphics/inkscape: Enable testing Approved by: fluffy (gnome@) Differential Revision: https://reviews.freebsd.org/D56417 --- graphics/inkscape/Makefile | 11 +++++++- .../inkscape/files/patch-fix-rendering-tests.patch | 30 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index f399ccda3783..a267b323b9b5 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -46,7 +46,7 @@ TEST_DEPENDS= googletest>0:devel/googletest \ bash:shells/bash USES= compiler:c++20-lang cmake:testing cpe desktop-file-utils ghostscript:run \ - gnome jpeg pathfix pkgconfig python \ + gnome iconv jpeg magick:test pathfix pkgconfig python \ readline shebangfix tar:xz xorg USE_GNOME= cairo gdkpixbuf glibmm gtkmm30 gtksourceview4 libxml2 libxslt USE_PYTHON= cython @@ -60,6 +60,8 @@ BINARY_ALIAS= python3=${PYTHON_CMD} SHEBANG_FILES= share/extensions/*.py share/extensions/genpofiles.sh \ share/templates/*.py man/fix-roff-punct +TESTING_UNSAFE= Some tests fail due to missing input files, an upstream packaging problem + OPTIONS_DEFINE= OPENMP POPPLER SCRIBUS VISIO CDR WPG GVFS NLS GSPELL OPTIONS_DEFAULT= POPPLER VISIO CDR WPG GM GSPELL OPTIONS_DEFAULT_amd64= OPENMP @@ -118,4 +120,11 @@ post-patch: ${WRKSRC}/src/extension/implementation/script.cpp @${TOUCH} ${WRKSRC}/share/extensions/gcodetools_check_for_updates.inx.h +# inkscape's buildsystem tries to execute tests that aren't built yet +# we have to build tests first with an explicit 'ninja tests' call +pre-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} tests + .include diff --git a/graphics/inkscape/files/patch-fix-rendering-tests.patch b/graphics/inkscape/files/patch-fix-rendering-tests.patch new file mode 100644 index 000000000000..3152d2acab95 --- /dev/null +++ b/graphics/inkscape/files/patch-fix-rendering-tests.patch @@ -0,0 +1,30 @@ +From 3ad0be197fe1c2e203a301e11c169915776fc341 Mon Sep 17 00:00:00 2001 +From: Alvin Wong +Date: Thu, 4 Dec 2025 18:10:54 +0800 +Subject: [PATCH] Fix rendering_tests for newer ImageMagick + +The output of `-match AE` was changed in ImageMagick 7.1.1.44. + +Ref: +* https://github.com/ImageMagick/ImageMagick/issues/7990 +* https://github.com/ImageMagick/ImageMagick/commit/d85a7583f9a96bf031941c24d774b71529de3ce0 +--- + testfiles/rendering_tests/test.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git testfiles/rendering_tests/test.sh testfiles/rendering_tests/test.sh +index 9d44a22787..a6398dd621 100755 +--- testfiles/rendering_tests/test.sh ++++ testfiles/rendering_tests/test.sh +@@ -36,7 +36,7 @@ perform_test() + COMPARE_OUTPUT="$(compare -metric "$METRIC" "${TESTNAME}${SUFFIX}.png" "${EXPECTED}${SUFFIX}.png" "${TESTNAME}-compare${SUFFIX}.png" 2>&1)" + + if [ "$FUZZ" = "" ]; then +- if [ "$COMPARE_OUTPUT" = 0 ]; then ++ if [ "$COMPARE_OUTPUT" = 0 ] || [ "$COMPARE_OUTPUT" = "0 (0)" ]; then + echo "${TESTNAME}${SUFFIX}" "PASSED; absolute difference is exactly zero." + rm "${TESTNAME}${SUFFIX}.png" "${TESTNAME}-compare${SUFFIX}.png" + else +-- +GitLab +