#7 Add 05-flatpak-fontpath.conf
Merged a year ago by kalev. Opened a year ago by tagoh.
rpms/ tagoh/flatpak-runtime-config f37  into  f37

Add 05-flatpak-fontpath.conf
Akira TAGOH • a year ago  
@@ -0,0 +1,12 @@ 

+ <?xml version="1.0"?>

+ <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

+ <fontconfig>

+         <!-- Redefine font directories to generate caches with different id -->

+         <reset-dirs />

+         <dir salt="flatpak">/usr/share/fonts</dir>

+         <dir salt="flatpak">/usr/share/X11/fonts/Type1</dir>

+         <dir salt="flatpak">/usr/share/X11/fonts/TTF</dir>

+         <dir salt="flatpak">/usr/local/share/fonts</dir>

+         <dir prefix="xdg">fonts</dir>

+         <dir>~/.fonts</dir>

+ </fontconfig>

@@ -15,6 +15,7 @@ 

  Source7:        org.fedoraproject.KDE5Sdk.appdata.xml

  Source8:        org.fedoraproject.KDE6Platform.appdata.xml

  Source9:        org.fedoraproject.KDE6Sdk.appdata.xml

+ Source10:       05-flatpak-fontpath.conf

  

  License:        MIT

  
@@ -45,6 +46,7 @@ 

  mkdir -p $RPM_BUILD_ROOT%{_prefix}/cache/fontconfig

  mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d

  install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE1}

+ install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE10}

  

  # usercustomize.py to set up Python paths

  for d in %{python3_sitelib} ; do

We need a different MD5 for fontconfig cache to avoid
conflict between caches on host and flatpak.

See https://github.com/fedora-silverblue/issue-tracker/issues/305

The web UI shows merge conflicts -- can you rebase, please?

rebased onto 8686361

a year ago

Ops, sorry, rebased.

Pull-Request has been merged by kalev

a year ago