Update to 2.13.0

7 files changed, 57 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 043a3bf9f965..2edf02ecbae2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-freetype2
 	pkgdesc = Font rasterization library (mingw-w64)
-	pkgver = 2.12.1
-	pkgrel = 3
+	pkgver = 2.13.0
+	pkgrel = 1
 	url = https://www.freetype.org/
 	arch = any
 	license = GPL
@@ -18,18 +18,20 @@ pkgbase = mingw-w64-freetype2
 	options = !buildflags
 	options = !libtool
 	options = staticlibs
-	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.12.1.tar.xz
-	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.12.1.tar.xz.sig
+	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 = 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
 	validpgpkeys = E30674707856409FF1948010BE6C3AAC63AD8E3F
-	sha256sums = 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f
+	sha256sums = 5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c
 	sha256sums = SKIP
-	sha256sums = 12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da
-	sha256sums = 2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f
-	sha256sums = caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20
-	sha256sums = 8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb
+	sha256sums = d279a9d4b2c146722dbc03f9a33009846efe8bbbe3ada52beb4a1aa4d4dfaa38
+	sha256sums = f2e8a16126723458b413e58da267fb30332d0b42fef972f951e3e9fc081fa492
+	sha256sums = 8e61d12ebdbbcb764a38d4798ee728074bac0aa20978d538b6e7045a63949ab8
+	sha256sums = cc364cc0ca21b8b30f29d90ab394d82f3303ca7d9813d866e6bf14f9bccd9564
+	sha256sums = 08cf087d7d612b4228e24d74df95cf1f397f7c41054c42837c63c1f33ffaee09
 
 pkgname = mingw-w64-freetype2
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 969e6025d832..f360a143132c 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Enable table validation modules
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index aded92e5e922..f133c65b27e2 100644
+index 5b6c9b5a5c1d..b4933bea7654 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -117,26 +117,26 @@ AUX_MODULES += cache
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index 8f16e7a5f26c..7f43859c3884 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 c5bde243b127..77d6efb2e5f2 100644
+index 9e03e1783be9..6f853d403862 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
index eee5e3ee703b..fc381b4ebcaf 100644
--- a/0003-Enable-infinality-subpixel-hinting.patch
+++ b/0003-Enable-infinality-subpixel-hinting.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Enable infinality subpixel hinting
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 77d6efb2e5f2..c33c51eeb2e7 100644
+index 6f853d403862..fc36a6db1e63 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -706,8 +706,8 @@ FT_BEGIN_HEADER
diff --git a/0004-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
index 93e04473cbe9..eefcea89104c 100644
--- a/0004-Enable-long-PCF-family-names.patch
+++ b/0004-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 c33c51eeb2e7..c33ddb4bf60c 100644
+index fc36a6db1e63..04e8ed0a85ac 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -895,7 +895,7 @@ FT_BEGIN_HEADER
+@@ -913,7 +913,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
new file mode 100644
index 000000000000..1e7eb4e135e2
--- /dev/null
+++ b/0005-builds-meson-parse_modules_cfg.py-Handle-gxvalid-and.patch
@@ -0,0 +1,30 @@
+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 0ad0c7b91e3d..1f9cafef03de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # you also find the URL of a binary repository.
 
 pkgname=mingw-w64-freetype2
-pkgver=2.12.1
-pkgrel=3
+pkgver=2.13.0
+pkgrel=1
 pkgdesc='Font rasterization library (mingw-w64)'
 arch=('any')
 url='https://www.freetype.org/'
@@ -17,13 +17,15 @@ source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkg
         0001-Enable-table-validation-modules.patch
         0002-Enable-subpixel-rendering.patch
         0003-Enable-infinality-subpixel-hinting.patch
-        0004-Enable-long-PCF-family-names.patch)
-sha256sums=('4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f'
+        0004-Enable-long-PCF-family-names.patch
+        0005-builds-meson-parse_modules_cfg.py-Handle-gxvalid-and.patch)
+sha256sums=('5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c'
             'SKIP'
-            '12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da'
-            '2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f'
-            'caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20'
-            '8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb')
+            'd279a9d4b2c146722dbc03f9a33009846efe8bbbe3ada52beb4a1aa4d4dfaa38'
+            'f2e8a16126723458b413e58da267fb30332d0b42fef972f951e3e9fc081fa492'
+            '8e61d12ebdbbcb764a38d4798ee728074bac0aa20978d538b6e7045a63949ab8'
+            'cc364cc0ca21b8b30f29d90ab394d82f3303ca7d9813d866e6bf14f9bccd9564'
+            '08cf087d7d612b4228e24d74df95cf1f397f7c41054c42837c63c1f33ffaee09')
 validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <wl@gnu.org>
 
 if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then
@@ -46,6 +48,7 @@ prepare() {
   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
 }
 
 build() {