Skip to Content.
Sympa Menu

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

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 (a475117cbdb17a23867890a6e77b1be598343a02)
  • Date: Fri, 14 Nov 2008 07:56:53 -0600

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

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

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

firefox: Added code to select correct nspr/nss depending on
what is installed. Still not sure this is all perfect, but
getting closer.

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index d150fa4..76e0775 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -2,6 +2,10 @@ depends atk &&
depends curl &&
depends g++ &&
depends glib2 &&
+if spell_ok nss && [[ $(installed_version nss) == 3.12* ]]; then
+ depends nspr &&
+ depends nss
+fi &&
depends jpeg &&
depends pango &&
depends perl &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 53da0f1..f1f5d14 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,11 @@
+2008-11-14 George Sherwood <george AT beernabeer.com>
+ * PRE_BUILD: Added option for system-nspr/nss if versions are
+ good.
+ * DEPENDS: If installed versions are correct depend nss/nspr
+ otherise use bundled versions
+ * mozconfig3: Removed nss/nspr options add conditionaly
+ depending on installed versions.
+
2008-11-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.4
* INSTALL: fixed linking with installed xulrunner plugins' path;
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 0f0e63d..1db2e7d 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,6 +11,11 @@ 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 af44dd3..bf5c59c 100644
--- a/http/firefox/mozconfig3
+++ b/http/firefox/mozconfig3
@@ -7,8 +7,6 @@ mk_add_options MOZ_CO_PROJECT=browser

# Options for 'configure' (same as command-line options).
ac_add_options --with-pthreads
-ac_add_options --with-system-nspr
-ac_add_options --without-system-nss
ac_add_options --with-system-jpeg=/usr/lib
ac_add_options --with-system-zlib=/usr/lib
ac_add_options --with-system-png=/usr/lib



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

Archive powered by MHonArc 2.6.24.

Top of Page