chromium fix

component/chromium/buildout.cfg

@@ -6,6 +6,7 @@
 # in the system.
 
 extends =
+  ../alsa/buildout.cfg
   ../coreutils/buildout.cfg
   ../cups/buildout.cfg
   ../dbus/buildout.cfg
@@ -14,6 +15,7 @@ extends =
   ../gettext/buildout.cfg
   ../glib/buildout.cfg
   ../gtk-2/buildout.cfg
+  ../gtk-3/buildout.cfg
   ../libexpat/buildout.cfg
   ../libffi/buildout.cfg
   ../libpng/buildout.cfg
@@ -29,6 +31,11 @@ extends =
 parts =
   chromium
 
+
+[chromium-wrapper-68]
+# TODO
+<= chromium-68
+
 [chromium-wrapper-67]
 # TODO
 <= chromium-67
@@ -37,24 +44,60 @@ parts =
 <= chromium
 # XXX really ?
 version = 67
+revision_x86 = 382014
+md5sum-x86 = TODO
+revision_x86-64 = 382014
+md5sum-x86_64 = ef2c476b1f059e9aa026bbac1872368d
+revision_mac = 381909
+md5sum-mac = TODO
+
+
+[chromium-68]
+<= chromium
+# XXX navigator.userAgent says 69.0.3497.0 ???
+version = 68.0.3440.106
+revision_x86-64 = 576753
+md5sum-x86_64 = 08ac27fd40ace4ca8dfbd1db403deccb
+generation-x86_64 = 1532051976706023
+
 
 [chromium]
-recipe = slapos.recipe.build
-slapos_promise =
-  file:chrome
-  file:chrome-wrapper
-  file:chrome-slapos
+# https://www.chromium.org/getting-involved/download-chromium
+
 
 # How to get the revision :
 # stable : https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Linux_x64%2FLAST_CHANGE?alt=media
 # snapshot : https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2FLAST_CHANGE?alt=media
 revision_x86 = 382014
+md5sum-x86 = TODO
+
 revision_x86-64 = 382014
+md5sum-x86_64 = ef2c476b1f059e9aa026bbac1872368d
+generation-x86_64 = TODO
+
 revision_mac = 381909
+md5sum-mac = TODO
+
+
+
+recipe = slapos.recipe.build
+slapos_promise =
+  file:chrome
+  file:chrome-wrapper
+  file:chrome-slapos
+
+fonts =
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+  ${ipa-fonts:location}
+  ${ocrb-fonts:location}
+  ${android-fonts:location}
+
 
-linux_x86 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Linux%2F${:revision_x86}%2Fchrome-linux.zip?alt=media
-linux_x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?alt=media ef2c476b1f059e9aa026bbac1872368d
-mac_x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Mac%2F${:revision_mac}%2Fchrome-linux.zip?alt=media
+linux_x86 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Linux%2F${:revision_x86}%2Fchrome-linux.zip?alt=media ${:md5sum-x86}
+linux_x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?generation=${:generation-x86_64}&alt=media ${:md5sum-x86_64}
+XXX-old-linux_x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?alt=media ${:md5sum-x86_64}
+mac_x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Mac%2F${:revision_mac}%2Fchrome-linux.zip?alt=media ${:md5sum-mac}
 
 script =
   #If part directory already exist, will just throw an error.
@@ -67,17 +110,22 @@ script =
   wrapper_location = os.path.join("%(location)s", "chrome-slapos")
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!/bin/sh
+  # this also needs a $FONTCONFIG_FILE set, otherwise system fonts will be used.
+  export PATH="${fontconfig:location}/bin:$PATH"
   export LD_LIBRARY_PATH="%(location)s"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${atk:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${at-spi2-atk:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${alsa:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cairo:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cups:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cups:location}/lib64" # XXX
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${dbus:location}/lib/"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${dbus-glib:location}/lib/"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${fontconfig:location}/lib/"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gdk-pixbuf:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gettext:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${glib:location}/lib"
-  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gtk-2:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gtk-3:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${harfbuzz:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXau:location}/lib"
@@ -87,6 +135,8 @@ script =
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXi:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXrender:location}/lib/"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXtst:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXScrnSaver:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXrandr:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libexpat:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libffi:location}/lib"
   export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libpng:location}/lib"