From 2e6bf149908d61c2b2121dad36f2caef260a2053 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 28 May 2019 14:56:55 +0200 Subject: [PATCH] Update to 2.10.0 Keep FT_Outline_New_Internal() and FT_Outline_Done_Internal() for ABI compatibility but make them just throw Unimplemented_Feature error. Remove them once soname has been bumped! Resolves: #1689117 --- freetype-2.10.0-internal-outline.patch | 72 ++++++++++++++++++++++++++ freetype-2.2.1-enable-valid.patch | 4 +- freetype-2.3.0-enable-spr.patch | 8 +-- freetype.spec | 15 +++++- 4 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 freetype-2.10.0-internal-outline.patch diff --git a/freetype-2.10.0-internal-outline.patch b/freetype-2.10.0-internal-outline.patch new file mode 100644 index 0000000..0f69ff9 --- /dev/null +++ b/freetype-2.10.0-internal-outline.patch @@ -0,0 +1,72 @@ +--- freetype-2.10.0/include/freetype/ftoutln.h ++++ freetype-2.10.0/include/freetype/ftoutln.h +@@ -165,6 +165,15 @@ FT_BEGIN_HEADER + FT_Int numContours, + FT_Outline *anoutline ); + ++ /* ++ * Kept downstream for ABI compatibility only. ++ * It just throws error now. Remove once soname has been bumped. ++ */ ++ FT_EXPORT( FT_Error ) ++ FT_Outline_New_Internal( FT_Memory memory, ++ FT_UInt numPoints, ++ FT_Int numContours, ++ FT_Outline *anoutline ); + + /************************************************************************** + * +@@ -192,6 +201,13 @@ FT_BEGIN_HEADER + FT_Outline_Done( FT_Library library, + FT_Outline* outline ); + ++ /* ++ * Kept downstream for ABI compatibility only. ++ * It just throws error now. Remove once soname has been bumped. ++ */ ++ FT_EXPORT( FT_Error ) ++ FT_Outline_Done_Internal( FT_Memory memory, ++ FT_Outline* outline ); + + /************************************************************************** + * +--- freetype-2.10.0/src/base/ftoutln.c ++++ freetype-2.10.0/src/base/ftoutln.c +@@ -291,6 +291,19 @@ + + /* documentation is in ftoutln.h */ + ++ /* ++ * Kept downstream for ABI compatibility only. ++ * It just throws error now. Remove once soname has been bumped. ++ */ ++ FT_EXPORT_DEF( FT_Error ) ++ FT_Outline_New_Internal( FT_Memory memory, ++ FT_UInt numPoints, ++ FT_Int numContours, ++ FT_Outline *anoutline ) ++ { ++ return FT_THROW( Unimplemented_Feature ); ++ } ++ + FT_EXPORT_DEF( FT_Error ) + FT_Outline_New( FT_Library library, + FT_UInt numPoints, +@@ -423,6 +436,17 @@ + + /* documentation is in ftoutln.h */ + ++ /* ++ * Kept downstream for ABI compatibility only. ++ * It just throws error now. Remove once soname has been bumped. ++ */ ++ FT_EXPORT_DEF( FT_Error ) ++ FT_Outline_Done_Internal( FT_Memory memory, ++ FT_Outline* outline ) ++ { ++ return FT_THROW( Unimplemented_Feature ); ++ } ++ + FT_EXPORT_DEF( FT_Error ) + FT_Outline_Done( FT_Library library, + FT_Outline* outline ) diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch index d924705..e1615aa 100644 --- a/freetype-2.2.1-enable-valid.patch +++ b/freetype-2.2.1-enable-valid.patch @@ -1,18 +1,18 @@ --- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 +++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 @@ -110,7 +110,7 @@ + # TrueType GX/AAT table validation. Needs `ftgxval.c' below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += gxvalid +AUX_MODULES += gxvalid # Support for streams compressed with gzip (files with suffix .gz). # @@ -124,7 +124,7 @@ + # OpenType table validation. Needs `ftotval.c' below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += otvalid +AUX_MODULES += otvalid diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch index d551000..a234782 100644 --- a/freetype-2.3.0-enable-spr.patch +++ b/freetype-2.3.0-enable-spr.patch @@ -1,11 +1,11 @@ --- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 +++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 @@ -92,7 +92,7 @@ - /* rendering technology that produces excellent output without LCD */ - /* filtering. */ - /* */ + * macro is not defined, FreeType offers alternative LCD rendering + * technology that produces excellent output without LCD filtering. + */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - /*************************************************************************/ + /************************************************************************** diff --git a/freetype.spec b/freetype.spec index 0aa90c0..392caab 100644 --- a/freetype.spec +++ b/freetype.spec @@ -2,8 +2,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.9.1 -Release: 8%{?dist} +Version: 2.10.0 +Release: 1%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement URL: http://www.freetype.org Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2 @@ -22,6 +22,8 @@ Patch3: freetype-2.6.5-libtool.patch Patch4: freetype-2.8-multilib.patch +Patch5: freetype-2.10.0-internal-outline.patch + BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -77,6 +79,7 @@ popd %patch3 -p1 -b .libtool %patch4 -p1 -b .multilib +%patch5 -p1 -b .internal-outline %build @@ -189,6 +192,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue May 28 2019 Marek Kasik - 2.10.0-1 +- Update to 2.10.0 +- Keep FT_Outline_New_Internal() and FT_Outline_Done_Internal() +- for ABI compatibility but make them just throw +- Unimplemented_Feature error. +- Remove them once soname has been bumped! +- Resolves: #1689117 + * Mon Apr 8 2019 Marek Kasik - 2.9.1-8 - Remove freetype-2.9-ftsmooth.patch