Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (3c583a42a2caa016e7d6ba04f93370bb405c83bb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (3c583a42a2caa016e7d6ba04f93370bb405c83bb)
  • Date: Sat, 15 Nov 2008 13:05:46 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

http/firefox/DEPENDS | 6 ++----
http/firefox/HISTORY | 7 ++++++-
http/firefox/PRE_BUILD | 5 -----
http/firefox/mozconfig3 | 2 ++
4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 3c583a42a2caa016e7d6ba04f93370bb405c83bb
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

firefox: Added sub depends on nss 3.12.x branch

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 76e0775..9d53187 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -2,10 +2,8 @@ depends atk &&
depends curl &&
depends g++ &&
depends glib2 &&
-if spell_ok nss && [[ $(installed_version nss) == 3.12* ]]; then
- depends nspr &&
- depends nss
-fi &&
+depends nspr &&
+depends -sub "3.12.x" nss &&
depends jpeg &&
depends pango &&
depends perl &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index f1f5d14..7c66548 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,4 +1,9 @@
-2008-11-14 George Sherwood <george AT beernabeer.com>
+2008-11-15 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Remove test for nss version
+ * DEPENDS: Added sub depends on nss branch 3.12.x
+ * mozconfig3: Added option for system nspr/nss
+
+2008-11-14 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: Added option for system-nspr/nss if versions are
good.
* DEPENDS: If installed versions are correct depend nss/nspr
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 1db2e7d..0f0e63d 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,11 +11,6 @@ else
cp -v $SPELL_DIRECTORY/mozconfig31 .mozconfig
fi &&

-if spell_ok nss && [[ $(installed_version nss) == 3.12* ]]; then
- sed -i '15iac_add_options --with-system-nspr' .mozconfig &&
- sed -i '15iac_add_options --with-system-nss' .mozconfig
-fi &&
-
if [[ $FIREFOX_OFFICIAL == y ]]; then
sed -i '24iac_add_options --enable-official-branding' .mozconfig
fi
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig3
index bf5c59c..e9ec093 100644
--- a/http/firefox/mozconfig3
+++ b/http/firefox/mozconfig3
@@ -10,6 +10,8 @@ ac_add_options --with-pthreads
ac_add_options --with-system-jpeg=/usr/lib
ac_add_options --with-system-zlib=/usr/lib
ac_add_options --with-system-png=/usr/lib
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
ac_add_options --enable-application=browser
ac_add_options --disable-system-cairo
ac_add_options --enable-default-toolkit=cairo-gtk2



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (3c583a42a2caa016e7d6ba04f93370bb405c83bb), George Sherwood, 11/15/2008

Archive powered by MHonArc 2.6.24.

Top of Page