updating pkgver, merging with fontconfig-ultimate

1 files changed, 43 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d3c485e7d6a..c79cb07c9691 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,53 @@
-# Generated by mksrcinfo v8
-# Mon Apr  3 21:16:49 UTC 2017
 pkgbase = fontconfig-infinality
-	pkgdesc = Fontconfig is a library for configuring and customizing font access, patched with infinality patches.
-	pkgver = 2.12.1
-	pkgrel = 2
-	url = https://github.com/bohoomil/fontconfig-ultimate
-	install = install.sh
-	arch = armv7h
+	pkgdesc = A library for configuring and customizing font access, optimized for freetype2-infinality.
+	pkgver = 2.13.1+12+g5f5ec56
+	pkgrel = 1
+	url = http://www.fontconfig.org/release/
+	install = fontconfig-ultimate.install
 	arch = i686
 	arch = x86_64
-	groups = infinality-bundle
-	license = GPL
-	makedepends = python2
-	makedepends = docbook2x
+	license = custom
+	license = MIT
+	makedepends = gperf
+	makedepends = python-lxml
+	makedepends = python-six
 	makedepends = git
 	depends = expat
-	depends = freetype2-infinality
-	provides = fontconfig=2.12.1
+	depends = freetype2
+	provides = fontconfig=$pkgver
+	provides = fontconfig-infinality
+	provides = fontconfig-infinality-ultimate
 	conflicts = fontconfig
-	source = http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.bz2
-	source = 90-fc-cache-ib.hook
-	source = git://github.com/bohoomil/fontconfig-ultimate.git#commit=36b60ecefe1fd0e042cad51105b0ffb29315e577
-	source = https://raw.githubusercontent.com/voidlinux/void-packages/60e7edd3ccb79c5e4e7944a7f69050e5371a064f/srcpkgs/fontconfig/patches/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
-	sha256sums = b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
-	sha256sums = 026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3
+	conflicts = fontconfig-infinality
+	conflicts = fontconfig-infinality-git
+	conflicts = fontconfig-infinality-ultimate-git
+	replaces = fontconfig-iu-comp
+	options = libtool
+	backup = etc/fonts/fonts.conf
+	backup = etc/fonts/conf.avail.infinality/combi/30-metric-aliases-combi.conf
+	backup = etc/fonts/conf.avail.infinality/combi/37-repl-global-combi.conf
+	backup = etc/fonts/conf.avail.infinality/combi/60-latin-combi.conf
+	backup = etc/fonts/conf.avail.infinality/combi/65-non-latin-combi.conf
+	backup = etc/fonts/conf.avail.infinality/combi/66-aliases-wine-combi.conf
+	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://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=5f5ec5676c61b9773026a9335c9b0dfa73a73353
+	source = https://raw.githubusercontent.com/archfan/infinality_bundle/master/02_fontconfig-iu/fontconfig-infinality-conf.tar.bz2
+	source = fc-cache-ib.hook
+	source = 0001-configure-20190528.patch
+	source = 0002-configure-20190528.ac.patch
+	source = 0003-Makefile-20190528.in.patch
+	source = 0004-Makefile-20190528.conf.d.patch
+	source = 0005-Makefile-20190528.am.patch
 	sha256sums = SKIP
-	sha256sums = 8fe9afc66332fa72157ab6449fc8cf09619d3be4986b6fde52cfd2db496c278b
+	sha256sums = 092e1d5afb0118136544677cced0a10d6b759e74b38db1483bd3023d9be853d4
+	sha256sums = 026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3
+	sha256sums = 6cbe70a851e6046addc978d475c10b0cf77ee5074dbe4cbed2b66c6d1dce38e4
+	sha256sums = a587293db608c8a5998b1257e34ebe4b116232cb6b24cfa87d5c42ded9543294
+	sha256sums = 7ec9377bb7e4df4db23dd1a5aef4e804864ff22c0be290477aadc6000bbca7c9
+	sha256sums = 84c6844b64b72c47f57bd75e355d64f857b84d7db2d2980ca022c494e0122641
+	sha256sums = c934695b792172021be09d2a72c08651bed511bcadba6e62f8af871e630a3bdf
 
 pkgname = fontconfig-infinality