Commit e5687602 authored by Jérome Perrin's avatar Jérome Perrin

component/{firefox,phantomjs}: don't install fonts

Users will need to generate a proper fonts.conf and set it as
$FONTCONFIG_FILE environment variable.
parent 85c97192
...@@ -110,9 +110,6 @@ slapos_promise = ...@@ -110,9 +110,6 @@ slapos_promise =
x86 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 ${:i686-md5sum} x86 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 ${:i686-md5sum}
x86-64 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ${:x86_64-md5sum} x86-64 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ${:x86_64-md5sum}
fonts =
${liberation-fonts:location}
${ipaex-fonts:location}
library = library =
${alsa:location}/lib ${alsa:location}/lib
${atk:location}/lib ${atk:location}/lib
......
...@@ -10,10 +10,6 @@ recipe = slapos.recipe.build ...@@ -10,10 +10,6 @@ recipe = slapos.recipe.build
slapos_promise = slapos_promise =
file:phantomjs-slapos file:phantomjs-slapos
depends =
${liberation-fonts:location}
${ipaex-fonts:location}
x86 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-i686.tar.bz2 9c1426eef5b04679d65198b1bdd6ef88 x86 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-i686.tar.bz2 9c1426eef5b04679d65198b1bdd6ef88
x86-64 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 f278996c3edd0e8d8ec4893807f27d71 x86-64 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 f278996c3edd0e8d8ec4893807f27d71
......
  • @romain this and !706 (merged) probably break jstestnode, but maybe it works when fonts are present system wide because it works on my testnode

  • should I install those components from the software profile?

  • No, a $FONTCONFIG_FILE is needed now. I will take a look if you want.

    I don't see how I can test this though, we could execute runTestSuite but I think it only works with a software distributor

  • In the case of ERP5, when ERP5 runs firefox it has $FONTCONFIG_FILE so it works (but I only tested ERP5 on my testnode where this works)

    FYI, my testnode where "it works" in reality does not work ;) there was another problem. On this testnode, the partition directory is a symlink and nginx does 404 because of the disable_symlinks we have on https://lab.nexedi.com/nexedi/slapos/blob/e56876027e0f2cc6bc3efe4bdb6aabbf868e55a2/software/jstestnode/template-nginx.cfg.in#L92 . What I did is create /srv/slappart11/srv, then move it to /data/srv_slappart11_srv and then symlink /srv/slappart11/srv -> /data/srv_slappart11_srv . I'm not sure we should support this, this setup is really hackish. I don't plan to change to support this, that's really for your information

  • !759 (merged) let's 🤞 for tests

  • for test, I configured an officejs test suite on that branch, if test pass there, it's OK.

  • mentioned in commit 6e11219d

    Toggle commit list
  • mentioned in merge request !762 (merged)

    Toggle commit list
  • mentioned in commit 986045b1

    Toggle commit list
  • mentioned in commit 8cc12eb3

    Toggle commit list
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment