updating fontconfig to 2.12.5

6 files changed, 391 insertions, 34 deletions

diff --git a/01-configure-20170913.patch b/01-configure-20170913.patch
new file mode 100644
index 000000000000..0abebfe85117
--- /dev/null
+++ b/01-configure-20170913.patch
@@ -0,0 +1,75 @@
+--- a/configure	2016-04-06 14:07:58.000000000 +0200
++++ b/configure	2016-04-10 05:09:21.455507196 +0200
+@@ -655,6 +655,7 @@ XMLDIR
+ CONFIGDIR
+ BASECONFIGDIR
+ TEMPLATEDIR
++TEMPLATEINFDIR
+ FC_FONTDATE
+ FC_CACHEDIR
+ fc_cachedir
+@@ -844,6 +845,7 @@ with_default_fonts
+ with_add_fonts
+ with_cache_dir
+ with_templatedir
++with_templateinfdir
+ with_baseconfigdir
+ with_configdir
+ with_xmldir
+@@ -1530,6 +1532,10 @@ Optional Packages:
+                           [default=LOCALSTATEDIR/cache/fontconfig]
+   --with-templatedir=DIR  Use DIR to store the configuration template files
+                           [default=DATADIR/fontconfig/conf.avail]
++  --with-templateinfdir=DIR
++                          Use DIR to store the Infinality compliant
++                          configuration template files
++                          [default=DATADIR/fontconfig/conf.avail.infinality]
+   --with-baseconfigdir=DIR
+                           Use DIR to store the base configuration files
+                           [default=SYSCONFDIR/fonts]
+@@ -15206,6 +15212,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 :
+@@ -15238,6 +15250,13 @@ no|yes)
+ *)
+ 	;;
+ esac
++case "$templateinfdir" in
++no|yes)
++	templateinfdir='${datadir}'/fontconfig/conf.avail.infinality
++	;;
++*)
++	;;
++esac
+ case "$baseconfigdir" in
+ no|yes)
+ 	baseconfigdir='${sysconfdir}'/fonts
+@@ -15261,6 +15280,7 @@ no|yes)
+ esac
+ 
+ TEMPLATEDIR=${templatedir}
++TEMPLATEINFDIR=${templateinfdir}
+ BASECONFIGDIR=${baseconfigdir}
+ CONFIGDIR=${configdir}
+ XMLDIR=${xmldir}
+@@ -16324,8 +16344,8 @@ _ACEOF
+ 
+ 
+ 
+-ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-blanks/Makefile fc-case/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
+-
++ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-blanks/Makefile fc-case/Makefile src/Makefile conf.d/Makefile conf.d.infinality/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
++ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
diff --git a/02-configure-20170913.ac.patch b/02-configure-20170913.ac.patch
new file mode 100644
index 000000000000..91f91aa9a5e5
--- /dev/null
+++ b/02-configure-20170913.ac.patch
@@ -0,0 +1,53 @@
+--- 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)
+ 
+ AC_ARG_WITH(templatedir,
+ 	[AC_HELP_STRING([--with-templatedir=DIR],
+-			[Use DIR to store the configuration template files [default=DATADIR/fontconfig/conf.avail]])],
++			[Use DIR to store the generic configuration template files [default=DATADIR/fontconfig/conf.avail]])],
+ 	[templatedir="$withval"],
+ 	[templatedir=yes])
++AC_ARG_WITH(templateinfdir,
++	[AC_HELP_STRING([--with-templateinfdir=DIR],
++			[Use DIR to store the Infinality compliant configuration template files [default=DATADIR/fontconfig/conf.avail.infinality]])],
++	[templateinfdir="$withval"],
++	[templateinfdir=yes])
+ 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)
+ *)
+ 	;;
+ esac
++case "$templateinfdir" in
++no|yes)
++	templateinfdir='${datadir}'/fontconfig/conf.avail.infinality
++	;;
++*)
++	;;
++esac
+ case "$baseconfigdir" in
+ no|yes)
+ 	baseconfigdir='${sysconfdir}'/fonts
+@@ -573,10 +585,12 @@ no|yes)
+ esac
+ 
+ TEMPLATEDIR=${templatedir}
++TEMPLATEINFDIR=${templateinfdir}
+ BASECONFIGDIR=${baseconfigdir}
+ CONFIGDIR=${configdir}
+ XMLDIR=${xmldir}
+ AC_SUBST(TEMPLATEDIR)
++AC_SUBST(TEMPLATEINFDIR)
+ AC_SUBST(BASECONFIGDIR)
+ AC_SUBST(CONFIGDIR)
+ AC_SUBST(XMLDIR)
+@@ -706,6 +720,7 @@ fc-blanks/Makefile
+ fc-case/Makefile
+ src/Makefile
+ conf.d/Makefile
++conf.d.infinality/Makefile
+ fc-cache/Makefile
+ fc-cat/Makefile
+ fc-list/Makefile
diff --git a/03-Makefile-20170913.in.patch b/03-Makefile-20170913.in.patch
new file mode 100644
index 000000000000..db4b7894ad3d
--- /dev/null
+++ b/03-Makefile-20170913.in.patch
@@ -0,0 +1,150 @@
+--- 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/04-Makefile-20160818.conf.d.patch b/04-Makefile-20170913.conf.d.patch
index 41babbcda6e2..cccb06968c87 100644
--- a/04-Makefile-20160818.conf.d.patch
+++ b/04-Makefile-20170913.conf.d.patch
@@ -1,7 +1,18 @@
-diff -ruN fontconfig-2.12.1-orig/conf.d/Makefile.am fontconfig-2.12.1/conf.d/Makefile.am
---- fontconfig-2.12.1-orig/conf.d/Makefile.am	2016-08-18 17:43:18.134614854 +0200
-+++ fontconfig-2.12.1/conf.d/Makefile.am	2016-08-18 17:46:34.272609706 +0200
-@@ -21,27 +21,9 @@
+From 50ca24b59585e2d90e0517041824d62b5b9a3807 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
+
+---
+ conf.d/Makefile.am | 43 +------------------------------------------
+ conf.d/Makefile.in | 31 +++----------------------------
+ 2 files changed, 4 insertions(+), 70 deletions(-)
+
+diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
+index fd50a5d..a85ad74 100644
+--- a/conf.d/Makefile.am
++++ b/conf.d/Makefile.am
+@@ -21,30 +21,9 @@
  #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  #  PERFORMANCE OF THIS SOFTWARE.
  
@@ -16,21 +27,24 @@ diff -ruN fontconfig-2.12.1-orig/conf.d/Makefile.am fontconfig-2.12.1/conf.d/Mak
 -	30-urw-aliases.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)
-@@ -85,24 +67,4 @@
+ 
+@@ -89,24 +68,4 @@ template_DATA =				\
  	80-delicious.conf		\
  	90-synthetic.conf
  
@@ -55,10 +69,11 @@ diff -ruN fontconfig-2.12.1-orig/conf.d/Makefile.am fontconfig-2.12.1/conf.d/Mak
 -	  done)
 -
  -include $(top_srcdir)/git.mk
-diff -ruN fontconfig-2.12.1-orig/conf.d/Makefile.in fontconfig-2.12.1/conf.d/Makefile.in
---- fontconfig-2.12.1-orig/conf.d/Makefile.in	2016-08-18 17:43:18.129614854 +0200
-+++ fontconfig-2.12.1/conf.d/Makefile.in	2016-08-18 17:47:23.998608401 +0200
-@@ -173,7 +173,7 @@
+diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in
+index d626007..40c0a57 100644
+--- a/conf.d/Makefile.in
++++ b/conf.d/Makefile.in
+@@ -173,7 +173,7 @@ am__uninstall_files_from_dir = { \
      || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
@@ -67,7 +82,7 @@ diff -ruN fontconfig-2.12.1-orig/conf.d/Makefile.in fontconfig-2.12.1/conf.d/Mak
  DATA = $(config_DATA) $(template_DATA)
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
  am__DIST_COMMON = $(srcdir)/Makefile.in README
-@@ -346,26 +346,8 @@
+@@ -346,29 +346,8 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -81,21 +96,24 @@ diff -ruN fontconfig-2.12.1-orig/conf.d/Makefile.in fontconfig-2.12.1/conf.d/Mak
 -	30-urw-aliases.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)
-@@ -530,7 +512,7 @@
+ configdir = $(CONFIGDIR)
+@@ -534,7 +513,7 @@ check: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) check-am
  all-am: Makefile $(DATA)
  installdirs:
@@ -104,13 +122,17 @@ diff -ruN fontconfig-2.12.1-orig/conf.d/Makefile.in fontconfig-2.12.1/conf.d/Mak
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -653,9 +635,6 @@
- .PRECIOUS: Makefile
+@@ -656,10 +635,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.14.1
+
diff --git a/05-Makefile-20170913.am.in.patch b/05-Makefile-20170913.am.in.patch
new file mode 100644
index 000000000000..5dcc6fed1b11
--- /dev/null
+++ b/05-Makefile-20170913.am.in.patch
@@ -0,0 +1,48 @@
+--- a/Makefile.am	2015-08-28 05:16:20.000000000 +0200
++++ b/Makefile.am	2015-08-28 05:17:53.230592960 +0200
+@@ -23,7 +23,7 @@
+ 
+ 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 \
+-	fc-validate conf.d test
++	fc-validate conf.d conf.d.infinality test
+ 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
+ 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 \
+-	fc-validate conf.d test doc
++	fc-validate conf.d conf.d.infinality test doc
+ 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@
+ 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 \
+-	fc-validate conf.d test $(am__append_1)
++	fc-validate conf.d conf.d.infinality test $(am__append_1)
+ ACLOCAL_AMFLAGS = -I m4
+ EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd \
+ 	fontconfig.spec.in fontconfig.spec fontconfig-zip.in \
diff --git a/PKGBUILD b/PKGBUILD
index 6f24f98960d5..f9b43256c57d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,10 @@
 pkgname=fontconfig-infinality-ultimate
 _basename=fontconfig
 pkgdesc="A library for configuring and customizing font access, optimized for freetype2-infinality-ultimate."
+date=20170913
 url='http://www.fontconfig.org/release/'
 license=('custom' 'MIT')
-pkgver=2.12.4
+pkgver=2.12.5
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('infinality-bundle')
@@ -26,35 +27,38 @@ backup=('etc/fonts/fonts.conf'
         'etc/fonts/conf.avail.infinality/38-repl-webfonts-custom.conf'
         'etc/fonts/conf.avail.infinality/97-selective-rendering-custom.conf')
 install=fontconfig-ultimate.install
-source=(http://www.fontconfig.org/release/${_basename}-${pkgver}.tar.bz2
+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)
+        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)
 
 # a nice page to test font matching:
 # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
 
 prepare() {
 
-  patches=(01-configure.patch
-           02-configure.ac.patch
-           03-Makefile.in.patch
-           04-Makefile-20160818.conf.d.patch
-           05-Makefile.am.in.patch)
+  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)
 
   # copy fontconfig-ib patches & stuff
   cd "${_basename}-ultimate-git" 
-  cp -r conf.d.infinality "${srcdir}/${_basename}-${pkgver}"/conf.d.infinality
-  cp -r fontconfig_patches/*.patch "${srcdir}/${_basename}-${pkgver}"   # prepare src
-  cd "${srcdir}/${_basename}-${pkgver}"
-
+  cp -r conf.d.infinality "${srcdir}/${_basename}/conf.d.infinality"
+  cd "${srcdir}/${_basename}"
+  NOCONFIGURE=1 ./autogen.sh  
   # infinality & post release fixes
   for patch in "${patches[@]}"; do
-    patch -Np1 -i ${patch}
+    patch -Np1 -i ../${patch}
   done
 
   # fc-blanks.py
   #sed -i 's/python/python2/' fc-blanks/fc-blanks.py
-
   aclocal
   libtoolize -f
   automake -afi
@@ -62,7 +66,7 @@ prepare() {
 }
 
 build() {
-  cd "${_basename}-${pkgver}"
+  cd "${_basename}"
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -77,12 +81,12 @@ build() {
 }
 
 #check() {
-#  cd "${_basename}-${pkgver}"
+#  cd "${_basename}"
 #  make -k check
 #}
 
 package() {
-  cd "${_basename}-${pkgver}"
+  cd "${_basename}"
   make DESTDIR="${pkgdir}" install
 
   #Install license
@@ -109,6 +113,11 @@ package() {
 
   find "${pkgdir}" -type d -name .git -exec rm -r '{}' +
 }
-sha256sums=('668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c'
+sha256sums=('SKIP'
             'b4977cfb0dc64167be3b58ae63022ffb2648e08519b0c061ee2ca43620d8b980'
-            '026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3')
+            '026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3'
+            '7cb8401c2acbc4ac7a9e4a948a4b04d3b5446cb1153fab351c8d92d1306719ac'
+            'ba8815b38d5d6e307d2107966c8b2ce0d2d48212ab99b55a56c6d66621b705ce'
+            '0676efe16ffe6a032fe2e8be1405974d633220ddcf7ea38cf686e521b3d83735'
+            '70c6a4fedccc49e2075232c67b4c4d95dc59119fc8efa3c0a6c5f8adb5276a4a'
+            'a623af1853e6d233620b7908372db568c5a3802862a95ef6964af361df5424a0')