From 30bc5baf413aeeab9e625081637ea8ef953b332e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 24 Jul 2021 15:54:20 +0200 Subject: [PATCH] Update to 2.11.0 --- .gitignore | 1 + freetype-2.10.0-internal-outline.patch | 12 ++++++------ freetype-2.2.1-enable-valid.patch | 10 +++++----- freetype-2.3.0-enable-spr.patch | 8 ++++---- mingw-freetype.spec | 11 +++++++---- sources | 2 +- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 686d4a7..93d4ac1 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ freetype-doc-2.3.11.tar.gz /freetype-2.10.1.tar.xz /freetype-2.10.2.tar.xz /freetype-2.10.4.tar.xz +/freetype-2.11.0.tar.xz diff --git a/freetype-2.10.0-internal-outline.patch b/freetype-2.10.0-internal-outline.patch index 25917ac..5fd8119 100644 --- a/freetype-2.10.0-internal-outline.patch +++ b/freetype-2.10.0-internal-outline.patch @@ -1,6 +1,6 @@ -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 +diff -rupN --no-dereference freetype-2.11.0/include/freetype/ftoutln.h freetype-2.11.0-new/include/freetype/ftoutln.h +--- freetype-2.11.0/include/freetype/ftoutln.h 2021-02-13 09:16:54.000000000 +0100 ++++ freetype-2.11.0-new/include/freetype/ftoutln.h 2021-07-24 15:34:28.799981435 +0200 @@ -164,6 +164,15 @@ FT_BEGIN_HEADER FT_Int numContours, FT_Outline *anoutline ); @@ -31,9 +31,9 @@ diff -rupN --no-dereference freetype-2.10.4/include/freetype/ftoutln.h freetype- /************************************************************************** * -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 +diff -rupN --no-dereference freetype-2.11.0/src/base/ftoutln.c freetype-2.11.0-new/src/base/ftoutln.c +--- freetype-2.11.0/src/base/ftoutln.c 2021-02-13 09:16:54.000000000 +0100 ++++ freetype-2.11.0-new/src/base/ftoutln.c 2021-07-24 15:34:28.799981435 +0200 @@ -289,6 +289,19 @@ /* documentation is in ftoutln.h */ diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch index eb54de9..0c1ca11 100644 --- a/freetype-2.2.1-enable-valid.patch +++ b/freetype-2.2.1-enable-valid.patch @@ -1,7 +1,7 @@ -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 +diff -rupN --no-dereference freetype-2.11.0/modules.cfg freetype-2.11.0-new/modules.cfg +--- freetype-2.11.0/modules.cfg 2021-05-19 07:43:30.000000000 +0200 ++++ freetype-2.11.0-new/modules.cfg 2021-07-24 15:34:28.669982785 +0200 +@@ -114,7 +114,7 @@ AUX_MODULES += cache # TrueType GX/AAT table validation. Needs `ftgxval.c' below. # @@ -10,7 +10,7 @@ diff -rupN --no-dereference freetype-2.10.4/modules.cfg freetype-2.10.4-new/modu # Support for streams compressed with gzip (files with suffix .gz). # -@@ -130,7 +130,7 @@ AUX_MODULES += bzip2 +@@ -133,7 +133,7 @@ AUX_MODULES += bzip2 # OpenType table validation. Needs `ftotval.c' below. # diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch index 798f2eb..6509012 100644 --- a/freetype-2.3.0-enable-spr.patch +++ b/freetype-2.3.0-enable-spr.patch @@ -1,7 +1,7 @@ -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 +diff -rupN --no-dereference freetype-2.11.0/include/freetype/config/ftoption.h freetype-2.11.0-new/include/freetype/config/ftoption.h +--- freetype-2.11.0/include/freetype/config/ftoption.h 2021-07-15 12:09:04.000000000 +0200 ++++ freetype-2.11.0-new/include/freetype/config/ftoption.h 2021-07-24 15:34:28.539984136 +0200 +@@ -123,7 +123,7 @@ FT_BEGIN_HEADER * When this macro is not defined, FreeType offers alternative LCD * rendering technology that produces excellent output. */ diff --git a/mingw-freetype.spec b/mingw-freetype.spec index 384e0d7..7f2e333 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.4 -Release: 3%{?dist} +Version: 2.11.0 +Release: 1%{?dist} Summary: Free and portable font rendering engine License: FTL or GPLv2+ @@ -108,7 +108,7 @@ rm -rf %{buildroot}%{mingw32_mandir} %{buildroot}%{mingw64_mandir} %files -n mingw32-freetype -%license docs/LICENSE.TXT +%license LICENSE.TXT %{mingw32_bindir}/freetype-config %{mingw32_bindir}/libfreetype-6.dll %{mingw32_includedir}/freetype2 @@ -120,7 +120,7 @@ rm -rf %{buildroot}%{mingw32_mandir} %{buildroot}%{mingw64_mandir} %{mingw32_libdir}/libfreetype.a %files -n mingw64-freetype -%license docs/LICENSE.TXT +%license LICENSE.TXT %{mingw64_bindir}/freetype-config %{mingw64_bindir}/libfreetype-6.dll %{mingw64_includedir}/freetype2 @@ -133,6 +133,9 @@ rm -rf %{buildroot}%{mingw32_mandir} %{buildroot}%{mingw64_mandir} %changelog +* Sat Jul 24 2021 Sandro Mani - 2.11.0-1 +- Update to 2.11.0 + * Thu Jul 22 2021 Fedora Release Engineering - 2.10.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 3a9c524..0ff14bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freetype-2.10.4.tar.xz) = 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f +SHA512 (freetype-2.11.0.tar.xz) = bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d