Update patches

7 files changed, 21 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2eb915c9748e..ff82107eb56c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.10.4+p10+g22bb0660a
+	pkgver = 2.10.4+p16+g5abd252a0
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
@@ -26,17 +26,17 @@ pkgbase = freetype2-git
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1
-	sha256sums = dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7
-	sha256sums = 21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f
-	sha256sums = 266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e
-	sha256sums = 04e622f514bc0ae6ecd21c8050115e2356058fcb49bc21d0f54358972f5d5639
+	sha256sums = 8b6f8b0798e77b945bad03cb01b1dbd654b18b0e9adf39cb5106ccfa104530a6
+	sha256sums = 7da842a8f487e0948d34b0ed743ae48d43daee09f6f241fb2516be7e06d2c87c
+	sha256sums = b089eaa1a7fe97f3f6fc66c8d6f93ae9cb69db8b93711adabb4b2bd5a57b150e
+	sha256sums = 68eb9b5de88d562db961bb835dc55069474b7be3ce52b0909da95a74e8a69667
+	sha256sums = fabfa40b42fac7a41231d4484bad2b9310bda9b441a887e9c38869f19353649a
 	sha256sums = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.10.4+p10+g22bb0660a
+	provides = freetype2=2.10.4+p16+g5abd252a0
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 
@@ -44,12 +44,12 @@ pkgname = freetype2-demos-git
 	pkgdesc = Freetype tools and demos (from git)
 	depends = freetype2-git
 	depends = libx11
-	provides = freetype2-demos=2.10.4+p10+g22bb0660a
+	provides = freetype2-demos=2.10.4+p16+g5abd252a0
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.10.4+p10+g22bb0660a
+	provides = freetype2-docs=2.10.4+p16+g5abd252a0
 	conflicts = freetype2-docs
 
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 4c469faf6313..464ba908444c 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 d6cdbe523..181f91541 100644
+index d6cdbe5239..181f915416 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -111,26 +111,26 @@ AUX_MODULES += cache
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index 26360b5c04b7..e7a57eb94e79 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 097f19b8a..e5de62e35 100644
+index 097f19b8a5..e5de62e353 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -124,7 +124,7 @@ FT_BEGIN_HEADER
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
index d2369893a92b..868a3a11637c 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 e5de62e35..acb4d6d6a 100644
+index e5de62e353..acb4d6d6aa 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -672,8 +672,8 @@ FT_BEGIN_HEADER
diff --git a/0004-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
index 45fb72c4b5f8..af66b329db07 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 acb4d6d6a..efa13b9c6 100644
+index acb4d6d6aa..efa13b9c66 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -861,7 +861,7 @@ FT_BEGIN_HEADER
diff --git a/0005-Enable-old-engines-but-keep-adobe-as-default.patch b/0005-Enable-old-engines-but-keep-adobe-as-default.patch
index 8ee0e83ea3bb..d4ccd57fdba6 100644
--- a/0005-Enable-old-engines-but-keep-adobe-as-default.patch
+++ b/0005-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -5,13 +5,10 @@ Subject: [PATCH] Enable old engines, but keep adobe as default
 
 ---
  include/freetype/config/ftoption.h | 4 ++--
- src/cff/cffobjs.c                  | 4 ----
- src/cid/cidobjs.c                  | 4 ----
- src/type1/t1objs.c                 | 4 ----
- 4 files changed, 2 insertions(+), 14 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index efa13b9c6..f3b35758c 100644
+index efa13b9c66..f3b35758c7 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -792,7 +792,7 @@ FT_BEGIN_HEADER
@@ -32,51 +29,3 @@ index efa13b9c6..f3b35758c 100644
  
  
    /*************************************************************************/
-diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
-index d555d5235..418c0c0ae 100644
---- a/src/cff/cffobjs.c
-+++ b/src/cff/cffobjs.c
-@@ -1174,11 +1174,7 @@
- 
- 
-     /* set default property values, cf. `ftcffdrv.h' */
--#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
--    driver->hinting_engine = FT_HINTING_FREETYPE;
--#else
-     driver->hinting_engine = FT_HINTING_ADOBE;
--#endif
- 
-     driver->no_stem_darkening = TRUE;
- 
-diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
-index 04b295eb8..53a8f1554 100644
---- a/src/cid/cidobjs.c
-+++ b/src/cid/cidobjs.c
-@@ -479,11 +479,7 @@
- 
- 
-     /* set default property values, cf. `ftt1drv.h' */
--#ifdef T1_CONFIG_OPTION_OLD_ENGINE
--    driver->hinting_engine = FT_HINTING_FREETYPE;
--#else
-     driver->hinting_engine = FT_HINTING_ADOBE;
--#endif
- 
-     driver->no_stem_darkening = TRUE;
- 
-diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
-index 3b918b733..d85bf5c64 100644
---- a/src/type1/t1objs.c
-+++ b/src/type1/t1objs.c
-@@ -598,11 +598,7 @@
- 
- 
-     /* set default property values, cf. `ftt1drv.h' */
--#ifdef T1_CONFIG_OPTION_OLD_ENGINE
--    driver->hinting_engine = FT_HINTING_FREETYPE;
--#else
-     driver->hinting_engine = FT_HINTING_ADOBE;
--#endif
- 
-     driver->no_stem_darkening = TRUE;
- 
diff --git a/PKGBUILD b/PKGBUILD
index 37610ca6c1c1..644a80c9b30d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=freetype2-git
 pkgname=(freetype2-git freetype2-demos-git freetype2-docs-git)
-pkgver=2.10.4+p10+g22bb0660a
+pkgver=2.10.4+p16+g5abd252a0
 pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
@@ -24,11 +24,11 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
         freetype2.sh)
 sha256sums=('SKIP'
             'SKIP'
-            'f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1'
-            'dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7'
-            '21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f'
-            '266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e'
-            '04e622f514bc0ae6ecd21c8050115e2356058fcb49bc21d0f54358972f5d5639'
+            '8b6f8b0798e77b945bad03cb01b1dbd654b18b0e9adf39cb5106ccfa104530a6'
+            '7da842a8f487e0948d34b0ed743ae48d43daee09f6f241fb2516be7e06d2c87c'
+            'b089eaa1a7fe97f3f6fc66c8d6f93ae9cb69db8b93711adabb4b2bd5a57b150e'
+            '68eb9b5de88d562db961bb835dc55069474b7be3ce52b0909da95a74e8a69667'
+            'fabfa40b42fac7a41231d4484bad2b9310bda9b441a887e9c38869f19353649a'
             'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
 validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl@gnu.org>