From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp2 ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms11 with LMTPS
	id +CYqB8fkRGBGJgAA0tVLHw
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 07 Mar 2021 14:35:51 +0000
Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2 with LMTPS
	id EC7YAsfkRGCGbQAAB5/wlQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 07 Mar 2021 14:35:51 +0000
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 667D62171B
	for <larch@yhetil.org>; Sun,  7 Mar 2021 15:35:50 +0100 (CET)
Received: from localhost ([::1]:37170 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	id 1lIuVZ-0007CQ-9W
	for larch@yhetil.org; Sun, 07 Mar 2021 09:35:49 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:60570)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1lIuUr-0006if-OQ
 for guix-patches@gnu.org; Sun, 07 Mar 2021 09:35:05 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:55726)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1lIuUo-0006OL-MA
 for guix-patches@gnu.org; Sun, 07 Mar 2021 09:35:05 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1lIuUo-0007Ek-Ij
 for guix-patches@gnu.org; Sun, 07 Mar 2021 09:35:02 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#46989] [PATCH] gnu: vtk: Fix build failure.
Resent-From: Felix Gruber <felgru@posteo.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Sun, 07 Mar 2021 14:35:02 +0000
Resent-Message-ID: <handler.46989.B.161512766027743@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 46989
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 46989@debbugs.gnu.org
Cc: Felix Gruber <felgru@posteo.net>
X-Debbugs-Original-To: guix-patches@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.161512766027743
 (code B ref -1); Sun, 07 Mar 2021 14:35:02 +0000
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 <debbugs-submit-bounces@debbugs.gnu.org>)
 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 <felgru@posteo.net>) 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 <felgru@posteo.net>) 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 <felgru@posteo.net>) 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 <guix-patches@gnu.org>; 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 <felgru@posteo.net>
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-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+larch=yhetil.org@gnu.org>
X-Migadu-Flow: FLOW_IN
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1615127750;
	h=from:from:sender:sender: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=iy4wG92QFL6tOSofet1o+nuI27fzb+ECAUpzBq2V0zE=;
	b=laXt31jQ2kKIkAxdb8TowaN0VUvkC3SedUjQA+77NGJgmALJSvshXGLaapSpq3pFZfx8St
	z9nzYQICbJ6GgyVnRYexHdbA51qXxScOs+cvpqrwTEca0ifMzvvi2QSEFEqyNn2Ouspncy
	feMUXZwBpS6Gy3K2rhxjX5DUM4/cqQlNcwDgE+LiSAXqFAGULU3Em3yBZrhfMJ8B4TkGCg
	mjr8srmeMCNnsYqS+2vtde8QXd7urwV1lwwqPLzMMi8M20wtgh3WrgNoXIlhwo76EIl87A
	i2E6UgciSHiZBf96ljIKlbq51VM1Mm22yTrbX0jtL5VIjO4KyMKfi6F6WNd/Zg==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615127750; a=rsa-sha256; cv=none;
	b=Atf+LFmuENox955GGTk4N6M4aN/uPI1drGz4RdUO+9jWwVTdp69FBdEqUtn2cS+V9hfqrt
	5OqOYPJaiMhT5Rh2cyfRRHmSQ+jkocofcDcMy7pJAA00x32FvqmPzOIveI5GTox7KdLIYc
	Ij3zdaBq6lOSIbnx1i/FByH1/76tmTN0ZMaMV0bLAX2sXQlpBv8i39sKpz8wge09jPReRi
	QyBlgbSKSAW5mLmQWKK4z294CHn+jr09pgZtQ+NA/3RI7JChBsCJL86p0a4D55Tn/C3kXI
	zrTYI0cWyFpsLNXcD0QDGtlgfnmW6iondgevxm6qRqrRcEQz5ZewIjtdcgrWZw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=AJq4JfAw;
	dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none);
	spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org
X-Migadu-Spam-Score: -0.27
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=AJq4JfAw;
	dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none);
	spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org
X-Migadu-Queue-Id: 667D62171B
X-Spam-Score: -0.27
X-Migadu-Scanner: scn1.migadu.com
X-TUID: OuP3ekY/jQ4b

* 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 <vkor@vkten.in>
 # Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
 # Copyright © 2020 Michael Rohleder <mike@rohleder.de>
-# Copyright © 2020 Felix Gruber <felgru@posteo.net>
+# Copyright © 2020, 2021 Felix Gruber <felgru@posteo.net>
 # Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 # Copyright © 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
 # Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
@@ -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 <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 Oleh Malyi <astroclubzp@gmail.com>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;;
 ;;; 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 <ben.boeckel@kitware.com>
+
+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