Update to 2.13.1

6 files changed, 29 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2edf02ecbae2..3792bc912132 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-freetype2
 	pkgdesc = Font rasterization library (mingw-w64)
-	pkgver = 2.13.0
+	pkgver = 2.13.1
 	pkgrel = 1
 	url = https://www.freetype.org/
 	arch = any
@@ -18,20 +18,16 @@ pkgbase = mingw-w64-freetype2
 	options = !buildflags
 	options = !libtool
 	options = staticlibs
-	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.13.0.tar.xz
-	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.13.0.tar.xz.sig
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.13.1.tar.xz
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.13.1.tar.xz.sig
 	source = 0001-Enable-table-validation-modules.patch
 	source = 0002-Enable-subpixel-rendering.patch
-	source = 0003-Enable-infinality-subpixel-hinting.patch
-	source = 0004-Enable-long-PCF-family-names.patch
-	source = 0005-builds-meson-parse_modules_cfg.py-Handle-gxvalid-and.patch
+	source = 0003-Enable-long-PCF-family-names.patch
 	validpgpkeys = E30674707856409FF1948010BE6C3AAC63AD8E3F
-	sha256sums = 5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c
-	sha256sums = SKIP
-	sha256sums = d279a9d4b2c146722dbc03f9a33009846efe8bbbe3ada52beb4a1aa4d4dfaa38
-	sha256sums = f2e8a16126723458b413e58da267fb30332d0b42fef972f951e3e9fc081fa492
-	sha256sums = 8e61d12ebdbbcb764a38d4798ee728074bac0aa20978d538b6e7045a63949ab8
-	sha256sums = cc364cc0ca21b8b30f29d90ab394d82f3303ca7d9813d866e6bf14f9bccd9564
-	sha256sums = 08cf087d7d612b4228e24d74df95cf1f397f7c41054c42837c63c1f33ffaee09
+	b2sums = edadf2cdd8eb17362239cc5ab7fdff7cb1ca398908d3a9fa0547c3922b098df331cc87e939cee62ce20a78b01f14372c952c823c30af9ac227fc7da10000d37b
+	b2sums = SKIP
+	b2sums = 2c148694e150b3faae9dc46ead824ae6d94cfe34f2918bc9066f45bab7e6b6f77b4d4b2fee00c3d466d866e1985132cea4a774dcf1bab95409b7cf55efff01e1
+	b2sums = 9598d13eae0411878c1af8e5d875c3b1fc09f4e6649edfbbf3b0a819c4c585648521f0b30ffd1318f5106cfde9c899d3db70c8ffe36dac59f3f98b5fd7dab115
+	b2sums = 66deb179d1f1f4e2e35f6d50acfbacce80595d5128f5fed8c1871838c210dbf1a7173a87dd937d64997844c8f478c8f81120f71e33b9d59d980e179d103ff31c
 
 pkgname = mingw-w64-freetype2
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index 7f43859c3884..95f40a306efa 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Enable subpixel rendering
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 9e03e1783be9..6f853d403862 100644
+index 1976b33af959..b3425e55feec 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -123,7 +123,7 @@ FT_BEGIN_HEADER
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
deleted file mode 100644
index fc381b4ebcaf..000000000000
--- a/0003-Enable-infinality-subpixel-hinting.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH] Enable infinality subpixel hinting
-
----
- include/freetype/config/ftoption.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 6f853d403862..fc36a6db1e63 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -706,8 +706,8 @@ FT_BEGIN_HEADER
-    * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
-    */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2         */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )
- 
- 
-   /**************************************************************************
diff --git a/0004-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index eefcea89104c..e38679e4184d 100644
--- a/0004-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable long PCF family names
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index fc36a6db1e63..04e8ed0a85ac 100644
+index b3425e55feec..ecff3ccd12d6 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -913,7 +913,7 @@ FT_BEGIN_HEADER
+@@ -887,7 +887,7 @@ FT_BEGIN_HEADER
     * If this option is activated, it can be controlled with the
     * `no-long-family-names` property of the 'pcf' driver module.
     */
diff --git a/0005-builds-meson-parse_modules_cfg.py-Handle-gxvalid-and.patch b/0005-builds-meson-parse_modules_cfg.py-Handle-gxvalid-and.patch
deleted file mode 100644
index 1e7eb4e135e2..000000000000
--- a/0005-builds-meson-parse_modules_cfg.py-Handle-gxvalid-and.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Thu, 9 Feb 2023 19:22:47 +0000
-Subject: [PATCH] * builds/meson/parse_modules_cfg.py: Handle gxvalid and
- otvalid
-
-These need a name mapping similar to what was done for other modules,
-or linking will fail.
----
- builds/meson/parse_modules_cfg.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/builds/meson/parse_modules_cfg.py b/builds/meson/parse_modules_cfg.py
-index 6030bb2098df..d48129fe72e1 100644
---- a/builds/meson/parse_modules_cfg.py
-+++ b/builds/meson/parse_modules_cfg.py
-@@ -97,8 +97,12 @@ def generate_ftmodule(lists):
- 
-     for module in lists["AUX_MODULES"]:
-         if module in ("psaux", "psnames", "otvalid", "gxvalid"):
-+            name = {
-+                "gxvalid": "gxv",
-+                "otvalid": "otv",
-+            }.get(module, module)
-             result += (
--                "FT_USE_MODULE( FT_Module_Class, %s_module_class )\n" % module
-+                "FT_USE_MODULE( FT_Module_Class, %s_module_class )\n" % name
-             )
- 
-     result += "/* EOF */\n"
diff --git a/PKGBUILD b/PKGBUILD
index 1f9cafef03de..968032409222 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.
 
 pkgname=mingw-w64-freetype2
-pkgver=2.13.0
+pkgver=2.13.1
 pkgrel=1
 pkgdesc='Font rasterization library (mingw-w64)'
 arch=('any')
@@ -13,20 +13,20 @@ license=('GPL')
 depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2 mingw-w64-brotli)
 makedepends=(mingw-w64-gcc mingw-w64-meson)
 options=(!strip !buildflags !libtool staticlibs)
-source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
-        0001-Enable-table-validation-modules.patch
-        0002-Enable-subpixel-rendering.patch
-        0003-Enable-infinality-subpixel-hinting.patch
-        0004-Enable-long-PCF-family-names.patch
-        0005-builds-meson-parse_modules_cfg.py-Handle-gxvalid-and.patch)
-sha256sums=('5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c'
-            'SKIP'
-            'd279a9d4b2c146722dbc03f9a33009846efe8bbbe3ada52beb4a1aa4d4dfaa38'
-            'f2e8a16126723458b413e58da267fb30332d0b42fef972f951e3e9fc081fa492'
-            '8e61d12ebdbbcb764a38d4798ee728074bac0aa20978d538b6e7045a63949ab8'
-            'cc364cc0ca21b8b30f29d90ab394d82f3303ca7d9813d866e6bf14f9bccd9564'
-            '08cf087d7d612b4228e24d74df95cf1f397f7c41054c42837c63c1f33ffaee09')
-validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <wl@gnu.org>
+source=(
+  https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
+  0001-Enable-table-validation-modules.patch
+  0002-Enable-subpixel-rendering.patch
+  0003-Enable-long-PCF-family-names.patch
+)
+b2sums=('edadf2cdd8eb17362239cc5ab7fdff7cb1ca398908d3a9fa0547c3922b098df331cc87e939cee62ce20a78b01f14372c952c823c30af9ac227fc7da10000d37b'
+        'SKIP'
+        '2c148694e150b3faae9dc46ead824ae6d94cfe34f2918bc9066f45bab7e6b6f77b4d4b2fee00c3d466d866e1985132cea4a774dcf1bab95409b7cf55efff01e1'
+        '9598d13eae0411878c1af8e5d875c3b1fc09f4e6649edfbbf3b0a819c4c585648521f0b30ffd1318f5106cfde9c899d3db70c8ffe36dac59f3f98b5fd7dab115'
+        '66deb179d1f1f4e2e35f6d50acfbacce80595d5128f5fed8c1871838c210dbf1a7173a87dd937d64997844c8f478c8f81120f71e33b9d59d980e179d103ff31c')
+validpgpkeys=(
+  E30674707856409FF1948010BE6C3AAC63AD8E3F  # Werner Lemberg <wl@gnu.org>
+)
 
 if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then
   _provides=(${pkgname%-bootstrap})
@@ -42,13 +42,10 @@ conflicts+=(${_provides})
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 prepare() {
-  cd "${srcdir}/freetype-${pkgver}"
-
+  cd freetype-$pkgver
   patch -Np1 -i ../0001-Enable-table-validation-modules.patch
   patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
-  patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
-  patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
-  patch -Np1 -i ../0005-builds-meson-parse_modules_cfg.py-Handle-gxvalid-and.patch
+  patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
 }
 
 build() {