From 9409967027e5c38018f1ee2115440c1e10256b22 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Tue, 21 Feb 2017 13:35:53 +0100 Subject: [PATCH] Revert "Revert "component/firefox: version up 51.0.1."" This reverts commit eb6f94c16a1881c1f6c08ee30776fa3115ac53a6. --- component/firefox/buildout.cfg | 52 ++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/component/firefox/buildout.cfg b/component/firefox/buildout.cfg index 80b1cb3b2..2b262ad09 100644 --- a/component/firefox/buildout.cfg +++ b/component/firefox/buildout.cfg @@ -5,10 +5,13 @@ extends = ../dbus/buildout.cfg ../fontconfig/buildout.cfg ../gtk-2/buildout.cfg + ../gtk-3/buildout.cfg ../libffi/buildout.cfg ../libpng/buildout.cfg ../p11-kit/buildout.cfg + ../pcre/buildout.cfg ../xorg/buildout.cfg + ../xz-utils/buildout.cfg parts = firefox @@ -26,12 +29,10 @@ depends = ${liberation-fonts:location} ${ipaex-fonts:location} -version = 45.0.1 +version = 51.0.1 -# MD5SUMs are available at : -# https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/MD5SUMS -x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 3756c8d06d6f915a3dff1dae643ee74b -x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 0409177ef649ec90ffe7a421a19bc156 +x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 9a5b67e9d759a1e4df004294a24b2b43 +x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 bd93f2652d1d90d59ae462439a93c85f script = if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ') @@ -42,7 +43,46 @@ script = wrapper = open(wrapper_location, 'w') wrapper.write("""#!${dash:location}/bin/dash cd %(location)s - export LD_LIBRARY_PATH=%(location)s:${alsa:location}/lib:${atk:location}/lib:${bzip2:location}/lib:${cairo:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcomposite:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libXt:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libtool:location}/lib:${libuuid:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${p11-kit:location}/lib:${pango:location}/lib:${pixman:location}/lib:${xdamage:location}/lib:${xfixes:location}/lib:${zlib:location}/lib + export LD_LIBRARY_PATH="%(location)s" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${alsa:location}/lib" + 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:${at-spi2-core:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${bzip2:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cairo:location}/lib" + 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:${freetype: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-3:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${harfbuzz:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libepoxy:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libffi:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libICE:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libpng:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libSM:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libtool:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libuuid:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXau:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libxcb:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXcomposite:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXcursor:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXext:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXi:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libxml2:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXrender:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXt:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pango:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pcre:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pixman:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${xdamage:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${xfixes:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${xz-utils:location}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${zlib:location}/lib" export PATH=${fontconfig:location}/bin:$PATH exec %(location)s/firefox $*""") wrapper.close() -- 2.30.9