2.12.6

8 files changed, 313 insertions, 219 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7f6fe379a5d..6acd025de2c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 19 14:54:26 UTC 2017
+# Tue Oct 17 18:01:08 UTC 2017
 pkgbase = fontconfig-infinality-ultimate
 	pkgdesc = A library for configuring and customizing font access, optimized for freetype2-infinality-ultimate.
-	pkgver = 2.12.5
-	pkgrel = 4
+	pkgver = 2.12.6
+	pkgrel = 1
 	url = http://www.fontconfig.org/release/
 	install = fontconfig-ultimate.install
 	arch = i686
@@ -33,22 +33,22 @@ pkgbase = fontconfig-infinality-ultimate
 	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.12.5
+	source = git+https://anongit.freedesktop.org/git/fontconfig#tag=2.12.6
 	source = https://raw.githubusercontent.com/archfan/infinality_bundle/820e74be8345a0da2cdcff0a05bf5fa10fd85740/02_fontconfig-iu/fontconfig-ultimate-git.tar.bz2
 	source = fc-cache-ib.hook
-	source = 01-configure-20170913.patch
-	source = 02-configure-20170913.ac.patch
-	source = 03-Makefile-20170913.in.patch
-	source = 04-Makefile-20170913.conf.d.patch
-	source = 05-Makefile-20170913.am.in.patch
+	source = 0001-configure-20171017.patch
+	source = 0002-configure-20171017.ac.patch
+	source = 0003-Makefile-20171017.in.patch
+	source = 0004-Makefile-20171017.conf.d.patch
+	source = 0005-Makefile-20171017.am.in.patch
 	sha256sums = SKIP
 	sha256sums = b4977cfb0dc64167be3b58ae63022ffb2648e08519b0c061ee2ca43620d8b980
 	sha256sums = 026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3
 	sha256sums = 7cb8401c2acbc4ac7a9e4a948a4b04d3b5446cb1153fab351c8d92d1306719ac
 	sha256sums = ba8815b38d5d6e307d2107966c8b2ce0d2d48212ab99b55a56c6d66621b705ce
-	sha256sums = 0676efe16ffe6a032fe2e8be1405974d633220ddcf7ea38cf686e521b3d83735
-	sha256sums = 70c6a4fedccc49e2075232c67b4c4d95dc59119fc8efa3c0a6c5f8adb5276a4a
-	sha256sums = a623af1853e6d233620b7908372db568c5a3802862a95ef6964af361df5424a0
+	sha256sums = 253392c84479aa2b539a0cac4311a28a30663fd806bfe40bd9e8284a9e194431
+	sha256sums = 8ee8dd7ee5b85ab410dc59127db8fc09ba2a1070949fa2e03b9ddeb43c8466a8
+	sha256sums = 82dfce9f9e3c340ff075b6a4957004fdcaa765b94c1a0aca74f0159fa5e18db1
 
 pkgname = fontconfig-infinality-ultimate
 
diff --git a/01-configure-20170913.patch b/0001-configure-20171017.patch
index 0abebfe85117..0abebfe85117 100644
--- a/01-configure-20170913.patch
+++ b/0001-configure-20171017.patch
diff --git a/02-configure-20170913.ac.patch b/0002-configure-20171017.ac.patch
index 91f91aa9a5e5..91f91aa9a5e5 100644
--- a/02-configure-20170913.ac.patch
+++ b/0002-configure-20171017.ac.patch
diff --git a/0003-Makefile-20171017.in.patch b/0003-Makefile-20171017.in.patch
new file mode 100644
index 000000000000..9845519b9da0
--- /dev/null
+++ b/0003-Makefile-20171017.in.patch
@@ -0,0 +1,245 @@
+From db6f2915ea4b759d4c7a7515b7336ab5c83b0d89 Mon Sep 17 00:00:00 2001
+From: Solomon Choina <shlomochoina@gmail.com>
+Date: Tue, 17 Oct 2017 13:05:00 -0400
+Subject: [PATCH] makefile-20171017.in
+
+---
+ Makefile.in              | 1 +
+ conf.d/Makefile.in       | 1 +
+ doc/Makefile.in          | 1 +
+ fc-blanks/Makefile.in    | 1 +
+ fc-cache/Makefile.in     | 1 +
+ fc-case/Makefile.in      | 1 +
+ fc-cat/Makefile.in       | 1 +
+ fc-glyphname/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 +
+ src/Makefile.in          | 1 +
+ test/Makefile.in         | 1 +
+ 18 files changed, 18 insertions(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index ad85d64..7ac4ecf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -373,6 +373,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in
+index a75b3ec..017b626 100644
+--- a/conf.d/Makefile.in
++++ b/conf.d/Makefile.in
+@@ -285,6 +285,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index f23f90d..84535c3 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -530,6 +530,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-blanks/Makefile.in b/fc-blanks/Makefile.in
+index 51e1dff..26cb169 100644
+--- a/fc-blanks/Makefile.in
++++ b/fc-blanks/Makefile.in
+@@ -277,6 +277,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-cache/Makefile.in b/fc-cache/Makefile.in
+index fe9d57b..e522315 100644
+--- a/fc-cache/Makefile.in
++++ b/fc-cache/Makefile.in
+@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-case/Makefile.in b/fc-case/Makefile.in
+index 483354e..b005101 100644
+--- a/fc-case/Makefile.in
++++ b/fc-case/Makefile.in
+@@ -303,6 +303,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-cat/Makefile.in b/fc-cat/Makefile.in
+index 83ab9cc..8648e6b 100644
+--- a/fc-cat/Makefile.in
++++ b/fc-cat/Makefile.in
+@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-glyphname/Makefile.in b/fc-glyphname/Makefile.in
+index cc902c9..17eb876 100644
+--- a/fc-glyphname/Makefile.in
++++ b/fc-glyphname/Makefile.in
+@@ -303,6 +303,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-lang/Makefile.in b/fc-lang/Makefile.in
+index 54a2539..149ccd6 100644
+--- a/fc-lang/Makefile.in
++++ b/fc-lang/Makefile.in
+@@ -303,6 +303,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-list/Makefile.in b/fc-list/Makefile.in
+index a239616..edab1e0 100644
+--- a/fc-list/Makefile.in
++++ b/fc-list/Makefile.in
+@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-match/Makefile.in b/fc-match/Makefile.in
+index 4b5af2c..5f5fa50 100644
+--- a/fc-match/Makefile.in
++++ b/fc-match/Makefile.in
+@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-pattern/Makefile.in b/fc-pattern/Makefile.in
+index 54d99d3..1f13272 100644
+--- a/fc-pattern/Makefile.in
++++ b/fc-pattern/Makefile.in
+@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-query/Makefile.in b/fc-query/Makefile.in
+index 2e8d3d2..362ee25 100644
+--- a/fc-query/Makefile.in
++++ b/fc-query/Makefile.in
+@@ -336,6 +336,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-scan/Makefile.in b/fc-scan/Makefile.in
+index 17af97f..6ebbd95 100644
+--- a/fc-scan/Makefile.in
++++ b/fc-scan/Makefile.in
+@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fc-validate/Makefile.in b/fc-validate/Makefile.in
+index 0a7e19a..98f09e0 100644
+--- a/fc-validate/Makefile.in
++++ b/fc-validate/Makefile.in
+@@ -336,6 +336,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/fontconfig/Makefile.in b/fontconfig/Makefile.in
+index 29ce210..9e3c7e6 100644
+--- a/fontconfig/Makefile.in
++++ b/fontconfig/Makefile.in
+@@ -281,6 +281,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index b500a70..0e5ca95 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -349,6 +349,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+diff --git a/test/Makefile.in b/test/Makefile.in
+index 6be47e9..2cb45e1 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -513,6 +513,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TEMPLATEDIR = @TEMPLATEDIR@
++TEMPLATEINFDIR = @TEMPLATEINFDIR@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XMLDIR = @XMLDIR@
+-- 
+2.14.2
+
diff --git a/04-Makefile-20170913.conf.d.patch b/0004-Makefile-20171017.conf.d.patch
index cccb06968c87..b4e88794ffaa 100644
--- a/04-Makefile-20170913.conf.d.patch
+++ b/0004-Makefile-20171017.conf.d.patch
@@ -1,18 +1,18 @@
-From 50ca24b59585e2d90e0517041824d62b5b9a3807 Mon Sep 17 00:00:00 2001
+From 8021f934890cb3c9c3f6dd626c73f8f33f010586 Mon Sep 17 00:00:00 2001
 From: Solomon Choina <shlomochoina@gmail.com>
-Date: Wed, 13 Sep 2017 11:58:59 -0400
-Subject: [PATCH] change conf.d slightly to fit infinality
+Date: Tue, 17 Oct 2017 13:25:52 -0400
+Subject: [PATCH] Makefile-20171017.conf.d
 
 ---
- conf.d/Makefile.am | 43 +------------------------------------------
- conf.d/Makefile.in | 31 +++----------------------------
- 2 files changed, 4 insertions(+), 70 deletions(-)
+ conf.d/Makefile.am | 42 +-----------------------------------------
+ conf.d/Makefile.in | 30 +++---------------------------
+ 2 files changed, 4 insertions(+), 68 deletions(-)
 
 diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
-index fd50a5d..a85ad74 100644
+index ff03fb2..d37ecb9 100644
 --- a/conf.d/Makefile.am
 +++ b/conf.d/Makefile.am
-@@ -21,30 +21,9 @@
+@@ -21,29 +21,9 @@
  #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  #  PERFORMANCE OF THIS SOFTWARE.
  
@@ -24,7 +24,6 @@ index fd50a5d..a85ad74 100644
 -	10-hinting-$(PREFERRED_HINTING).conf	\
 -	10-scale-bitmap-fonts.conf \
 -	20-unhint-small-vera.conf \
--	30-urw-aliases.conf \
 -	30-metric-aliases.conf \
 -	40-nonlatin.conf \
 -	45-generic.conf \
@@ -40,11 +39,11 @@ index fd50a5d..a85ad74 100644
 -	80-delicious.conf \
 -	90-synthetic.conf
 -
-+CONF_LINKS = 
++CONF_LINKS =
  EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
  CLEANFILES = $(DOC_FILES)
  
-@@ -89,24 +68,4 @@ template_DATA =				\
+@@ -87,24 +67,4 @@ template_DATA =				\
  	80-delicious.conf		\
  	90-synthetic.conf
  
@@ -70,10 +69,10 @@ index fd50a5d..a85ad74 100644
 -
  -include $(top_srcdir)/git.mk
 diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in
-index d626007..40c0a57 100644
+index 017b626..aee1797 100644
 --- a/conf.d/Makefile.in
 +++ b/conf.d/Makefile.in
-@@ -173,7 +173,7 @@ am__uninstall_files_from_dir = { \
+@@ -175,7 +175,7 @@ am__uninstall_files_from_dir = { \
      || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
@@ -82,7 +81,7 @@ index d626007..40c0a57 100644
  DATA = $(config_DATA) $(template_DATA)
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
  am__DIST_COMMON = $(srcdir)/Makefile.in README
-@@ -346,29 +346,8 @@ target_alias = @target_alias@
+@@ -349,28 +349,8 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -93,7 +92,6 @@ index d626007..40c0a57 100644
 -	10-hinting-$(PREFERRED_HINTING).conf	\
 -	10-scale-bitmap-fonts.conf \
 -	20-unhint-small-vera.conf \
--	30-urw-aliases.conf \
 -	30-metric-aliases.conf \
 -	40-nonlatin.conf \
 -	45-generic.conf \
@@ -113,7 +111,7 @@ index d626007..40c0a57 100644
  EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
  CLEANFILES = $(DOC_FILES)
  configdir = $(CONFIGDIR)
-@@ -534,7 +513,7 @@ check: $(BUILT_SOURCES)
+@@ -535,7 +515,7 @@ check: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) check-am
  all-am: Makefile $(DATA)
  installdirs:
@@ -122,7 +120,7 @@ index d626007..40c0a57 100644
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -656,10 +635,6 @@ uninstall-am: uninstall-configDATA uninstall-local \
+@@ -657,10 +637,6 @@ uninstall-am: uninstall-configDATA uninstall-local \
  
  .PRECIOUS: Makefile
  
@@ -134,5 +132,5 @@ index d626007..40c0a57 100644
  	mkdir -p $(DESTDIR)$(configdir)
  	@(echo cd $(DESTDIR)$(configdir);			\
 -- 
-2.14.1
+2.14.2
 
diff --git a/05-Makefile-20170913.am.in.patch b/0005-Makefile-20171017.am.in.patch
index 5dcc6fed1b11..2cf675a5ab12 100644
--- a/05-Makefile-20170913.am.in.patch
+++ b/0005-Makefile-20171017.am.in.patch
@@ -1,5 +1,17 @@
---- a/Makefile.am	2015-08-28 05:16:20.000000000 +0200
-+++ b/Makefile.am	2015-08-28 05:17:53.230592960 +0200
+From b8863b45a5c9fd43666ec05b5a2499f99f769161 Mon Sep 17 00:00:00 2001
+From: Solomon Choina <shlomochoina@gmail.com>
+Date: Tue, 17 Oct 2017 13:51:43 -0400
+Subject: [PATCH] Makefile-20171017.am.in
+
+---
+ Makefile.am | 2 +-
+ Makefile.in | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2b4a5b8..411eb03 100644
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -23,7 +23,7 @@
  
  SUBDIRS=fontconfig fc-blanks fc-case fc-lang fc-glyphname src \
@@ -9,18 +21,11 @@
  if ENABLE_DOCS
  SUBDIRS += doc
  endif
---- a/Makefile.in	2015-06-02 10:33:36.000000000 +0200
-+++ b/Makefile.in	2016-03-29 05:16:51.275520793 +0200
-@@ -143,6 +143,8 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
-+depcomp =
-+am__depfiles_maybe =
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-@@ -218,7 +220,7 @@ CTAGS = ctags
+diff --git a/Makefile.in b/Makefile.in
+index 7ac4ecf..1ca269b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -220,7 +220,7 @@ CTAGS = ctags
  CSCOPE = cscope
  DIST_SUBDIRS = fontconfig fc-blanks fc-case fc-lang fc-glyphname src \
  	fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
@@ -29,15 +34,7 @@
  am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
  	$(srcdir)/fontconfig-zip.in $(srcdir)/fontconfig.pc.in \
  	$(srcdir)/fontconfig.spec.in AUTHORS COPYING ChangeLog INSTALL \
-@@ -369,6 +371,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
-@@ -434,7 +437,7 @@ top_builddir = @top_builddir@
+@@ -439,7 +439,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = fontconfig fc-blanks fc-case fc-lang fc-glyphname src \
  	fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
@@ -46,3 +43,6 @@
  ACLOCAL_AMFLAGS = -I m4
  EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd \
  	fontconfig.spec.in fontconfig.spec fontconfig-zip.in \
+-- 
+2.14.2
+
diff --git a/03-Makefile-20170913.in.patch b/03-Makefile-20170913.in.patch
deleted file mode 100644
index db4b7894ad3d..000000000000
--- a/03-Makefile-20170913.in.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- a/fc-blanks/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-blanks/Makefile.in	2016-03-29 04:45:09.437481817 +0200
-@@ -273,6 +273,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-cache/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-cache/Makefile.in	2016-03-29 04:45:09.437481817 +0200
-@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-case/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-case/Makefile.in	2016-03-29 04:45:09.437481817 +0200
-@@ -299,6 +299,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-cat/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-cat/Makefile.in	2016-03-29 04:45:09.437481817 +0200
-@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-glyphname/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-glyphname/Makefile.in	2016-03-29 04:45:09.437481817 +0200
-@@ -299,6 +299,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-lang/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-lang/Makefile.in	2016-03-29 04:45:09.437481817 +0200
-@@ -299,6 +299,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-list/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-list/Makefile.in	2016-03-29 04:45:09.437481817 +0200
-@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-match/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-match/Makefile.in	2016-03-29 04:45:09.440815218 +0200
-@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-pattern/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-pattern/Makefile.in	2016-03-29 04:45:09.440815218 +0200
-@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-query/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-query/Makefile.in	2016-03-29 04:45:09.440815218 +0200
-@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-scan/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-scan/Makefile.in	2016-03-29 04:45:09.440815218 +0200
-@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fc-validate/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fc-validate/Makefile.in	2016-03-29 04:45:09.440815218 +0200
-@@ -335,6 +335,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/fontconfig/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/fontconfig/Makefile.in	2016-03-29 04:45:09.440815218 +0200
-@@ -277,6 +277,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/src/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/src/Makefile.in	2016-03-29 04:45:09.440815218 +0200
-@@ -348,6 +348,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
---- a/test/Makefile.in	2015-06-02 10:33:37.000000000 +0200
-+++ b/test/Makefile.in	2016-03-29 04:45:09.444148620 +0200
-@@ -497,6 +497,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
diff --git a/PKGBUILD b/PKGBUILD
index e61e6adf4af9..a5dfd566726e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@
 pkgname=fontconfig-infinality-ultimate
 _basename=fontconfig
 pkgdesc="A library for configuring and customizing font access, optimized for freetype2-infinality-ultimate."
-date=20170913
+date=20171017
 url='http://www.fontconfig.org/release/'
 license=('custom' 'MIT')
-pkgver=2.12.5
-pkgrel=4
+pkgver=2.12.6
+pkgrel=1
 arch=('i686' 'x86_64')
 groups=('infinality-bundle')
 depends=('expat' 'freetype2-infinality-ultimate')
@@ -30,22 +30,23 @@ install=fontconfig-ultimate.install
 source=("git+https://anongit.freedesktop.org/git/fontconfig#tag=${pkgver}"
         https://raw.githubusercontent.com/archfan/infinality_bundle/820e74be8345a0da2cdcff0a05bf5fa10fd85740/02_fontconfig-iu/fontconfig-ultimate-git.tar.bz2
         fc-cache-ib.hook
-        01-configure-${date}.patch
-        02-configure-${date}.ac.patch
-        03-Makefile-${date}.in.patch
-        04-Makefile-${date}.conf.d.patch
-        05-Makefile-${date}.am.in.patch)
+        0001-configure-${date}.patch
+        0002-configure-${date}.ac.patch
+        0003-Makefile-${date}.in.patch
+        0004-Makefile-${date}.conf.d.patch
+        0005-Makefile-${date}.am.in.patch
+        )
 
 # a nice page to test font matching:
 # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
 
 prepare() {
 
-  patches=(01-configure-${date}.patch
-           02-configure-${date}.ac.patch
-           03-Makefile-${date}.in.patch
-           04-Makefile-${date}.conf.d.patch
-           05-Makefile-${date}.am.in.patch)
+  patches=(0001-configure-${date}.patch
+           0002-configure-${date}.ac.patch
+           0003-Makefile-${date}.in.patch
+           0004-Makefile-${date}.conf.d.patch
+           0005-Makefile-${date}.am.in.patch)
 
   # copy fontconfig-ib patches & stuff
   cd "${_basename}-ultimate-git" 
@@ -116,6 +117,6 @@ sha256sums=('SKIP'
             '026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3'
             '7cb8401c2acbc4ac7a9e4a948a4b04d3b5446cb1153fab351c8d92d1306719ac'
             'ba8815b38d5d6e307d2107966c8b2ce0d2d48212ab99b55a56c6d66621b705ce'
-            '0676efe16ffe6a032fe2e8be1405974d633220ddcf7ea38cf686e521b3d83735'
-            '70c6a4fedccc49e2075232c67b4c4d95dc59119fc8efa3c0a6c5f8adb5276a4a'
-            'a623af1853e6d233620b7908372db568c5a3802862a95ef6964af361df5424a0')
+            '253392c84479aa2b539a0cac4311a28a30663fd806bfe40bd9e8284a9e194431'
+            '8ee8dd7ee5b85ab410dc59127db8fc09ba2a1070949fa2e03b9ddeb43c8466a8'
+            '82dfce9f9e3c340ff075b6a4957004fdcaa765b94c1a0aca74f0159fa5e18db1')