diff --git a/desktop/font/fontconfig/actions.py b/desktop/font/fontconfig/actions.py index dcdcfdc1d9..3c58626439 100644 --- a/desktop/font/fontconfig/actions.py +++ b/desktop/font/fontconfig/actions.py @@ -10,6 +10,8 @@ from pisi.actionsapi import libtools from pisi.actionsapi import get def setup(): + #Make sure the system regenerates src/fcobjshash.h. + shelltools.system("rm -rf src/fcobjshash.h") # Do not rebuild docs shelltools.export("HASDOCBOOK", "no") @@ -35,7 +37,8 @@ def install(): disabled_configs = ("10-no-sub-pixel.conf",) for cfg in enabled_configs: - pisitools.dosym("../conf.avail/%s" % cfg, "/etc/fonts/conf.d/%s" % cfg) + pisitools.dosym("/usr/share/fontconfig/conf.avail/%s" % cfg, "/etc/fonts/conf.d/%s" % cfg) + #pisitools.dosym("../conf.avail/%s" % cfg, "/etc/fonts/conf.d/%s" % cfg) for cfg in disabled_configs: pisitools.remove("/usr/share/fontconfig/conf.avail/%s" % cfg) diff --git a/desktop/font/fontconfig/pspec.xml b/desktop/font/fontconfig/pspec.xml index 96fa532744..b50c750d08 100644 --- a/desktop/font/fontconfig/pspec.xml +++ b/desktop/font/fontconfig/pspec.xml @@ -21,7 +21,7 @@ - 0001-fix-test-with-freetype2-2.7.1.patch + prefer_dejavu.patch use_legacy_lcdfilter_on_small_monospace.patch @@ -30,9 +30,9 @@ fontconfig-2.8.0-sleep-less.patch deprecated-user-conf.patch - fontconfig-const-name-in-range.patch - fontconfig-implicit-object-for-const-name.patch - fontconfig-locale.patch + + + @@ -97,6 +97,13 @@ + + 2019-11-09 + 2.13.1 + Version Bump symlinks fix + Pisi Linux Community + admin@pisilinux.org + 2018-07-30 2.13.0