software/cloudooo switch to new $FONTCONFIG_FILE

software/cloudooo/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
 
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = 5fc0919cc3eab365f773c6eb73f9c6c3
+md5sum = e01ee969a45d44d386653a9eb699cc59

software/cloudooo/instance-cloudooo.cfg.in

@@ -167,13 +167,31 @@ recipe = slapos.cookbook:publish.serialised
 {{   family_name }} = {{ scheme ~ '://' ~ ipv4 ~ ':' ~ apache_port }}
 {% endfor -%}
 
+[fontconfig-conf]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_dict['template-fonts-conf'] }}
+rendered = ${directory:etc}/fonts.conf
+context =
+    key cachedir directory:fontconfig-cache
+    key fonts :fonts
+    key includes :includes
+fonts =
+{% for font in parameter_dict['fonts'].splitlines() %}
+   {{ font }}
+{% endfor%}
+    ${directory:font}
+includes =
+{% for include in parameter_dict['fontconfig-includes'].splitlines() %}
+   {{ include }}
+{% endfor%}
 
 [cloudooo-base]
 recipe = slapos.cookbook:generic.cloudooo
 ip = {{ ipv4 }}
 environment =
   LD_LIBRARY_PATH = {{ parameter_dict['cairo'] }}/lib:{{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['glu'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['libexpat'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['mesa'] }}/lib:{{ parameter_dict['pixman'] }}/lib:{{ parameter_dict['xdamage'] }}/lib:{{ parameter_dict['xfixes'] }}/lib:{{ parameter_dict['zlib'] }}/lib
-  FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
+  FONTCONFIG_FILE = ${fontconfig-conf:rendered}
+
   PATH = ${binary-link:target-directory}
 mimetype_entry_addition =
 {% for entry in mimetype_entry_addition.splitlines() -%}
@@ -226,14 +244,6 @@ configuration-file = ${cloudooo-0:configuration-file}
 run-unit-test-binary = {{ bin_directory }}/runCloudoooUnitTest
 run-test-suite-binary = {{ bin_directory }}/runCloudoooTestSuite
 
-[fontconfig-instance]
-recipe = slapos.cookbook:fontconfig
-conf-path = ${directory:etc}/font.conf
-font-system-folder = {{ parameter_dict['fonts'] }}
-font-folder = ${directory:font}
-service-folder = ${directory:services}
-
-
 [binary-link]
 recipe = slapos.cookbook:symbolic.link
 target-directory = ${directory:bin}
@@ -264,6 +274,7 @@ certs = ${:ca-dir}/certs
 crl = ${:ca-dir}/crl
 etc = ${buildout:directory}/etc
 font = ${:srv}/font
+fontconfig-cache = ${buildout:directory}/.fontconfig
 log = ${:var}/log
 newcerts = ${:ca-dir}/newcerts
 private = ${:ca-dir}/private

software/cloudooo/software-common.cfg

@@ -54,7 +54,23 @@ dbus = ${dbus:location}
 dbus-glib = ${dbus-glib:location}
 file = ${file:location}
 fontconfig = ${fontconfig:location}
-fonts = ${fonts:location}
+template-fonts-conf = ${template-fonts-conf:output}
+fonts =
+  ${android-fonts:location}
+  ${ipa-fonts:location}
+  ${ipaex-fonts:location}
+  ${liberation-fonts:location}
+  ${ocrb-fonts:location}
+# XXX These fonts have always been missing in cloudooo, but we want
+# keep compatibility a little bit more.
+#  ${dejavu-fonts:location}
+#  ${libreoffice-bin:location}/share/fonts/
+
+# XXX fonts-include also have always been missing, which causes wrong
+# font selections in cloudooo, such as using a serif fonts for Arial
+fontconfig-includes =
+#    ${fontconfig:location}/etc/fonts/conf.d
+
 freetype = ${freetype:location}
 glib = ${glib:location}
 glu = ${glu:location}

stack/cloudooo.cfg

@@ -9,6 +9,7 @@ extends =
   ../component/dbus/buildout.cfg
   ../component/dcron/buildout.cfg
   ../component/file/buildout.cfg
+  ../component/fontconfig/buildout.cfg
   ../component/fonts/buildout.cfg
   ../component/git/buildout.cfg
   ../component/glib/buildout.cfg
@@ -44,13 +45,6 @@ parts =
   libSM
   libXrender
 
-# fonts
-  liberation-fonts
-  ipaex-fonts
-  ipa-fonts
-  ocrb-fonts
-  android-fonts
-
 # Dependencies
   cups
   dbus