Skip to Content.
Sympa Menu

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

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 (8a8a71b5f1ec511ea6b9fccd9227edc0b50d4111)
  • Date: Sat, 15 Nov 2008 12:54:45 -0600

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

http/xulrunner/DEPENDS | 6 ++----
http/xulrunner/HISTORY | 5 +++++
http/xulrunner/PRE_BUILD | 5 -----
http/xulrunner/mozconfig3 | 3 +++
4 files changed, 10 insertions(+), 9 deletions(-)

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

xulrunner: Added subdepends for nss 3.12.x branch.
Always attempt to use system libs

diff --git a/http/xulrunner/DEPENDS b/http/xulrunner/DEPENDS
index 94ef0e3..cbf9bd8 100755
--- a/http/xulrunner/DEPENDS
+++ b/http/xulrunner/DEPENDS
@@ -5,10 +5,8 @@ depends libidl &&
depends libxft &&
depends libpng &&
depends sqlite &&
-if spell_ok nss && [[ $(installed_version nss) == 3.12* ]]; then
- depends nspr &&
- depends nss
-fi &&
+depends nspr &&
+depends -sub "3.12.x" nss &&
depends perl &&
depends xorg-libs '--with-x' &&
depends zip &&
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index b5d5297..56857ef 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,8 @@
+2008-11-15 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: added sub depends on nss 3.12.x branch
+ * mozconfig3: Added use system nspr/nss
+ * PRE_BUILD: Removed test of installed version of nss
+
2008-11-13 George Sherwood <gsherwood AT sourcemage.org>
* DEPENDS: depends nss nspr if nss >= 3.12 installed
* PRE_BUILD: If nspr/nss >= 3.12 installed. Use system libs
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 9d7094b..0d66d0a 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -12,11 +12,6 @@ echo "Requires: nspr" >>
xulrunner/installer/libxul-embedding.pc.in &&

cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&

-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/xulrunner/mozconfig3 b/http/xulrunner/mozconfig3
index b5d9e65..1063b83 100644
--- a/http/xulrunner/mozconfig3
+++ b/http/xulrunner/mozconfig3
@@ -9,6 +9,9 @@
ac_add_options --prefix=$INSTALL_ROOT/usr
ac_add_options --with-pthreads

+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --with-system-zlib



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

Archive powered by MHonArc 2.6.24.

Top of Page