New commits:
commit cb23a83d6dc83d9c1354abcbbb89fb16ff681bec
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>
seamonkey 2.0.13, SECURITY_PATCH=31
(cherry picked from commit 67a412b0b69d97eb7c3565619a812d555d3481c4)
commit ac54bff61be9b50d633d4858a4747fef2d7d1843
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
seamonkey: gnome-vfs2 is broken too
(cherry picked from commit 1947b68b99cb615600e564ee983c4a89c9bacec6)
commit 642e5addfe874d578b592f193646ae245e119b95
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
seamonkey: dependency fixes
(cherry picked from commit 4db7100b25280e5dfc17a93f97a1d2ace58b7c1f)
diff --git a/http/seamonkey/BUILD b/http/seamonkey/BUILD
index c13d772..170fd3d 100755
--- a/http/seamonkey/BUILD
+++ b/http/seamonkey/BUILD
@@ -5,7 +5,7 @@ MOZILLA_HOME=$INSTALL_ROOT/usr/lib/seamonkey &&
# Only strip if the user wants us to
#
if echo $LDFLAGS | grep -q -- '-s'; then
- OPTS="$OPTS --enable-strip"
+ OPTS="--enable-strip $OPTS"
fi &&
-#cp -v $SPELL_DIRECTORY/blfs-mozconfig mozilla/.mozconfig &&
-
if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
sed -i '78iac_add_options --enable-system-cairo' .mozconfig
else
@@ -33,6 +31,21 @@ fi &&
if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
sed -i '78iac_add_options --enable-pango' .mozconfig
-fi
+fi &&
+
+if is_depends_enabled $SPELL openldap; then
+ sed -i '78iac_add_options --enable-ldap' .mozconfig
+else
+ sed -i '78iac_add_options --disable-ldap' .mozconfig
+fi &&
+
+if ! is_depends_enabled $SPELL alsa-lib; then
+ sed -i '78iac_add_options --disable-ogg' .mozconfig &&
+ sed -i '78iac_add_options --disable-wave' .mozconfig
+fi &&
+
+# GNOME support is broken (at least for download manager)
+echo "ac_add_options --disable-gnomeui" >> .mozconfig &&
+echo "ac_add_options --disable-gnomevfs" >> .mozconfig &&
echo "ac_add_options --disable-crashreporter" >> .mozconfig
diff --git a/http/seamonkey/blfs-mozconfig b/http/seamonkey/blfs-mozconfig
index 5074cd3..fb0d7ee 100644
--- a/http/seamonkey/blfs-mozconfig
+++ b/http/seamonkey/blfs-mozconfig
@@ -43,7 +43,7 @@ ac_add_options --enable-canvas
# this option if you may have a need to retain the debugging symbols
# in the installed binaries. Note that this can substantially
# increase the size of the installed binaries.
-ac_add_options --enable-strip
+#ac_add_options --enable-strip
# This option is added so that test libraries and programs are not
# built. These would only be required for debugging purposes.
@@ -64,7 +64,7 @@ ac_add_options --enable-svg
# This option is used to enable source tree included LDAP support in
# the SeaMonkey binaries.
-ac_add_options --enable-ldap
+#ac_add_options --enable-ldap
# Uncomment this option if you desire support for dual-monitor
# display of SeaMonkey using the X-Window Xinerama libraries.
@@ -80,3 +80,11 @@ ac_add_options --enable-ldap
# option is not required for end-user browsing, and is only used for
# development purposes.
ac_add_options --with-default-mozilla-five-home=/usr/lib/seamonkey
+
+# These two options enable support for building SeaMonkey with
+# system-installed versions of the Network Security Services (NSS)
+# and Netscape Portable Runtime (NSPR) libraries. Uncomment both
+# lines to enable support for system-installed NSS/NSPR.
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --enable-crypto
[SM-Commit] GIT changes to stable-0.54 grimoire by George Sherwood (cb23a83d6dc83d9c1354abcbbb89fb16ff681bec),
George Sherwood, 03/26/2011