qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure the fontconfig cache in the xbaseXX.tgz set is valid.

Browse Source 
Tarballs only store timestamps with 1s resolution, while the
fontconfig cache uses nano-second resolution from the filesystem to
check that a directory hasn't changed.

So the font directories extracted by the installer were almost always
considered out of date, causing applications that use fontconfig to
trigger a rebuild of the cache.

Now, when installing with DESTDIR set, we use a perl one-liner to
remove the nanoseconds from the mtime of the fonts directories before
running fc-cache, so that the timestamps recorded in the cache match
what will be set after extracting the xfont set.

Help and suggestions from at least guenther@, millert@, espie@
and deraadt@
This commit is contained in:
matthieu 2018-07-09 21:20:56 +00:00
parent 3d6c235903
commit e573efcd34
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
font/alias/Makefile.bsd-wrapper
View File

@ -1,16 +1,6 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2016/11/19 08:38:15 tb Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2018/07/09 21:20:56 matthieu Exp $
afterinstall:
@if test -z "$(DESTDIR)"; then \
echo "fc-cache -s -v ${DESTDIR}/usr/X11R6/lib/X11/fonts";\
fc-cache -s -v ${DESTDIR}/usr/X11R6/lib/X11/fonts ;\
chmod 644 ${DESTDIR}/var/cache/fontconfig/*; \
else \
echo "fc-cache -y ${DESTDIR} -s -v /usr/X11R6/lib/X11/fonts";\
fc-cache -y ${DESTDIR} -s -v /usr/X11R6/lib/X11/fonts;\
chown root:wheel ${DESTDIR}/var/cache/fontconfig/*; \
chmod 644 ${DESTDIR}/var/cache/fontconfig/*; \
fi
.for fdir in 100dpi 75dpi OTF TTF Type1 cyrillic misc
rm -f ${DESTDIR}/usr/X11R6/lib/X11/fonts/${fdir}/fonts.dir
mkfontdir ${DESTDIR}/usr/X11R6/lib/X11/fonts/${fdir}
@ -22,5 +12,18 @@ afterinstall:
chown ${BINOWN}:${BINGRP} ${DESTDIR}/usr/X11R6/lib/X11/fonts/${fdir}/fonts.scale
chmod 644 ${DESTDIR}/usr/X11R6/lib/X11/fonts/${fdir}/fonts.scale
.endfor
if test -z "$(DESTDIR)"; then \
echo "fc-cache -s -v ${DESTDIR}/usr/X11R6/lib/X11/fonts";\
fc-cache -s -v ${DESTDIR}/usr/X11R6/lib/X11/fonts ;\
chmod 644 ${DESTDIR}/var/cache/fontconfig/*; \
else \
echo "truncating font directories mtimes"; \
find "${DESTDIR}/usr/X11R6/lib/X11/fonts" -type d \
-exec perl -e 'utime+(stat)[8,9],$$_ for @ARGV' {} + ; \
echo "fc-cache -y ${DESTDIR} -s -v /usr/X11R6/lib/X11/fonts";\
fc-cache -y ${DESTDIR} -s -v /usr/X11R6/lib/X11/fonts;\
chown root:wheel ${DESTDIR}/var/cache/fontconfig/*; \
chmod 644 ${DESTDIR}/var/cache/fontconfig/*; \
fi
.include <bsd.xorg.mk>