diff --git a/component/alsa/buildout.cfg b/component/alsa/buildout.cfg index 452bb71207ad6caa76e781c837974ca44ffafdeb..21e1cee88b150fb8feb83df50c2b1951640d81d7 100644 --- a/component/alsa/buildout.cfg +++ b/component/alsa/buildout.cfg @@ -19,3 +19,4 @@ configure-options = --disable-alisp --disable-old-symbols --disable-python + --without-debug diff --git a/component/firefox/buildout.cfg b/component/firefox/buildout.cfg index 6afda37e5e8ee321a57527a9c5b0ec16e3026983..55f8e313a144fa21d1bf13ada0f2988b6d7c6578 100644 --- a/component/firefox/buildout.cfg +++ b/component/firefox/buildout.cfg @@ -12,6 +12,9 @@ extends = parts = firefox +# XXX : Firefox binary tries to find libgnomeui-2.so.0 and it will +# fail to run if exists. + [firefox] recipe = slapos.recipe.build slapos_promise = @@ -22,8 +25,9 @@ depends = ${liberation-fonts:location} ${ipaex-fonts:location} -x86 = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-i686/fr/firefox-11.0.tar.bz2 a7e9c614ddac993476ef771afaedf568 -x86-64 = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-x86_64/fr/firefox-11.0.tar.bz2 b358865c08145211314a62660e871614 +version = 26.0 +x86 = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 92f89c9e4f8325e947de8918efb18e55 +x86-64 = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 4b74154431b8a3766fad4fe4fe1f9f7c script = if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ') @@ -39,4 +43,3 @@ script = exec %(location)s/firefox $*""") wrapper.close() os.chmod(wrapper_location, 0755) - diff --git a/component/gtk-2/buildout.cfg b/component/gtk-2/buildout.cfg index 57314273d8cacc31a91951d207c27bd8b2da77a7..f90ab6be0fb0639a9853fd1080a0f176cbc4c5c0 100644 --- a/component/gtk-2/buildout.cfg +++ b/component/gtk-2/buildout.cfg @@ -75,6 +75,7 @@ configure-options = --disable-papi --enable-explicit-deps --disable-xinerama + --disable-glibtest environment = PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig