From 3dc084f71aa2165a8defcb298cbdb82b45e0d367 Mon Sep 17 00:00:00 2001
From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Date: Fri, 1 Apr 2022 05:04:01 +0100
Subject: [PATCH] freetype: update to 2.12.0

---
 mingw-w64-freetype/PKGBUILD                   | 30 +++++++++++--------
 .../freetype-2.5.1-enable-sph.patch           | 13 --------
 2 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100644 mingw-w64-freetype/freetype-2.5.1-enable-sph.patch

diff --git a/mingw-w64-freetype/PKGBUILD b/mingw-w64-freetype/PKGBUILD
index bf52051037..264696173a 100644
--- a/mingw-w64-freetype/PKGBUILD
+++ b/mingw-w64-freetype/PKGBUILD
@@ -6,8 +6,8 @@ _with_harfbuzz="yes"
 _realname=freetype
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.11.1
-pkgrel=2
+pkgver=2.12.0
+pkgrel=1
 pkgdesc="TrueType font rendering library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -28,22 +28,28 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
 options=('strip' '!libtool' 'staticlibs')
 source=(https://download-mirror.savannah.gnu.org/releases/freetype//freetype-${pkgver}.tar.xz{,.sig}
         freetype-2.10.0-enable-valid.patch
-        freetype-2.10.0-enable-spr.patch
-        freetype-2.5.1-enable-sph.patch)
-sha256sums=('3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8'
+        freetype-2.10.0-enable-spr.patch)
+sha256sums=('ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033'
             'SKIP'
             '30e84993f899b66c31451992667f7ac6cc9e0b19dfe2f47ccb546d77bbc77ef5'
-            '0571f18d97834df020e4cbdb1338b14f9160669f868237080951e01f5b86727c'
-            '324012ad68388d22c63368314721d2360b48dd40daa808d0383699a281d931b0')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+            '0571f18d97834df020e4cbdb1338b14f9160669f868237080951e01f5b86727c')
+validpgpkeys=('E30674707856409FF1948010BE6C3AAC63AD8E3F') # Werner Lemberg <wl@gnu.org>
+
+# Helper macros to help make tasks easier #
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying ${_patch}"
+    patch -Nbp1 -i "${srcdir}/${_patch}"
+  done
+}
 
 prepare() {
   cd "${srcdir}/freetype-${pkgver}"
 
-  plain "freetype-2.10.0-enable-valid.patch"
-  patch -p1 -i "${srcdir}/freetype-2.10.0-enable-valid.patch"
-  plain "freetype-2.10.0-enable-spr.patch"
-  patch -p1 -i "${srcdir}/freetype-2.10.0-enable-spr.patch"
+  apply_patch_with_msg \
+    freetype-2.10.0-enable-valid.patch \
+    freetype-2.10.0-enable-spr.patch
 }
 
 build() {
diff --git a/mingw-w64-freetype/freetype-2.5.1-enable-sph.patch b/mingw-w64-freetype/freetype-2.5.1-enable-sph.patch
deleted file mode 100644
index a4e424cac6..0000000000
--- a/mingw-w64-freetype/freetype-2.5.1-enable-sph.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h
-index fe2ba15..1ab4226 100644
---- i/include/freetype/config/ftoption.h
-+++ w/include/freetype/config/ftoption.h
-@@ -591,7 +591,7 @@ FT_BEGIN_HEADER
-   /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
-   /*   defined.                                                            */
-   /*                                                                       */
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
- 
- 
-   /*************************************************************************/