From 8ac8fa402c96b4cdee638b245d70f20b7153d871 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 28 Apr 2021 09:49:43 +0530 Subject: [PATCH 1/2] texlive-core: hooks take long time --- mingw-w64-texlive-core/PKGBUILD | 10 +++++----- mingw-w64-texlive-core/mktexlsr.script.in | 2 +- mingw-w64-texlive-core/texlive-fmtutil.script.in | 1 + mingw-w64-texlive-core/texlive-updmap.script.in | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mingw-w64-texlive-core/PKGBUILD b/mingw-w64-texlive-core/PKGBUILD index c6f3ae99f9..c993fa0c2c 100644 --- a/mingw-w64-texlive-core/PKGBUILD +++ b/mingw-w64-texlive-core/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2021.20210424 _revnr=${pkgver#2021.} -pkgrel=1 +pkgrel=2 pkgdesc="TeX Live core distribution (mingw-w64)" license=('GPL') arch=('any') @@ -23,7 +23,7 @@ optdepends=( "${MINGW_PACKAGE_PREFIX}-ruby: for old ConTeXT MkII and epspdf" #"t1utils: can be useful when installing Type1 fonts" ) -groups=('texlive-most') +groups=("${MINGW_PACKAGE_PREFIX}-texlive-most") conflicts=( "${MINGW_PACKAGE_PREFIX}-tetex" "${MINGW_PACKAGE_PREFIX}-texlive-latex3" @@ -80,11 +80,11 @@ sha256sums=('b51d381e3eafc3ab228fa6334873c103890774ed1696b0372243d72b87a4f057' 'a0e9859ccbfc51b21660af389557a4343ce61cb77e6161f1b00d80277da87724' '849f0f5388b9bc4e4982b1c95a26924a14e1c3d942af125df0d7b7de53cd50ff' '542f68cd8e1a00f1598db8532e70e1bb77adc0516daee84e5aa92707f58fdf04' - 'e928c013251f578f6a6cf88feef11027516c715313ef0a93e4ce246ed3cf2ee3' + '773e9c8f60c4241a57adafda8abac765c53f7e6e24c86b87366b037ade29077b' 'bffaa8a7f5d78aed138a760dfa1073ad7c419a61a9739cafbc28dce330aae911' - 'db908b689902148236db85c5756e33026f5a8baa413d762d036a7389cb1b9ced' + 'e154d58543dc8d9957f502b3d162023f0be4a650860d3be5289ff2ac880ccca2' 'd615d040d1943bcdf7b1c7a649644a7bd47703317b79963062a058e1300602f3' - 'eea03a5acda0f31093f3bf709676d471e518de95c0d95b1e7d09eae65422ffdd' + 'dd286733d0b596708ee049aa22d641129d20f61113298c6f11ad37500bf9f1fb' '3bc32f119b672015d75d136a3a506efefac6f7b8e01a9a6c95c10c4336931b26' '8ededf35132ffbe26434c0c778b3d4a159ce428452abe6ebc8d94161f02bd7e9' '87eddde958848d041ded1625e14009e89b3bd5953e7ae39b6aac2f65d3856485') diff --git a/mingw-w64-texlive-core/mktexlsr.script.in b/mingw-w64-texlive-core/mktexlsr.script.in index 084a9debef..459c890a4f 100644 --- a/mingw-w64-texlive-core/mktexlsr.script.in +++ b/mingw-w64-texlive-core/mktexlsr.script.in @@ -3,7 +3,7 @@ export PATH=@MINGW_PREFIX@/bin:$PATH echo ">>> Running mktexlsr" @MINGW_PREFIX@/bin/mktexlsr -echo ">>> Running mtxrun" +echo ">>> Running mtxrun (this might take a while)" cd @MINGW_PREFIX@/etc/texmf @MINGW_PREFIX@/bin/mtxrun --generate >/dev/null cd - diff --git a/mingw-w64-texlive-core/texlive-fmtutil.script.in b/mingw-w64-texlive-core/texlive-fmtutil.script.in index a79ed06fe9..2f698a7518 100644 --- a/mingw-w64-texlive-core/texlive-fmtutil.script.in +++ b/mingw-w64-texlive-core/texlive-fmtutil.script.in @@ -49,6 +49,7 @@ echo >> $LANGUAGE_DAT_LUA # new line # remove mflua-nowin it fails sed -i 's/mflua mflua-nowin - mf.ini//' $FMTUTIL +echo ">>> Running fmtutil (this might take a while)" # Run mktexlsr since /etc/texmf/tex/generic/config/language.* can be a new files @MINGW_PREFIX@/bin/mktexlsr @MINGW_PREFIX@/bin/fmtutil-sys --all --cnffile $FMTUTIL > /dev/null diff --git a/mingw-w64-texlive-core/texlive-updmap.script.in b/mingw-w64-texlive-core/texlive-updmap.script.in index ab4bc7351b..68e8b28cc0 100644 --- a/mingw-w64-texlive-core/texlive-updmap.script.in +++ b/mingw-w64-texlive-core/texlive-updmap.script.in @@ -9,6 +9,7 @@ if [[ -f "$UPDMAPLOCAL" ]]; then cat "$UPDMAPLOCAL" >> $UPDMAP fi +echo ">>> Running updmap (this might take a while)" # Run mktexlsr since /etc/texmf/web2c/updmap.cfg can be a new file @MINGW_PREFIX@/bin/mktexlsr @MINGW_PREFIX@/bin/updmap-sys --quiet --nohash From 6f89744d9cd6aacc5b39ad902e5e3d17612b7d2e Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 28 Apr 2021 10:22:02 +0530 Subject: [PATCH 2/2] fontconfig: trigger fc-cache hook this should run when other directories are changed also. this didn't run when I added a font from texlive-core --- mingw-w64-fontconfig/PKGBUILD | 4 ++-- mingw-w64-fontconfig/fontconfig.hook.in | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw-w64-fontconfig/PKGBUILD b/mingw-w64-fontconfig/PKGBUILD index 7cdf7c819b..c026c93c07 100644 --- a/mingw-w64-fontconfig/PKGBUILD +++ b/mingw-w64-fontconfig/PKGBUILD @@ -5,7 +5,7 @@ _realname=fontconfig pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.13.93 -pkgrel=2 +pkgrel=3 pkgdesc="A library for configuring and customizing font access (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -35,7 +35,7 @@ sha256sums=('ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0' '57ff8420dbf62873b6fcb38b52fb7b37e0e278425a9125e15dccba54668c8ab9' '552b54010f9fe4097f332cf2397bbd3e78489542d3bbf07792ed1cfe9381796e' 'af373531873da46d0356305da5444c1ec74f443cd2635ea2db6b7dadd1561f5b' - 'ce98f763643f8f859b40c703b8dbe9d203978e4947318eddd583dab9f36a3b3f') + 'ad4ce48983045d7f39b40ca9e04d4be2eaa9177b89dcc516388d779c131a88bc') prepare() { cd "${srcdir}"/${_realname}-${pkgver} diff --git a/mingw-w64-fontconfig/fontconfig.hook.in b/mingw-w64-fontconfig/fontconfig.hook.in index cdfdc38ed6..69abc17c38 100644 --- a/mingw-w64-fontconfig/fontconfig.hook.in +++ b/mingw-w64-fontconfig/fontconfig.hook.in @@ -4,6 +4,9 @@ Operation = Install Operation = Upgrade Operation = Remove Target = @MINGW_HOOK_TARGET_PREFIX@/share/fonts/* +Target = @MINGW_HOOK_TARGET_PREFIX@/etc/fonts/conf.d/* +Target = @MINGW_HOOK_TARGET_PREFIX@/share/fontconfig/conf.avail/* +Target = @MINGW_HOOK_TARGET_PREFIX@/share/fontconfig/conf.default/* [Action] Description = Updating fontconfig cache...