Resync patches

8 files changed, 23 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 844934f176ea..be9401abb0d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.11.0+p0+g801cd842e
-	pkgrel = 2
+	pkgver = 2.11.0+p110+g842ec5ed6
+	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
 	arch = x86_64
@@ -29,17 +29,17 @@ pkgbase = freetype2-git
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c
-	sha256sums = 17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468
-	sha256sums = 561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a
-	sha256sums = 9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6
-	sha256sums = 5b6f2292e7956510c6729c0de1a86be66886d9d10c8723fe399b6eb42003d8ac
+	sha256sums = 663310ef70f7830de462fb8964ee4fa1d49ad4aeb1a6eae5857707e161039a53
+	sha256sums = 17cd4bd0c650b9bdd3bc30581ad6457524db14ec34b56f98e243357c3ab4bc05
+	sha256sums = 0607ac8176d4f08bcfb78d07bdc2c66fcbe7dfde6c82a0e98d6e625597442fd0
+	sha256sums = 6e5192dc08119e32992eee5a15595e131adcc9d2411066ca8691bfe2af14d97e
+	sha256sums = 27b2d2358e2d0488d4a7f714986e311de514ab8e173f11120395784894fdd2a4
 	sha256sums = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.11.0+p0+g801cd842e
+	provides = freetype2=2.11.0+p110+g842ec5ed6
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 
@@ -48,11 +48,11 @@ pkgname = freetype2-demos-git
 	depends = freetype2-git
 	depends = libx11
 	optdepends = qt5-base: ftinspect
-	provides = freetype2-demos=2.11.0+p0+g801cd842e
+	provides = freetype2-demos=2.11.0+p110+g842ec5ed6
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.11.0+p0+g801cd842e
+	provides = freetype2-docs=2.11.0+p110+g842ec5ed6
 	conflicts = freetype2-docs
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 67dea6e4dc5e..5adeb2124f0c 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 30f7fac45a..a9a4703989 100644
+index 30f7fac45abd..a9a4703989b9 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -114,26 +114,26 @@ AUX_MODULES += cache
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index 8a1cddb96252..03f911a26a8d 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 4227fd376e..32da3fa039 100644
+index 4227fd376e41..32da3fa03903 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 cc1aa73d4566..dc0adb23e135 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 32da3fa039..0dd4021e24 100644
+index 32da3fa03903..0dd4021e2433 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -688,8 +688,8 @@ FT_BEGIN_HEADER
diff --git a/0004-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
index 1c082b79c7c5..2c932957e27f 100644
--- a/0004-Enable-long-PCF-family-names.patch
+++ b/0004-Enable-long-PCF-family-names.patch
@@ -8,7 +8,7 @@ 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 0dd4021e24..8da3073b6d 100644
+index 0dd4021e2433..8da3073b6d71 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -877,7 +877,7 @@ FT_BEGIN_HEADER
diff --git a/0005-Run-docwriter-via-venv.patch b/0005-Run-docwriter-via-venv.patch
index eff4c35b75b9..ee7baaa0f826 100644
--- a/0005-Run-docwriter-via-venv.patch
+++ b/0005-Run-docwriter-via-venv.patch
@@ -5,11 +5,10 @@ Subject: [PATCH] Run docwriter via venv
 
 ---
  builds/meson/generate_reference_docs.py | 6 ++++--
- meson.build                             | 2 +-
- 2 files changed, 5 insertions(+), 3 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/builds/meson/generate_reference_docs.py b/builds/meson/generate_reference_docs.py
-index 15d9b06600..124c174ff5 100644
+index 15d9b066005e..124c174ff570 100644
 --- a/builds/meson/generate_reference_docs.py
 +++ b/builds/meson/generate_reference_docs.py
 @@ -65,22 +65,24 @@ def main():
@@ -39,16 +38,3 @@ index 15d9b06600..124c174ff5 100644
      )
      return 0
  
-diff --git a/meson.build b/meson.build
-index 0eb780bfd6..295a3853f8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -392,7 +392,7 @@ gen_docs = custom_target('freetype2 reference documentation',
-   command: [python_exe,
-     files('builds/meson/generate_reference_docs.py'),
-     '--version=' + meson.project_version(),
--    '--input-dir=' + meson.source_root(),
-+    '--input-dir=' + meson.current_source_dir(),
-     '--output-dir=@OUTPUT@'
-   ],
- )
diff --git a/0005-Use-docwriter-from-PATH.patch b/0005-Use-docwriter-from-PATH.patch
deleted file mode 100644
index c648cba2c5c9..000000000000
--- a/0005-Use-docwriter-from-PATH.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Fri, 23 Jul 2021 21:12:45 +0000
-Subject: [PATCH] Use docwriter from PATH
-
----
- builds/meson/generate_reference_docs.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/builds/meson/generate_reference_docs.py b/builds/meson/generate_reference_docs.py
-index 15d9b06600..158c536a82 100644
---- a/builds/meson/generate_reference_docs.py
-+++ b/builds/meson/generate_reference_docs.py
-@@ -66,8 +66,6 @@ def main():
-         )
- 
-     cmds = [
--        sys.executable,
--        "-m",
-         "docwriter",
-         "--prefix=ft2",
-         "--title=FreeType-" + args.version,
diff --git a/PKGBUILD b/PKGBUILD
index d9e7835042cd..cea738057db6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=freetype2-git
 pkgname=(freetype2-git freetype2-demos-git freetype2-docs-git)
-pkgver=2.11.0+p0+g801cd842e
-pkgrel=2
+pkgver=2.11.0+p110+g842ec5ed6
+pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
 url="https://www.freetype.org/"
@@ -24,11 +24,11 @@ source=(git+https://gitlab.freedesktop.org/freetype/freetype.git
         freetype2.sh)
 sha256sums=('SKIP'
             'SKIP'
-            'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c'
-            '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468'
-            '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a'
-            '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6'
-            '5b6f2292e7956510c6729c0de1a86be66886d9d10c8723fe399b6eb42003d8ac'
+            '663310ef70f7830de462fb8964ee4fa1d49ad4aeb1a6eae5857707e161039a53'
+            '17cd4bd0c650b9bdd3bc30581ad6457524db14ec34b56f98e243357c3ab4bc05'
+            '0607ac8176d4f08bcfb78d07bdc2c66fcbe7dfde6c82a0e98d6e625597442fd0'
+            '6e5192dc08119e32992eee5a15595e131adcc9d2411066ca8691bfe2af14d97e'
+            '27b2d2358e2d0488d4a7f714986e311de514ab8e173f11120395784894fdd2a4'
             'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
 validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl@gnu.org>