diff --git a/.gitignore b/.gitignore index aea3836..686d4a7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ freetype-doc-2.3.11.tar.gz /freetype-2.10.0.tar.bz2 /freetype-2.10.1.tar.xz /freetype-2.10.2.tar.xz +/freetype-2.10.4.tar.xz diff --git a/freetype-2.10.0-internal-outline.patch b/freetype-2.10.0-internal-outline.patch index 5cd293d..25917ac 100644 --- a/freetype-2.10.0-internal-outline.patch +++ b/freetype-2.10.0-internal-outline.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference freetype-2.10.2/include/freetype/ftoutln.h freetype-2.10.2-new/include/freetype/ftoutln.h ---- freetype-2.10.2/include/freetype/ftoutln.h 2020-01-19 17:02:27.000000000 +0100 -+++ freetype-2.10.2-new/include/freetype/ftoutln.h 2020-07-18 10:31:21.614160142 +0200 -@@ -165,6 +165,15 @@ FT_BEGIN_HEADER +diff -rupN --no-dereference freetype-2.10.4/include/freetype/ftoutln.h freetype-2.10.4-new/include/freetype/ftoutln.h +--- freetype-2.10.4/include/freetype/ftoutln.h 2020-08-31 09:26:12.000000000 +0200 ++++ freetype-2.10.4-new/include/freetype/ftoutln.h 2020-10-23 18:08:03.623465356 +0200 +@@ -164,6 +164,15 @@ FT_BEGIN_HEADER FT_Int numContours, FT_Outline *anoutline ); @@ -17,7 +17,7 @@ diff -rupN --no-dereference freetype-2.10.2/include/freetype/ftoutln.h freetype- /************************************************************************** * -@@ -192,6 +201,13 @@ FT_BEGIN_HEADER +@@ -191,6 +200,13 @@ FT_BEGIN_HEADER FT_Outline_Done( FT_Library library, FT_Outline* outline ); @@ -31,10 +31,10 @@ diff -rupN --no-dereference freetype-2.10.2/include/freetype/ftoutln.h freetype- /************************************************************************** * -diff -rupN --no-dereference freetype-2.10.2/src/base/ftoutln.c freetype-2.10.2-new/src/base/ftoutln.c ---- freetype-2.10.2/src/base/ftoutln.c 2020-01-19 17:02:27.000000000 +0100 -+++ freetype-2.10.2-new/src/base/ftoutln.c 2020-07-18 10:31:21.614160142 +0200 -@@ -290,6 +290,19 @@ +diff -rupN --no-dereference freetype-2.10.4/src/base/ftoutln.c freetype-2.10.4-new/src/base/ftoutln.c +--- freetype-2.10.4/src/base/ftoutln.c 2020-08-27 08:17:20.000000000 +0200 ++++ freetype-2.10.4-new/src/base/ftoutln.c 2020-10-23 18:08:03.623465356 +0200 +@@ -289,6 +289,19 @@ /* documentation is in ftoutln.h */ @@ -54,7 +54,7 @@ diff -rupN --no-dereference freetype-2.10.2/src/base/ftoutln.c freetype-2.10.2-n FT_EXPORT_DEF( FT_Error ) FT_Outline_New( FT_Library library, FT_UInt numPoints, -@@ -422,6 +435,17 @@ +@@ -421,6 +434,17 @@ /* documentation is in ftoutln.h */ diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch index f244945..eb54de9 100644 --- a/freetype-2.2.1-enable-valid.patch +++ b/freetype-2.2.1-enable-valid.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference freetype-2.10.2/modules.cfg freetype-2.10.2-new/modules.cfg ---- freetype-2.10.2/modules.cfg 2020-01-19 17:02:27.000000000 +0100 -+++ freetype-2.10.2-new/modules.cfg 2020-07-18 10:31:21.497161798 +0200 +diff -rupN --no-dereference freetype-2.10.4/modules.cfg freetype-2.10.4-new/modules.cfg +--- freetype-2.10.4/modules.cfg 2020-08-24 22:21:47.000000000 +0200 ++++ freetype-2.10.4-new/modules.cfg 2020-10-23 18:08:03.512465603 +0200 @@ -111,7 +111,7 @@ AUX_MODULES += cache # TrueType GX/AAT table validation. Needs `ftgxval.c' below. diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch index 093393f..798f2eb 100644 --- a/freetype-2.3.0-enable-spr.patch +++ b/freetype-2.3.0-enable-spr.patch @@ -1,9 +1,9 @@ -diff -rupN --no-dereference freetype-2.10.2/include/freetype/config/ftoption.h freetype-2.10.2-new/include/freetype/config/ftoption.h ---- freetype-2.10.2/include/freetype/config/ftoption.h 2020-01-19 17:02:27.000000000 +0100 -+++ freetype-2.10.2-new/include/freetype/config/ftoption.h 2020-07-18 10:31:21.371163581 +0200 -@@ -126,7 +126,7 @@ FT_BEGIN_HEADER - * macro is not defined, FreeType offers alternative LCD rendering - * technology that produces excellent output without LCD filtering. +diff -rupN --no-dereference freetype-2.10.4/include/freetype/config/ftoption.h freetype-2.10.4-new/include/freetype/config/ftoption.h +--- freetype-2.10.4/include/freetype/config/ftoption.h 2020-08-31 09:26:12.000000000 +0200 ++++ freetype-2.10.4-new/include/freetype/config/ftoption.h 2020-10-23 18:08:03.397465859 +0200 +@@ -124,7 +124,7 @@ FT_BEGIN_HEADER + * When this macro is not defined, FreeType offers alternative LCD + * rendering technology that produces excellent output. */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING diff --git a/mingw-freetype.spec b/mingw-freetype.spec index 2d8402c..3c8eab9 100644 --- a/mingw-freetype.spec +++ b/mingw-freetype.spec @@ -2,8 +2,8 @@ Name: mingw-freetype # NOTE See comment for Patch2 below -Version: 2.10.2 -Release: 2%{?dist} +Version: 2.10.4 +Release: 1%{?dist} Summary: Free and portable font rendering engine License: FTL or GPLv2+ @@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Fri Oct 23 2020 Sandro Mani - 2.10.4-1 +- Update to 2.10.4 + * Tue Jul 28 2020 Fedora Release Engineering - 2.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 1418aa4..3a9c524 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freetype-2.10.2.tar.xz) = cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa +SHA512 (freetype-2.10.4.tar.xz) = 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f