[Lunar-commits] <moonbase> firefox: If system sqlite is discouraged by the devs, then lets not

[Dennis `stumbles` Veatch]

commit 4c47b022fdd9857da1cf448a47dab36bac7adc41
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Tue Jul 27 13:28:56 2010 -0400

    firefox: If system sqlite is discouraged by the devs, then lets not
    
    enable it in the BUILDs. Also the minicupm_generator.cc file for Linux
    no longer exists so that line can be deleted. The dump_symbols.cc file
    now has the missing include so that line can be deleted.
---
 web/firefox/BUILD        |    7 +------
 web/firefox/BUILD.x86_64 |    7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index c3b9831..39b0c90 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -3,9 +3,7 @@
  MOZILLA_DIR=mozilla-1.9.2
   #Really? You go and call fprintf and don't #include <cstdio>?
   #How exactly did you plan on doing that?!?!
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
   sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
 
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
@@ -27,6 +25,7 @@
   cd $MOZILLA_DIR  &&
 
   echo "ac_add_options --disable-necko-wifi" >> mozconfig
+  echo "ac_add_options --disable-system-sqlite" >> mozconfig
 
   #Add DEPENDS options
 
@@ -36,10 +35,6 @@
     echo "ac_add_options --disable-dbus" >> mozconfig
   fi  &&
 
-  if in_depends $MODULE sqlite ; then
-    echo "ac_add_options --enable-system-sqlite" >> mozconfig
-  fi  &&
-
   if in_depends $MODULE "xulrunner" ; then
     XUL=`module_version xulrunner`
     echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
diff --git a/web/firefox/BUILD.x86_64 b/web/firefox/BUILD.x86_64
index c3b9831..39b0c90 100644
--- a/web/firefox/BUILD.x86_64
+++ b/web/firefox/BUILD.x86_64
@@ -3,9 +3,7 @@
  MOZILLA_DIR=mozilla-1.9.2
   #Really? You go and call fprintf and don't #include <cstdio>?
   #How exactly did you plan on doing that?!?!
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
   sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
 
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
@@ -27,6 +25,7 @@
   cd $MOZILLA_DIR  &&
 
   echo "ac_add_options --disable-necko-wifi" >> mozconfig
+  echo "ac_add_options --disable-system-sqlite" >> mozconfig
 
   #Add DEPENDS options
 
@@ -36,10 +35,6 @@
     echo "ac_add_options --disable-dbus" >> mozconfig
   fi  &&
 
-  if in_depends $MODULE sqlite ; then
-    echo "ac_add_options --enable-system-sqlite" >> mozconfig
-  fi  &&
-
   if in_depends $MODULE "xulrunner" ; then
     XUL=`module_version xulrunner`
     echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig