From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 07 09:34:20 2021 Received: (at submit) by debbugs.gnu.org; 7 Mar 2021 14:34:20 +0000 Received: from localhost ([127.0.0.1]:39033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIuU1-0007DB-AS for submit@debbugs.gnu.org; Sun, 07 Mar 2021 09:34:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:37836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIuTu-0007Cx-3a for submit@debbugs.gnu.org; Sun, 07 Mar 2021 09:34:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIuTt-0006fW-T6 for guix-patches@gnu.org; Sun, 07 Mar 2021 09:34:05 -0500 Received: from mout01.posteo.de ([185.67.36.65]:52349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIuTr-000670-3v for guix-patches@gnu.org; Sun, 07 Mar 2021 09:34:05 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 9143916005F for ; Sun, 7 Mar 2021 15:33:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1615127639; bh=MTxdi0KtrBS0QQDH3LrqDtG6+ejfXucbtdH/Q0uuoPE=; h=From:To:Cc:Subject:Date:From; b=AJq4JfAwOVc+L0+6Wua90gf/eV0FRZRicqIyFqxTJH6MYcoIw8fxYWYr7UnefDIJo Q1YMS0r5mZydL3lA/FO7nkxgU3h9rAr/B9/xwZVFzfMUZN2+4mScwusRYI1Jz2lyi3 rKHy9pbEaj3MfSRZrcgN93f3vIYLScYc9i7bD/L6EUDC1yLPFE9QhZATKdBK51dds6 WZEz4lBS51H7AvNkFDlcZxE20jATPl+v2gsamQSuAYD9Yx5kA9SrCRVm4/tzYTkHlR 7wUa5ImebAbnj/pv/Cd0yJVG2jQxiT8BBDLU5VW1i/r1MQ+zCbFYD49E1TKqDmUnHO ThJK2YgThoLZQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DtkVt6l01z9rxf; Sun, 7 Mar 2021 15:33:58 +0100 (CET) From: Felix Gruber To: guix-patches@gnu.org Subject: [PATCH] gnu: vtk: Fix build failure. Date: Sun, 7 Mar 2021 15:32:33 +0100 Message-Id: <20210307143233.149166-1-felgru@posteo.net> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=felgru@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/image-processing.scm (vtk): Fix build failure. [source]: Add patch to fix build failure with recent versions of freetype. * gnu/packages/patches/vtk-fix-freetypetools-build-failure.patc [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/image-processing.scm (vtk): Fix build failure. [source]: Add patch to fix build failure with recent versions of freetype. * gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 3 +- gnu/packages/image-processing.scm | 3 ++ .../vtk-fix-freetypetools-build-failure.patch | 36 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch diff --git a/gnu/local.mk b/gnu/local.mk index fb3b395852..2d2cba3f95 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -31,7 +31,7 @@ # Copyright © 2020 R Veera Kumar # Copyright © 2020 Nicolò Balzarotti # Copyright © 2020 Michael Rohleder -# Copyright © 2020 Felix Gruber +# Copyright © 2020, 2021 Felix Gruber # Copyright © 2020 Ryan Prior # Copyright © 2020 Jan Wielkiewicz # Copyright © 2020 Brice Waegeneire @@ -1718,6 +1718,7 @@ dist_patch_DATA = \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ + %D%/packages/patches/vtk-fix-freetypetools-build-failure.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-share-store.patch \ %D%/packages/patches/webkitgtk-bind-all-fonts.patch \ diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 5dfd18d1bd..6f4576b8b9 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2021 Oleh Malyi +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -254,6 +255,8 @@ many popular formats.") (sha256 (base32 "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl")) + (patches + (search-patches "vtk-fix-freetypetools-build-failure.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch new file mode 100644 index 0000000000..6988e65872 --- /dev/null +++ b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch @@ -0,0 +1,36 @@ +This fixes a build failure in VTK when building against recent versions +of freetype. + + https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7432 + +Patch by Ben Boeckel + +Subject: [PATCH] vtkFreeTypeTools: avoid using an internal macro + +This macro has been removed upstream as it was always intended to be +private. +--- + Rendering/FreeType/vtkFreeTypeTools.cxx | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx +index c54289dc60..03b899c4da 100644 +--- a/Rendering/FreeType/vtkFreeTypeTools.cxx ++++ b/Rendering/FreeType/vtkFreeTypeTools.cxx +@@ -387,11 +387,8 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() + } + + //---------------------------------------------------------------------------- +-FT_CALLBACK_DEF(FT_Error) +-vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, +- FT_Library lib, +- FT_Pointer request_data, +- FT_Face* face) ++static FT_Error vtkFreeTypeToolsFaceRequester( ++ FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) + { + #if VTK_FTFC_DEBUG_CD + printf("vtkFreeTypeToolsFaceRequester()\n"); +-- +2.30.1 + -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 09 16:01:21 2021 Received: (at 46989-done) by debbugs.gnu.org; 9 Mar 2021 21:01:21 +0000 Received: from localhost ([127.0.0.1]:48094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJjTk-0007cG-UQ for submit@debbugs.gnu.org; Tue, 09 Mar 2021 16:01:21 -0500 Received: from flashner.co.il ([178.62.234.194]:45850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJjTi-0007bx-47 for 46989-done@debbugs.gnu.org; Tue, 09 Mar 2021 16:01:19 -0500 Received: from localhost (unknown [31.210.181.184]) by flashner.co.il (Postfix) with ESMTPSA id DCEC540363; Tue, 9 Mar 2021 21:01:11 +0000 (UTC) Date: Tue, 9 Mar 2021 23:00:39 +0200 From: Efraim Flashner To: Felix Gruber Subject: Re: [bug#46989] [PATCH] gnu: vtk: Fix build failure. Message-ID: References: <20210307143233.149166-1-felgru@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="X1+jaHxPr2QmbBd7" Content-Disposition: inline In-Reply-To: <20210307143233.149166-1-felgru@posteo.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 46989-done Cc: 46989-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --X1+jaHxPr2QmbBd7 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks! Patch pushed. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --X1+jaHxPr2QmbBd7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmBH4fcACgkQQarn3Mo9 g1Hb9A/+LrETF8y+1JbqCJSK+dfSdApkSJ58BU9nAXzQTi3vprVB/VtGx3uyZAIF TkeR3dcCgTxSuYagpr6/ktxJgMRTYU1leF/Tjt+vaW5J/s9KTfPkhHna+KjAMlPg tCZ2GIPOrDSzdL+f+Q//1VVgi8hUEJpm8A/hKpi0/PBS63wqzBYd5WgHRpdxJEbM wokx0U/CSCan9Wp7ZvQ7bBHV2z+zoyGswX76CYr6oBj10bjAj+roY2V60YIP3bb6 /7BdhVPGrs6RRjb6sRfz9/VtHsBX8U0fRpUpGewQ/2t22VVyvVKBp7dsyfZG32o+ u8gAnDW83c3dVR2QzLHBk/qBw2gJyrL3O2B3mwZ3GEuZBgdYb0B81MJ8sxYlvjLx o3wbGksPJgbQHGF8q+Adu1b4bFZunOVn5WYvRUBYpNuObB8VUM5vZENqi9SAVJqY MHvgJcvIM79LWmICydR7xDOD6V327xQuZFnON0KgjQF67KsfXA7/VW4nhJ58feFv UH4bZnH5PQ7bvKSZQEgY/OR0yx2hlKE4d42DNm7Kf82B0vi7L0XBd4RuNlVnmumF SI797qPtrQXmUT4cMfJFgWUZVFeuGT2+0kEJFZMQySRCFT+CeFa1dKQJHxlGSuKz 4fYDz4rbxc0h/o3Rqg1weAXmEYIijabwLfGZleN20lP4FWzK/d0= =tdeQ -----END PGP SIGNATURE----- --X1+jaHxPr2QmbBd7-- From unknown Sat Aug 09 22:10:28 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 07 Apr 2021 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator