From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id uCohC14PsWYWFQEAqHPOHw:P1 (envelope-from ) for ; Mon, 05 Aug 2024 17:43:58 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id uCohC14PsWYWFQEAqHPOHw (envelope-from ) for ; Mon, 05 Aug 2024 19:43:58 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="khB/X2Yn"; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=ALJ0ZsIW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722879838; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=MAFNtFIqGSe8vL4sXToaxAZVnf9+7h2H3P8+oT2z3Is=; b=O2bZIwQxLsfNUeqH5bcB4uK9LYsJqZoOPONZrd+PP6qIAsr89AAsVYk4i3CqeWRZfBByGq yirPdyIRU2S9P/LyiA3wRE4LI8zDzVUPfxwewOCV7IPJkvDCi4hFpaNyjn8dLM+bWx/2Jg 3WS9itdpVtOHwcv/WotEV7o81sOMWfh7kz0Yds/AC33YG7LcbWPEE1moAKmRTMBnkR5Leq lbzN5zfBtQeBrn81SLdb1zD4RIm8CxyeQ9g+xDkJL+sLmmI3kzQQKq7y7fsTIrR35rVz7E FvDzdmK8Ig8hAuuzgYCACM3zELwjWAxsnNSoXjTCi1wTu3HMdZyC42KSHeblpw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="khB/X2Yn"; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=ALJ0ZsIW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722879838; a=rsa-sha256; cv=none; b=GhfXlfg2SlrxEzYF7PRYgFoa1opMUPS7Ppy43vzpW89d7b34soKXDOFsWmvTKfmCDdQMkQ QvpExGP4phKxDcJL+JHKq58kagFOvGF5bDMtASorsjJWJdXeRO5BsCx6pRvBwvK53y2rxP 9P26v6cQ+evf4jEsbOEqSFi5iUklFah+Ejc2kQJM3v9KXbBIysK8rH8bscbXqNnDQcP+zR g/89LQieMQ5K6YAJfdDt194cnuQBWUX0bD2Mysx8wBdRffNGlk6cczbrX3m3B1uXsq5MlG 5wDywV+Mj8iyfd+VWpFUO/736zseFUn0kK9OQ+EULCa4sp5vVAFsdTiS6qbHZg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DC6B3FA96 for ; Mon, 5 Aug 2024 19:43:57 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sb1kH-0001mb-UW; Mon, 05 Aug 2024 13:43:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sb1kD-0001TY-Dg for guix-patches@gnu.org; Mon, 05 Aug 2024 13:43:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sb1kB-0003cn-Pn for guix-patches@gnu.org; Mon, 05 Aug 2024 13:43:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:Subject; bh=MAFNtFIqGSe8vL4sXToaxAZVnf9+7h2H3P8+oT2z3Is=; b=khB/X2YnAbUHz/AenyH3E/o7RE6TaOMfnVUkJCrAB82piVGGTz/m2oWAxCDpKARC0gX3NUCdE5Japu5c86Q8U89lNN4VCn8pOOtWqaQ5KEct1wfQpHziibs/eBwm+p9DKwWCVgQVFNbyEfpmM9l8FqWjsuxrIgx9jj/jIWEoltSJZFVwLpLl9zksFSsFlx8JGq9mLRk30Ldckg31ybr3dn6yGTWPNow+su8MuPEj2XTPlGBQdzn3SWxMF8AO09lYKSGFcmAk8+2HCvNTT/IKw4pFVPaaWQXP4CFMp6nepwTf5CQF7ZgHdqDeETG3P5uYSqnAYLiJWSsz0nsNsEc/sw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sb1kY-0006V7-1p for guix-patches@gnu.org; Mon, 05 Aug 2024 13:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72480] [PATCH core-updates] gnu: inkscape: Fix build on i686. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Aug 2024 17:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72480 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72480@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172287983724967 (code B ref -1); Mon, 05 Aug 2024 17:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Aug 2024 17:43:57 +0000 Received: from localhost ([127.0.0.1]:59418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sb1kS-0006Uc-FF for submit@debbugs.gnu.org; Mon, 05 Aug 2024 13:43:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:54772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sb1kQ-0006UQ-2O for submit@debbugs.gnu.org; Mon, 05 Aug 2024 13:43:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sb1jz-0000na-8t for guix-patches@gnu.org; Mon, 05 Aug 2024 13:43:28 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sb1jv-0003a7-Qi for guix-patches@gnu.org; Mon, 05 Aug 2024 13:43:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1722879797; x=1723138997; bh=MAFNtFIqGSe8vL4sXToaxAZVnf9+7h2H3P8+oT2z3Is=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=ALJ0ZsIWkWp7Fk2fNZt9dwopMFyMVDvqyb2gGv1y6DrcNeYBk59R2NvHa86TijSUo l1j4e9++Bb9uH9CDrTWCQMq7QmgjDUMRqNFRHtxKjV/39cWrio/38vP+NVvIalV9Dn CLE0zcV7WTX/QHeF5AMLZae/ubT10lqETMnfDQv/G/kchK5w6QCKGCxSzB5ZuCiTKB yi5KnvQsNVPbKPtcgPsVbLIMN1TQhxxQUscRvI0vqEzgGb3dRP/TfavT7OhA8w9kXs AwYrvFh127O+Y+RXwDPvGD0w3hY19rcxWB0HrFCeZ9N2qqD0gczCHvM/vAdW5OnqNb BKESL/lQ+8KUA== Date: Mon, 05 Aug 2024 17:43:10 +0000 Message-ID: <6cc72f1031fd7e9155c3b83fb7af60ddad11312e.1722879755.git.kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton X-Pm-Message-ID: 7a600cb75715c3da1d63986142f3a5f67489783e MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.43.16; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-4316.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches From: Kaelyn Takata via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -7.14 X-Migadu-Queue-Id: DC6B3FA96 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -7.14 X-TUID: iAMHgdckriKe * gnu/packages/inkscape.scm (inkscape): Fix build on i686. Change-Id: Id4b11ac7aa725a8a55d04bca221319201e488940 --- gnu/packages/inkscape.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 8d8dac4fa8..224caa34cf 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -204,6 +204,13 @@ (define-public inkscape/stable (("add_pdfinput_test\\(font-(spacing|style) 1 dr= aw-all" all) (string-append "#" all)))))) '()) + #$@(if (target-x86-32?) + '((add-after 'unpack 'fix-32bit-size_t-format + (lambda _ + ;; Fix an error due to format type mismatch with 3= 2-bit size_t. + (substitute* "testfiles/src/visual-bounds-test.cpp= " + (("%lu") "%u"))))) + '()) (add-after 'unpack 'set-home ;; Mute Inkscape warnings during tests. (lambda _ @@ -239,7 +246,15 @@ (define-public inkscape/stable "cli_export-ps-level_3_check_output" "cli_export-ps-level_3_content_check_output" "cli_export-ps-level_2_content_check_output" - "cli_export-ps-level_2_check_output"))) + "cli_export-ps-level_2_check_output" + ;; These fail on i686 but not x86-64 + #$@(if (target-x86-32?) + '("cli_pdfinput-font-spacing_check_output= " + "cli_pdfinput-font-style_check_output" + "cli_pdfinput-latex_check_output" + "cli_pdfinput-multi-page-sample_check_o= utput" + "test_lpe") + '())))) (invoke "make" "-j" job-count "tests") (invoke "ctest" "-j" job-count "--output-on-error" @@ -340,10 +355,6 @@ (define-public inkscape #~(delete "-DWITH_IMAGE_MAGICK=3DOFF" #$flags)) ((#:phases phases) #~(modify-phases #$phases - (replace 'check - ;; Re-instate the tests disabled in inskcape/stable, now tha= t - ;; their ImageMagick requirement is satisfied. - (assoc-ref %standard-phases 'check)) (replace 'wrap-program ;; Ensure Python is available at runtime. (lambda _ base-commit: baad95b19a24401cad8bee7290e5dbf3b3f38287 --=20 2.45.2