From 628b8fd7d5318d12e1eec1632be43fb2e2b7b294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Wed, 14 Sep 2011 16:25:03 +0200
Subject: [PATCH] Ongoing work with firefox
---
component/firefox/buildout.cfg | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/component/firefox/buildout.cfg b/component/firefox/buildout.cfg
index ec9e1c87a..9686b3f4d 100644
--- a/component/firefox/buildout.cfg
+++ b/component/firefox/buildout.cfg
@@ -53,7 +53,7 @@ url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/source/firefo
#patches =
# ${firefox-cairo-patch:location}/${firefox-cairo-patch:filename}
configure-options =
- --enable-application=browser
+ --enable-system-cairo
--disable-webm
--disable-ogg
--disable-wave
@@ -61,7 +61,6 @@ configure-options =
--disable-gconf
--disable-libnotify
--disable-gnomeui
- --disable-dbus
--disable-accessibility
--disable-printing
--disable-crashreporter
@@ -70,14 +69,11 @@ configure-options =
--disable-javaxpcom
--disable-necko-disk-cache
--disable-necko-wifi
- --disable-mathml
- --disable-smil
--disable-angle
--disable-tests
environment =
PATH=${pkgconfig:location}/bin:${glib:location}/bin:%(PATH)s
- PKG_CONFIG_PATH=${gtk-2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libIDL:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${mesa:location}/lib/pkgconfig
+ PKG_CONFIG_PATH=${gtk-2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libIDL:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${mesa:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${libXt:location}/include -I${libXext:location}/include -I${xextproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${mesa:location}/include -I${libIce:location}/include -I${kbproto:location}/include -I${xtrans:location}/include -I${fontconfig:location}/include/ -I${freetype:location}/include/ -I${freetype:location}/include/freetype2 -I${cairo:location}/include/cairo -I${libSM:location}/include/ -I${xorg-libpthread-stubs:location}/include -I${pango:location}/include/pango-1.0 -I${gdk-pixbuf:location}/include/gdk-pixbuf-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/lib/glib-2.0/include -I${gtk-2:location}/include/gtk-2.0 -I${gtk-2:location}/lib/gtk-2.0/include -I${atk:location}/include/atk-1.0 -I${libdrm:location}/include/libdrm -I${libdrm:location}/include -I${dbus-glib:location}/include
- LDFLAGS=-L${gettext:location}/lib
+ LDFLAGS=-L${gettext:location}/lib -L${libX11:location}/lib -L${xproto:location}/lib -L${libXt:location}/lib -L${libXext:location}/lib -L${xextproto:location}/lib -L${libXrender:location}/lib -L${render:location}/lib -L${mesa:location}/lib -L${libIce:location}/lib -L${kbproto:location}/lib -L${xtrans:location}/lib -L${fontconfig:location}/lib/ -L${freetype:location}/lib/ -L${freetype:location}/lib/freetype2 -L${cairo:location}/lib/cairo -L${libSM:location}/lib/ -L${xorg-libpthread-stubs:location}/lib -L${pango:location}/lib/pango-1.0 -L${gdk-pixbuf:location}/lib/gdk-pixbuf-2.0 -L${glib:location}/lib/glib-2.0 -L${glib:location}/lib/gio-unix-2.0 -L${glib:location}/lib/glib-2.0/lib -L${gtk-2:location}/lib/gtk-2.0 -L${gtk-2:location}/lib/gtk-2.0/lib -L${atk:location}/lib/atk-1.0 -L${libdrm:location}/lib/libdrm -L${libdrm:location}/lib -L${dbus-glib:location}/lib -lX11
LD_LIBRARY_PATH=${libIDL:location}/lib:${glib:location}/lib:${gettext:location}/lib:${gtk-2:location}/lib:${cairo:location}/lib:${pango:location}/lib:${libpng:location}/lib:${freetype:location}/lib:${fontconfig:location}/lib:${pixman:location}/lib:${libXt:location}/lib:${dbus:location}/lib:${mesa:location}/lib
-
\ No newline at end of file
--
2.30.9