Skip to Content.
Sympa Menu

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

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 (14421f2979daccff033355c34bd6183e1d6a0a78)
  • Date: Thu, 13 Nov 2008 18:02:02 -0600

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

http/xulrunner/HISTORY | 2 ++
http/xulrunner/INSTALL | 6 ------
http/xulrunner/PRE_BUILD | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)

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

xulrunner: Cleanup due to installing upstream names of
nspr/nss pc files.

diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 3e81c5d..b5d5297 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,6 +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
+ Only add nspr to libxul-embedding.pc
+ * INSTALL: No need to correct names of nss/nspr pc files.
* mozconfig3: remove nspr/nss options. Added back conditionally.

2008-11-10 George Sherwood <gsherwood AT sourcemage.org>
diff --git a/http/xulrunner/INSTALL b/http/xulrunner/INSTALL
index bd04c92..7b8e205 100755
--- a/http/xulrunner/INSTALL
+++ b/http/xulrunner/INSTALL
@@ -31,12 +31,6 @@ fi
#Need ln -s to for some apps
ln -s $INSTALL_ROOT/usr/lib/xulrunner-1.9/ $INSTALL_ROOT/usr/lib/xulrunner
&&

-# make the pkgconfig files reference the nspr from the standalone nspr spell
-sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/mozilla-js.pc &&
-sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/mozilla-plugin.pc &&
-sedit 's/nspr/mozilla-nspr/' ${INSTALL_ROOT}/usr/lib/pkgconfig/libxul.pc &&
-sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/libxul-unstable.pc &&
-
#libxul.pc needs to include an idl compiler directory
sed -i 's:\/xulrunner-1\.9\/idl:\/xulrunner-1\.9\/idl\/stable:'
${INSTALL_ROOT}/usr/lib/pkgconfig/libxul.pc &&
sed -i '5ilibdir=/usr/lib/xulrunner-1.9'
${INSTALL_ROOT}/usr/lib/pkgconfig/libxul.pc
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 5d7b464..9d7094b 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -8,7 +8,7 @@ patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&
patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&

# Needed to make things using XUL find NSPR.
-echo "Requires: mozilla-nspr" >> xulrunner/installer/libxul-embedding.pc.in
&&
+echo "Requires: nspr" >> xulrunner/installer/libxul-embedding.pc.in &&

cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&




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

Archive powered by MHonArc 2.6.24.

Top of Page