[Lunar-commits] <moonbase-other> seamonkey: bump to 2.29. Shared js still needs to be disabled and a few twiddles of BUILD and PRE_BUILD.

[Dennis Veatch]

commit 2ef09a438e0cb5badcd6cf87f8f0a000c61e8084
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Mon, 22 Sep 2014 15:40:31 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/2ef09a438e0cb5badcd6cf87f8f0a000c61e8084

seamonkey: bump to 2.29. Shared js still needs to be disabled and a few twiddles of BUILD and PRE_BUILD.
---
  web/seamonkey/BUILD     | +0/-29    
  web/seamonkey/DEPENDS   | +2/-2     
  web/seamonkey/DETAILS   | +3/-3     
  web/seamonkey/PRE_BUILD | +27/-1    
  web/seamonkey/mozconfig | +3/-1     
  5 files changed, 35 insertions(+), 36 deletions(-)

--- a/web/seamonkey/BUILD
+++ b/web/seamonkey/BUILD
@@ -1,30 +1,3 @@
-(
-
-  export MOZ_CO_PROJECT=suite  &&
-  export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
-  export MOZILLA_OFFICIAL=1  &&
-  export BUILD_OFFICIAL=1  &&
-  export MOZ_MAKE_FILES=$MAKES  &&
-  export MOZ_OPTIMIZE_FLAGS="$CFLAGS" &&
-  export MOZ_DEBUG_FLAGS="$CFLAGS" &&
-
-  cp $SCRIPT_DIRECTORY/mozconfig .  &&
-  export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
-  mkdir -p ${MOZ_OBJDIR}  &&
-
-  for flag in $OPTS; do
-    echo "ac_add_options $flag" >> mozconfig
-  done &&
-
-  if [ "$SAFE" == "y" ] ; then
-    echo "ac_add_options --enable-safe-browsing" >> mozconfig
-  fi  &&
-
-  setterm -bfreq -blength &&
-
-  if [ -n "${MAKES}" ]; then
-    echo "mk_add_options MOZ_MAKE_FLAGS='-j${MAKES}'" >> mozconfig
-  fi &&
 
   #Finally, the build!
   make -f client.mk build ${MAKES:+-j${MAKES}}  &&
@@ -42,5 +15,3 @@
   if [ -x /usr/bin/gtk-update-icon-cache -a -f /usr/share/icons/hicolor/index.theme ]; then
     gtk-update-icon-cache -f /usr/share/icons/hicolor
   fi
-
-) > $C_FIFO 2>&1
--- a/web/seamonkey/DEPENDS
+++ b/web/seamonkey/DEPENDS
@@ -22,8 +22,8 @@ optional_depends "libffi"           "--enable-system-ffi"      "--disable-system
 optional_depends "libnotify4"       "--enable-libnotify"       "--disable-libnotify"       "To enable libnotify support"
 optional_depends "openldap"         "--enable-ldap"            "--disable-ldap"            "To enable ldap support"
 optional_depends "%GECKO_RENDERER"  "--with-system-libxul"     "--without-system-libxul"   "To use system xulrunner"
-optional_depends "nspr"             "--with-system-nspr"       "--without-system-nspr"      "To use system nspr"
-optional_depends "nss"              "--with-system-nss"        "--without-system-nss"       "To use system nss"
+optional_depends "nspr"             "--with-system-nspr"       "--without-system-nspr"     "To use system nspr"
+optional_depends "nss"              "--with-system-nss"        "--without-system-nss"      "To use system nss"
 
 optional_depends "startup-notification" "--enable-startup-notification" "--disable-startup-notification" "To enable startup notification"
 optional_depends "%JAVA_SDK" "--with-java-bin-path=/usr/java/default/bin" "" "For java support"
--- a/web/seamonkey/DETAILS
+++ b/web/seamonkey/DETAILS
@@ -1,12 +1,12 @@
           MODULE=seamonkey
-         VERSION=2.26.1
+         VERSION=2.29
           SOURCE=$MODULE-$VERSION.source.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/comm-release
       SOURCE_URL=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source
-      SOURCE_VFY=sha1:3fd468206ff5bab4d916e145436afbe357d1daa0
+      SOURCE_VFY=sha1:7f7f401d8f60d420bdfe139f70fdfc29697cc077
         WEB_SITE=http://www.seamonkey-project.org
          ENTERED=20051208
-         UPDATED=20140812
+         UPDATED=20140922
            SHORT="Seamonkey is a next generation mozilla web browser"
 cat << EOF
 Seamonkey is a next generation browser that is being developed by the Free Software
--- a/web/seamonkey/PRE_BUILD
+++ b/web/seamonkey/PRE_BUILD
@@ -16,4 +16,30 @@ fi &&
 sedit "s:\$(MOZ_ZLIB_CFLAGS):\$(MOZ_ZLIB_CFLAGS) \$(MOZ_PIXMAN_CFLAGS):" config/config.mk &&
 
 # To skirt around this make failure in ftbzip2.c:183: undefined reference to `BZ2_bzDecompressInit'
- CFLAGS+=" -lbz2"
+ CFLAGS+=" -lbz2" &&
+
+ export MOZ_CO_PROJECT=suite  &&
+ export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
+ export MOZILLA_OFFICIAL=1  &&
+ export BUILD_OFFICIAL=1  &&
+ export MOZ_MAKE_FILES=$MAKES  &&
+ export MOZ_OPTIMIZE_FLAGS="$CFLAGS" &&
+ export MOZ_DEBUG_FLAGS="$CFLAGS" &&
+
+ cp $SCRIPT_DIRECTORY/mozconfig .  &&
+ export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
+ mkdir -p ${MOZ_OBJDIR}  &&
+
+ for flag in $OPTS; do
+   echo "ac_add_options $flag" >> mozconfig
+ done &&
+
+ if [ "$SAFE" == "y" ] ; then
+   echo "ac_add_options --enable-safe-browsing" >> mozconfig
+ fi  &&
+
+ setterm -bfreq -blength &&
+
+ if [ -n "${MAKES}" ]; then
+   echo "mk_add_options MOZ_MAKE_FLAGS='-j${MAKES}'" >> mozconfig
+ fi
--- a/web/seamonkey/mozconfig
+++ b/web/seamonkey/mozconfig
@@ -7,11 +7,13 @@ ac_add_options --with-system-zlib
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-bz2
 ac_add_options --enable-storage
+ac_add_options --enable-shared
 ac_add_options --enable-application=suite
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-optimize="$CFLAGS"
 ac_add_options --enable-crypto
 ac_add_options --enable-strip
+ac_add_options --enable-install-strip
 ac_add_options --enable-system-cairo
 ac_add_options --enable-xterm-updates
 ac_add_options --enable-official-branding
@@ -34,5 +36,5 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi
 ac_add_options --enable-tree-freetype
 
-#Same issue here as with firefox-31.0
+# Still tanks the make, disable it, 20140922
 ac_add_options --disable-shared-js