From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
Date: Sun, 8 Nov 2020 13:59:39 +0000 (UTC) [thread overview]
Message-ID: <1604843975.2b2feec8938382ff81a1c44c571d072c3ec52167.sam@gentoo> (raw)
commit: 2b2feec8938382ff81a1c44c571d072c3ec52167
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 13:59:29 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 13:59:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2feec8
sci-libs/vtk: fix build with >=media-libs/freetype-2.10.3
Closes: https://bugs.gentoo.org/751088
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
...8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch | 18 ++++++++++++++++++
sci-libs/vtk/vtk-8.2.0.ebuild | 1 +
2 files changed, 19 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
new file mode 100644
index 00000000000..b4674873508
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
@@ -0,0 +1,18 @@
+--- VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in.orig 2019-01-30 18:15:13.000000000 +0100
++++ VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in 2020-10-17 00:03:32.730820908 +0200
+@@ -20,6 +20,15 @@
+
+ #ifdef VTK_USE_SYSTEM_FREETYPE
+ # include <ft2build.h>
++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
++/* has been moved to <freetype/internal/compiler-macros.h> */
++# ifndef FT_CALLBACK_DEF
++# ifdef __cplusplus
++# define FT_CALLBACK_DEF( x ) extern "C" x
++# else
++# define FT_CALLBACK_DEF( x ) static x
++# endif
++# endif /* FT_CALLBACK_DEF */
+ #else
+ # include <vtkfreetype/include/ft2build.h>
+ #endif
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index b0aa1a26e40..5f74a4c99e4 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -129,6 +129,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc-10.patch # bug 723374
"${FILESDIR}"/${P}-fno-common.patch # bug 721048
"${FILESDIR}"/${P}-py38.patch
+ "${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088
)
RESTRICT="test"
next reply other threads:[~2020-11-08 13:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-08 13:59 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-08 13:51 [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/ Sam James
2024-09-07 14:27 Sam James
2023-05-03 22:23 Sam James
2023-02-27 16:46 Joonas Niilola
2022-12-12 6:09 Joonas Niilola
2022-06-26 7:09 Sam James
2022-04-02 13:06 Andreas Sturmlechner
2022-02-21 23:24 Sam James
2021-12-03 22:38 Vadim Misbakh-Soloviov
2021-05-31 11:40 Sam James
2021-05-31 11:40 Sam James
2020-12-15 2:13 Sam James
2020-06-06 9:42 Andreas Sturmlechner
2020-05-01 16:48 Matthias Maier
2017-07-06 13:37 Michael Palimaka
2017-07-06 12:49 Michael Palimaka
2017-06-02 14:59 Matthias Maier
2016-03-25 17:07 David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1604843975.2b2feec8938382ff81a1c44c571d072c3ec52167.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox