[Lunar-commits] <moonbase-other> seamonkey: Bump to 2.26.1.

Dennis Veatch dennisveatch at bellsouth.net
Wed Aug 13 15:18:24 CEST 2014 

commit e83a8dbfb0484fc625ffc56f19864b98d7d6ebf1
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Wed, 13 Aug 2014 09:10:33 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/e83a8dbfb0484fc625ffc56f19864b98d7d6ebf1

seamonkey: Bump to 2.26.1.

Moved somethings to PRE_BUILD from BUILD. Needed a CFLAGS
to compile with tree freetype.

A sedit needed for it to find system pixman.h.

Has the same issue as firefox-31.0 requiring --disable-shared-js.

Not catastrophic but removed the switches from CONFIGURE, was appending two of those to mozconfig.

Probably a few other observations I am forgetting but it compiles with yes to all the optional_depends (sans gnome-vfs).

Since sqlite is used to track history and bookmarks, created some history and bookmarks and noted
no issues. Granted it was not an extensive attempt but one none the less, ymmv.
---
  web/seamonkey/BUILD        | +7/-50    
  web/seamonkey/CONFIGURE    | +1/-1     
  web/seamonkey/DEPENDS      | +20/-34   
  web/seamonkey/DETAILS      | +5/-10    
  web/seamonkey/POST_INSTALL | +3/-15    
  web/seamonkey/PRE_BUILD    | +14/-2    
  web/seamonkey/mozconfig    | +5/-8     
  7 files changed, 55 insertions(+), 120 deletions(-)

--- a/web/seamonkey/BUILD
+++ b/web/seamonkey/BUILD
@@ -1,18 +1,5 @@
 (
 
-  sedit 's/@PRE_RELEASE_SUFFIX@//g' mozilla/browser/base/content/browser.xul &&
-
-  # Reverse patch which causes seamonkey build to break
-  bzcat $SOURCE_CACHE/Bug-515374.patch.bz2 | patch -p1 -R -d mozilla &&
-
-  if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
-        set_module_config OLD_VER "`installed_version $MODULE`"
-  fi  &&
-
-  # Adds support for libvpx 1.0. Later firefox will have this fix so remove this then.
-  sedit 's/VPX_CODEC_USE_INPUT_PARTITION/VPX_CODEC_USE_INPUT_FRAGMENTS/' mozilla/configure  &&
-  sedit 's/v0\.9\.7/v1.0.0/' configure  &&
-
   export MOZ_CO_PROJECT=suite  &&
   export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
   export MOZILLA_OFFICIAL=1  &&
@@ -25,50 +12,20 @@
   export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
   mkdir -p ${MOZ_OBJDIR}  &&
 
-  #Add DEPENDS options
-
-  if in_depends $MODULE gnome-vfs ; then
-    echo "ac_add_options --enable-gnomevfs" >> mozconfig
-  else
-    echo "ac_add_options --disable-gnomevfs" >> mozconfig
-  fi  &&
-
-  if in_depends $MODULE libevent ; then
-    echo "ac_add_options --with-system-libevent" >> mozconfig
-  else
-    echo "ac_add_options --without-system-libevent" >> mozconfig
-  fi  &&
-
-  if in_depends $MODULE dbus-glib ; then
-    echo "ac_add_options --enable-dbus" >> mozconfig
-  else
-    echo "ac_add_options --disable-dbus" >> mozconfig
-  fi  &&
-
-  if in_depends $MODULE libffi ; then
-    echo "ac_add_options --enable-system-ffi" >> mozconfig
-  else
-    echo "ac_add_options --disable-system-ffi" >> mozconfig
-  fi  &&
-
-  if in_depends $MODULE sun-jdk ; then
-    echo "ac_add_options --with-java-bin-path=/usr/java/default/bin" >> mozconfig
-  fi  &&
-
-  #Add CONFIGURE options
+  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  &&
 
-  if in_depends $MODULE openldap ; then
-    echo "ac_add_options --enable-ldap" >> mozconfig
-  else
-    echo "ac_add_options --disable-ldap" >> 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}}  &&
 
--- a/web/seamonkey/CONFIGURE
+++ b/web/seamonkey/CONFIGURE
@@ -1 +1 @@
-mquery SAFE "Enable safe browsing (anti-phishing)?"  y  "--enable-safe-browsing"  ""
+mquery SAFE "Enable safe browsing (anti-phishing)?"  y
--- a/web/seamonkey/DEPENDS
+++ b/web/seamonkey/DEPENDS
@@ -1,43 +1,29 @@
-depends ORBit2
+depends pixman
+depends freetype2
+depends cairo
+depends curl
 depends zip
 depends unzip
+depends ORBit2
 depends gtk+-2
-depends nss
-depends curl
 depends alsa-lib
 depends libvpx
 
-# Seamonkey crashes with sqlite 3.6.18 when adding new bookmarks:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=512940
-# Comment 9:  "System SQLite isn't supported by Mozilla (in fact we discourage its use)"
-# So, disable the option to use system sqlite - instead, use Mozilla's version
-#optional_depends "sqlite"  ""  ""  \
-#                 "Use system sqlite"
 
-optional_depends "Python"           ""  ""  "Needed to do a Profile Guided Optimization build"
 optional_depends "flash-plugin-11"  ""  ""  "To enable Flash plugin"
-optional_depends "gnome-vfs"        ""  ""  "For Gnome VFS support"
-optional_depends "hunspell"         "--enable-system-hunspell"  "--disable-system-hunspell"  "For spelling support"
-
-# $OPTS is ignored in this BUILD
-optional_depends "libevent"         ""  ""  "For event detection"
-optional_depends "dbus-glib"        ""  ""  "For dbus support"
-optional_depends "libffi" "" "" "Use system libffi instead of compiling the one in firefox"
-
-optional_depends "startup-notification"  "--enable-startup-notification"  ""  \
-                 "To enable startup notification"
-
-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 --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL"  ""  \
-                 "To use system xulrunner"
-
-optional_depends "nspr"  "--with-system-nspr"  ""  \
-                "To use system nspr"
+optional_depends "Python"           ""  ""  "Needed to do a Profile Guided Optimization build"
 
-optional_depends "nss"  "--with-system-nss"  ""  \
-                 "To use system nss"
+optional_depends "sqlite"           "--enable-system-sqlite"   "--disable-system-sqlite"   "Use system sqlite. ${PROBLEM_COLOR}Not recommended${DEFAULT_COLOR}"
+optional_depends "gnome-vfs"        "--enable-gnomevfs"        "--disable-gnomevfs"        "For Gnome VFS support"
+optional_depends "hunspell"         "--enable-system-hunspell" "--disable-system-hunspell" "For spelling support"
+optional_depends "libevent"         "--with-system-libevent"   "--without-system-libevent" "For event detection"
+optional_depends "dbus-glib"        "--enable-dbus"            "--disable-dbus"            "For dbus support"
+optional_depends "libffi"           "--enable-system-ffi"      "--disable-system-ffi"      "Use system libffi instead of compiling the one in firefox"
+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 "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,19 +1,14 @@
           MODULE=seamonkey
-         VERSION=2.13.2
+         VERSION=2.26.1
           SOURCE=$MODULE-$VERSION.source.tar.bz2
-         SOURCE2=Bug-515374.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/comm-release
-   SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/$MODULE/releases/$VERSION/source
-   SOURCE_URL[1]=ftp://mozilla.isc.org/pub/mozilla.org/$MODULE/releases/$VERSION/source
-   SOURCE_URL[2]=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source
-     SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:fea6d026c10a64bd987f38a5068acc20fae931ef
-     SOURCE2_VFY=sha1:2e31bd69350b870e54fb7909e42038c12a592ea1
+      SOURCE_URL=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source
+      SOURCE_VFY=sha1:3fd468206ff5bab4d916e145436afbe357d1daa0
         WEB_SITE=http://www.seamonkey-project.org
          ENTERED=20051208
-         UPDATED=20121028
+         UPDATED=20140812
            SHORT="Seamonkey is a next generation mozilla web browser"
-
+PSAFE=no
 cat << EOF
 Seamonkey is a next generation browser that is being developed by the Free Software
 Community. Initially, its development was based on a last beta version of Mozilla Web Suite.
--- a/web/seamonkey/POST_INSTALL
+++ b/web/seamonkey/POST_INSTALL
@@ -9,20 +9,8 @@ if [ ! -z "$OLD_VER" ] && [ "$OLD_VER" != "$NEW_VER" ] ; then
 fi
 unset_module_config OLD_VER
 
-rm -rf /usr/lib/seamonkey-1*
-rm -rf /usr/lib/seamonkey-2.[02-9]*
-rm -rf /usr/lib/seamonkey-devel-2.[02-9]*
+ln -snf /usr/lib/lunar/plugins /usr/lib/$MODULE-$VERSION/plugins
 
-ln -snf /opt/lunar/plugins /usr/lib/$SMNKEY_LIBDIR/plugins
-
-export LD_LIBRARY_PATH="/usr/lib/$SMNKEY_LIBDIR:/opt/lunar/plugins:/usr/lib/$SMNKEY_LIBDIR/components"
-export MOZILLA_FIVE_HOME="/usr/lib/$SMNKEY_LIBDIR"
+export LD_LIBRARY_PATH="/usr/lib/$MODULE-$VERSION:/opt/lunar/plugins:/usr/lib/$MODULE-$VERSION/components"
+export MOZILLA_FIVE_HOME="/usr/lib/$MODULE-$VERSION"
 ldconfig
-
-# Added the symlinks back now that zbiggy has removed mozilla from moonbase
-rm -rf /usr/lib/mozilla
-ln -snf /usr/lib/$SMNKEY_LIBDIR /usr/lib/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
--- a/web/seamonkey/PRE_BUILD
+++ b/web/seamonkey/PRE_BUILD
@@ -1,7 +1,19 @@
+default_pre_build &&
+
 if [ ! -e /usr/include/cairo/cairo-tee.h ] ; then
   message "${PROBLEM_COLOR}Run:  ${MODULE_COLOR}lin -c cairo"
   message "${MESSAGE_COLOR}To recompile cairo with tee support, which is required by Seamonkey.${DEFAULT_COLOR}"
   exit 1
-fi
+fi &&
+
+sedit 's/@PRE_RELEASE_SUFFIX@//g' mozilla/browser/base/content/browser.xul &&
+
+if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
+     set_module_config OLD_VER "`installed_version $MODULE`"
+fi &&
+
+#Can't find pixman.h
+sedit "s:\$(MOZ_ZLIB_CFLAGS):\$(MOZ_ZLIB_CFLAGS) \$(MOZ_PIXMAN_CFLAGS):" config/config.mk &&
 
-default_pre_build
+# To skirt around this make failure in ftbzip2.c:183: undefined reference to `BZ2_bzDecompressInit'
+ CFLAGS+=" -lbz2"
--- a/web/seamonkey/mozconfig
+++ b/web/seamonkey/mozconfig
@@ -12,10 +12,7 @@ ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-optimize="$CFLAGS"
 ac_add_options --enable-crypto
 ac_add_options --enable-strip
-#seamonkey 12 will not build with system cairo
-#because it uses some mozilla made extensions/private functions
-#so disable it till this will work again
-#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-cairo
 ac_add_options --enable-xterm-updates
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
@@ -30,12 +27,12 @@ ac_add_options --disable-os2-high-mem
 ac_add_options --enable-gio
 ac_add_options --enable-raw
 ac_add_options --with-system-libvpx
-ac_add_options --enable-shared-js
 ac_add_options --enable-system-pixman
 ac_add_options --enable-calendar
-#seamonkey 12 will not build with tree freetype
-#ac_add_options --enable-tree-freetype
 ac_add_options --enable-static-mail
 ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi
-ac_add_options --disable-system-sqlite
+ac_add_options --enable-tree-freetype
+
+#Same issue here as with firefox-31.0
+ac_add_options --disable-shared-js

More information about the Lunar-commits mailing list