summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sherwood2011-08-04 21:49:00 -0500
committerGeorge Sherwood2011-08-04 21:49:00 -0500
commit700cd2f1359dbcedac0e028f4894467e34ae8136 (patch)
tree0099efe03c923074e56627a83dfb69f98c92ae64
parent1847a92f3ed0a980fa20c4dda08e4e0e0a1adbd5 (diff)
seamonkey: Removed apparently broken option to build without mail
news client. Added sub_depends on nss 3.12.x. Resolves issue #7
-rwxr-xr-xhttp/seamonkey/CONFIGURE7
-rwxr-xr-xhttp/seamonkey/DEPENDS2
-rw-r--r--http/seamonkey/HISTORY5
-rwxr-xr-xhttp/seamonkey/PRE_BUILD7
4 files changed, 14 insertions, 7 deletions
diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index 051ba8780d..e0e60fd1f9 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -1,9 +1,10 @@
config_query SEAMONKEY_OFFICIAL "Enable official branding? If enabled, you may \
be restricted in distributing these binaries IAW mozilla policies" n &&
-config_query SEAMONKEY_MAILNEWS \
- "Build Mail News client?" \
- n &&
+#Will not build without the Mail News client
+#config_query SEAMONKEY_MAILNEWS \
+# "Build Mail News client?" \
+# n &&
config_query SEAMONKEY_COMPOSER \
'Build Composer component?' \
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index 73d13903a6..fb515bdb58 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -6,7 +6,7 @@ depends JPEG &&
depends libidl &&
depends libxft &&
depends nspr &&
-depends nss &&
+depends -sub 3.12.x nss &&
depends perl &&
depends zip &&
depends zlib &&
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index c61d86534d..d640acb7d9 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,8 @@
+2011-08-04 George Sherwood <gsherwood@sourcemage.org>
+ * CONFIGURE: Removed option to build without mail news client
+ * DEPENDS: Added sub_depends on nss 3.12.x
+ * PRE_BUILD: Removed option to build without mail news client
+
2011-08-02 George Sherwood <gsherwood@sourcemage.org>
* CONFIGURE: Removed old useless options
Added option to strip and official branding
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 858a9bbea7..9fff8df468 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -9,9 +9,10 @@ if [[ "$SEAMONKEY_OFFICIAL" == "y" ]]; then
sed -i '78iac_add_options --enable-official-branding' .mozconfig
fi &&
-if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
- sed -i '78iac_add_options --disable-mailnews' .mozconfig
-fi &&
+#This option is broke will not build without mailnews component
+#if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
+# sed -i '78iac_add_options --disable-mailnews' .mozconfig
+#fi &&
if [[ "$SEAMONKEY_COMPOSER" == "n" ]]; then
sed -i '78iac_add_options --disable-composer' .mozconfig