Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4db7100b25280e5dfc17a93f97a1d2ace58b7c1f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4db7100b25280e5dfc17a93f97a1d2ace58b7c1f)
  • Date: Sun, 20 Mar 2011 06:16:52 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/seamonkey/BUILD | 2 +-
http/seamonkey/DEPENDS | 30 ++++++------------------------
http/seamonkey/HISTORY | 8 ++++++++
http/seamonkey/PRE_BUILD | 24 +++++++++++++++++++++---
http/seamonkey/blfs-mozconfig | 12 ++++++++++--
5 files changed, 46 insertions(+), 30 deletions(-)

New commits:
commit 4db7100b25280e5dfc17a93f97a1d2ace58b7c1f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey: dependency fixes

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 &&

#
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index 71422ef..8f08f6e 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -5,11 +5,9 @@ depends gtk+2 &&
depends JPEG &&
depends libidl &&
depends -sub APNG libpng &&
-depends libxft &&
-if spell_ok nss && [[ $(installed_version nss) == 3.11* ]]; then
-depends nspr '--with-system-nspr' &&
-depends nss '--with-system-nss --enable-crypto'
-fi &&
+depends libxft &&
+depends nspr &&
+depends nss &&
depends perl &&
depends zip &&
depends zlib &&
@@ -21,22 +19,6 @@ if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
depends pango
fi &&

-optional_depends alsa-lib \
- "" "--disable-ogg --disable-wave" \
- "for audio support" &&
-
-# not tested
-optional_depends openldap \
- '--enable-ldap' \
- '--disable-ldap' \
- 'LDAP support' &&
-
-optional_depends gnome-vfs2 \
- "--enable-gnomevfs" \
- "--disable-gnomevfs" \
- "for smb:// url support (if enabled in gnome-vfs)" &&
-
-optional_depends libgnomeui \
- "--enable-gnomeui" \
- "--disable-gnomeui" \
- "For GNOME UI support"
+optional_depends alsa-lib "" "" "for audio support" &&
+optional_depends openldap "" "" "for LDAP support" &&
+optional_depends gnome-vfs2 "" "" "for smb:// url support (if enabled in
gnome-vfs2)"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 8fa84bc..5236ee5 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,11 @@
+2011-03-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: use OPTS in the end
+ * DEPENDS: removed useless flags; sm works fine with system nss 3.12
+ removed libgnomeui support -- currently broken
+ * PRE_BUILD: apply the flags here
+ * blfs-mozconfig: don't force strip and ldap support; readded system
nss
+ flags
+
2011-03-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.12, SECURITY_PATCH=30

diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index dea446d..2e7547d 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -5,8 +5,6 @@ cd comm-1.9.1 &&

cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&

-#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,26 @@ 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 gnome-vfs2; then
+ sed -i '78iac_add_options --enable-gnomevfs' .mozconfig
+else
+ sed -i '78iac_add_options --disable-gnomevfs' .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 &&
+
+# GnomeUI support is broken (at least for download manager)
+echo "ac_add_options --disable-gnomeui" >> .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 master grimoire by Vlad Glagolev (4db7100b25280e5dfc17a93f97a1d2ace58b7c1f), Vlad Glagolev, 03/20/2011

Archive powered by MHonArc 2.6.24.

Top of Page