Update patches

10 files changed, 108 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b22876e35422..8706c9b6ae1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.10.0+p0+gfbbcf5036
+	pkgver = 2.10.2+p7+ge13391333
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
@@ -18,25 +18,29 @@ pkgbase = freetype2-git
 	source = git://git.sv.gnu.org/freetype/freetype2.git
 	source = git://git.sv.gnu.org/freetype/freetype2-demos.git
 	source = 0001-Enable-table-validation-modules.patch
-	source = 0002-Enable-infinality-subpixel-hinting.patch
-	source = 0003-Enable-long-PCF-family-names.patch
-	source = 0004-Enable-old-engines-but-keep-adobe-as-default.patch
-	source = 0005-freetype-2.5.2-more-demos.patch
+	source = 0002-Enable-subpixel-rendering.patch
+	source = 0003-Enable-infinality-subpixel-hinting.patch
+	source = 0004-Enable-long-PCF-family-names.patch
+	source = 0005-Enable-old-engines-but-keep-adobe-as-default.patch
+	source = freetype-2.5.2-more-demos.patch
+	source = cflags-order.patch
 	source = freetype2.sh
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
 	sha1sums = SKIP
 	sha1sums = SKIP
-	sha1sums = 46fd67e6a594f6c2c473b9321ba64913984ba42f
-	sha1sums = 4bf0c0749db09878b918cc404300f0d3e9091607
-	sha1sums = af76172be8135e74391b7ad1b82c2124ae0ad86c
-	sha1sums = 7770412a35d60e38cbe673c45214fbe9a17bedcf
+	sha1sums = 07aecf77659ff956270c042990a013552b826e5e
+	sha1sums = f03de1bd288de5251710a7d9b05a7aec9ebb4445
+	sha1sums = 6a47234d60eeec766fd2b00d18bab18cf06eb651
+	sha1sums = 82e08f0f4f6f5454d9706d24d45824b5ed412a37
+	sha1sums = 9ad5cbe34209ed2cd36687971dac7ba92688b774
 	sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
+	sha1sums = 6b93645ff0bf25fcc67a01f764f884c9791bf09f
 	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.10.0+p0+gfbbcf5036
+	provides = freetype2=2.10.2+p7+ge13391333
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 
@@ -44,12 +48,12 @@ pkgname = freetype2-demos-git
 	pkgdesc = Freetype tools and demos (from git)
 	depends = freetype2-git
 	depends = libx11
-	provides = freetype2-demos=2.10.0+p0+gfbbcf5036
+	provides = freetype2-demos=2.10.2+p7+ge13391333
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.10.0+p0+gfbbcf5036
+	provides = freetype2-docs=2.10.2+p7+ge13391333
 	conflicts = freetype2-docs
 
diff --git a/.gitignore b/.gitignore
index e6c2c575aff1..c3ae16a7c931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /*.log
-/*.pkg.tar.xz
+/*.pkg.tar.*
 /.mkpkg_check
 /MKPKG
 /freetype2
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 2c38e8f5b665..d017d5d05262 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,15 +1,14 @@
-From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001
-Message-Id: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+From 68277dfaeac91da6ecd9ca8948591b58c2aa4999 Mon Sep 17 00:00:00 2001
 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
+Subject: [PATCH 1/5] Enable table validation modules
 
 ---
  modules.cfg | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index dc6c8d42d..2ab145016 100644
+index d6cdbe523..181f91541 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -111,26 +111,26 @@ AUX_MODULES += cache
@@ -42,5 +41,5 @@ index dc6c8d42d..2ab145016 100644
  # Auxiliary PostScript driver component to share common code.
  #
 -- 
-2.21.0
+2.27.0
 
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
new file mode 100644
index 000000000000..fd52d2c474de
--- /dev/null
+++ b/0002-Enable-subpixel-rendering.patch
@@ -0,0 +1,25 @@
+From 40dba82266ae30ba29dce9bef6eb98c72c983a03 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 23 Jun 2015 08:43:07 +0200
+Subject: [PATCH 2/5] Enable subpixel rendering
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index fd686d954..2e4e05273 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -124,7 +124,7 @@ FT_BEGIN_HEADER
+    * When this macro is not defined, FreeType offers alternative LCD
+    * rendering technology that produces excellent output.
+    */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ 
+ 
+   /**************************************************************************
+-- 
+2.27.0
+
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
index 22a19a6463ee..9ee057c25c8d 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0003-Enable-infinality-subpixel-hinting.patch
@@ -1,20 +1,17 @@
-From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001
-Message-Id: <fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2.1552648361.git.jan.steffens@gmail.com>
-In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
-References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+From e7f309c526b98d9de21527c4216fa536cc8379ec 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 2/4] Enable infinality subpixel hinting
+Subject: [PATCH 3/5] 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 12f47a82e..1d4469a99 100644
+index 2e4e05273..6fc26a0bb 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -658,8 +658,8 @@ FT_BEGIN_HEADER
+@@ -672,8 +672,8 @@ FT_BEGIN_HEADER
     * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
     */
  /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
@@ -26,5 +23,5 @@ index 12f47a82e..1d4469a99 100644
  
    /**************************************************************************
 -- 
-2.21.0
+2.27.0
 
diff --git a/0003-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
index 916fe9cf141f..657f799bdc23 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0004-Enable-long-PCF-family-names.patch
@@ -1,20 +1,17 @@
-From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001
-Message-Id: <a7c04e60d28a0ad0420bb7a1943479a08a923d07.1552648361.git.jan.steffens@gmail.com>
-In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
-References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+From ee8a9f58fb102d85cd0f473489094d9624c00705 Mon Sep 17 00:00:00 2001
 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
+Subject: [PATCH 4/5] Enable long PCF family names
 
 ---
  include/freetype/config/ftoption.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 1d4469a99..4ff4e7821 100644
+index 6fc26a0bb..776a7e938 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -847,7 +847,7 @@ FT_BEGIN_HEADER
+@@ -861,7 +861,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.
     */
@@ -24,5 +21,5 @@ index 1d4469a99..4ff4e7821 100644
  
    /*************************************************************************/
 -- 
-2.21.0
+2.27.0
 
diff --git a/0004-Enable-old-engines-but-keep-adobe-as-default.patch b/0005-Enable-old-engines-but-keep-adobe-as-default.patch
index 325d6b9227f6..94fd614f298b 100644
--- a/0004-Enable-old-engines-but-keep-adobe-as-default.patch
+++ b/0005-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -1,10 +1,7 @@
-From 9482db09a09e2cb610f08a06e681d1a4b2356b36 Mon Sep 17 00:00:00 2001
-Message-Id: <9482db09a09e2cb610f08a06e681d1a4b2356b36.1552648361.git.jan.steffens@gmail.com>
-In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
-References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+From 4a9da1400b53567f30effea451b7531338e0a049 Mon Sep 17 00:00:00 2001
 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
+Subject: [PATCH 5/5] Enable old engines, but keep adobe as default
 
 ---
  include/freetype/config/ftoption.h | 4 ++--
@@ -14,10 +11,10 @@ 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 4ff4e7821..3a7ed8725 100644
+index 776a7e938..71d9fba3c 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -778,7 +778,7 @@ FT_BEGIN_HEADER
+@@ -792,7 +792,7 @@ FT_BEGIN_HEADER
     * switch between the two engines using the `hinting-engine` property of
     * the 'type1' driver module.
     */
@@ -26,7 +23,7 @@ index 4ff4e7821..3a7ed8725 100644
  
  
    /*************************************************************************/
-@@ -820,7 +820,7 @@ FT_BEGIN_HEADER
+@@ -834,7 +834,7 @@ FT_BEGIN_HEADER
     * between the two engines using the `hinting-engine` property of the 'cff'
     * driver module.
     */
@@ -36,7 +33,7 @@ index 4ff4e7821..3a7ed8725 100644
  
    /*************************************************************************/
 diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
-index 1a1030c06..1a767ee26 100644
+index 5e5831568..c66857037 100644
 --- a/src/cff/cffobjs.c
 +++ b/src/cff/cffobjs.c
 @@ -1163,11 +1163,7 @@
@@ -52,7 +49,7 @@ index 1a1030c06..1a767ee26 100644
      driver->no_stem_darkening = TRUE;
  
 diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
-index 4e9728719..4747af185 100644
+index 67dae5e1a..11ed32228 100644
 --- a/src/cid/cidobjs.c
 +++ b/src/cid/cidobjs.c
 @@ -479,11 +479,7 @@
@@ -68,7 +65,7 @@ index 4e9728719..4747af185 100644
      driver->no_stem_darkening = TRUE;
  
 diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
-index 741388a64..5abcdbc22 100644
+index ff2786ba2..fceb7bbfc 100644
 --- a/src/type1/t1objs.c
 +++ b/src/type1/t1objs.c
 @@ -599,11 +599,7 @@
@@ -84,5 +81,5 @@ index 741388a64..5abcdbc22 100644
      driver->no_stem_darkening = TRUE;
  
 -- 
-2.21.0
+2.27.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f47d826974b..83d34bcb08a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=freetype2-git
 pkgname=('freetype2-git' 'freetype2-demos-git' 'freetype2-docs-git')
-pkgver=2.10.0+p0+gfbbcf5036
+pkgver=2.10.2+p7+ge13391333
 pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
@@ -17,18 +17,22 @@ makedepends=('libx11' 'git' 'python')
 source=(git://git.sv.gnu.org/freetype/freetype2.git
         git://git.sv.gnu.org/freetype/freetype2-demos.git
         0001-Enable-table-validation-modules.patch
-        0002-Enable-infinality-subpixel-hinting.patch
-        0003-Enable-long-PCF-family-names.patch
-        0004-Enable-old-engines-but-keep-adobe-as-default.patch
-        0005-freetype-2.5.2-more-demos.patch
+        0002-Enable-subpixel-rendering.patch
+        0003-Enable-infinality-subpixel-hinting.patch
+        0004-Enable-long-PCF-family-names.patch
+        0005-Enable-old-engines-but-keep-adobe-as-default.patch
+        freetype-2.5.2-more-demos.patch
+        cflags-order.patch
         freetype2.sh)
 sha1sums=('SKIP'
           'SKIP'
-          '46fd67e6a594f6c2c473b9321ba64913984ba42f'
-          '4bf0c0749db09878b918cc404300f0d3e9091607'
-          'af76172be8135e74391b7ad1b82c2124ae0ad86c'
-          '7770412a35d60e38cbe673c45214fbe9a17bedcf'
+          '07aecf77659ff956270c042990a013552b826e5e'
+          'f03de1bd288de5251710a7d9b05a7aec9ebb4445'
+          '6a47234d60eeec766fd2b00d18bab18cf06eb651'
+          '82e08f0f4f6f5454d9706d24d45824b5ed412a37'
+          '9ad5cbe34209ed2cd36687971dac7ba92688b774'
           '72cfecbe738085eec475e012617661ad0cc9b76f'
+          '6b93645ff0bf25fcc67a01f764f884c9791bf09f'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
@@ -48,15 +52,19 @@ prepare() {
 
   cd freetype2
   patch -Np1 -i ../0001-Enable-table-validation-modules.patch
-  patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
-  patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
-  patch -Np1 -i ../0004-Enable-old-engines-but-keep-adobe-as-default.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-Enable-old-engines-but-keep-adobe-as-default.patch
 
   ./autogen.sh
 
   cd ../freetype2-demos
   # enable more demos
-  patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
+  patch -Np1 -i ../freetype-2.5.2-more-demos.patch
+
+  # ensure include dirs of built freetype come first
+  patch -Np1 -i ../cflags-order.patch
 
   # Suppress RPATH
   sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
diff --git a/cflags-order.patch b/cflags-order.patch
new file mode 100644
index 000000000000..4a07647d3732
--- /dev/null
+++ b/cflags-order.patch
@@ -0,0 +1,22 @@
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git c/Makefile i/Makefile
+index 8e4ca56..e6ad0af 100644
+--- c/Makefile
++++ i/Makefile
+@@ -130,10 +130,10 @@ else
+                  $(TOP_DIR)/include \
+                  $(SRC_DIR)
+ 
+-  COMPILE = $(CC) $(CPPFLAGS) \
+-                  $(CFLAGS) \
+-                  $(ANSIFLAGS) \
+-                  $(INCLUDES:%=$I%)
++  COMPILE = $(CC) $(ANSIFLAGS) \
++                  $(INCLUDES:%=$I%) \
++                  $(CPPFLAGS) \
++                  $(CFLAGS)
+ 
+   # Enable C99 for gcc to avoid warnings.
+   # Note that clang++ aborts with an error if we use `-std=C99',
diff --git a/0005-freetype-2.5.2-more-demos.patch b/freetype-2.5.2-more-demos.patch
index e737cb7dafe7..e737cb7dafe7 100644
--- a/0005-freetype-2.5.2-more-demos.patch
+++ b/freetype-2.5.2-more-demos.patch