From 1df760fa781e5c81edc89314a96a25237cb50a69 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Sat, 25 Feb 2023 13:16:06 +0100
Subject: [PATCH] Update to 2.13.0

Resolves: #2168496
---
 .gitignore                                  |  3 +++
 freetype-2.12.1-clear-ownership-flags.patch | 29 ---------------------
 freetype.spec                               | 11 ++++----
 sources                                     |  6 ++---
 4 files changed, 12 insertions(+), 37 deletions(-)
 delete mode 100644 freetype-2.12.1-clear-ownership-flags.patch

diff --git a/.gitignore b/.gitignore
index 4643dfa..3dd701c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,6 @@ ft2demos-2.4.2.tar.bz2
 /freetype-2.12.1.tar.xz
 /freetype-doc-2.12.1.tar.xz
 /ft2demos-2.12.1.tar.xz
+/freetype-2.13.0.tar.xz
+/freetype-doc-2.13.0.tar.xz
+/ft2demos-2.13.0.tar.xz
diff --git a/freetype-2.12.1-clear-ownership-flags.patch b/freetype-2.12.1-clear-ownership-flags.patch
deleted file mode 100644
index 2598188..0000000
--- a/freetype-2.12.1-clear-ownership-flags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c26872ed59cba3af2f407b5eefc92fcec92aa52b Mon Sep 17 00:00:00 2001
-From: Ben Wagner <bungeman@chromium.org>
-Date: Thu, 26 May 2022 20:27:53 -0400
-Subject: [svg] Clear correct flags for doc ownership
-
-This issue was discovered with an SVG based font with some documents
-compressed and other uncompressed. After loading the first compressed
-document the ownership flag on the glyph slot was set to true but never
-set to false. As a result after loading a compressed document a glyph
-from an uncompressed document would load fine, but when this glyph slot
-was cleared it would try to free its document resulting in a wild free.
-
-* src/base/ftobjs.c (ft_glyphslot_clear): clear correct flags
-
-Fixes: #1162
-
-diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
-index eeda69c3e..f66273f3d 100644
---- a/src/base/ftobjs.c
-+++ b/src/base/ftobjs.c
-@@ -605,7 +605,7 @@
- 
- 
-         FT_FREE( doc->svg_document );
--        slot->internal->load_flags &= ~FT_GLYPH_OWN_GZIP_SVG;
-+        slot->internal->flags &= ~FT_GLYPH_OWN_GZIP_SVG;
-       }
-     }
- #endif
diff --git a/freetype.spec b/freetype.spec
index 27f3561..10c4454 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -3,8 +3,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.12.1
-Release: 4%{?dist}
+Version: 2.13.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.12.1-clear-ownership-flags.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 .clear-ownership-flags
 
 %build
 
@@ -233,6 +230,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 %{_mandir}/man1/*
 
 %changelog
+* Sat Feb 25 2023 Marek Kasik <mkasik@redhat.com> - 2.13.0-1
+- Update to 2.13.0
+- Resolves: #2168496
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index e0b6848..ad51d1b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (freetype-2.12.1.tar.xz) = 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
-SHA512 (freetype-doc-2.12.1.tar.xz) = 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
-SHA512 (ft2demos-2.12.1.tar.xz) = cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
+SHA512 (freetype-2.13.0.tar.xz) = b93a69a92b99f54c4fc4a276066bc7a87597df132e42ef93f6d973f1425e64bebcc568defa511d39fb04ab4d3a2090a6db1e54cf992a80ff57d658fee28a9110
+SHA512 (freetype-doc-2.13.0.tar.xz) = d4367513e1ca48691aa6d64c36bf53603f67a67214378a2ae3810b2227084647743ee0d7137453f31c966ccb9ce19c2a72b3b5445d4accbce9a63d71f6b6800e
+SHA512 (ft2demos-2.13.0.tar.xz) = 7d686e9febdda587b74647cc38fa22f0722d0306ecb05430e319e05b6132c999d20728bcd7a6506b8d8ad45a6859443e2b69d766802497357a8f0ba3352404ba