From d6214db5e7e63c0bc908422df30885a4e43b7cdf Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Thu, 22 Jul 2021 19:10:45 +0200
Subject: [PATCH] Update to 2.11.0

---
 .gitignore                            |  3 ++
 freetype-2.10.4-png-memory-leak.patch | 43 ---------------------------
 freetype-2.5.2-more-demos.patch       |  2 +-
 freetype.spec                         | 12 ++++----
 sources                               |  6 ++--
 5 files changed, 13 insertions(+), 53 deletions(-)
 delete mode 100644 freetype-2.10.4-png-memory-leak.patch

diff --git a/.gitignore b/.gitignore
index 8bd6c86..bbcf9f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,6 @@ ft2demos-2.4.2.tar.bz2
 /freetype-2.10.4.tar.xz
 /freetype-doc-2.10.4.tar.xz
 /ft2demos-2.10.4.tar.xz
+/freetype-2.11.0.tar.xz
+/freetype-doc-2.11.0.tar.xz
+/ft2demos-2.11.0.tar.xz
diff --git a/freetype-2.10.4-png-memory-leak.patch b/freetype-2.10.4-png-memory-leak.patch
deleted file mode 100644
index 52df99a..0000000
--- a/freetype-2.10.4-png-memory-leak.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 007c109b4594c5e63948bd08b4d5011ad76ffb10 Mon Sep 17 00:00:00 2001
-From: Ben Wagner <bungeman@google.com>
-Date: Fri, 23 Oct 2020 08:29:14 +0200
-Subject: [PATCH] * src/sfnt/pngshim.c (Load_SBit_Png): Fix memory leak
- (#59322).
-
-The issue is that `rows` is allocated but will not be freed in the
-event that the call to `png_read_image` fails and calls `longjmp`.
----
- ChangeLog          | 7 +++++++
- src/sfnt/pngshim.c | 1 +
- 2 files changed, 8 insertions(+)
-
-diff --git a/ChangeLog b/ChangeLog
-index 42f7c34ba..ff048b8ab 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+2020-10-23  Ben Wagner  <bungeman@google.com>
-+
-+	* src/sfnt/pngshim.c (Load_SBit_Png): Fix memory leak (#59322).
-+
-+	The issue is that `rows` is allocated but will not be freed in the
-+	event that the call to `png_read_image` fails and calls `longjmp`.
-+
- 2020-10-20  Werner Lemberg  <wl@gnu.org>
- 
- 	* Version 2.10.4 released.
-diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c
-index f55016122..d4e43a9f4 100644
---- a/src/sfnt/pngshim.c
-+++ b/src/sfnt/pngshim.c
-@@ -443,6 +443,7 @@
-     png_read_end( png, info );
- 
-   DestroyExit:
-+    FT_FREE( rows );
-     png_destroy_read_struct( &png, &info, NULL );
-     FT_Stream_Close( &stream );
- 
--- 
-2.26.2
-
diff --git a/freetype-2.5.2-more-demos.patch b/freetype-2.5.2-more-demos.patch
index e737cb7..7e58be7 100644
--- a/freetype-2.5.2-more-demos.patch
+++ b/freetype-2.5.2-more-demos.patch
@@ -14,4 +14,4 @@
 +  EXES += fttimer
    # EXES += testname
  
-   exes: $(EXES:%=$(BIN_DIR_2)/%$E)
+   # Not all demo programs have a man page; we thus check for existence in a
diff --git a/freetype.spec b/freetype.spec
index 0724d69..74c1069 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -3,8 +3,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.10.4
-Release: 4%{?dist}
+Version: 2.11.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.xz
@@ -27,8 +27,6 @@ Patch5:  freetype-2.10.0-internal-outline.patch
 # Revert ABI/API change
 Patch6:  freetype-2.10.1-debughook.patch
 
-Patch7:  freetype-2.10.4-png-memory-leak.patch
-
 BuildRequires:  gcc
 BuildRequires: libX11-devel
 BuildRequires: libpng-devel
@@ -91,7 +89,6 @@ popd
 %patch4 -p1 -b .multilib
 %patch5 -p1 -b .internal-outline
 %patch6 -p1 -b .debughook
-%patch7 -p1 -b .png-memory-leak
 
 %build
 
@@ -185,7 +182,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 %files
 %{!?_licensedir:%global license %%doc}
-%license docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
+%license LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
 %{_libdir}/libfreetype.so.*
 %doc README
 
@@ -233,6 +230,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jul 22 2021 Marek Kasik <mkasik@redhat.com> - 2.11.0-1
+- Update to 2.11.0
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index a9ea804..bcff9d2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (freetype-2.10.4.tar.xz) = 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
-SHA512 (freetype-doc-2.10.4.tar.xz) = 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
-SHA512 (ft2demos-2.10.4.tar.xz) = d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
+SHA512 (freetype-2.11.0.tar.xz) = bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d
+SHA512 (freetype-doc-2.11.0.tar.xz) = 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301
+SHA512 (ft2demos-2.11.0.tar.xz) = 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531