From ac07a003d7f75321346188eb9618d418d2b2decb Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 17 Oct 2019 21:06:50 +0200 Subject: [PATCH] Revert FT_DebugHook_Func ABI/API changes --- freetype-2.10.1-debughook.patch | 13 +++++++++++++ freetype.spec | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 freetype-2.10.1-debughook.patch diff --git a/freetype-2.10.1-debughook.patch b/freetype-2.10.1-debughook.patch new file mode 100644 index 0000000..4421401 --- /dev/null +++ b/freetype-2.10.1-debughook.patch @@ -0,0 +1,13 @@ +diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h +index 8d039c4f3..88488bfe8 100644 +--- a/include/freetype/ftmodapi.h ++++ b/include/freetype/ftmodapi.h +@@ -623,7 +623,7 @@ FT_BEGIN_HEADER + * it is bytecode interpreter's execution context, `TT_ExecContext`, + * which is declared in FreeType's internal header file `tttypes.h`. + */ +- typedef FT_Error ++ typedef void + (*FT_DebugHook_Func)( void* arg ); + + diff --git a/freetype.spec b/freetype.spec index 9568871..b2c7801 100644 --- a/freetype.spec +++ b/freetype.spec @@ -23,6 +23,8 @@ Patch3: freetype-2.6.5-libtool.patch Patch4: freetype-2.8-multilib.patch Patch5: freetype-2.10.0-internal-outline.patch +# Revert ABI/API change +Patch6: freetype-2.10.1-debughook.patch BuildRequires: gcc BuildRequires: libX11-devel @@ -80,6 +82,7 @@ popd %patch3 -p1 -b .libtool %patch4 -p1 -b .multilib %patch5 -p1 -b .internal-outline +%patch6 -p1 -b .debughook %build @@ -194,6 +197,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %changelog * Sat Oct 12 2019 Michael Kuhn - 2.10.1-1 - Update to 2.10.1 +- Revert FT_DebugHook_Func ABI/API changes * Thu Jul 25 2019 Fedora Release Engineering - 2.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild