[Lunar-commits] <moonbase> seamonkey: fixed build and post_install Do not blindly bump versions. Build before commit. Fixed google breakpad again to have successful build. Fixed post_install to avoid build errors due to existing dirs. Removed sedits which do nothing.

[Zbigniew Luszpinski]

commit e4404c0b7c1355734f4b81e89f4bc2c1cdd10d6a
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Sep 25 21:46:11 2010 +0000

    seamonkey: fixed build and post_install
    Do not blindly bump versions. Build before commit.
    Fixed google breakpad again to have successful build.
    Fixed post_install to avoid build errors due to existing dirs.
    Removed sedits which do nothing.
---
 web/seamonkey/BUILD        |   13 +++++++------
 web/seamonkey/POST_INSTALL |    4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/web/seamonkey/BUILD b/web/seamonkey/BUILD
index 2e66095..fec3431 100644
--- a/web/seamonkey/BUILD
+++ b/web/seamonkey/BUILD
@@ -1,10 +1,11 @@
 (
- 
-  #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' comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
+
+  # Yet again fix for broken Google software
+  FIXHERE=comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src
+  sedit 's:<cassert>:<cassert>\n#include <cstdio>:' $FIXHERE/processor/minidump_processor.cc &&
+  sedit 's:#include <string>:#include <cstring>:'   $FIXHERE/processor/minidump_stackwalk.cc &&
+  sedit 's:<sstream>:<sstream>\n#include <cstdio>:' $FIXHERE/processor/postfix_evaluator-inl.h &&
+  sedit 's:#include <sys/mman.h>:#include <sys/mman.h>\n#include <sys/stat.h>:' $FIXHERE/common/linux/file_id.cc &&
 
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
diff --git a/web/seamonkey/POST_INSTALL b/web/seamonkey/POST_INSTALL
index a026b2a..9055151 100644
--- a/web/seamonkey/POST_INSTALL
+++ b/web/seamonkey/POST_INSTALL
@@ -27,9 +27,9 @@ export MOZILLA_FIVE_HOME="/usr/lib/$SMNKEY_LIBDIR"
 ldconfig
 
 # Added the symlinks back now that zbiggy has removed mozilla from moonbase
-rm -f /usr/lib/mozilla
+rm -rf /usr/lib/mozilla
 ln -snf /usr/lib/$SMNKEY_LIBDIR /usr/lib/mozilla
-rm -f /usr/include/mozilla
+rm -rf /usr/include/mozilla
 ln -snf /usr/include/$SMNKEY_LIBDIR /usr/include/mozilla
 ln -sf /usr/bin/seamonkey /usr/bin/mozilla
 ln -sf /usr/bin/seamonkey-config /usr/bin/mozilla-config