[Lunar-commits] <moonbase> firefox4: force bundled libevent

[Paul Bredbury]

commit 1bf396daf903498af930056dcb6927b5b0f4e47c
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Tue Feb 8 14:00:17 2011 +0700

    firefox4: force bundled libevent
    
    libevent 2 is required by transmission 2.20, but breaks firefox4.
    Recompiling firefox4, it was half-installed without an executable, which
    is worrying.
    
    While we sort out libevent 1 vs 2, let's choose the safe option for
    firefox4.
---
 web/firefox4/DEPENDS   |    7 ++++---
 web/firefox4/mozconfig |    4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/firefox4/DEPENDS b/web/firefox4/DEPENDS
index 09ae2fa..e0a36fb 100644
--- a/web/firefox4/DEPENDS
+++ b/web/firefox4/DEPENDS
@@ -19,9 +19,10 @@ optional_depends "flash-plugin-10"  ""  ""  "To enable Flash plugin"
 optional_depends "gnome-vfs"        ""  ""  "For Gnome VFS support"
 optional_depends "hunspell"         ""  ""  "For spelling support"
 
-optional_depends "libevent"         "--with-system-libevent"      \
-                                    "--without-system-libevent"   \
-                                    "For event detection"
+# Specified in mozconfig, and don't forget that $OPTS is ignored in this BUILD.
+#optional_depends "libevent"         "--with-system-libevent"      \
+#                                    "--without-system-libevent"   \
+#                                    "For event detection"
 
 optional_depends "dbus-glib"       \
                  "--enable-dbus"   \
diff --git a/web/firefox4/mozconfig b/web/firefox4/mozconfig
index 28db401..da71a77 100644
--- a/web/firefox4/mozconfig
+++ b/web/firefox4/mozconfig
@@ -30,7 +30,9 @@ ac_add_options --disable-logging
 ac_add_options --disable-accessibility
 ac_add_options --enable-mathml
 ac_add_options --disable-os2-high-mem
-ac_add_options --with-system-libevent
+# firefox4 can use its internal libevent 1.x
+# until the libevent 1 vs 2 issue is safe.
+ac_add_options --without-system-libevent
 ac_add_options --enable-gio
 ac_add_options --enable-raw
 ac_add_options --with-system-libvpx