Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert change to FONTCONFIG_FILE, so we have a complete fontconfig configuration #144

Merged
merged 2 commits into from Aug 21, 2018
Merged

Revert change to FONTCONFIG_FILE, so we have a complete fontconfig configuration #144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a61ee26
Revert "Fix FONTCONFIG_PATH to match where we generate fonts.conf (#1…
jhenstridge Aug 21, 2018
f789d36
Add a comment describing how the fontconfig fragment is integrated into
jhenstridge Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions common/desktop-exports
View file
Open in desktop
Expand Up @@ -215,7 +215,7 @@ IFS=':' read -r -a data_dirs_array <<< "$XDG_DATA_DIRS"

# Font Config and themes
export FONTCONFIG_PATH=$RUNTIME/etc/fonts/conf.d
export FONTCONFIG_FILE=$XDG_CONFIG_HOME/fontconfig/fonts.conf
export FONTCONFIG_FILE=$RUNTIME/etc/fonts/fonts.conf

function make_user_fontconfig {
echo "<fontconfig>"
Expand Down Expand Up @@ -243,8 +243,12 @@ function make_user_fontconfig {

if [ $needs_update = true ]; then
rm -rf $XDG_DATA_HOME/{fontconfig,fonts,fonts-*,themes,.themes}

# This fontconfig fragment is installed in a location that is
# included by the system fontconfig configuration: namely the
# etc/fonts/conf.d/50-user.conf file.
mkdir -p $XDG_CONFIG_HOME/fontconfig
make_user_fontconfig > $FONTCONFIG_FILE
make_user_fontconfig > $XDG_CONFIG_HOME/fontconfig/fonts.conf

# the themes symlink are needed for GTK 3.18 when the prefix isn't changed
# GTK 3.20 looks into XDG_DATA_DIR which has connected themes.
Expand Down