Update to fontconfig-infinality-remix to 2.13.91+24+g75eadca.

10 files changed, 233 insertions, 315 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3963a2218ee1..c94c4ae563f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fontconfig-infinality-remix
 	pkgdesc = A library for configuring and customizing font access, optimized for Infinality Remix.
-	pkgver = 2.13.1
-	pkgrel = 2
+	pkgver = 2.13.91+24+g75eadca
+	pkgrel = 1
 	url = http://www.fontconfig.org/release/
 	install = fontconfig-infinality-remix.install
 	arch = i686
@@ -15,8 +15,7 @@ pkgbase = fontconfig-infinality-remix
 	makedepends = git
 	depends = expat
 	depends = freetype2
-	provides = fontconfig=$pkgver
-	provides = fontconfig-infinality-remix
+	provides = fontconfig=2.13.91+24+g75eadca
 	conflicts = fontconfig
 	conflicts = fontconfig-infinality
 	conflicts = fontconfig-infinality-git
@@ -33,24 +32,24 @@ pkgbase = fontconfig-infinality-remix
 	backup = etc/fonts/conf.avail.infinality/35-repl-custom.conf
 	backup = etc/fonts/conf.avail.infinality/38-repl-webfonts-custom.conf
 	backup = etc/fonts/conf.avail.infinality/97-selective-rendering-custom.conf
-	source = git+https://anongit.freedesktop.org/git/fontconfig#tag=2.13.1
-	source = fontconfig-infinality-remix-srcs-2.13.1.tar.bz2
+	source = git+https://anongit.freedesktop.org/git/fontconfig#commit=75eadca26648abf69497691ff0f4c7803b9ff23c
+	source = fontconfig-infinality-remix-srcs-20191030.tar.bz2
 	source = fc-presets
 	source = fc-cache-infinality-remix.hook
-	source = 0001-configure-2.13.1.patch
-	source = 0002-configure-2.13.1.ac.patch
-	source = 0003-Makefile-2.13.1.in.patch
-	source = 0004-Makefile-2.13.1.conf.d.patch
-	source = 0005-Makefile-2.13.1.am.in.patch
+	source = 0001-configure-2.13.91+24+g75eadca.patch
+	source = 0002-configure-2.13.91+24+g75eadca.ac.patch
+	source = 0003-Makefile-2.13.91+24+g75eadca.in.patch
+	source = 0004-Makefile-2.13.91+24+g75eadca.conf.d.patch
+	source = 0005-Makefile-2.13.91+24+g75eadca.am.in.patch
 	sha256sums = SKIP
 	sha256sums = f8c49b4ee86ad64b1d3df700a5c0b337e44f507bb7e7d264eb5eaf0040998ef2
 	sha256sums = c291f3849369106c5005155b5b099459c86baf455cea0e080a76a3fdf8a8f4b7
 	sha256sums = 94e7b03a32304604be2cf5568c02805ea1ac45eb68104de400ae7f370e3e598b
-	sha256sums = 7a0597c3a926176b5c844aa15f3fc98007398eb24db336b059c30f1cec8510cf
-	sha256sums = ba8815b38d5d6e307d2107966c8b2ce0d2d48212ab99b55a56c6d66621b705ce
-	sha256sums = 039f53ede54db124ab55bf084c22359bf31e667e18e0abf660ce4b450610ae49
-	sha256sums = 6d1296fa0d86b95b41017e0c424c1cffea85606edaf80ed5e1d52b1d21486e5d
-	sha256sums = 61d6c1ecd4516a4b836c0dea3e0f70a4703ca326ffc830e9c135f907c464cfae
+	sha256sums = 45a1ea897f0c7687f4ba1d2c200b17145cc5246e4a82eaa33e09d1b843030cb7
+	sha256sums = 006a14e00017736813002034996b024bb7133bd3eeda6b7f74e4c2880b64031d
+	sha256sums = 7dfc5ba9b20e0326e6a3a880f18d58a7ed31f7af025627670f210ec109be1a81
+	sha256sums = fd3487482109874d21c0e537284920392f93c4362b70a765de376c66654edec6
+	sha256sums = f989fce1a1537f6e9ad42b8a2d1bb87a451af6b4fb80f9281f8773985ce85627
 
 pkgname = fontconfig-infinality-remix
 
diff --git a/0001-configure-2.13.1.patch b/0001-configure-2.13.91+24+g75eadca.patch
index 7e78c8830ff1..2554705dbe8f 100644
--- a/0001-configure-2.13.1.patch
+++ b/0001-configure-2.13.91+24+g75eadca.patch
@@ -1,14 +1,14 @@
-From 1127988d78956f86880f85314a3d1169378a5db8 Mon Sep 17 00:00:00 2001
+From 085dea68e4ec02e0031d5868dbace913d17b0fbf Mon Sep 17 00:00:00 2001
 From: Solomon Choina <shlomochoina@gmail.com>
-Date: Sun, 25 Mar 2018 14:05:26 -0400
-Subject: [PATCH] configure-20180325
+Date: Tue, 28 May 2019 21:17:19 -0400
+Subject: [PATCH 1/5] configure-20190528
 
 ---
- configure | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
+ configure | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index f7609c9..886ce06 100755
+index c6f1142..b9f064d 100755
 --- a/configure
 +++ b/configure
 @@ -656,6 +656,7 @@ XMLDIR
@@ -19,7 +19,7 @@ index f7609c9..886ce06 100755
  FC_FONTDATE
  FC_CACHEDIR
  fc_cachedir
-@@ -866,6 +867,7 @@ with_default_fonts
+@@ -870,6 +871,7 @@ with_default_fonts
  with_add_fonts
  with_cache_dir
  with_templatedir
@@ -27,35 +27,34 @@ index f7609c9..886ce06 100755
  with_baseconfigdir
  with_configdir
  with_xmldir
-@@ -1567,6 +1569,10 @@ Optional Packages:
+@@ -1572,6 +1574,10 @@ Optional Packages:
+   --with-cache-dir=DIR    Use DIR to store cache files
                            [default=LOCALSTATEDIR/cache/fontconfig]
    --with-templatedir=DIR  Use DIR to store the configuration template files
-                           [default=DATADIR/fontconfig/conf.avail]
-+  --with-templateinfdir=DIR
++ --with-templateinfdir=DIR
 +                          Use DIR to store the Infinality compliant
 +                          configuration template files
 +                          [default=DATADIR/fontconfig/conf.avail.infinality]
+                           [default=DATADIR/fontconfig/conf.avail]
    --with-baseconfigdir=DIR
                            Use DIR to store the base configuration files
-                           [default=SYSCONFDIR/fonts]
-@@ -17808,6 +17814,12 @@ else
+@@ -17918,6 +17924,12 @@ else
    templatedir=yes
  fi
- 
+
 +# Check whether --with-templateinfdir was given.
 +if test "${with_templateinfdir+set}" = set; then :
 +  withval=$with_templateinfdir; templateinfdir="$withval"
 +else
 +  templateinfdir=yes
 +fi
- 
+
  # Check whether --with-baseconfigdir was given.
  if test "${with_baseconfigdir+set}" = set; then :
-@@ -17840,6 +17852,15 @@ no|yes)
+@@ -17950,6 +17962,13 @@ no|yes)
  *)
  	;;
  esac
-+
 +case "$templateinfdir" in
 +no|yes)
 +	templateinfdir='${datadir}'/fontconfig/conf.avail.infinality
@@ -63,27 +62,25 @@ index f7609c9..886ce06 100755
 +*)
 +	;;
 +esac
-+
  case "$baseconfigdir" in
  no|yes)
  	baseconfigdir='${sysconfdir}'/fonts
-@@ -17863,6 +17884,7 @@ no|yes)
+@@ -17973,6 +17992,7 @@ no|yes)
  esac
- 
+
  TEMPLATEDIR=${templatedir}
 +TEMPLATEINFDIR=${templateinfdir}
  BASECONFIGDIR=${baseconfigdir}
  CONFIGDIR=${configdir}
  XMLDIR=${xmldir}
-@@ -18926,7 +18948,7 @@ _ACEOF
- 
- 
- 
+@@ -19036,7 +19056,7 @@ _ACEOF
+
+
+
 -ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-case/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-conflist/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml its/Makefile po/Makefile.in po-conf/Makefile.in test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
 +ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-case/Makefile src/Makefile conf.d/Makefile conf.d.infinality/Makefile fc-cache/Makefile fc-cat/Makefile fc-conflist/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml its/Makefile po/Makefile.in po-conf/Makefile.in test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
- 
+
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
--- 
-2.16.3
-
+--
+2.21.0
diff --git a/0002-configure-2.13.1.ac.patch b/0002-configure-2.13.91+24+g75eadca.ac.patch
index 91f91aa9a5e5..8e912e4a7fc2 100644
--- a/0002-configure-2.13.1.ac.patch
+++ b/0002-configure-2.13.91+24+g75eadca.ac.patch
@@ -1,7 +1,18 @@
---- a/configure.ac	2016-04-06 14:05:36.000000000 +0200
-+++ b/configure.ac	2016-04-10 05:01:11.577597555 +0200
-@@ -524,9 +524,14 @@ AC_SUBST(FC_FONTDATE)
- 
+From f7d8de65f0c8328bb3f4f1e1ad3de2ba0ad9929c Mon Sep 17 00:00:00 2001
+From: Solomon Choina <shlomochoina@gmail.com>
+Date: Wed, 29 May 2019 15:51:56 -0400
+Subject: [PATCH] configure-20190328.ac
+
+---
+ configure.ac | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fb8af46..1db2c1d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -620,9 +620,14 @@ AC_SUBST(FC_FONTDATE)
+
  AC_ARG_WITH(templatedir,
  	[AC_HELP_STRING([--with-templatedir=DIR],
 -			[Use DIR to store the configuration template files [default=DATADIR/fontconfig/conf.avail]])],
@@ -16,7 +27,7 @@
  AC_ARG_WITH(baseconfigdir,
  	[AC_HELP_STRING([--with-baseconfigdir=DIR],
  			[Use DIR to store the base configuration files [default=SYSCONFDIR/fonts]])],
-@@ -550,6 +555,13 @@ no|yes)
+@@ -646,6 +651,13 @@ no|yes)
  *)
  	;;
  esac
@@ -30,9 +41,9 @@
  case "$baseconfigdir" in
  no|yes)
  	baseconfigdir='${sysconfdir}'/fonts
-@@ -573,10 +585,12 @@ no|yes)
+@@ -669,10 +681,12 @@ no|yes)
  esac
- 
+
  TEMPLATEDIR=${templatedir}
 +TEMPLATEINFDIR=${templateinfdir}
  BASECONFIGDIR=${baseconfigdir}
@@ -43,11 +54,13 @@
  AC_SUBST(BASECONFIGDIR)
  AC_SUBST(CONFIGDIR)
  AC_SUBST(XMLDIR)
-@@ -706,6 +720,7 @@ fc-blanks/Makefile
+@@ -800,6 +814,7 @@ fc-lang/Makefile
  fc-case/Makefile
  src/Makefile
  conf.d/Makefile
 +conf.d.infinality/Makefile
  fc-cache/Makefile
  fc-cat/Makefile
- fc-list/Makefile
+ fc-conflist/Makefile
+--
+2.21.0
diff --git a/0003-Makefile-2.13.1.in.patch b/0003-Makefile-2.13.91+24+g75eadca.in.patch
index 7a8e181ccfda..1075d0aa7129 100644
--- a/0003-Makefile-2.13.1.in.patch
+++ b/0003-Makefile-2.13.91+24+g75eadca.in.patch
@@ -1,33 +1,31 @@
-From 6db25311e1a1d817ee1a1115d23847329348b23c Mon Sep 17 00:00:00 2001
+From c6617930d51c3b0235cbf533bb49cf7a0bcd3216 Mon Sep 17 00:00:00 2001
 From: Solomon Choina <shlomochoina@gmail.com>
-Date: Sun, 25 Mar 2018 14:42:19 -0400
-Subject: [PATCH] Makefile-20180325.in
-
----:w
- Makefile.in                   |  1 +
- conf.d/Makefile.in            |  1 +
- doc/Makefile.in               |  1 +
- fc-cache/Makefile.in          |  1 +
- fc-case/Makefile.in           |  1 +
- fc-cat/Makefile.in            |  1 +
- fc-conflist/Makefile.in       |  1 +
- fc-lang/Makefile.in           |  1 +
- fc-list/Makefile.in           |  1 +
- fc-match/Makefile.in          |  1 +
- fc-pattern/Makefile.in        |  1 +
- fc-query/Makefile.in          |  1 +
- fc-scan/Makefile.in           |  1 +
- fc-validate/Makefile.in       |  1 +
- fontconfig/Makefile.in        |  1 +
- its/Makefile.in               |  1 +
- src/Makefile.in               |  1 +
- test/Makefile.in              |  1 +
- 19 files changed, 107 insertions(+)
- create mode 100644 0001-configure-20180325.patch
+Date: Wed, 29 May 2019 14:12:57 -0400
+Subject: [PATCH 3/5] Makefile-20190328.in
 
+---
+ Makefile.in             | 1 +
+ conf.d/Makefile.in      | 1 +
+ doc/Makefile.in         | 1 +
+ fc-cache/Makefile.in    | 1 +
+ fc-case/Makefile.in     | 1 +
+ fc-cat/Makefile.in      | 1 +
+ fc-conflist/Makefile.in | 1 +
+ fc-lang/Makefile.in     | 1 +
+ fc-list/Makefile.in     | 1 +
+ fc-match/Makefile.in    | 1 +
+ fc-pattern/Makefile.in  | 1 +
+ fc-query/Makefile.in    | 1 +
+ fc-scan/Makefile.in     | 1 +
+ fc-validate/Makefile.in | 1 +
+ fontconfig/Makefile.in  | 1 +
+ its/Makefile.in         | 1 +
+ src/Makefile.in         | 1 +
+ test/Makefile.in        | 1 +
+ 18 files changed, 18 insertions(+)
 
 diff --git a/Makefile.in b/Makefile.in
-index 30734df..7476ab5 100644
+index bea1b79..e13301f 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -389,6 +389,7 @@ SET_MAKE = @SET_MAKE@
@@ -39,7 +37,7 @@ index 30734df..7476ab5 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in
-index b984aac..2c33f6f 100644
+index 604af41..52e31fc 100644
 --- a/conf.d/Makefile.in
 +++ b/conf.d/Makefile.in
 @@ -301,6 +301,7 @@ SET_MAKE = @SET_MAKE@
@@ -51,10 +49,10 @@ index b984aac..2c33f6f 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 9e03624..e9d3332 100644
+index b8ae0b4..0e68e22 100644
 --- a/doc/Makefile.in
 +++ b/doc/Makefile.in
-@@ -546,6 +546,7 @@ SET_MAKE = @SET_MAKE@
+@@ -550,6 +550,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -63,10 +61,10 @@ index 9e03624..e9d3332 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-cache/Makefile.in b/fc-cache/Makefile.in
-index d291623..0d1c033 100644
+index 75393fa..0964634 100644
 --- a/fc-cache/Makefile.in
 +++ b/fc-cache/Makefile.in
-@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@
+@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -75,7 +73,7 @@ index d291623..0d1c033 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-case/Makefile.in b/fc-case/Makefile.in
-index d342751..6f01df0 100644
+index 6485973..b91db3c 100644
 --- a/fc-case/Makefile.in
 +++ b/fc-case/Makefile.in
 @@ -319,6 +319,7 @@ SET_MAKE = @SET_MAKE@
@@ -87,10 +85,10 @@ index d342751..6f01df0 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-cat/Makefile.in b/fc-cat/Makefile.in
-index 07e35c5..080d152 100644
+index 75f5953..3e52282 100644
 --- a/fc-cat/Makefile.in
 +++ b/fc-cat/Makefile.in
-@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@
+@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -99,10 +97,10 @@ index 07e35c5..080d152 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-conflist/Makefile.in b/fc-conflist/Makefile.in
-index 4db0122..82067a1 100644
+index 212e2e9..f9fe443 100644
 --- a/fc-conflist/Makefile.in
 +++ b/fc-conflist/Makefile.in
-@@ -352,6 +352,7 @@ SET_MAKE = @SET_MAKE@
+@@ -356,6 +356,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -111,7 +109,7 @@ index 4db0122..82067a1 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-lang/Makefile.in b/fc-lang/Makefile.in
-index 45fb91e..c34d3e6 100644
+index eea0cbb..6972f6b 100644
 --- a/fc-lang/Makefile.in
 +++ b/fc-lang/Makefile.in
 @@ -319,6 +319,7 @@ SET_MAKE = @SET_MAKE@
@@ -123,10 +121,10 @@ index 45fb91e..c34d3e6 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-list/Makefile.in b/fc-list/Makefile.in
-index 5e048f9..5d0145f 100644
+index e8ac374..a9e6ed3 100644
 --- a/fc-list/Makefile.in
 +++ b/fc-list/Makefile.in
-@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@
+@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -135,10 +133,10 @@ index 5e048f9..5d0145f 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-match/Makefile.in b/fc-match/Makefile.in
-index fff0c0b..67032d9 100644
+index c87053a..fad6675 100644
 --- a/fc-match/Makefile.in
 +++ b/fc-match/Makefile.in
-@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@
+@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -147,10 +145,10 @@ index fff0c0b..67032d9 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-pattern/Makefile.in b/fc-pattern/Makefile.in
-index 31c7ece..0bad3b7 100644
+index 7eb31b9..6172d8d 100644
 --- a/fc-pattern/Makefile.in
 +++ b/fc-pattern/Makefile.in
-@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@
+@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -159,10 +157,10 @@ index 31c7ece..0bad3b7 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-query/Makefile.in b/fc-query/Makefile.in
-index 5fefdc4..86140d4 100644
+index c7e231e..c94726b 100644
 --- a/fc-query/Makefile.in
 +++ b/fc-query/Makefile.in
-@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@
+@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -171,10 +169,10 @@ index 5fefdc4..86140d4 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-scan/Makefile.in b/fc-scan/Makefile.in
-index f5169a3..770fe9a 100644
+index 153c33f..cb8bad8 100644
 --- a/fc-scan/Makefile.in
 +++ b/fc-scan/Makefile.in
-@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@
+@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -183,10 +181,10 @@ index f5169a3..770fe9a 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fc-validate/Makefile.in b/fc-validate/Makefile.in
-index 32e29f0..aecd457 100644
+index dffa1a6..1617efc 100644
 --- a/fc-validate/Makefile.in
 +++ b/fc-validate/Makefile.in
-@@ -352,6 +352,7 @@ SET_MAKE = @SET_MAKE@
+@@ -356,6 +356,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -195,7 +193,7 @@ index 32e29f0..aecd457 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/fontconfig/Makefile.in b/fontconfig/Makefile.in
-index c36c8bf..11a4bde 100644
+index 6f3c47d..ba53f89 100644
 --- a/fontconfig/Makefile.in
 +++ b/fontconfig/Makefile.in
 @@ -297,6 +297,7 @@ SET_MAKE = @SET_MAKE@
@@ -207,7 +205,7 @@ index c36c8bf..11a4bde 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/its/Makefile.in b/its/Makefile.in
-index 4bc26b1..4b0597b 100644
+index 8492db4..65b54e6 100644
 --- a/its/Makefile.in
 +++ b/its/Makefile.in
 @@ -278,6 +278,7 @@ SET_MAKE = @SET_MAKE@
@@ -219,10 +217,10 @@ index 4bc26b1..4b0597b 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 9996941..9646b89 100644
+index 70b1161..fd7eb06 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -366,6 +366,7 @@ SET_MAKE = @SET_MAKE@
+@@ -384,6 +384,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -231,10 +229,10 @@ index 9996941..9646b89 100644
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
 diff --git a/test/Makefile.in b/test/Makefile.in
-index c389d31..8494d13 100644
+index 013abb4..c256839 100644
 --- a/test/Makefile.in
 +++ b/test/Makefile.in
-@@ -523,6 +523,7 @@ SET_MAKE = @SET_MAKE@
+@@ -571,6 +571,7 @@ SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  TEMPLATEDIR = @TEMPLATEDIR@
@@ -242,6 +240,5 @@ index c389d31..8494d13 100644
  USE_NLS = @USE_NLS@
  UUID_CFLAGS = @UUID_CFLAGS@
  UUID_LIBS = @UUID_LIBS@
--- 
-2.16.3
-
+--
+2.21.0
diff --git a/0004-Makefile-2.13.1.conf.d.patch b/0004-Makefile-2.13.1.conf.d.patch
deleted file mode 100644
index 892d2fc5fe89..000000000000
--- a/0004-Makefile-2.13.1.conf.d.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From f7e2933b792c7f7d55fac0c99a4426437f07854f Mon Sep 17 00:00:00 2001
-From: Solomon Choina <shlomochoina@gmail.com>
-Date: Sun, 25 Mar 2018 16:26:59 -0400
-Subject: [PATCH] Makefile-20180325.conf.d
-
----
- conf.d/Makefile.am | 42 ++----------------------------------------
- conf.d/Makefile.in | 28 +++-------------------------
- 2 files changed, 5 insertions(+), 65 deletions(-)
-
-diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
-index ff03fb2..a892b04 100644
---- a/conf.d/Makefile.am
-+++ b/conf.d/Makefile.am
-@@ -21,28 +21,10 @@
- #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- #  PERFORMANCE OF THIS SOFTWARE.
- 
--BUILT_SOURCES = README
--DOC_SOURCES = README.in
-+
- DOC_FILES = $(DOC_SOURCES:.in=)
- 
--CONF_LINKS = \
--	10-hinting-$(PREFERRED_HINTING).conf	\
--	10-scale-bitmap-fonts.conf \
--	20-unhint-small-vera.conf \
--	30-metric-aliases.conf \
--	40-nonlatin.conf \
--	45-generic.conf \
--	45-latin.conf \
--	49-sansserif.conf \
--	50-user.conf \
--	51-local.conf \
--	60-generic.conf \
--	60-latin.conf \
--	65-fonts-persian.conf \
--	65-nonlatin.conf \
--	69-unifont.conf \
--	80-delicious.conf \
--	90-synthetic.conf
-+CONF_LINKS = 
- 
- EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
- CLEANFILES = $(DOC_FILES)
-@@ -87,24 +69,4 @@ template_DATA =				\
- 	80-delicious.conf		\
- 	90-synthetic.conf
- 
--README: $(srcdir)/README.in
--	sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
--
--install-data-hook:
--	mkdir -p $(DESTDIR)$(configdir)
--	@(echo cd $(DESTDIR)$(configdir);			\
--	  cd $(DESTDIR)$(configdir);				\
--	  for i in $(CONF_LINKS); do				\
--	    echo $(RM) $$i";" ln -s $(templatedir)/$$i .;	\
--	    $(RM) $$i;						\
--	    ln -s $(templatedir)/$$i .;				\
--	  done)
--uninstall-local:
--	@(echo cd $(DESTDIR)$(configdir);			\
--	  cd $(DESTDIR)$(configdir);				\
--	  for i in $(CONF_LINKS); do				\
--	    echo $(RM) $$i;					\
--	    $(RM) $$i;						\
--	  done)
--
- -include $(top_srcdir)/git.mk
-diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in
-index 2c33f6f..7f6ddeb 100644
---- a/conf.d/Makefile.in
-+++ b/conf.d/Makefile.in
-@@ -180,7 +180,7 @@ am__uninstall_files_from_dir = { \
-     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-          $(am__cd) "$$dir" && rm -f $$files; }; \
-   }
--am__installdirs = "$(DESTDIR)$(configdir)" "$(DESTDIR)$(templatedir)"
-+am__installdirs = "$(DESTDIR)$(templatedir)"
- DATA = $(config_DATA) $(template_DATA)
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
- am__DIST_COMMON = $(srcdir)/Makefile.in README
-@@ -367,27 +367,8 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--BUILT_SOURCES = README
--DOC_SOURCES = README.in
- DOC_FILES = $(DOC_SOURCES:.in=)
--CONF_LINKS = \
--	10-hinting-$(PREFERRED_HINTING).conf	\
--	10-scale-bitmap-fonts.conf \
--	20-unhint-small-vera.conf \
--	30-metric-aliases.conf \
--	40-nonlatin.conf \
--	45-generic.conf \
--	45-latin.conf \
--	49-sansserif.conf \
--	50-user.conf \
--	51-local.conf \
--	60-generic.conf \
--	60-latin.conf \
--	65-fonts-persian.conf \
--	65-nonlatin.conf \
--	69-unifont.conf \
--	80-delicious.conf \
--	90-synthetic.conf
-+CONF_LINKS = 
- 
- EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
- CLEANFILES = $(DOC_FILES)
-@@ -553,7 +534,7 @@ check: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) check-am
- all-am: Makefile $(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(configdir)" "$(DESTDIR)$(templatedir)"; do \
-+	for dir in "$(DESTDIR)$(templatedir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
-@@ -676,9 +657,6 @@ uninstall-am: uninstall-configDATA uninstall-local \
- .PRECIOUS: Makefile
- 
- 
--README: $(srcdir)/README.in
--	sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
--
- install-data-hook:
- 	mkdir -p $(DESTDIR)$(configdir)
- 	@(echo cd $(DESTDIR)$(configdir);			\
--- 
-2.16.3
-
diff --git a/0004-Makefile-2.13.91+24+g75eadca.conf.d.patch b/0004-Makefile-2.13.91+24+g75eadca.conf.d.patch
new file mode 100644
index 000000000000..6f57767b939f
--- /dev/null
+++ b/0004-Makefile-2.13.91+24+g75eadca.conf.d.patch
@@ -0,0 +1,62 @@
+--- a/conf.d/Makefile.am	2019-10-30 16:02:58.939228041 -0400
++++ b/conf.d/Makefile.am	2019-10-30 16:09:44.696215561 -0400
+@@ -23,30 +23,11 @@
+ 
+ NULL =
+ BUILT_SOURCES = 		\
+-	README			\
+ 	35-lang-normalize.conf	\
+ 	$(NULL)
+-DOC_SOURCES = README.in
+ DOC_FILES = $(DOC_SOURCES:.in=)
+ 
+-CONF_LINKS = \
+-	10-hinting-$(PREFERRED_HINTING).conf	\
+-	10-scale-bitmap-fonts.conf \
+-	20-unhint-small-vera.conf \
+-	30-metric-aliases.conf \
+-	40-nonlatin.conf \
+-	45-generic.conf \
+-	45-latin.conf \
+-	49-sansserif.conf \
+-	50-user.conf \
+-	51-local.conf \
+-	60-generic.conf \
+-	60-latin.conf \
+-	65-fonts-persian.conf \
+-	65-nonlatin.conf \
+-	69-unifont.conf \
+-	80-delicious.conf \
+-	90-synthetic.conf
++CONF_LINKS =
+ 
+ EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
+ CLEANFILES = $(DOC_FILES)
+@@ -94,27 +75,7 @@
+ 	80-delicious.conf		\
+ 	90-synthetic.conf
+ 
+-README: $(srcdir)/README.in
+-	sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
+-
+ 35-lang-normalize.conf: ../fc-lang/Makefile.am
+ 	cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) $(top_builddir)/conf.d/35-lang-normalize.conf
+ 
+-install-data-hook:
+-	mkdir -p $(DESTDIR)$(configdir)
+-	@(echo cd $(DESTDIR)$(configdir);			\
+-	  cd $(DESTDIR)$(configdir);				\
+-	  for i in $(CONF_LINKS); do				\
+-	    echo $(RM) $$i";" ln -s $(templatedir)/$$i .;	\
+-	    $(RM) $$i;						\
+-	    ln -s $(templatedir)/$$i .;				\
+-	  done)
+-uninstall-local:
+-	@(echo cd $(DESTDIR)$(configdir);			\
+-	  cd $(DESTDIR)$(configdir);				\
+-	  for i in $(CONF_LINKS); do				\
+-	    echo $(RM) $$i;					\
+-	    $(RM) $$i;						\
+-	  done)
+-
+ -include $(top_srcdir)/git.mk
diff --git a/0005-Makefile-2.13.1.am.in.patch b/0005-Makefile-2.13.1.am.in.patch
deleted file mode 100644
index e2a3b00056a9..000000000000
--- a/0005-Makefile-2.13.1.am.in.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 742bdc47854f8104a712136fdcce1c92ec1b6a79 Mon Sep 17 00:00:00 2001
-From: Solomon Choina <shlomochoina@gmail.com>
-Date: Sun, 25 Mar 2018 16:33:46 -0400
-Subject: [PATCH] Makefile-20180325.am.in
-
----
-
- Makefile.am                         |   2 +-
- Makefile.in                         |   4 +-
- 3 files changed, 137 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cc3024e..ba45eed 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -24,7 +24,7 @@
- SUBDIRS=fontconfig fc-case fc-lang src \
- 	fc-cache fc-cat fc-conflist fc-list fc-match \
- 	fc-pattern fc-query fc-scan fc-validate conf.d \
--	its po po-conf test
-+	conf.d.infinality its po po-conf test
- if ENABLE_DOCS
- SUBDIRS += doc
- endif
-diff --git a/Makefile.in b/Makefile.in
-index 7476ab5..976cb97 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -225,7 +225,7 @@ CTAGS = ctags
- CSCOPE = cscope
- DIST_SUBDIRS = fontconfig fc-case fc-lang src fc-cache fc-cat \
- 	fc-conflist fc-list fc-match fc-pattern fc-query fc-scan \
--	fc-validate conf.d its po po-conf test doc
-+	fc-validate conf.d conf.d.infinality its po po-conf test doc
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- 	$(srcdir)/fontconfig-zip.in $(srcdir)/fontconfig.pc.in \
- 	$(srcdir)/fontconfig.spec.in ABOUT-NLS AUTHORS COPYING \
-@@ -457,7 +457,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = fontconfig fc-case fc-lang src fc-cache fc-cat fc-conflist \
- 	fc-list fc-match fc-pattern fc-query fc-scan fc-validate \
--	conf.d its po po-conf test $(am__append_1)
-+	conf.d conf.d.infinality its po po-conf test $(am__append_1)
- ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = config.rpath fontconfig.pc.in fonts.conf.in fonts.dtd \
- 	fontconfig.spec.in fontconfig.spec fontconfig-zip.in \
--- 
-2.16.3
-
diff --git a/0005-Makefile-2.13.91+24+g75eadca.am.in.patch b/0005-Makefile-2.13.91+24+g75eadca.am.in.patch
new file mode 100644
index 000000000000..095767549f97
--- /dev/null
+++ b/0005-Makefile-2.13.91+24+g75eadca.am.in.patch
@@ -0,0 +1,24 @@
+From 53ae12f285b2a7fa019939ef35265034643d5443 Mon Sep 17 00:00:00 2001
+From: Solomon Choina <shlomochoina@gmail.com>
+Date: Wed, 29 May 2019 14:28:17 -0400
+Subject: [PATCH 5/5] Makefile-20190328.am
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cc3024e..da0cc8e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,7 +23,7 @@
+
+ SUBDIRS=fontconfig fc-case fc-lang src \
+ 	fc-cache fc-cat fc-conflist fc-list fc-match \
+-	fc-pattern fc-query fc-scan fc-validate conf.d \
++	fc-pattern fc-query fc-scan fc-validate conf.d conf.d.infinality \
+ 	its po po-conf test
+ if ENABLE_DOCS
+ SUBDIRS += doc
+--
+2.21.0
diff --git a/PKGBUILD b/PKGBUILD
index 753357ac04fb..2e3f5b3a30c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ _basename=fontconfig
 pkgdesc="A library for configuring and customizing font access, optimized for Infinality Remix."
 url='http://www.fontconfig.org/release/'
 license=('custom' 'MIT')
-pkgver=2.13.1
-pkgrel=2
+pkgver=2.13.91+24+g75eadca
+pkgrel=1
 arch=(i686 x86_64)
 groups=('infinality-remix')
 
@@ -15,7 +15,7 @@ depends=('expat' 'freetype2')
 makedepends=('gperf' 'python-lxml' 'python-six' 'git')
 options=('libtool')
 
-provides=('fontconfig=$pkgver' 'fontconfig-infinality-remix')
+provides=("fontconfig=$pkgver")
 
 conflicts=('fontconfig'
             'fontconfig-infinality'
@@ -36,8 +36,14 @@ backup=('etc/fonts/fonts.conf'
 
 install=fontconfig-infinality-remix.install
 
-source=("git+https://anongit.freedesktop.org/git/fontconfig#tag=${pkgver}"
-        fontconfig-infinality-remix-srcs-${pkgver}.tar.bz2
+# Arch official upstream version commit
+_commit=75eadca26648abf69497691ff0f4c7803b9ff23c
+
+# Infinality Remix fontconfig configuration version
+_remixver=20191030
+
+source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit"
+        fontconfig-infinality-remix-srcs-${_remixver}.tar.bz2
         fc-presets
         fc-cache-infinality-remix.hook
         0001-configure-${pkgver}.patch
@@ -50,22 +56,25 @@ sha256sums=('SKIP'
             'f8c49b4ee86ad64b1d3df700a5c0b337e44f507bb7e7d264eb5eaf0040998ef2'
             'c291f3849369106c5005155b5b099459c86baf455cea0e080a76a3fdf8a8f4b7'
             '94e7b03a32304604be2cf5568c02805ea1ac45eb68104de400ae7f370e3e598b'
-            '7a0597c3a926176b5c844aa15f3fc98007398eb24db336b059c30f1cec8510cf'
-            'ba8815b38d5d6e307d2107966c8b2ce0d2d48212ab99b55a56c6d66621b705ce'
-            '039f53ede54db124ab55bf084c22359bf31e667e18e0abf660ce4b450610ae49'
-            '6d1296fa0d86b95b41017e0c424c1cffea85606edaf80ed5e1d52b1d21486e5d'
-            '61d6c1ecd4516a4b836c0dea3e0f70a4703ca326ffc830e9c135f907c464cfae')
+            '45a1ea897f0c7687f4ba1d2c200b17145cc5246e4a82eaa33e09d1b843030cb7'
+            '006a14e00017736813002034996b024bb7133bd3eeda6b7f74e4c2880b64031d'
+            '7dfc5ba9b20e0326e6a3a880f18d58a7ed31f7af025627670f210ec109be1a81'
+            'fd3487482109874d21c0e537284920392f93c4362b70a765de376c66654edec6'
+            'f989fce1a1537f6e9ad42b8a2d1bb87a451af6b4fb80f9281f8773985ce85627')
+
+pkgver() {
+    cd fontconfig
+    git describe --tags | sed 's/-/+/g'
+}
 
 # a nice page to test font matching:
 # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
 prepare() {
-
     patches=(0001-configure-${pkgver}.patch
             0002-configure-${pkgver}.ac.patch
             0003-Makefile-${pkgver}.in.patch
             0004-Makefile-${pkgver}.conf.d.patch
-            0005-Makefile-${pkgver}.am.in.patch
-            )
+            0005-Makefile-${pkgver}.am.in.patch)
 
     # Copy the Infinality font configuration.
     cd "${_basename}-infinality-remix-srcs"
@@ -88,14 +97,14 @@ build() {
     cd "${_basename}"
 
     ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-templatedir=/etc/fonts/conf.avail \
-    --with-templateinfdir=/etc/fonts/conf.avail.infinality \
-    --with-xmldir=/etc/fonts \
-    --localstatedir=/var \
-    --disable-static \
-    --with-default-fonts=/usr/share/fonts \
-    --with-add-fonts=/usr/share/fonts
+        --sysconfdir=/etc \
+        --with-templatedir=/etc/fonts/conf.avail \
+        --with-templateinfdir=/etc/fonts/conf.avail.infinality \
+        --with-xmldir=/etc/fonts \
+        --localstatedir=/var \
+        --disable-static \
+        --with-default-fonts=/usr/share/fonts \
+        --with-add-fonts=/usr/share/fonts
     make
 }
 
@@ -117,7 +126,7 @@ package() {
 
     # ALPM/Pacman hook
     install -D -m 644 "${srcdir}"/fc-cache-infinality-remix.hook \
-    "${pkgdir}/usr/share/libalpm/hooks/90-fc-cache-infinality-remix.hook"
+        "${pkgdir}/usr/share/libalpm/hooks/90-fc-cache-infinality-remix.hook"
 
     # Switch to Infinality Remix sources
     cd "${srcdir}"/"${_basename}-infinality-remix-srcs"
diff --git a/fontconfig-infinality-remix-srcs-2.13.1.tar.bz2 b/fontconfig-infinality-remix-srcs-20191030.tar.bz2
index f59e36f62341..f59e36f62341 100644
--- a/fontconfig-infinality-remix-srcs-2.13.1.tar.bz2
+++ b/fontconfig-infinality-remix-srcs-20191030.tar.bz2