software/seleniumserver: switch to new $FONTCONFIG_FILE

software/seleniumserver/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = 1f0b67d2a542e94380c35afc9cd1946b
+md5sum = 269ac5ce96695ede3ee917c6ce17ae2d

software/seleniumserver/instance-selenium.cfg.in

@@ -6,15 +6,28 @@ parts =
 
 extends = ${monitor-template:rendered}
 eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory} 
+develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[fontconfig-instance]
-recipe = slapos.cookbook:fontconfig
-conf-path = $${directory:etc}/font.conf
-font-system-folder = ${fonts:location}
-font-folder = $${directory:fonts}
-service-folder = $${directory:services}
+[fontconfig-conf]
+recipe = slapos.recipe.template:jinja2
+template = ${template-fonts-conf:output}
+rendered = $${directory:etc}/fonts.conf
+context =
+    key cachedir directory:fontconfig-cache
+    key fonts :fonts
+    key includes :includes
+fonts =
+    ${android-fonts:location}
+    ${dejavu-fonts:location}
+    ${ipa-fonts:location}
+    ${ipaex-fonts:location}
+    ${liberation-fonts:location}
+    ${ocrb-fonts:location}
+    $${directory:fonts}
+# XXX we don't include conf.d for now, to keep compatibility with current font selection problems.
+includes =
+#    ${fontconfig:location}/etc/fonts/conf.d
 
 [xvfb-instance]
 recipe = slapos.cookbook:wrapper
@@ -79,7 +92,7 @@ environment =
   PATH=${buildout:bin-directory}
   XORG_LOCK_DIR=$${directory:tmp}
   DISPLAY=$${xvfb-instance:display}
-  FONTCONFIG_FILE=$${fontconfig-instance:conf-path}
+  FONTCONFIG_FILE=$${fontconfig-conf:rendered}
 hostname = $${instance-parameter:ipv4-random}
 
 
@@ -331,5 +344,7 @@ tmp = $${buildout:directory}/tmp
 services = $${:etc}/service
 framebuffer = $${:srv}/framebuffer
 fonts = $${:srv}/fonts/
+fontconfig-cache = $${buildout:directory}/.fontconfig
+
 ssh = $${:etc}/ssh
 run = $${:var}/run
\ No newline at end of file

software/seleniumserver/software.cfg

@@ -12,6 +12,8 @@ extends =
    ../../component/java/buildout.cfg
    ../../component/caddy/buildout.cfg
    ../../component/openssh/buildout.cfg
+   ../../component/fonts/buildout.cfg
+   ../../component/fontconfig/buildout.cfg
    ../../stack/slapos.cfg
    ./buildout.hash.cfg
    ../../stack/monitor/buildout.cfg