diff options
| -rw-r--r-- | .SRCINFO | 64 | ||||
| -rw-r--r-- | 0001-configure-20190528.patch | 87 | ||||
| -rw-r--r-- | 0002-configure-20190528.ac.patch | 67 | ||||
| -rw-r--r-- | 0003-Makefile-20190528.in.patch | 245 | ||||
| -rw-r--r-- | 0004-Makefile-20190528.conf.d.patch | 71 | ||||
| -rw-r--r-- | 0005-Makefile-20190528.am.patch | 25 | ||||
| -rw-r--r-- | PKGBUILD | 168 | ||||
| -rw-r--r-- | fc-cache-ib.hook | 12 | ||||
| -rw-r--r-- | fontconfig-ultimate.install | 70 |
9 files changed, 727 insertions, 82 deletions
@@ -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 diff --git a/0001-configure-20190528.patch b/0001-configure-20190528.patch new file mode 100644 index 000000000000..ac7e7a2df671 --- /dev/null +++ b/0001-configure-20190528.patch @@ -0,0 +1,87 @@ +From 085dea68e4ec02e0031d5868dbace913d17b0fbf Mon Sep 17 00:00:00 2001 +From: Solomon Choina <shlomochoina@gmail.com> +Date: Tue, 28 May 2019 21:17:19 -0400 +Subject: [PATCH 1/5] configure-20190528 + +--- + configure | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index c6f1142..b9f064d 100755 +--- a/configure ++++ b/configure +@@ -656,6 +656,7 @@ XMLDIR + CONFIGDIR + BASECONFIGDIR + TEMPLATEDIR ++TEMPLATEINFDIR + FC_FONTDATE + FC_CACHEDIR + fc_cachedir +@@ -870,6 +871,7 @@ with_default_fonts + with_add_fonts + with_cache_dir + with_templatedir ++with_templateinfdir + with_baseconfigdir + with_configdir + with_xmldir +@@ -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 ++ --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 +@@ -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 : +@@ -17950,6 +17962,13 @@ no|yes) + *) + ;; + esac ++case "$templateinfdir" in ++no|yes) ++ templateinfdir='${datadir}'/fontconfig/conf.avail.infinality ++ ;; ++*) ++ ;; ++esac + case "$baseconfigdir" in + no|yes) + baseconfigdir='${sysconfdir}'/fonts +@@ -17973,6 +17992,7 @@ no|yes) + esac + + TEMPLATEDIR=${templatedir} ++TEMPLATEINFDIR=${templateinfdir} + BASECONFIGDIR=${baseconfigdir} + CONFIGDIR=${configdir} + XMLDIR=${xmldir} +@@ -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.21.0 + diff --git a/0002-configure-20190528.ac.patch b/0002-configure-20190528.ac.patch new file mode 100644 index 000000000000..50b96367389f --- /dev/null +++ b/0002-configure-20190528.ac.patch @@ -0,0 +1,67 @@ +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]])], ++ [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]])], +@@ -646,6 +651,13 @@ no|yes) + *) + ;; + esac ++case "$templateinfdir" in ++no|yes) ++ templateinfdir='${datadir}'/fontconfig/conf.avail.infinality ++ ;; ++*) ++ ;; ++esac + case "$baseconfigdir" in + no|yes) + baseconfigdir='${sysconfdir}'/fonts +@@ -669,10 +681,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) +@@ -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-conflist/Makefile +-- +2.21.0 + diff --git a/0003-Makefile-20190528.in.patch b/0003-Makefile-20190528.in.patch new file mode 100644 index 000000000000..29e3049a6a14 --- /dev/null +++ b/0003-Makefile-20190528.in.patch @@ -0,0 +1,245 @@ +From c6617930d51c3b0235cbf533bb49cf7a0bcd3216 Mon Sep 17 00:00:00 2001 +From: Solomon Choina <shlomochoina@gmail.com> +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 bea1b79..e13301f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -389,6 +389,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in +index 604af41..52e31fc 100644 +--- a/conf.d/Makefile.in ++++ b/conf.d/Makefile.in +@@ -301,6 +301,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/doc/Makefile.in b/doc/Makefile.in +index b8ae0b4..0e68e22 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -550,6 +550,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-cache/Makefile.in b/fc-cache/Makefile.in +index 75393fa..0964634 100644 +--- a/fc-cache/Makefile.in ++++ b/fc-cache/Makefile.in +@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-case/Makefile.in b/fc-case/Makefile.in +index 6485973..b91db3c 100644 +--- a/fc-case/Makefile.in ++++ b/fc-case/Makefile.in +@@ -319,6 +319,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-cat/Makefile.in b/fc-cat/Makefile.in +index 75f5953..3e52282 100644 +--- a/fc-cat/Makefile.in ++++ b/fc-cat/Makefile.in +@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-conflist/Makefile.in b/fc-conflist/Makefile.in +index 212e2e9..f9fe443 100644 +--- a/fc-conflist/Makefile.in ++++ b/fc-conflist/Makefile.in +@@ -356,6 +356,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-lang/Makefile.in b/fc-lang/Makefile.in +index eea0cbb..6972f6b 100644 +--- a/fc-lang/Makefile.in ++++ b/fc-lang/Makefile.in +@@ -319,6 +319,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-list/Makefile.in b/fc-list/Makefile.in +index e8ac374..a9e6ed3 100644 +--- a/fc-list/Makefile.in ++++ b/fc-list/Makefile.in +@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-match/Makefile.in b/fc-match/Makefile.in +index c87053a..fad6675 100644 +--- a/fc-match/Makefile.in ++++ b/fc-match/Makefile.in +@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-pattern/Makefile.in b/fc-pattern/Makefile.in +index 7eb31b9..6172d8d 100644 +--- a/fc-pattern/Makefile.in ++++ b/fc-pattern/Makefile.in +@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-query/Makefile.in b/fc-query/Makefile.in +index c7e231e..c94726b 100644 +--- a/fc-query/Makefile.in ++++ b/fc-query/Makefile.in +@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-scan/Makefile.in b/fc-scan/Makefile.in +index 153c33f..cb8bad8 100644 +--- a/fc-scan/Makefile.in ++++ b/fc-scan/Makefile.in +@@ -354,6 +354,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-validate/Makefile.in b/fc-validate/Makefile.in +index dffa1a6..1617efc 100644 +--- a/fc-validate/Makefile.in ++++ b/fc-validate/Makefile.in +@@ -356,6 +356,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fontconfig/Makefile.in b/fontconfig/Makefile.in +index 6f3c47d..ba53f89 100644 +--- a/fontconfig/Makefile.in ++++ b/fontconfig/Makefile.in +@@ -297,6 +297,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/its/Makefile.in b/its/Makefile.in +index 8492db4..65b54e6 100644 +--- a/its/Makefile.in ++++ b/its/Makefile.in +@@ -278,6 +278,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 70b1161..fd7eb06 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -384,6 +384,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/test/Makefile.in b/test/Makefile.in +index 013abb4..c256839 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -571,6 +571,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +-- +2.21.0 + diff --git a/0004-Makefile-20190528.conf.d.patch b/0004-Makefile-20190528.conf.d.patch new file mode 100644 index 000000000000..b79ce2a7b42a --- /dev/null +++ b/0004-Makefile-20190528.conf.d.patch @@ -0,0 +1,71 @@ +From 0e01ff35b0d1f5a3ddca94a24083a31da17ca22c Mon Sep 17 00:00:00 2001 +From: Solomon Choina <shlomochoina@gmail.com> +Date: Wed, 29 May 2019 14:23:26 -0400 +Subject: [PATCH 4/5] Makefile-20190328.conf.d + +--- + conf.d/Makefile.am | 41 +---------------------------------------- + 1 file changed, 1 insertion(+), 40 deletions(-) + +diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am +index ff03fb2..107b058 100644 +--- a/conf.d/Makefile.am ++++ b/conf.d/Makefile.am +@@ -21,28 +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-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 +68,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 +-- +2.21.0 + diff --git a/0005-Makefile-20190528.am.patch b/0005-Makefile-20190528.am.patch new file mode 100644 index 000000000000..84b4487d15c9 --- /dev/null +++ b/0005-Makefile-20190528.am.patch @@ -0,0 +1,25 @@ +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 + @@ -1,90 +1,136 @@ -# Maintainer : Dobroslaw Kijowski [dobo] <dobo90_at_gmail.com> -# Contributor: Shanto <shanto@hotmail.com> -# Contributor: Maarten de Boer <maarten@ikfixjewebstek.nl> - +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: bohoomil <bohoomil@zoho.com> +# Maintainer Solomon Choina <shlomochoina@gmail.com> pkgname=fontconfig-infinality _pkgname=fontconfig-ultimate -_commit='36b60ecefe1fd0e042cad51105b0ffb29315e577' -pkgver=2.12.1 -pkgrel=2 -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=('expat' 'freetype2-infinality') -makedepends=('python2' 'docbook2x' 'git') -conflicts=('fontconfig') -provides=("fontconfig=${pkgver}") -install='install.sh' -source=("http://www.freedesktop.org/software/fontconfig/release/fontconfig-${pkgver}.tar.bz2" - "90-fc-cache-ib.hook" - "git://github.com/bohoomil/fontconfig-ultimate.git#commit=${_commit}" - "https://raw.githubusercontent.com/voidlinux/void-packages/60e7edd3ccb79c5e4e7944a7f69050e5371a064f/srcpkgs/fontconfig/patches/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch") -sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3' - '026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3' - 'SKIP' - '8fe9afc66332fa72157ab6449fc8cf09619d3be4986b6fde52cfd2db496c278b') +_basename=fontconfig +pkgdesc="A library for configuring and customizing font access, optimized for freetype2-infinality." +date=20190528 +url='http://www.fontconfig.org/release/' +license=('custom' 'MIT') +pkgver=2.13.1+12+g5f5ec56 +pkgrel=1 +arch=('i686' 'x86_64') +depends=('expat' 'freetype2') +makedepends=('gperf' 'python-lxml' 'python-six' 'git') +options=('libtool') +provides=('fontconfig=$pkgver' 'fontconfig-infinality' 'fontconfig-infinality-ultimate') +conflicts=('fontconfig' 'fontconfig-infinality' 'fontconfig-infinality-git' 'fontconfig-infinality-ultimate-git') +replaces=('fontconfig-iu-comp') +backup=('etc/fonts/fonts.conf' + 'etc/fonts/conf.avail.infinality/combi/30-metric-aliases-combi.conf' + 'etc/fonts/conf.avail.infinality/combi/37-repl-global-combi.conf' + 'etc/fonts/conf.avail.infinality/combi/60-latin-combi.conf' + 'etc/fonts/conf.avail.infinality/combi/65-non-latin-combi.conf' + 'etc/fonts/conf.avail.infinality/combi/66-aliases-wine-combi.conf' + 'etc/fonts/conf.avail.infinality/35-repl-custom.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 +_commit=5f5ec5676c61b9773026a9335c9b0dfa73a73353 # master +source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit" + https://raw.githubusercontent.com/archfan/infinality_bundle/master/02_fontconfig-iu/fontconfig-infinality-conf.tar.bz2 +#} -prepare() { - sed -i 's/10-hinting-slight.conf/10-hinting-$(PREFERRED_HINTING).conf/' \ - "${srcdir}/${_pkgname}/fontconfig_patches/04-Makefile.conf.d.patch" + fc-cache-ib.hook + 0001-configure-${date}.patch + 0002-configure-${date}.ac.patch + 0003-Makefile-${date}.in.patch + 0004-Makefile-${date}.conf.d.patch + 0005-Makefile-${date}.am.patch + ) - cd "${srcdir}/fontconfig-${pkgver}" - patch -p0 < '../0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch' +# a nice page to test font matching: +# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' } -build() { - # Apply patches - cd "${srcdir}/fontconfig-${pkgver}" +prepare() { + + 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.patch + ) - patches=('01-configure.patch' - '02-configure.ac.patch' - '03-Makefile.in.patch' - '04-Makefile.conf.d.patch' - '05-Makefile.am.in.patch') + # copy fontconfig-ib patches & stuff + [ -d "${pkgname}" ] || ln -sf fontconfig "${pkgname}" + cp -r fontconfig-infinality-conf/conf.d.infinality "${_basename}/conf.d.infinality" + cd "${_basename}" + NOCONFIGURE=1 ./autogen.sh + # infinality & post release fixes for patch in "${patches[@]}"; do - patch -Np1 -i "${srcdir}/${_pkgname}/fontconfig_patches/${patch}" + patch -Np1 -i ../${patch} done - ln -s "${srcdir}/${_pkgname}/conf.d.infinality" 'conf.d.infinality' + aclocal + libtoolize -f + automake -afi + +} + +build() { + cd "${_basename}" - # Compile - autoreconf ./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 + --with-add-fonts=/usr/local/share/fonts make } -package() { - cd "${srcdir}/fontconfig-${pkgver}" +#check() { +# cd "${_basename}" +# make -k check +_install_conf() { + echo "about to _install_conf($1)..." + install -m644 "$1" "$pkgdir/etc/fonts/conf.avail" + ln -s "../conf.avail/${1##*/}" "$pkgdir/etc/fonts/conf.d" + # copy presets + cp -r "${srcdir}"/fontconfig-infinality-conf/conf.avail.infinality/{combi,free,ms,fonts-settings} \ + "${pkgdir}"/etc/fonts/conf.avail.infinality +} - # Install fontconfig +package() { + cd "${_basename}" make DESTDIR="${pkgdir}" install - # 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 license + install -m755 -d "${pkgdir}"/usr/share/licenses/"${_basename}" + install -m644 COPYING "${pkgdir}"/usr/share/licenses/"${_basename}" - 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 + # alpm hook + install -D -m 644 "${srcdir}"/fc-cache-ib.hook \ + "${pkgdir}/usr/share/libalpm/hooks/90-fc-cache-ib.hook" - # Install presets switcher - install -D -m 755 "${srcdir}/${_pkgname}/fontconfig_patches/fc-presets" \ - "${pkgdir}/usr/bin/fc-presets" + ## copy presets + mkdir -p "${pkgdir}"/etc/fonts/conf.avail.infinality + cp -r "${srcdir}"/fontconfig-infinality-conf/conf.avail.infinality/* \ + "${pkgdir}"/etc/fonts/conf.avail.infinality + + # install fc-presets + install -m755 ${srcdir}/fontconfig-infinality-conf/"fc-presets" "${pkgdir}"/usr/bin/"fc-presets" + + # copy documentation + install -m755 -d "${pkgdir}"/usr/share/doc/"${pkgname}" + cp -r doc "${pkgdir}"/usr/share/ - # Install pacman hook - install -D -m 644 "${srcdir}/90-fc-cache-ib.hook" \ - "${pkgdir}/usr/share/libalpm/hooks/90-fc-cache-ib.hook" } +sha256sums=('SKIP' + '092e1d5afb0118136544677cced0a10d6b759e74b38db1483bd3023d9be853d4' + '026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3' + '6cbe70a851e6046addc978d475c10b0cf77ee5074dbe4cbed2b66c6d1dce38e4' + 'a587293db608c8a5998b1257e34ebe4b116232cb6b24cfa87d5c42ded9543294' + '7ec9377bb7e4df4db23dd1a5aef4e804864ff22c0be290477aadc6000bbca7c9' + '84c6844b64b72c47f57bd75e355d64f857b84d7db2d2980ca022c494e0122641' + 'c934695b792172021be09d2a72c08651bed511bcadba6e62f8af871e630a3bdf') diff --git a/fc-cache-ib.hook b/fc-cache-ib.hook new file mode 100644 index 000000000000..09d354c37943 --- /dev/null +++ b/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/fontconfig-ultimate.install b/fontconfig-ultimate.install new file mode 100644 index 000000000000..d24697c4f12b --- /dev/null +++ b/fontconfig-ultimate.install @@ -0,0 +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() { + + 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() { + 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 +} |