[Lunar-commits] <moonbase> seamonkey: updated to 2.0 Since 2.0 release Seamonkey is based on Firefox 3.5.4 engine. Except classic UI and behaviour this is just Firefox.

Zbigniew Luszpinski zbiggy at lunar-linux.org
Thu Nov 5 21:17:28 CET 2009


commit 62c84880659e99e2f9ec87a33b20c97c7bede805
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Thu Nov 5 21:17:28 2009 +0100

    seamonkey: updated to 2.0
    Since 2.0 release Seamonkey is based on Firefox 3.5.4 engine.
    Except classic UI and behaviour this is just Firefox.
---
 web/seamonkey/BUILD             |  133 ++++++++++++++++-----------------------
 web/seamonkey/CONFIGURE         |    2 +
 web/seamonkey/DEPENDS           |   25 ++++++--
 web/seamonkey/DETAILS           |   14 +++--
 web/seamonkey/POST_INSTALL      |   15 +++--
 web/seamonkey/POST_REMOVE       |    2 +-
 web/seamonkey/PRE_BUILD         |    5 ++
 web/seamonkey/mozconfig         |   29 +++++++++
 web/seamonkey/seamonkey.desktop |    2 +-
 9 files changed, 128 insertions(+), 99 deletions(-)

diff --git a/web/seamonkey/BUILD b/web/seamonkey/BUILD
index 8225873..98df213 100644
--- a/web/seamonkey/BUILD
+++ b/web/seamonkey/BUILD
@@ -1,99 +1,74 @@
 (
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
-  fi &&
+  fi  &&
 
   # This should always be just a link
-  rm -rf /usr/lib/seamonkey-$VERSION/plugins &&
+  rm -rf /usr/lib/$MODULE-$VERSION/plugins  &&
 
-  # Do not conflict with the same plugin from firefox
-  sedit 's/nullplugin$/nullpluginSM/' modules/plugin/samples/default/unix/Makefile.in &&
+  export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
+  export MOZILLA_OFFICIAL=1
+  export BUILD_OFFICIAL=1
 
-  MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
+  cp $SCRIPT_DIRECTORY/mozconfig comm-1.9.1/  &&
+
+  export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"
+  mkdir -p ${MOZ_OBJDIR}  &&
+
+  cd comm-1.9.1/mozilla &&
+  # Do not conflict with the same plugin from firefox
+  sedit 's/nullplugin$/nullpluginSM/' modules/plugin/default/unix/Makefile.in &&
+  patch_it $SOURCE2 1 &&
+  cd .. &&
 
-  MOZ_EXTENSIONS="default,xmlextras,xforms,webservices,universalchardet,transformiix,tasks,schema-validation,reporter,cookie,cview,datetime,finger,p3p,permissions,spellcheck,irc,wallet,-gnomevfs"
+  #Add DEPENDS options
 
-  if in_depends $MODULE heimdal ; then
-        MOZ_EXTENSIONS="${MOZ_EXTENSIONS},auth"
+  if in_depends $MODULE dbus ; then
+    echo "ac_add_options --enable-dbus" >> mozconfig
   else
-        MOZ_EXTENSIONS="${MOZ_EXTENSIONS},-auth"
-  fi &&
+    echo "ac_add_options --disable-dbus" >> mozconfig
+  fi  &&
 
-  # This hack added to fix a gtk+-2/pango/atk update that broke seamonkey. This should be removed in the future.
-  sedit "s/(MOZ_GTK2_LIBS)/(MOZ_GTK2_LIBS) -lX11 -lXrender/" layout/build/Makefile.in &&
+  if in_depends $MODULE sqlite ; then
+    echo "ac_add_options --enable-system-sqlite" >> mozconfig
+  fi  &&
 
-  export MOZ_FREETYPE2="no"
-  export MOZ_PANGO="yes"
-  export MOZ_CO_PROJECT=suite
-  export MOZILLA_OFFICIAL=1
-  export BUILD_OFFICIAL=1
-  export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-  export MOZ_NSS_AUTOCONF=1
-  export NATIVE_THEME_SUPPORT=1
-  export MOZILLA_USE_XFT=1
-  export BUILD_OPT=1
-
-  ./configure           \
-    --prefix=/usr       \
-    --with-x            \
-    --with-pthreads     \
-    --with-default-mozilla-five-home=$MOZILLA_HOME \
-    --with-user-appdir=.seamonkey     \
-    --with-system-zlib  \
-    --with-system-png   \
-    --with-system-jpeg  \
-    --enable-extensions=${MOZ_EXTENSIONS}       \
-    --enable-application=suite     \
-    --enable-default-toolkit=gtk2  \
-    --enable-optimize="$CFLAGS"    \
-    --enable-xft        \
-    --enable-reorder    \
-    --enable-cpp-rtti   \
-    --enable-cpp-exceptions \
-    --enable-crypto     \
-    --enable-strip      \
-    --enable-strip-libs \
-    --enable-canvas     \
-    --enable-svg        \
-    --enable-svg-renderer=cairo  \
-    --enable-system-cairo        \
-    --enable-xterm-updates       \
-    --disable-debug     \
-    --disable-tests     \
-    --disable-installer \
-    --disable-pedantic  \
-    --disable-logging   \
-    --disable-accessibility     \
-    --disable-ldap      \
-    --disable-profilesharing    \
-    --enable-mathml     \
-    --disable-xinerama \
-    --disable-gnomeui  \
-    --enable-glitz      \
-    --disable-pango \
-    --disable-gnomevfs \
-    $OPTS               &&
+  if in_depends $MODULE "xulrunner" ; then
+    XUL=`module_version xulrunner`
+    echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
+  fi  &&
 
-  setterm -bfreq -blength &&
-  default_make        &&
+  if [ "$SAFE" == "y" ] ; then
+    echo "ac_add_options --enable-safe-browsing" >> mozconfig
+  fi  &&
 
-  # Put some important headers in place
-  mkdir -p /usr/include/seamonkey-$VERSION/nss &&
-  cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/seamonkey-$VERSION/nss &&
+  setterm -bfreq -blength &&
 
-  # Install the plugins in the right directories
-  mkdir -p /opt/lunar/plugins         &&
-  for plugin in `ls /usr/lib/seamonkey-$VERSION/plugins`; do
-       `install -m755 /usr/lib/seamonkey-$VERSION/plugins/$plugin /opt/lunar/plugins`; done  &&
+  #Finally, the build!
+  if [ "$PGO" == "y" ] ; then
+    #CCache breaks the pgo build
+    export CCACHE_DISABLE=1
+    echo "ac_add_options --enable-profile-guided-optimization" >> mozconfig  &&
+    echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig  &&
+    make -f client.mk profiledbuild
+  else
+    make -f client.mk build
+  fi  &&
 
-  rm -rf /usr/lib/seamonkey-$VERSION/plugins &&
-  ln -snf /opt/lunar/plugins /usr/lib/seamonkey-$VERSION/plugins &&
+  cd ${MOZ_OBJDIR}  &&
+  prepare_install   &&
+  make install      &&
 
   # Now the .desktop file and the icon
-  mkdir -p /usr/share/applications /usr/share/pixmaps &&
-  install -m644 $SCRIPT_DIRECTORY/seamonkey.desktop /usr/share/applications &&
-  # please, dont just let the lin fail because /usr/share/pixmaps/seamonkey.xpm is an existing symlink...
-  rm -f /usr/share/pixmaps/seamonkey.xpm &&
-  install -m644 $MOZILLA_HOME/chrome/icons/default/main-window.xpm /usr/share/pixmaps/seamonkey.xpm
+  mkdir -p /usr/share/applications /usr/share/pixmaps  &&
+  install -m644 $SCRIPT_DIRECTORY/seamonkey.desktop /usr/share/applications  &&
+  # please, dont just let the lin fail because /usr/share/pixmaps/seamonkey.png is an existing symlink...
+  rm -f /usr/share/pixmaps/seamonkey.xpm  &&
+  install -m644 $MOZILLA_HOME/chrome/icons/default/default48.png /usr/share/pixmaps/seamonkey.png  &&
+
+  for icon in `ls /usr/lib/seamonkey-$VERSION/icons`; do
+   `ln -sf /usr/lib/seamonkey-$VERSION/icons/$icon \
+           /usr/lib/seamonkey-$VERSION/chrome/icons/default/$icon`
+  done
 
 ) > $C_FIFO 2>&1
diff --git a/web/seamonkey/CONFIGURE b/web/seamonkey/CONFIGURE
new file mode 100644
index 0000000..c8311d9
--- /dev/null
+++ b/web/seamonkey/CONFIGURE
@@ -0,0 +1,2 @@
+mquery PGO "Build with Profile Guided Optimization?"  y  "--enable-profile-guided-optimization"  ""
+mquery SAFE "Enable safe browsing (anti-phishing)?"  y  "--enable-safe-browsing"  ""
diff --git a/web/seamonkey/DEPENDS b/web/seamonkey/DEPENDS
index 69037b2..4b5c969 100644
--- a/web/seamonkey/DEPENDS
+++ b/web/seamonkey/DEPENDS
@@ -1,8 +1,23 @@
 depends ORBit2
-depends libpng
-depends jpeg
-depends zlib
-depends cairo
+depends zip
+depends unzip
+depends expat
 depends gtk+-2
+depends nss
+depends curl
 
-optional_depends  "flash-plugin-10"  ""  ""  "to enable Shockwave Flash"
+# 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 "flash-plugin-10"  ""  ""  \
+                 "To enable Flash plugin"
+
+optional_depends "gnome-vfs"  ""  ""  \
+                 "For Gnome VFS support"
+
+optional_depends "Python"  ""  "" \
+                 "Needed to do a Profile Guided Optimization build"
diff --git a/web/seamonkey/DETAILS b/web/seamonkey/DETAILS
index ea95a31..97fd8d5 100644
--- a/web/seamonkey/DETAILS
+++ b/web/seamonkey/DETAILS
@@ -1,15 +1,17 @@
           MODULE=seamonkey
-         VERSION=1.1.18
+         VERSION=2.0
           SOURCE=$MODULE-$VERSION.source.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+         SOURCE2=breakpad.patch
    SOURCE_URL[0]=ftp://mozilla.isc.org/pub/mozilla.org/$MODULE/releases/$VERSION/
-   SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/
-   SOURCE_URL[2]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/$MODULE/releases/$VERSION/
-      SOURCE_VFY=sha1:11c154ea7f77f903449f3b8394678e0a2d64e7d2
+   SOURCE_URL[1]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/$MODULE/releases/$VERSION/
+   SOURCE_URL[2]=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:8b877adab13abdbe28d8e23a48c702893144b4a6
+     SOURCE2_VFY=sha1:92380304fcb778d21deb7f01f57da64229b8c351
         WEB_SITE=http://www.seamonkey-project.org/
            PSAFE=no
          ENTERED=20051208
-         UPDATED=20090904
+         UPDATED=20091104
       MAINTAINER=zbiggy at o2.pl
            SHORT="Seamonkey is a next generation mozilla web browser."
 cat << EOF
diff --git a/web/seamonkey/POST_INSTALL b/web/seamonkey/POST_INSTALL
index bfd9f88..a026b2a 100644
--- a/web/seamonkey/POST_INSTALL
+++ b/web/seamonkey/POST_INSTALL
@@ -6,14 +6,17 @@ if [ ! -z $OLD_VER ]; then
   rm -rf /usr/include/seamonkey-$OLD_VER
   rm -rf /usr/share/idl/seamonkey-$OLD_VER
 fi
-
 unset_module_config OLD_VER
 
+rm -rf /usr/lib/seamonkey-1*
+
 if [ -h /usr/lib/$SMNKEY_LIBDIR/plugins ]; then
-rm -f /usr/lib/$SMNKEY_LIBDIR/plugins
-else
-for plugin in `ls /usr/lib/seamonkey-$VERSION/plugins`; do
-`install -m755 /usr/lib/seamonkey-$VERSION/plugins/$plugin /opt/lunar/plugins/`; done
+   rm -f /usr/lib/$SMNKEY_LIBDIR/plugins
+fi
+
+if [ -d /usr/lib/$SMNKEY_LIBDIR/plugins ]; then
+   for plugin in `ls /usr/lib/seamonkey-$VERSION/plugins`; do
+       `install -m755 /usr/lib/seamonkey-$VERSION/plugins/$plugin /opt/lunar/plugins/`; done
 rm -rf /usr/lib/$SMNKEY_LIBDIR/plugins
 fi
 
@@ -23,8 +26,6 @@ export LD_LIBRARY_PATH="/usr/lib/$SMNKEY_LIBDIR:/opt/lunar/plugins:/usr/lib/$SMN
 export MOZILLA_FIVE_HOME="/usr/lib/$SMNKEY_LIBDIR"
 ldconfig
 
-cd /usr/lib/$SMNKEY_LIBDIR
-./regxpcom
 # Added the symlinks back now that zbiggy has removed mozilla from moonbase
 rm -f /usr/lib/mozilla
 ln -snf /usr/lib/$SMNKEY_LIBDIR /usr/lib/mozilla
diff --git a/web/seamonkey/POST_REMOVE b/web/seamonkey/POST_REMOVE
index 546a994..7b21cea 100644
--- a/web/seamonkey/POST_REMOVE
+++ b/web/seamonkey/POST_REMOVE
@@ -2,4 +2,4 @@ rm -fr /usr/lib/seamonkey*
 rm -fr /usr/include/seamonkey*
 rm -fr /usr/share/applications/seamonkey*
 rm -fr /usr/share/idl/seamonkey*
-rm -f /usr/share/pixmaps/seamonkey.xpm
+rm -f /usr/share/pixmaps/seamonkey.png
diff --git a/web/seamonkey/PRE_BUILD b/web/seamonkey/PRE_BUILD
new file mode 100644
index 0000000..cc901d0
--- /dev/null
+++ b/web/seamonkey/PRE_BUILD
@@ -0,0 +1,5 @@
+validate_source_dir &&
+mk_source_dir &&
+
+cd $SOURCE_DIRECTORY &&
+unpack $SOURCE
diff --git a/web/seamonkey/mozconfig b/web/seamonkey/mozconfig
new file mode 100644
index 0000000..3efc594
--- /dev/null
+++ b/web/seamonkey/mozconfig
@@ -0,0 +1,29 @@
+ac_add_options --prefix=/usr
+ac_add_options --with-x
+ac_add_options --with-pthreads
+ac_add_options --with-default-mozilla-five-home=$MOZILLA_HOME
+ac_add_options --with-user-appdir=".seamonkey"
+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-places
+ac_add_options --enable-application=suite
+ac_add_options --enable-optimize="$CFLAGS"
+ac_add_options --enable-cpp-rtti
+ac_add_options --enable-cpp-exceptions
+ac_add_options --enable-crypto
+ac_add_options --enable-strip
+ac_add_options --enable-system-cairo
+ac_add_options --enable-xterm-updates
+ac_add_options --enable-calendar
+#ac_add_options --enable-libxul
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --disable-installer
+ac_add_options --disable-pedantic
+ac_add_options --disable-logging
+ac_add_options --disable-accessibility
+ac_add_options --disable-ldap
+ac_add_options --disable-necko-wifi
diff --git a/web/seamonkey/seamonkey.desktop b/web/seamonkey/seamonkey.desktop
index b3d9d4c..7cd10ef 100644
--- a/web/seamonkey/seamonkey.desktop
+++ b/web/seamonkey/seamonkey.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=Seamonkey
 Comment=Seamonkey Web Browser
 Exec=seamonkey
-Icon=/usr/share/pixmaps/seamonkey.xpm
+Icon=/usr/share/pixmaps/seamonkey.png
 Terminal=false
 Type=Application
 Categories=Application;Network;


More information about the Lunar-commits mailing list