Skip to Content.
Sympa Menu

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

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 (640665be4d933ca09f241539284fb811a0a8acd1)
  • Date: Tue, 7 Oct 2008 20:14:44 -0500

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

http/firefox/BUILD | 4 ----
http/firefox/DEPENDS | 15 ++++++---------
http/firefox/HISTORY | 7 +++++++
http/firefox/INSTALL | 23 +++--------------------
http/firefox/PRE_BUILD | 2 ++
http/firefox/firefox-xulrunner.patch | 24 ++++++++++++++++++++++++
http/firefox/mozconfig3 | 5 ++++-
7 files changed, 46 insertions(+), 34 deletions(-)

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

firefox: Updated to build against xulrunner. Firefox doesn't
provide GECKO any longer. Cleaned up depends and use make install.
Added patch to fix disk usage during build.

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 1a59594..0ba7903 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -22,10 +22,6 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
CFLAGS="${CFLAGS//-ffast-math/}" &&
CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&

-./configure --prefix=$INSTALL_ROOT/usr \
- --mandir=$INSTALL_ROOT/usr/share/man \
- --enable-optimize="$CFLAGS" \
- $OPTS &&
make_single &&
make -f client.mk build &&
make_normal
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 9cd7dd8..c50fc0b 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,21 +1,18 @@
depends atk &&
-depends curl '--enable-crashreporter' &&
+depends curl &&
depends g++ &&
depends glib2 &&
-depends jpeg '--with-system-jpeg' &&
+depends jpeg &&
depends pango &&
depends perl &&
depends zip &&
-depends zlib '--with-system-zlib' &&
+depends zlib &&
depends cairo &&
depends python &&
-
+depends xulrunner &&
depends -sub APNG libpng &&
-
-# These were the GTK+2 option in the GTK version conditional, perhaps
-# the flags need a closer look.
-depends gtk+2 '--enable-xft --disable-freetype2' &&
-depends libidl &&
+depends gtk+2 &&
+depends libidl &&

suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar'
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 8f0fec9..484048d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,5 +1,12 @@
2008-10-07 George Sherwood <gsherwood AT sourcemage.org>
+ * BUILD: Updated to not use configure. All options set in
+ mozconfig3
+ * DEPENDS: Cleaned up. Now depends on xulrunner
+ * INSTALL: Use make install. Removed older workarounds
+ * PRE_BUILD: Added patch
* PROVIDES: No longer provides GECKO.
+ * firefox-xulrunner.patch: Added patch to skip copy of
+ xulrunner if using libxul. During build was using 4 gig of disk

2008-09-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.3
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 30f7253..4882221 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -6,16 +6,9 @@ if spell_ok Firebird; then
dispel Firebird
fi &&

-# Not recommended by http://www.mozilla.org/build to use
-# make install. Manually install the files.
-
-mkdir -p $INSTALL_ROOT/usr/lib/firefox &&
-cp -RLv dist/bin/* $INSTALL_ROOT/usr/lib/firefox/ &&
-mkdir -p $INSTALL_ROOT/usr/include/firefox/ &&
-cp -LfRv dist/include/* $INSTALL_ROOT/usr/include/firefox/ &&
-mkdir -p $INSTALL_ROOT/usr/share/idl/firefox/ &&
-cp -LfRv dist/idl/* $INSTALL_ROOT/usr/share/idl/firefox/ &&
+make install &&

+ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox &&
#
# Script to set MOZILLA_FIVE_HOME
#
@@ -49,16 +42,6 @@ if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
fi &&
if [[ $FIREFOX_NULLPLUGIN == n ]]; then
rm $FIREFOX_HOME/plugins/libnullplugin.so
-fi &&
+fi

-#
-# install firefox script so it loads properly even if MOZILLA_FIVE_HOME is
-# not set or set to a different mozilla/firefox directory
-#
-install -m 755 -o root -g root $SPELL_DIRECTORY/firefox \
- $INSTALL_ROOT/usr/bin &&

-# fix up permissions, firefox 2.0.0.8 installs stuff non-readable for
-# anyone but root
-chmod -R go+r /usr/lib/firefox &&
-chmod go+x /usr/lib/firefox/run-mozilla.sh
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 60c1760..65cce7b 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,6 +3,8 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla &&

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

if [[ $FIREFOX_OFFICIAL == y ]]; then
diff --git a/http/firefox/firefox-xulrunner.patch
b/http/firefox/firefox-xulrunner.patch
new file mode 100644
index 0000000..bf94426
--- /dev/null
+++ b/http/firefox/firefox-xulrunner.patch
@@ -0,0 +1,24 @@
+--- config/rules.mk
++++ config/rules.mk
+@@ -57,16 +57,21 @@
+ REPORT_BUILD = @echo $(notdir $<)
+
+ ifeq ($(OS_ARCH),OS2)
+ EXEC =
+ else
+ EXEC = exec
+ endif
+
++# Don't copy xulrunner files at install time, when using system xulrunner
++ifdef LIBXUL_SDK
++ SKIP_COPY_XULRUNNER=1
++endif
++
+ # ELOG prints out failed command when building silently (gmake -s).
+ ifneq (,$(findstring -s,$(MAKEFLAGS)))
+ ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
+ else
+ ELOG :=
+ endif
+
+ ifeq ($(MOZ_OS2_TOOLS),VACPP)
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig3
index 076bf67..8838ebe 100644
--- a/http/firefox/mozconfig3
+++ b/http/firefox/mozconfig3
@@ -21,4 +21,7 @@ ac_add_options --disable-dbus
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-tests
-ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
+ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
+ac_add_options --prefix=$INSTALL_ROOT/usr
+ac_add_options --mandir=$INSTALL_ROOT/usr
+ac_add_options --enable-optimize="$CFLAGS"



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

Archive powered by MHonArc 2.6.24.

Top of Page