From 0c52bd5788cb0f591dcb78d2cbcf315d1fd2f0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Mon, 12 Sep 2011 20:02:36 +0200
Subject: [PATCH] Add ongoing work to firefox and chromium

---
 component/chromium/buildout.cfg |  15 ++-
 component/firefox/buildout.cfg  | 175 ++++++++++++++++++--------------
 2 files changed, 110 insertions(+), 80 deletions(-)

diff --git a/component/chromium/buildout.cfg b/component/chromium/buildout.cfg
index fe87e0f27..c9969f14c 100644
--- a/component/chromium/buildout.cfg
+++ b/component/chromium/buildout.cfg
@@ -5,14 +5,23 @@ parts =
   
 [chromium]
 recipe = slapos.recipe.build
-slapos_promisee =
+slapos_promise =
   directory:bin
 
+#chromium zip files for linux seem to be corrupted : rights are not correctly
+#set (+x) when unzipping using python, but it works when doing "unzip chromium.zip"
+#AND it works when unzipping any other archive with python.
+#Conclusion : Google, please, learn how to make zip files.
 x86 = http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/98589/chrome-linux.zip 8ba6c022849b2a882b6e65163c147eb9
-x86-64 = http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/98589/chrome-linux.zip 7d2c81295ba3a25b0d1d22eb6162e481
+x86-64 = http://build.chromium.org/f/chromium/snapshots/Linux_x64/100161/chrome-linux.zip 95b8f49090ff4390f517bfaa4a7f77c1
+#mac-x86-64 = http://commondatastorage.googleapis.com/chromium-browser-continuous/Mac/100142/chrome-mac.zip cb3a76b8a1a93be94df2f500fb621131
+
 script =
+  #If part directory already exist, will just throw an error.
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
   extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
   workdir = guessworkdir(extract_dir)
   self.copyTree(workdir, "%(location)s")
-  os.chmod('%(location)s', '755')
\ No newline at end of file
+  import pdb; pdb.set_trace()
+
+# requirements : libXrender1 libxss1 x11-common
\ No newline at end of file
diff --git a/component/firefox/buildout.cfg b/component/firefox/buildout.cfg
index b28d57c9e..3175ecdcb 100644
--- a/component/firefox/buildout.cfg
+++ b/component/firefox/buildout.cfg
@@ -1,85 +1,106 @@
 [buildout]
 extends = 
+  ../glib/buildout.cfg
+  ../bison/buildout.cfg
+  ../gtk-2/buildout.cfg
    
 parts =
   firefox
 
-[firefox]
-recipe = slapos.recipe.build
-slapos_promise =
-  directory:bin
-
-x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-i686/en-US/firefox-6.0.2.tar.bz2 d3334d1c4f7c94d0ec2b2d76f6d720d0
-x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-x86_64/en-US/firefox-6.0.2.tar.bz2 13df923c0fbc40da0af4d3147da8ec2f
-script =
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir, "%(location)s")
-  
 #[firefox]
-#recipe = hexagonit.recipe.cmmi
-#url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.9/source/firefox-3.6.9.source.tar.bz2
-#configure-options = 
-#  --enable-application=browser
-#configure-options =
-#  --disable-webm
-#  --disable-ogg
-#  --disable-wave
-#  --disable-libjpeg-turbo
-#  --disable-necko-wifi
-#  --disable-pango
-#
-#[libnotify]
-#recipe = hexagonit.recipe.cmmi
-#url = http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.5.tar.bz2
-#
-#[GTK]
-#recipe = hexagonit.recipe.cmmi
-#url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.20/gtk+-2.20.0.tar.bz2
-#
-#[cairo]
-#recipe = hexagonit.recipe.cmmi
-#url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
-#
-#[pango]
-#recipe = hexagonit.recipe.cmmi
-#url = http://ftp.gnome.org/pub/gnome/sources/pango/1.20/pango-1.20.0.tar.bz2
-#
-#[libXrender]
-#recipe = hexagonit.recipe.cmmi
-#url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2
-#environment =
-#  PKG_CONFIG_PATH=${render:location}/lib/pkgconfig
-#  LD_LIBRARY_PATH=${render:location}/lib
-#  LD_RUN_PATH=${render:location}/lib
-#  PATH=${pkgconfig:location}/bin:%(PATH)s
-#
-#[render]
-#recipe = hexagonit.recipe.cmmi
-#url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2
-#
-#[atk]
-#recipe = hexagonit.recipe.cmmi
-#url = http://ftp.acc.umu.se/pub/gnome/sources/atk/2.0/atk-2.0.0.tar.bz2
+#recipe = slapos.recipe.build
+#slapos_promise =
+#  file:firefox
+#  file:firefox-bin
 #
-#[dbus-1]
-#recipe = hexagonit.recipe.cmmi
-#url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz
-#
-#[dbus-glib]
-#recipe = hexagonit.recipe.cmmi
-#url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.90.tar.gz
-#
-#[libIDL]
-#recipe = hexagonit.recipe.cmmi
-#url = http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.0.tar.bz2
-#environment =
-#  PKG_CONFIG_PATH=${bison:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
-#  LD_LIBRARY_PATH=${bison:location}/lib:${glib:location}/lib
-#  LD_RUN_PATH=${bison:location}/lib:${glib:location}/lib
-#  PATH=${pkgconfig:location}/bin:${bison:location}/bin:%(PATH)s
-#  
-#[bison]
-#recipe = hexagonit.recipe.cmmi
-#url = http://ftp.gnu.org/gnu/bison/bison-2.3.tar.bz2
+#x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-i686/en-US/firefox-6.0.2.tar.bz2 d3334d1c4f7c94d0ec2b2d76f6d720d0
+#x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-x86_64/en-US/firefox-6.0.2.tar.bz2 13df923c0fbc40da0af4d3147da8ec2f
+#script =
+#  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
+#  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
+#  workdir = guessworkdir(extract_dir)
+#  self.copyTree(workdir, "%(location)s")
+  
+[firefox]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/source/firefox-6.0.2.source.tar.bz2
+configure-options = 
+  --enable-application=browser
+  --disable-webm
+  --disable-ogg
+  --disable-wave
+  --disable-pango
+  --disable-gnomevfs
+  --disable-gconf
+  --disable-libnotify
+  --disable-gnomeui
+  --disable-dbus
+  --disable-crypto
+  --disable-jsd
+  --disable-dbm
+  --disable-accessibility
+  --disable-printing
+  --disable-xpcom-fastload
+  --disable-permissions
+  --disable-negotiateauth
+  --disable-xtf
+  --disable-pref-extensions
+  --disable-angle
+  --disable-crashreporter
+  --disable-libjpeg-turbo
+  --disable-mathml
+  --disable-smil
+  --disable-installer
+  --disable-updater
+  --disable-xpconnect-idispatch
+  --disable-activex
+  --disable-tests
+  --disable-parental-controls
+  --disable-feeds
+  --disable-zipwriter
+  --disable-libconic
+  --disable-optimize
+  --disable-logging
+  --disable-elf-hack
+  --disable-xul
+  --disable-profilelocking
+  --disable-rdf
+  --disable-necko-disk-cache
+  --disable-necko-wifi
+  --disable-cookies
+  --disable-ctypes
+environment =
+  PKG_CONFIG_PATH=${gtk-2:location}/lib/pkgconfig
+  
+#  --without-libIDL
+#  --with-libIDL-prefix=PFX
+#  --with-libIDL-exec-prefix=PFX
+#  --disable-libIDLtest
+#  --with-glib-prefix=PFX
+#  --with-glib-exec-prefix=PFX
+#  --disable-glibtest
+
+#perl
+#libXt-devel
+#freetype
+#fontconfig
+#pkgconfig
+#yasm
+#autoconf
+
+[dbus-1]
+recipe = hexagonit.recipe.cmmi
+url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz
+
+[dbus-glib]
+recipe = hexagonit.recipe.cmmi
+url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.90.tar.gz
+
+[libIDL]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.0.tar.bz2
+environment =
+  PKG_CONFIG_PATH=${bison:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${bison:location}/lib:${glib:location}/lib
+  LD_RUN_PATH=${bison:location}/lib:${glib:location}/lib
+  PATH=${pkgconfig:location}/bin:${bison:location}/bin:%(PATH)s
-- 
2.30.9