[Lunar-commits] <moonbase> seamonkey: updated to 2.1
Zbigniew Luszpinski
zbiggy at lunar-linux.org
Sat Jul 2 16:58:19 CEST 2011
commit ce7dc130d24adb778f9ec9abf556540978b935a1
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date: Sat Jul 2 16:58:19 2011 +0200
seamonkey: updated to 2.1
---
web/seamonkey/BUILD | 94 +++++++++++++++++++++++----------------
web/seamonkey/CONFIGURE | 2 +
web/seamonkey/DEPENDS | 34 +++++++++++---
web/seamonkey/DETAILS | 7 ++-
web/seamonkey/POST_INSTALL | 11 +----
web/seamonkey/POST_REMOVE | 5 --
web/seamonkey/PRE_BUILD | 10 +++--
web/seamonkey/mozconfig | 31 ++++++-------
web/seamonkey/seamonkey.desktop | 2 +-
9 files changed, 110 insertions(+), 86 deletions(-)
diff --git a/web/seamonkey/BUILD b/web/seamonkey/BUILD
index 41a65a7..e6eb272 100644
--- a/web/seamonkey/BUILD
+++ b/web/seamonkey/BUILD
@@ -1,65 +1,81 @@
(
- # 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`"
fi &&
- # This should always be just a link
- rm -rf /usr/lib/$MODULE-$VERSION/plugins &&
-
- export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
- export MOZILLA_OFFICIAL=1
- export BUILD_OFFICIAL=1
+ export MOZ_CO_PROJECT=suite &&
+ export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
+ export MOZILLA_OFFICIAL=1 &&
+ export BUILD_OFFICIAL=1 &&
- cp $SCRIPT_DIRECTORY/mozconfig comm-1.9.1/ &&
-
- export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"
+ cp $SCRIPT_DIRECTORY/mozconfig . &&
+ cp suite/config/version-20.txt mail/config/ &&
+ find . -type f -name 'Makefile*' -exec sed -i 's/elif/else if/' {} \; &&
+ 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 &&
- cd .. &&
+ echo "ac_add_options --disable-necko-wifi" >> mozconfig &&
+ echo "ac_add_options --disable-system-sqlite" >> mozconfig &&
#Add DEPENDS options
- if in_depends $MODULE dbus ; then
+ 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 sqlite ; then
- echo "ac_add_options --enable-system-sqlite" >> mozconfig
+ if in_depends $MODULE sun-jdk ; then
+ echo "ac_add_options --with-java-include-path=/usr/java/default/include" >> mozconfig &&
+ echo "ac_add_options --with-java-bin-path=/usr/java/default/bin" >> mozconfig &&
+ echo "ac_add_options --enable-javaxpcom" >> 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
+ #Add CONFIGURE options
+
+ if [ "$SAFE" == "y" ] ; then
+ echo "ac_add_options --enable-safe-browsing" >> mozconfig
fi &&
setterm -bfreq -blength &&
#Finally, the build!
- default_build &&
-
- # 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.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
+ 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 build &&
+ make -f client.mk profiledbuild
+ else
+ make -f client.mk build
+ fi &&
+
+ cd ${MOZ_OBJDIR} &&
+ prepare_install &&
+ make install || exit 1
+
+ # Now the .desktop file and icons
+ install -Dm 644 {"$SCRIPT_DIRECTORY",/usr/share/applications}/seamonkey.desktop &&
+
+ for s in 16 48 ; do
+ install -Dm 644 mozilla/dist/seamonkey/chrome/icons/default/default${s}.png /usr/share/icons/hicolor/${s}x${s}/apps/seamonkey.png
+ done &&
+ if [ -x /usr/bin/gtk-update-icon-cache ] ; then
+ gtk-update-icon-cache -f /usr/share/icons/hicolor/
+ fi
) > $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 a795775..8c65ec8 100644
--- a/web/seamonkey/DEPENDS
+++ b/web/seamonkey/DEPENDS
@@ -1,11 +1,11 @@
depends ORBit2
depends zip
depends unzip
-depends expat
depends gtk+-2
depends nss
depends curl
-depends startup-notification
+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
@@ -14,11 +14,29 @@ depends startup-notification
#optional_depends "sqlite" "" "" \
# "Use system sqlite"
-optional_depends "flash-plugin-10" "" "" \
- "To enable Flash plugin"
+optional_depends "Python" "" "" "Needed to do a Profile Guided Optimization build"
+optional_depends "flash-plugin-10" "" "" "To enable Flash plugin"
+optional_depends "gnome-vfs" "" "" "For Gnome VFS support"
+optional_depends "hunspell" "--enable-system-hunspell" "--disable-system-hunspell" "For spelling support"
-optional_depends "gnome-vfs" "" "" \
- "For Gnome VFS support"
+# $OPTS is ignored in this BUILD
+optional_depends "libevent" "" "" "For event detection"
+optional_depends "dbus-glib" "" "" "For dbus support"
-optional_depends "Python" "" "" \
- "Needed to do a Profile Guided Optimization build"
+optional_depends "startup-notification" "--enable-startup-notification" "" \
+ "To enable startup notification"
+
+optional_depends "libnotify" "--enable-libnotify" "--disable-libnotify" \
+ "To enable libnotify support"
+
+optional_depends "openldap" "--enable-ldap" "--disable-ldap" \
+ "To enable ldap support"
+
+optional_depends "xulrunner" "--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 "nss" "--with-system-nss" "" \
+ "To use system nss"
diff --git a/web/seamonkey/DETAILS b/web/seamonkey/DETAILS
index bd9295c..06d170e 100644
--- a/web/seamonkey/DETAILS
+++ b/web/seamonkey/DETAILS
@@ -1,14 +1,15 @@
MODULE=seamonkey
- VERSION=2.0.14
+ VERSION=2.1
SOURCE=$MODULE-$VERSION.source.tar.bz2
SOURCE_URL[0]=ftp://mozilla.isc.org/pub/mozilla.org/$MODULE/releases/$VERSION/source
SOURCE_URL[1]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/$MODULE/releases/$VERSION/source
SOURCE_URL[2]=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source
- SOURCE_VFY=sha1:363b63c16f8e23c84cf55f886b1ae4b9ea266d46
+ SOURCE_VFY=sha1:8d48aaf5ff3a5e88bf8c93b8414776a085f370d5
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/comm-2.0
WEB_SITE=http://www.seamonkey-project.org
PSAFE=no
ENTERED=20051208
- UPDATED=20110430
+ UPDATED=20110617
MAINTAINER=zbiggy at o2.pl
SHORT="Seamonkey is a next generation mozilla web browser"
diff --git a/web/seamonkey/POST_INSTALL b/web/seamonkey/POST_INSTALL
index 9055151..81318e1 100644
--- a/web/seamonkey/POST_INSTALL
+++ b/web/seamonkey/POST_INSTALL
@@ -9,16 +9,7 @@ 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
-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
+rm -rf /usr/lib/seamonkey-2.0*
ln -snf /opt/lunar/plugins /usr/lib/$SMNKEY_LIBDIR/plugins
diff --git a/web/seamonkey/POST_REMOVE b/web/seamonkey/POST_REMOVE
deleted file mode 100644
index 7b21cea..0000000
--- a/web/seamonkey/POST_REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-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.png
diff --git a/web/seamonkey/PRE_BUILD b/web/seamonkey/PRE_BUILD
index cc901d0..9574723 100644
--- a/web/seamonkey/PRE_BUILD
+++ b/web/seamonkey/PRE_BUILD
@@ -1,5 +1,7 @@
-validate_source_dir &&
-mk_source_dir &&
+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 Seamonkey2.1.${DEFAULT_COLOR}"
+ exit 1
+fi
-cd $SOURCE_DIRECTORY &&
-unpack $SOURCE
+default_pre_build
diff --git a/web/seamonkey/mozconfig b/web/seamonkey/mozconfig
index cf35e0f..a3a47b0 100644
--- a/web/seamonkey/mozconfig
+++ b/web/seamonkey/mozconfig
@@ -4,41 +4,40 @@ 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-png
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-default-toolkit=cairo-gtk2
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-canvas
ac_add_options --enable-svg
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 --enable-libxul
+ac_add_options --enable-official-branding
ac_add_options --enable-jemalloc
-ac_add_options --enable-calendar
-ac_add_options --enable-startup-notification
-ac_add_options --disable-pedantic
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
ac_add_options --enable-mathml
-#ac_add_options --with-java-include-path=/usr/java/include
-#ac_add_options --with-java-bin-path=/usr/java/bin
-#ac_add_options --enable-javaxpcom
-#ac_add_options --enable-extensions=$MOZ_EXTENSIONS
+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-splashscreen
+ac_add_options --enable-shared-js
+ac_add_options --enable-system-pixman
ac_add_options --enable-image-decoders=all
ac_add_options --enable-image-encoders=all
-
+ac_add_options --enable-calendar
+ac_add_options --enable-functiontimer
+ac_add_options --enable-timeline
+ac_add_options --enable-tree-freetype
+ac_add_options --enable-faststart
diff --git a/web/seamonkey/seamonkey.desktop b/web/seamonkey/seamonkey.desktop
index 8c66ec8..a7e3d8e 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.png
+Icon=seamonkey
Terminal=false
Type=Application
Categories=Application;Network;
More information about the Lunar-commits
mailing list