* Upgrade to 2.11.95.

* Download files and patches directly from repository.
* Add pacman hook.
* Use the same install script as in bohoomil's repository.

11 files changed, 152 insertions, 513 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c70e383c2c8a..c8e995bc76f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,27 @@
 # Generated by mksrcinfo v8
-# Wed Feb 17 08:56:33 UTC 2016
+# Thu Apr 14 17:05:17 UTC 2016
 pkgbase = fontconfig-infinality
 	pkgdesc = Fontconfig is a library for configuring and customizing font access, patched with infinality patches.
-	pkgver = 2.11.94
-	pkgrel = 2
+	pkgver = 2.11.95
+	pkgrel = 1
 	url = https://github.com/bohoomil/fontconfig-ultimate
 	install = install.sh
 	arch = armv7h
 	arch = i686
 	arch = x86_64
+	groups = infinality-bundle
 	license = GPL
+	makedepends = python2
+	makedepends = docbook2x
+	makedepends = git
+	depends = expat
 	depends = freetype2-infinality
-	provides = fontconfig=2.11.94
+	provides = fontconfig=2.11.95
 	conflicts = fontconfig
-	options = !libtool
-	source = http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.94.tar.bz2
-	source = 01-configure.patch
-	source = 02-configure.ac.patch
-	source = 03-Makefile.in.patch
-	source = 04-Makefile.conf.d.patch
-	source = 05-Makefile.am.in.patch
-	source = conf.d.infinality.tar.xz
-	source = presets.tar.xz
-	sha256sums = d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df
-	sha256sums = dd8d5ee295003982a783aaa57307f507889216c53856f8355a1b83e836c92ec5
-	sha256sums = dff6e1e1561a5d094b9906efb8b0ac06cd652c6a19eab3cde06c314a7b3f92eb
-	sha256sums = 3daa2e2db611fb13342cdb511c344c12847ab669d050823c1cf40c4de863eff7
-	sha256sums = 16f8b2fe38ba7dc921825b8d5a54248804c390ab6773830bc39394dd91a4d9ec
-	sha256sums = 024dac82d87171c7c53b852ae97b563f4f70c6d2079921f8b0f16fa811eb93d5
-	sha256sums = d8eb772ac556d2a8d62a203afbb261110f236cce8b283e80bae3cc2350c32d80
-	sha256sums = ddbc1bea23161f6b32680ee45092f7b5f2d53aeb01730db38f686cb68786c672
+	source = http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.95.tar.bz2
+	source = 90-fc-cache-ib.hook
+	sha256sums = 7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89
+	sha256sums = 026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3
 
 pkgname = fontconfig-infinality
 
diff --git a/01-configure.patch b/01-configure.patch
deleted file mode 100644
index 9f526d692748..000000000000
--- a/01-configure.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/configure	2014-03-24 07:04:16.000000000 +0100
-+++ b/configure	2015-03-18 21:26:18.805031769 +0100
-@@ -655,6 +655,7 @@ XMLDIR
- CONFIGDIR
- BASECONFIGDIR
- TEMPLATEDIR
-+TEMPLATEINFDIR
- FC_FONTDATE
- FC_CACHEDIR
- fc_cachedir
-@@ -833,6 +834,7 @@ with_default_fonts
- with_add_fonts
- with_cache_dir
- with_templatedir
-+with_templateinfdir
- with_baseconfigdir
- with_configdir
- with_xmldir
-@@ -1518,6 +1520,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]
-@@ -14856,6 +14862,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 :
-@@ -14888,6 +14900,13 @@ no|yes)
- *)
- 	;;
- esac
-+case "$templateinfdir" in
-+no|yes)
-+	templateinfdir='${datadir}'/fontconfig/conf.avail.infinality
-+	;;
-+*)
-+	;;
-+esac
- case "$baseconfigdir" in
- no|yes)
- 	baseconfigdir='${sysconfdir}'/fonts
-@@ -14911,6 +14930,7 @@ no|yes)
- esac
- 
- TEMPLATEDIR=${templatedir}
-+TEMPLATEINFDIR=${templateinfdir}
- BASECONFIGDIR=${baseconfigdir}
- CONFIGDIR=${configdir}
- XMLDIR=${xmldir}
-@@ -16294,7 +16294,7 @@ _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-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
diff --git a/02-configure.ac.patch b/02-configure.ac.patch
deleted file mode 100644
index d7f78c9cda2c..000000000000
--- a/02-configure.ac.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/configure.ac	2015-03-18 21:12:24.000000000 +0100
-+++ b/configure.ac	2015-03-18 21:35:29.224165540 +0100
-@@ -520,9 +520,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]])],
-@@ -546,6 +551,13 @@ no|yes)
- *)
- 	;;
- esac
-+case "$templateinfdir" in
-+no|yes)
-+	templateinfdir='${datadir}'/fontconfig/conf.avail.infinality
-+	;;
-+*)
-+	;;
-+esac
- case "$baseconfigdir" in
- no|yes)
- 	baseconfigdir='${sysconfdir}'/fonts
-@@ -569,10 +581,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)
-@@ -702,6 +716,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.in.patch b/03-Makefile.in.patch
deleted file mode 100644
index fb6668f673b2..000000000000
--- a/03-Makefile.in.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- a/doc/Makefile.in	2014-03-24 07:04:15.000000000 +0100
-+++ b/doc/Makefile.in	2015-03-18 21:40:52.932671653 +0100
-@@ -514,6 +514,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-cache/Makefile.in	2015-03-18 21:43:52.937006196 +0100
-@@ -318,6 +318,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-case/Makefile.in	2015-03-18 21:45:27.227510005 +0100
-@@ -283,6 +283,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-cat/Makefile.in	2015-03-18 21:46:51.928365449 +0100
-@@ -318,6 +318,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-glyphname/Makefile.in	2015-03-18 21:47:41.240280146 +0100
-@@ -283,6 +283,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-lang/Makefile.in	2015-03-18 21:49:04.774578565 +0100
-@@ -283,6 +283,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-list/Makefile.in	2015-03-18 21:51:13.704329503 +0100
-@@ -318,6 +318,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-match/Makefile.in	2015-03-18 21:52:26.998992338 +0100
-@@ -318,6 +318,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-pattern/Makefile.in	2015-03-18 21:53:13.907720435 +0100
-@@ -318,6 +318,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-query/Makefile.in	2015-03-18 21:54:35.288864307 +0100
-@@ -318,6 +318,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-scan/Makefile.in	2015-03-18 21:55:11.414565316 +0100
-@@ -318,6 +318,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fc-validate/Makefile.in	2015-03-18 21:55:50.673519841 +0100
-@@ -320,6 +320,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/fontconfig/Makefile.in	2015-03-18 21:56:36.035649892 +0100
-@@ -261,6 +261,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/src/Makefile.in	2015-03-18 21:57:16.651243142 +0100
-@@ -331,6 +331,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	2014-03-24 07:04:15.000000000 +0100
-+++ b/test/Makefile.in	2015-03-18 21:57:59.763440840 +0100
-@@ -472,6 +472,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.conf.d.patch b/04-Makefile.conf.d.patch
deleted file mode 100644
index 9be723f70d43..000000000000
--- a/04-Makefile.conf.d.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/conf.d/Makefile.am	2014-01-20 09:14:19.000000000 +0100
-+++ b/conf.d/Makefile.am	2015-03-18 22:01:22.228445576 +0100
-@@ -21,26 +21,9 @@
- #  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-scale-bitmap-fonts.conf \
--	20-unhint-small-vera.conf \
--	30-urw-aliases.conf \
--	30-metric-aliases.conf \
--	40-nonlatin.conf \
--	45-latin.conf \
--	49-sansserif.conf \
--	50-user.conf \
--	51-local.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)
-@@ -80,24 +63,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
---- a/conf.d/Makefile.in	2014-03-24 07:04:15.000000000 +0100
-+++ b/conf.d/Makefile.in	2015-03-18 22:06:52.180613814 +0100
-@@ -163,7 +163,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)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -324,25 +324,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-scale-bitmap-fonts.conf \
--	20-unhint-small-vera.conf \
--	30-urw-aliases.conf \
--	30-metric-aliases.conf \
--	40-nonlatin.conf \
--	45-latin.conf \
--	49-sansserif.conf \
--	50-user.conf \
--	51-local.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)
-@@ -504,7 +487,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)
-@@ -625,9 +608,6 @@ uninstall-am: uninstall-configDATA unins
- 	uninstall-local uninstall-templateDATA
-
-
--README: $(srcdir)/README.in
--	sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
--
- install-data-hook:
- 	mkdir -p $(DESTDIR)$(configdir)
- 	@(echo cd $(DESTDIR)$(configdir);			\
diff --git a/05-Makefile.am.in.patch b/05-Makefile.am.in.patch
deleted file mode 100644
index 0cadc0837eb8..000000000000
--- a/05-Makefile.am.in.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/Makefile.am	2014-01-20 09:14:19.000000000 +0100
-+++ b/Makefile.am	2015-03-18 22:14:14.902609277 +0100
-@@ -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	2014-03-24 07:04:15.000000000 +0100
-+++ b/Makefile.in	2015-03-18 22:19:27.809614806 +0100
-@@ -138,6 +138,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 \
-@@ -219,7 +219,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 \
-@@ -354,6 +356,7 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- TEMPLATEDIR = @TEMPLATEDIR@
-+TEMPLATEINFDIR = @TEMPLATEINFDIR@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
- XMLDIR = @XMLDIR@
-@@ -415,7 +418,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/90-fc-cache-ib.hook b/90-fc-cache-ib.hook
new file mode 100644
index 000000000000..09d354c37943
--- /dev/null
+++ b/90-fc-cache-ib.hook
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/fonts/*
+
+[Action]
+Description = Update IU font cache
+When = PostTransaction
+Exec = /usr/bin/fc-cache --system-only
+NeedsTargets
diff --git a/PKGBUILD b/PKGBUILD
index efff5e5d64b1..e3099fa6a9df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,76 +2,84 @@
 # Maintainer: Maarten de Boer <maarten@ikfixjewebstek.nl>
 
 pkgname=fontconfig-infinality
-pkgver=2.11.94
-pkgrel=2
+_pkgname=fontconfig-ultimate
+_commit='36b60ecefe1fd0e042cad51105b0ffb29315e577'
+pkgver=2.11.95
+pkgrel=1
 pkgdesc="Fontconfig is a library for configuring and customizing font access, patched with infinality patches."
 arch=('armv7h' 'i686' 'x86_64')
 license=('GPL')
+groups=('infinality-bundle')
 url="https://github.com/bohoomil/fontconfig-ultimate"
-depends=('freetype2-infinality')
+depends=('expat' 'freetype2-infinality')
+makedepends=('python2' 'docbook2x' 'git')
 conflicts=('fontconfig')
-provides=("fontconfig=$pkgver")
-options=('!libtool')
+provides=("fontconfig=${pkgver}")
 install='install.sh'
-source=(
-	"http://www.freedesktop.org/software/fontconfig/release/fontconfig-${pkgver}.tar.bz2"
-	"01-configure.patch"
-	"02-configure.ac.patch"
-	"03-Makefile.in.patch"
-	"04-Makefile.conf.d.patch"
-	"05-Makefile.am.in.patch"
-	"conf.d.infinality.tar.xz"
-	"presets.tar.xz"
+source=("http://www.freedesktop.org/software/fontconfig/release/fontconfig-${pkgver}.tar.bz2"
+        "90-fc-cache-ib.hook"
 )
-sha256sums=('d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df'
-            'dd8d5ee295003982a783aaa57307f507889216c53856f8355a1b83e836c92ec5'
-            'dff6e1e1561a5d094b9906efb8b0ac06cd652c6a19eab3cde06c314a7b3f92eb'
-            '3daa2e2db611fb13342cdb511c344c12847ab669d050823c1cf40c4de863eff7'
-            '16f8b2fe38ba7dc921825b8d5a54248804c390ab6773830bc39394dd91a4d9ec'
-            '024dac82d87171c7c53b852ae97b563f4f70c6d2079921f8b0f16fa811eb93d5'
-            'd8eb772ac556d2a8d62a203afbb261110f236cce8b283e80bae3cc2350c32d80'
-            'ddbc1bea23161f6b32680ee45092f7b5f2d53aeb01730db38f686cb68786c672')
+sha256sums=('7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89'
+            '026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3')
 
 build() {
-	cd "${srcdir}/fontconfig-${pkgver}"
+  # Clone repo and reset to base commit
+  cd "${srcdir}"
+  git clone https://github.com/bohoomil/fontconfig-ultimate.git
 
-	patch -Np1 -i ../01-configure.patch
-	patch -Np1 -i ../02-configure.ac.patch
-	patch -Np1 -i ../03-Makefile.in.patch
-	patch -Np1 -i ../04-Makefile.conf.d.patch
-	patch -Np1 -i ../05-Makefile.am.in.patch
+  cd "${srcdir}/${_pkgname}"
+  git reset --hard "${_commit}"
 
-	ln -s ../conf.d.infinality
+  # Apply patches
+  cd "${srcdir}/fontconfig-${pkgver}"
 
-	autoreconf
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-	make
+  patches=('01-configure.patch'
+           '02-configure.ac.patch'
+           '03-Makefile.in.patch'
+           '04-Makefile.conf.d.patch'
+           '05-Makefile.am.in.patch')
+
+  for patch in "${patches[@]}"; do
+    patch -Np1 -i "${srcdir}/${_pkgname}/fontconfig_patches/${patch}"
+  done
+
+  ln -s "${srcdir}/${_pkgname}/conf.d.infinality" 'conf.d.infinality'
+
+  # Compile
+  autoreconf
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-templatedir=/etc/fonts/conf.avail \
+    --with-xmldir=/etc/fonts \
+    --localstatedir=/var \
+    --disable-static \
+    --with-default-fonts=/usr/share/fonts \
+    --with-add-fonts=/usr/share/fonts
+  make
 }
 
 package() {
-	cd "${srcdir}/fontconfig-${pkgver}"
+  cd "${srcdir}/fontconfig-${pkgver}"
 
-	# Install fontconfig
-	make DESTDIR="${pkgdir}" install
+  # Install fontconfig
+  make DESTDIR="${pkgdir}" install
 
-	# Install presets
-	install -Dm 755 "${srcdir}/presets/combi/30-metric-aliases-combi.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/combi/30-metric-aliases-combi.conf"
-	install -Dm 755 "${srcdir}/presets/combi/37-repl-global-combi.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/combi/37-repl-global-combi.conf"
-	install -Dm 755 "${srcdir}/presets/combi/60-latin-combi.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/combi/60-latin-combi.conf"
-	install -Dm 755 "${srcdir}/presets/combi/65-non-latin-combi.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/combi/65-non-latin-combi.conf"
-	install -Dm 755 "${srcdir}/presets/combi/66-aliases-wine-combi.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/combi/66-aliases-wine-combi.conf"
-	install -Dm 755 "${srcdir}/presets/free/30-metric-aliases-free.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/free/30-metric-aliases-free.conf"
-	install -Dm 755 "${srcdir}/presets/free/37-repl-global-free.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/free/37-repl-global-free.conf"
-	install -Dm 755 "${srcdir}/presets/free/60-latin-free.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/free/60-latin-free.conf"
-	install -Dm 755 "${srcdir}/presets/free/65-non-latin-free.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/free/65-non-latin-free.conf"
-	install -Dm 755 "${srcdir}/presets/free/66-aliases-wine-free.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/free/66-aliases-wine-free.conf"
-	install -Dm 755 "${srcdir}/presets/ms/30-metric-aliases-ms.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/ms/30-metric-aliases-ms.conf"
-	install -Dm 755 "${srcdir}/presets/ms/37-repl-global-ms.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/ms/37-repl-global-ms.conf"
-	install -Dm 755 "${srcdir}/presets/ms/60-latin-ms.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/ms/60-latin-ms.conf"
-	install -Dm 755 "${srcdir}/presets/ms/65-non-latin-ms.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/ms/65-non-latin-ms.conf"
-	install -Dm 755 "${srcdir}/presets/ms/66-aliases-wine-ms.conf" "${pkgdir}/etc/fonts/conf.avail.infinality/ms/66-aliases-wine-ms.conf"
+  # Install presets
+  install -dm 755 "${pkgdir}/etc/fonts/conf.avail.infinality"
+  install -Dm 644 "${srcdir}/${_pkgname}/conf.d.infinality/"*.conf \
+    "${pkgdir}/etc/fonts/conf.avail.infinality"
 
-	# Install presets switcher
-	install -m 755 "${srcdir}/presets/fc-presets" "${pkgdir}/usr/bin/fc-presets"
-}
+  for i in combi free ms; do
+    install -dm 755 "${pkgdir}/etc/fonts/conf.avail.infinality/${i}"
+    install -Dm 644 "${srcdir}/${_pkgname}/fontconfig_patches/${i}/"*.conf \
+      "${pkgdir}/etc/fonts/conf.avail.infinality/${i}"
+  done
+
+  # Install presets switcher
+  install -D -m 755 "${srcdir}/${_pkgname}/fontconfig_patches/fc-presets" \
+    "${pkgdir}/usr/bin/fc-presets"
 
+  # Install pacman hook
+  install -D -m 644 "${srcdir}/90-fc-cache-ib.hook" \
+    "${pkgdir}/usr/share/libalpm/hooks/90-fc-cache-ib.hook"
+}
diff --git a/conf.d.infinality.tar.xz b/conf.d.infinality.tar.xz
deleted file mode 100644
index 0fa1e547b280..000000000000
--- a/conf.d.infinality.tar.xz
+++ /dev/null
diff --git a/install.sh b/install.sh
index 0046c9b3f8c3..d24697c4f12b 100644
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,70 @@
+redundant=(20-unhint-small-dejavu-sans-mono.conf
+           20-unhint-small-dejavu-sans.conf
+           20-unhint-small-dejavu-serif.conf
+           57-dejavu-sans-mono.conf
+           57-dejavu-sans.conf
+           57-dejavu-serif.conf)
+
 post_install() {
-	fc-cache
+
+  cat << _EOF
+
+  Thank you for checking out fontconfig-infinality-ultimate.
+
+  By default, fontconfig will use presets for the free font collection
+  from [infinality-bundle-fonts] repository.
+
+  If you are going to use either a custom font collection or core
+  Microsoft families, set the appropriate presets using
+  fc-presets command.
+
+_EOF
+
+  pushd etc/fonts/conf.d > /dev/null
+  echo -e "Removing redundant symlinks ..."
+  for bit in "${redundant[@]}"; do
+    if [ -f ${bit} ]; then
+      rm -f ${bit}
+    fi
+  done
+  echo -e "Done."
+
+  echo -e "Creating symlinks for free font collection ..."
+  ln -sf ../conf.avail.infinality/free/30-metric-aliases-free.conf .
+  ln -sf ../conf.avail.infinality/free/37-repl-global-free.conf .
+  ln -sf ../conf.avail.infinality/free/60-latin-free.conf .
+  ln -sf ../conf.avail.infinality/free/65-non-latin-free.conf .
+  ln -sf ../conf.avail.infinality/free/66-aliases-wine-free.conf .
+  echo -e "Done."
+
+  popd > /dev/null
+
+  echo -e "Updating font cache... "
+  /usr/bin/fc-cache -f
+  echo -e "Done."
 }
 
 post_upgrade() {
-	fc-cache
+  echo -e "Updating font cache... "
+  /usr/bin/fc-cache -f
+  echo "Done."
+}
+
+post_remove() {
+  pushd etc/fonts/conf.d > /dev/null
+  echo -e "Restoring old symlinks ..."
+  for bit in "${redundant[@]}"; do
+    if [[ ! -f ${bit} ]] && [[ -f ../conf.avail/${bit} ]]; then
+      ln -sf ../conf.avail/${bit} .
+    fi
+  done
+  echo -e "Done."
+
+  cat << _EOF
+
+  fontconfig-infinality-ultimate-git has been removed.
+  Check for dead symlinks and leftover files
+  in /etc/fonts/conf.d/
+
+_EOF
 }
diff --git a/presets.tar.xz b/presets.tar.xz
deleted file mode 100644
index 2f3c6406b6f7..000000000000
--- a/presets.tar.xz
+++ /dev/null