haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Downloaded fonts don't need to be visible to Kit processes any longer 

After recent changes in core, it is only the ForKit process that opens
such files.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I69ce1c4caf229b34e42799c525a1f1461a1841e0
pull/5340/head
Tor Lillqvist 2022-09-21 13:10:37 +03:00 committed by Tor Lillqvist
parent 48eaa195b7
commit 8bd276976e
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
coolwsd-systemplate-setup
View File

@ -15,12 +15,6 @@ test -d "$INSTDIR" || { echo "$0: No such directory: $INSTDIR"; exit 1; }
mkdir -p $CHROOT || exit 1
# For the tmpfonts we need to use the pathnames as used by the
# configure script, which does *not* look up realpaths, because the
# Makefile.am uses @SYSTEMPLATE_PATH@ which uses abs_top_builddir
# which uses ac_pwd which is not based on use of realpath.
CHROOT_AS_GIVEN=$CHROOT
# Resolve the real paths, in case they are relative and/or symlinked.
# INSTDIR_LOGICAL will contain the logical path, if there are symlinks,
# while INSTDIR is the physical one. Both will most likely be the same,
@ -119,23 +113,6 @@ do
ln -f -s `${REALPATH} --relative-to=$INSTDIR_PARENT $CHROOT/lo` $CHROOT/$path
done
# A similar dance also for the directory where "temporary" fonts are
# stored. Such are downloaded from other servers based on a separate
# configuration file. They need to be accessible using the same
# pathname both in the ForKit process and in the Kit processes.
mkdir -p $CHROOT/tmpfonts
mkdir -p $CHROOT$CHROOT
ln -f -s `${REALPATH} --relative-to=$CHROOT$CHROOT $CHROOT/tmpfonts` $CHROOT$CHROOT
# To be safe we do this both for $CHROOT and $CHROOT_AS_GIVEN, in case they differ.
if [ "$CHROOT_AS_GIVEN" != "$CHROOT" ]; then
mkdir -p $CHROOT_AS_GIVEN/tmpfonts
mkdir -p $CHROOT_AS_GIVEN$CHROOT_AS_GIVEN
ln -f -s `${REALPATH} --relative-to=$CHROOT_AS_GIVEN$CHROOT_AS_GIVEN $CHROOT_AS_GIVEN/tmpfonts` $CHROOT_AS_GIVEN$CHROOT_AS_GIVEN
fi
# /usr/share/fonts needs to be taken care of separately because the
# directory time stamps must be preserved for fontconfig to trust
# its cache.

2
wsd/COOLWSD.cpp
View File

@ -5210,7 +5210,7 @@ int COOLWSD::innerMain()
assert(Server && "The COOLWSDServer instance does not exist.");
Server->findClientPort();
TmpFontDir = SysTemplate + "/tmpfonts";
TmpFontDir = ChildRoot + JailUtil::CHILDROOT_TMP_INCOMING_PATH;
// Start the internal prisoner server and spawn forkit,
// which in turn forks first child.