Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-firefox4 grimoire by George Sherwood (f9b6e7cda611ecb21cb372c628c6fc6c7245be2f)

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 devel-firefox4 grimoire by George Sherwood (f9b6e7cda611ecb21cb372c628c6fc6c7245be2f)
  • Date: Fri, 25 Mar 2011 20:52:20 -0500

GIT changes to devel-firefox4 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

http/xulrunner/BUILD | 6 ++----
http/xulrunner/DEPENDS | 5 ++---
http/xulrunner/DETAILS | 4 ++--
http/xulrunner/HISTORY | 13 +++++++++++++
http/xulrunner/INSTALL | 12 ++++++------
http/xulrunner/PRE_BUILD | 9 ++-------
http/xulrunner/mozconfig3 | 43 -------------------------------------------
http/xulrunner/mozconfig4 | 44 ++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 71 insertions(+), 65 deletions(-)

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

xulrunner: Updated for 2.0.

diff --git a/http/xulrunner/BUILD b/http/xulrunner/BUILD
index bf87044..0c026fc 100755
--- a/http/xulrunner/BUILD
+++ b/http/xulrunner/BUILD
@@ -1,4 +1,4 @@
-cd "$SOURCE_DIRECTORY/mozilla-1.9.2" &&
+cd "$SOURCE_DIRECTORY/mozilla-2.0" &&

XULRUNNER_HOME="$INSTALL_ROOT/usr/lib/xulrunner" &&
export MOZ_PHOENIX=1 &&
@@ -26,9 +26,7 @@ CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&

OPTS="${OPTS} --enable-optimize=-O2" &&

-./configure --prefix=$INSTALL_ROOT/usr \
- --mandir=$INSTALL_ROOT/usr/share/man \
- $OPTS &&
+
make_single &&
# workaround for configure not handling --disable-necko-wifi correctly
if [[ $OPTS =~ --disable-necko-wifi ]]; then
diff --git a/http/xulrunner/DEPENDS b/http/xulrunner/DEPENDS
index 52d480a..4c36db4 100755
--- a/http/xulrunner/DEPENDS
+++ b/http/xulrunner/DEPENDS
@@ -1,10 +1,9 @@
depends gtk+2 &&
-depends cairo &&
+depends -sub TEE cairo &&
depends JPEG &&
depends libidl &&
depends libxft &&
-depends -sub APNG libpng &&
-depends -sub SECURE_DELETE sqlite &&
+depends -sub "SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite &&
depends nspr &&
depends -sub "3.12.x" nss &&
depends perl &&
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 5215fdc..6bf1b4a 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
SPELL=xulrunner
- VERSION=1.9.2.15
- FFVERSION=3.6.15
+ VERSION=2.0
+ FFVERSION=4.0
SOURCE=firefox-$FFVERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index c5898c3..c0a91fa 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,16 @@
+2011-03-25 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 2.0 andd FFVERSION to 4.0
+ * DEPENDS: Added new sub_depends for cairo and sqlite
+ Remove depends libpng. Need newer version
+ * BUILD: Updated directories for new version
+ Remove configure IAW with mozilla build directions
+ * PRE_BUILD: Removed gcc-4.4 fix. Updated to new config file
+ * INSTALL: Updated directories for new version
+ Use proper make command
+ Use updated install directory
+ * mozconfig3: Removed
+ * mozconfig3: Added with updateds for xulrunner 2.0
+
2011-03-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9.2.15, FFVERSION=3.6.15

diff --git a/http/xulrunner/INSTALL b/http/xulrunner/INSTALL
index b3d09e3..f28269c 100755
--- a/http/xulrunner/INSTALL
+++ b/http/xulrunner/INSTALL
@@ -1,8 +1,8 @@
-cd "$SOURCE_DIRECTORY/mozilla-1.9.2" &&
+cd "$SOURCE_DIRECTORY/mozilla-2.0" &&

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

-make install &&
+make -f client.mk install &&

#
# Script to set MOZILLA_FIVE_HOME
@@ -29,8 +29,8 @@ then
fi

#Need ln -s to for some apps
-ln -s $INSTALL_ROOT/usr/lib/xulrunner-1.9/ $INSTALL_ROOT/usr/lib/xulrunner
&&
+ln -s $INSTALL_ROOT/usr/lib/xulrunner-2.0/ $INSTALL_ROOT/usr/lib/xulrunner
&&

#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
+sed -i 's:\/xulrunner-2\.0\/idl:\/xulrunner-2\.0\/idl\/stable:'
${INSTALL_ROOT}/usr/lib/pkgconfig/libxul.pc &&
+sed -i '5ilibdir=/usr/lib/xulrunner-2.0'
${INSTALL_ROOT}/usr/lib/pkgconfig/libxul.pc
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 933f54b..ae67f7d 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -1,17 +1,12 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file '' &&
-cd mozilla-1.9.2 &&
-# fix for gcc-4.4
-sed -i 's/^#elif$/#else/' toolkit/xre/nsAppRunner.cpp &&
-patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&
-
-patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&
+cd mozilla-2.0 &&

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

-cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&
+cp -v $SPELL_DIRECTORY/mozconfig4 .mozconfig &&

if [[ $FIREFOX_OFFICIAL == y ]]; then
sed -i '24iac_add_options --enable-official-branding' .mozconfig
diff --git a/http/xulrunner/mozconfig3 b/http/xulrunner/mozconfig3
deleted file mode 100644
index 1063b83..0000000
--- a/http/xulrunner/mozconfig3
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# See http://www.mozilla.org/build/ for build instructions.
-#
-
-# Options for client.mk.
-#mk_add_options MOZ_CO_PROJECT=xulrunner
-
-# Options for 'configure' (same as command-line options).
-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
-ac_add_options --with-system-bz2
-ac_add_options --enable-image-encoder=all
-ac_add_options --enable-js-binary
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-ac_add_options --with-system-png=/usr/lib
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-system-cairo
-ac_add_options --enable-storage
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-svg-renderer=cairo
-ac_add_options --enable-pango
-ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner
-ac_add_options --enable-webservices
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-lcms
-ac_add_options --disable-mailnews
-ac_add_options --disable-freetype2
-ac_add_options --disable-dbus
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-crashreporter
diff --git a/http/xulrunner/mozconfig4 b/http/xulrunner/mozconfig4
new file mode 100644
index 0000000..02ad054
--- /dev/null
+++ b/http/xulrunner/mozconfig4
@@ -0,0 +1,44 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+#mk_add_options MOZ_CO_PROJECT=xulrunner
+
+# Options for 'configure' (same as command-line options).
+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
+ac_add_options --with-system-bz2
+ac_add_options --enable-image-encoder=all
+ac_add_options --enable-js-binary
+ac_add_options --with-system-jpeg=/usr/lib
+ac_add_options --with-system-zlib=/usr/lib
+# doesn't seem to work with current version of libpng 1.2.44
+#ac_add_options --with-system-png=/usr/lib
+ac_add_options --enable-application=xulrunner
+ac_add_options --enable-system-cairo
+ac_add_options --enable-storage
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-svg-renderer=cairo
+ac_add_options --enable-pango
+ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner
+ac_add_options --enable-webservices
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-lcms
+ac_add_options --disable-mailnews
+ac_add_options --disable-freetype2
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-crashreporter



  • [SM-Commit] GIT changes to devel-firefox4 grimoire by George Sherwood (f9b6e7cda611ecb21cb372c628c6fc6c7245be2f), George Sherwood, 03/25/2011

Archive powered by MHonArc 2.6.24.

Top of Page