Skip to Content.
Sympa Menu

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

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 (845ca03b2d6b2a5f822bc295016a9594934dd098)
  • Date: Fri, 10 Oct 2008 08:42:30 -0500

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

http/xulrunner/DEPENDS | 1 +
http/xulrunner/DETAILS | 2 +-
http/xulrunner/HISTORY | 8 ++++++++
http/xulrunner/INSTALL | 5 +++++
http/xulrunner/PRE_BUILD | 2 ++
http/xulrunner/mozconfig3 | 4 ++--
http/xulrunner/xulrunner-nss.patch | 12 ++++++++++++
7 files changed, 31 insertions(+), 3 deletions(-)

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

xulrunner: One more update to fix xulrunner clobbering nss and
nspr. Switched to system nss and nspr which required a
patch to keep from building nss.pc. Probably need to dispel
xulrunner, cast nspr nss and than cast xulrunner to gaurantee
success.

diff --git a/http/xulrunner/DEPENDS b/http/xulrunner/DEPENDS
index c094e55..ad5bba8 100755
--- a/http/xulrunner/DEPENDS
+++ b/http/xulrunner/DEPENDS
@@ -4,6 +4,7 @@ depends jpeg &&
depends libidl &&
depends libxft &&
depends libpng &&
+depends nss &&
depends perl &&
depends xorg-libs '--with-x' &&
depends zip &&
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 7319e20..f33af98 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -35,7 +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
+ PATCHLEVEL=2
ENTERED=20060829
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 7db4723..0a9cd60 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,11 @@
+2008-10-10 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * DEPENDS: depends nss
+ * INSTALL: Added back sed's of four pc files for nspr.
+ * mozconfig3: Switched to system nspr and nss
+ * PRE_BUILD: Added patch
+ * xulrunner-nss.patch: Added patch to prevent building of
mozilla-nss.pc
+
2008-10-09 George Sherwood <gsherwood AT sourcemage.org>
* INSTALL: Removed sed's of three pc files for nspr.
Few other small cleanups.
diff --git a/http/xulrunner/INSTALL b/http/xulrunner/INSTALL
index d74a782..bd04c92 100755
--- a/http/xulrunner/INSTALL
+++ b/http/xulrunner/INSTALL
@@ -31,6 +31,11 @@ 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 &&
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 917987f..85f5f8e 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -5,6 +5,8 @@ cd mozilla &&

patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&

+patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&
+
cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&

if [[ $FIREFOX_OFFICIAL == y ]]; then
diff --git a/http/xulrunner/mozconfig3 b/http/xulrunner/mozconfig3
index 097b5cc..922cf51 100644
--- a/http/xulrunner/mozconfig3
+++ b/http/xulrunner/mozconfig3
@@ -10,8 +10,8 @@ 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 --with-system-nss
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss

ac_add_options --enable-svg
ac_add_options --enable-canvas
diff --git a/http/xulrunner/xulrunner-nss.patch
b/http/xulrunner/xulrunner-nss.patch
new file mode 100644
index 0000000..de736be
--- /dev/null
+++ b/http/xulrunner/xulrunner-nss.patch
@@ -0,0 +1,12 @@
+--- xulrunner/installer/Makefile.in.orig 2008-10-10 06:31:57.000000000
-0500
++++ xulrunner/installer/Makefile.in 2008-10-10 06:34:17.000000000 -0500
+@@ -106,9 +106,6 @@
+
+ $(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS))
+
+-ifndef MOZ_NATIVE_NSS
+-pkg_config_files += mozilla-nss.pc
+-endif
+
+ %.pc: $(srcdir)/%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+ cat $< | sed \



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

Archive powered by MHonArc 2.6.24.

Top of Page