diff options
Diffstat (limited to '0001-configure-20190528.patch')
-rw-r--r-- | 0001-configure-20190528.patch | 87 |
1 files changed, 87 insertions, 0 deletions
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 + |