Skip to Content.
Sympa Menu

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

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 (a439a881a7b54f985cc1a546a51adbe0fbd46591)
  • Date: Thu, 13 Nov 2008 16:19:49 -0600

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

http/xulrunner/DEPENDS | 5 ++++-
http/xulrunner/HISTORY | 5 +++++
http/xulrunner/PRE_BUILD | 5 +++++
http/xulrunner/mozconfig3 | 4 ----
4 files changed, 14 insertions(+), 5 deletions(-)

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

xulrunner: Fixed to build against system nspr/nss if nss
>= 3.12 installed.

diff --git a/http/xulrunner/DEPENDS b/http/xulrunner/DEPENDS
index d02d786..94ef0e3 100755
--- a/http/xulrunner/DEPENDS
+++ b/http/xulrunner/DEPENDS
@@ -5,7 +5,10 @@ depends libidl &&
depends libxft &&
depends libpng &&
depends sqlite &&
-depends nspr &&
+if spell_ok nss && [[ $(installed_version nss) == 3.12* ]]; then
+ depends nspr &&
+ depends nss
+fi &&
depends perl &&
depends xorg-libs '--with-x' &&
depends zip &&
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 1a5289d..3e81c5d 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,8 @@
+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
+ * mozconfig3: remove nspr/nss options. Added back conditionally.
+
2008-11-10 George Sherwood <gsherwood AT sourcemage.org>
* DEPENDS: depends nspr, sqlite
* PRE_BUILD: Added nspr to libxul-embedding.pc
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index cc1210e..5d7b464 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -12,6 +12,11 @@ echo "Requires: mozilla-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 3806632..b5d9e65 100644
--- a/http/xulrunner/mozconfig3
+++ b/http/xulrunner/mozconfig3
@@ -9,10 +9,6 @@
ac_add_options --prefix=$INSTALL_ROOT/usr
ac_add_options --with-pthreads

-# These cause breakage when building apps
-ac_add_options --with-system-nspr
-ac_add_options --without-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 (a439a881a7b54f985cc1a546a51adbe0fbd46591), George Sherwood, 11/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page