Update patches

6 files changed, 43 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 837812ec2106..a53259373359 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sat Dec 16 22:19:18 UTC 2017
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.8.1+p145+g2c048a8a6
-	pkgrel = 3
+	pkgver = 2.9+p33+g6f854692a
+	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
 	arch = i686
@@ -25,19 +23,20 @@ pkgbase = freetype2-git
 	source = 0004-Enable-old-engines-but-keep-adobe-as-default.patch
 	source = 0005-freetype-2.5.2-more-demos.patch
 	source = freetype2.sh
+	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
 	sha1sums = SKIP
 	sha1sums = SKIP
-	sha1sums = b69531770c343d403be294b7e4d25ac45738c833
-	sha1sums = 3d26a569f0cb94c28a550577f5dcaadb4e193d91
-	sha1sums = 770f1981734a837bcf065564c91644b4cc5e256a
-	sha1sums = 6b551a5df41c9f02152b8456a457392ab5a4367e
+	sha1sums = c65d93939677c3e9eb5380c9cfe20caf068d5a4b
+	sha1sums = c3613862d8cda4bd151d26a6258b594a42fd1450
+	sha1sums = a0452a704b2bd48f5b0407a4e782de502467e7d4
+	sha1sums = 12306db4952f046387669f2bdb0d4dc4b1ea0f6e
 	sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
 	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.8.1+p145+g2c048a8a6
+	provides = freetype2=2.9+p33+g6f854692a
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 
@@ -45,12 +44,12 @@ pkgname = freetype2-demos-git
 	pkgdesc = Freetype tools and demos (from git)
 	depends = freetype2-git
 	depends = libx11
-	provides = freetype2-demos=2.8.1+p145+g2c048a8a6
+	provides = freetype2-demos=2.9+p33+g6f854692a
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.8.1+p145+g2c048a8a6
+	provides = freetype2-docs=2.9+p33+g6f854692a
 	conflicts = freetype2-docs
 
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 5fd339ff056f..9f1279b594ec 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,5 +1,5 @@
-From c7a6a2312313a971089fb592deb8c476be4dca0f Mon Sep 17 00:00:00 2001
-Message-Id: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From 0670c22b537c67ebf78188fbc3af6c74b3efd9d9 Mon Sep 17 00:00:00 2001
+Message-Id: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Tue, 23 Jun 2015 08:40:29 +0200
 Subject: [PATCH 1/4] Enable table validation modules
@@ -9,11 +9,11 @@ Subject: [PATCH 1/4] Enable table validation modules
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index 56a2340e56d187aa..3a028329187275df 100644
+index 4bf344524..f9aa44b2a 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -120,30 +120,30 @@ AUX_MODULES += cache
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+ # TrueType GX/AAT table validation.  Needs `ftgxval.c' below.
  #
  # No FT_CONFIG_OPTION_PIC support.
 -# AUX_MODULES += gxvalid
@@ -37,7 +37,7 @@ index 56a2340e56d187aa..3a028329187275df 100644
  # No FT_CONFIG_OPTION_PIC support.
  AUX_MODULES += bzip2
  
- # OpenType table validation.  Needs ftotval.c below.
+ # OpenType table validation.  Needs `ftotval.c' below.
  #
  # No FT_CONFIG_OPTION_PIC support.
 -# AUX_MODULES += otvalid
@@ -46,5 +46,5 @@ index 56a2340e56d187aa..3a028329187275df 100644
  # Auxiliary PostScript driver component to share common code.
  #
 -- 
-2.15.1
+2.16.2
 
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index 5f4391504bf8..c3ca91762942 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,7 +1,7 @@
-From 438b8c65e900d4c28db9eeb2a45e5998048eb471 Mon Sep 17 00:00:00 2001
-Message-Id: <438b8c65e900d4c28db9eeb2a45e5998048eb471.1513462508.git.jan.steffens@gmail.com>
-In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
-References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From abbdee6e2ba3e13e927669864d6823b8af4c1ee5 Mon Sep 17 00:00:00 2001
+Message-Id: <abbdee6e2ba3e13e927669864d6823b8af4c1ee5.1520586205.git.jan.steffens@gmail.com>
+In-Reply-To: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
+References: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 29 Aug 2016 08:43:10 +0200
 Subject: [PATCH 2/4] Enable infinality subpixel hinting
@@ -11,7 +11,7 @@ Subject: [PATCH 2/4] 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 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
+index a5cb7fff2..992c96b51 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -654,8 +654,8 @@ FT_BEGIN_HEADER
@@ -26,5 +26,5 @@ index 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
  
    /*************************************************************************/
 -- 
-2.15.1
+2.16.2
 
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index be202c1f0902..0b6462b4f3d5 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,7 +1,7 @@
-From 7e262bff01573c67432f8b8fd879bf858e1611b3 Mon Sep 17 00:00:00 2001
-Message-Id: <7e262bff01573c67432f8b8fd879bf858e1611b3.1513462508.git.jan.steffens@gmail.com>
-In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
-References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From 5479575ce1b0b869cf8ca8134eca57b93f897190 Mon Sep 17 00:00:00 2001
+Message-Id: <5479575ce1b0b869cf8ca8134eca57b93f897190.1520586205.git.jan.steffens@gmail.com>
+In-Reply-To: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
+References: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Sun, 14 May 2017 18:09:31 +0200
 Subject: [PATCH 3/4] Enable long PCF family names
@@ -11,7 +11,7 @@ Subject: [PATCH 3/4] 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 e6f9720df9b5d004..832c9c3cd200f91a 100644
+index 992c96b51..d27e9150d 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -845,7 +845,7 @@ FT_BEGIN_HEADER
@@ -24,5 +24,5 @@ index e6f9720df9b5d004..832c9c3cd200f91a 100644
  
    /*************************************************************************/
 -- 
-2.15.1
+2.16.2
 
diff --git a/0004-Enable-old-engines-but-keep-adobe-as-default.patch b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
index 09cd1f949352..9ded6692d94b 100644
--- a/0004-Enable-old-engines-but-keep-adobe-as-default.patch
+++ b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -1,7 +1,7 @@
-From 026fd5f70d81f719773247d4d0086c6023c23436 Mon Sep 17 00:00:00 2001
-Message-Id: <026fd5f70d81f719773247d4d0086c6023c23436.1513462508.git.jan.steffens@gmail.com>
-In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
-References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From 9ff9495f79984c56961d8239a0d203924b8b9cba Mon Sep 17 00:00:00 2001
+Message-Id: <9ff9495f79984c56961d8239a0d203924b8b9cba.1520586205.git.jan.steffens@gmail.com>
+In-Reply-To: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
+References: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Sat, 16 Dec 2017 23:08:02 +0100
 Subject: [PATCH 4/4] Enable old engines, but keep adobe as default
@@ -14,7 +14,7 @@ Subject: [PATCH 4/4] Enable old engines, but keep adobe as default
  4 files changed, 2 insertions(+), 14 deletions(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 832c9c3cd200f91a..dc3417d73e99d987 100644
+index d27e9150d..7052eb97a 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -775,7 +775,7 @@ FT_BEGIN_HEADER
@@ -36,7 +36,7 @@ index 832c9c3cd200f91a..dc3417d73e99d987 100644
  
    /*************************************************************************/
 diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
-index d4b6e5941ac44b58..c520f97f667f5d9a 100644
+index a2d7aec65..bc7dc16f8 100644
 --- a/src/cff/cffobjs.c
 +++ b/src/cff/cffobjs.c
 @@ -1163,11 +1163,7 @@
@@ -52,7 +52,7 @@ index d4b6e5941ac44b58..c520f97f667f5d9a 100644
      driver->no_stem_darkening = TRUE;
  
 diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
-index ed1dca2656b0c66c..2c02e1ce7d330fc3 100644
+index 77afe1c87..e1ea64cd6 100644
 --- a/src/cid/cidobjs.c
 +++ b/src/cid/cidobjs.c
 @@ -472,11 +472,7 @@
@@ -68,7 +68,7 @@ index ed1dca2656b0c66c..2c02e1ce7d330fc3 100644
      driver->no_stem_darkening = TRUE;
  
 diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
-index c00b322b138f8a95..c30a49d4e2b55e92 100644
+index 7333c4c95..4cc27fe9e 100644
 --- a/src/type1/t1objs.c
 +++ b/src/type1/t1objs.c
 @@ -587,11 +587,7 @@
@@ -84,5 +84,5 @@ index c00b322b138f8a95..c30a49d4e2b55e92 100644
      driver->no_stem_darkening = TRUE;
  
 -- 
-2.15.1
+2.16.2
 
diff --git a/PKGBUILD b/PKGBUILD
index fc71aae8795c..29cd85e2d697 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=freetype2-git
 pkgname=('freetype2-git' 'freetype2-demos-git' 'freetype2-docs-git')
-pkgver=2.8.1+p145+g2c048a8a6
-pkgrel=3
+pkgver=2.9+p33+g6f854692a
+pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
 arch=(i686 x86_64)
@@ -24,10 +24,10 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
         freetype2.sh)
 sha1sums=('SKIP'
           'SKIP'
-          'b69531770c343d403be294b7e4d25ac45738c833'
-          '3d26a569f0cb94c28a550577f5dcaadb4e193d91'
-          '770f1981734a837bcf065564c91644b4cc5e256a'
-          '6b551a5df41c9f02152b8456a457392ab5a4367e'
+          'c65d93939677c3e9eb5380c9cfe20caf068d5a4b'
+          'c3613862d8cda4bd151d26a6258b594a42fd1450'
+          'a0452a704b2bd48f5b0407a4e782de502467e7d4'
+          '12306db4952f046387669f2bdb0d4dc4b1ea0f6e'
           '72cfecbe738085eec475e012617661ad0cc9b76f'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')