Skip to Content.
Sympa Menu

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

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 (caa5bf3cc234f778e463c30724b61959d60ba58b)
  • Date: Thu, 9 Oct 2008 13:08:14 -0500

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

http/xulrunner/DETAILS | 1 +
http/xulrunner/HISTORY | 4 ++++
http/xulrunner/INSTALL | 14 +++++---------
3 files changed, 10 insertions(+), 9 deletions(-)

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

xulrunner: Small fixes to .pc files to allow epiphany to compile.
PATCHLEVEL++ enough small fixes have snuck in now.

diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index fbce06f..7319e20 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -35,6 +35,7 @@
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE2_URL[11]=ftp://ftp.free.fr/pub/Networking/www/Mozilla/$SOURCE2_URI
SOURCE2_URL[12]=ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/pub/$SOURCE2_URI
WEB_SITE=http://www.mozilla.org/
+ PATCHLEVEL=1
ENTERED=20060829
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index ef0a65d..7db4723 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,7 @@
+2008-10-09 George Sherwood <gsherwood AT sourcemage.org>
+ * INSTALL: Removed sed's of three pc files for nspr.
+ Few other small cleanups.
+
2008-10-07 George Sherwood <gsherwood AT sourcemage.org>
* INSTALL: Added fixes for libxul.pc. Create symlnk for
/usr/lib/xulrunner
diff --git a/http/xulrunner/INSTALL b/http/xulrunner/INSTALL
index ab1704e..d74a782 100755
--- a/http/xulrunner/INSTALL
+++ b/http/xulrunner/INSTALL
@@ -1,6 +1,6 @@
cd "$SOURCE_DIRECTORY/mozilla" &&

-MOZILLA_FIVE_HOME="$INSTALL_ROOT/usr/lib/xulrunner-$VERSION" &&
+MOZILLA_FIVE_HOME="$INSTALL_ROOT/usr/lib/xulrunner-1.9" &&

make install &&

@@ -18,23 +18,19 @@ cp ${SCRIPT_DIRECTORY}/${SPELL}.sh
$INSTALL_ROOT/etc/profile.d &&
# symlink.
#
if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
- if ! test -f $MOZILLA_HOME/libnssckbi.so ||
- test -h $MOZILLA_HOME/libnssckbi.so; then
- ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $MOZILLA_HOME/libnssckbi.so
+ if ! test -f $MOZILLA_FIVE_HOME/libnssckbi.so ||
+ test -h $MOZILLA_FIVE_HOME/libnssckbi.so; then
+ ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so
$MOZILLA_FIVE_HOME/libnssckbi.so
fi
fi &&
if [[ "$XULRUNNER_NULLPLUGIN" == "n" ]]
then
- rm $MOZILLA_HOME/plugins/libnullplugin.so
+ rm $MOZILLA_FIVE_HOME/plugins/libnullplugin.so
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/mozilla-nss.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 &&



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (caa5bf3cc234f778e463c30724b61959d60ba58b), George Sherwood, 10/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page