Date: Thu, 9 Nov 2006 19:24:56 -0500 From: Mikhail Teterin <mi+mx@aldan.algebra.com> To: gnome@freebsd.org Subject: improving firefox port Message-ID: <200611091924.56887.mi%2Bmx@aldan.algebra.com>
next in thread | raw e-mail | index | archive | help
--Boundary-00=_Yb8UFlfOpWAcHdk
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Hello!
The following changes to firefox/Makefile and mozilla/Makefile.common, along
with attached additional patch (firefox/files/patch-sysbz2) allow:
1) use of the base system's -lbz2 instead of compiling Mozilla's own;
2) build and run the vendor's self-checks (yes, I'm still at it :-)
Please, consider committing ASAP. Thank you!
-mi
--Boundary-00=_Yb8UFlfOpWAcHdk
Content-Type: text/x-diff;
charset="us-ascii";
name="mozilla.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="mozilla.diff"
Index: firefox/Makefile
===================================================================
RCS file: /meow/ncvs/ports/www/firefox/Makefile,v
retrieving revision 1.163
diff -U2 -r1.163 Makefile
--- firefox/Makefile 6 Nov 2006 03:02:13 -0000 1.163
+++ firefox/Makefile 10 Nov 2006 00:20:30 -0000
@@ -24,5 +24,5 @@
WANT_GNOME= yes
-ALL_TARGET= default
+ALL_TARGET= default check
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
EXTRA_CFLAGS= -O2
Index: mozilla/Makefile.common
===================================================================
RCS file: /meow/ncvs/ports/www/mozilla/Makefile.common,v
retrieving revision 1.18
diff -U2 -r1.18 Makefile.common
--- mozilla/Makefile.common 1 Nov 2006 13:20:10 -0000 1.18
+++ mozilla/Makefile.common 9 Nov 2006 19:43:20 -0000
@@ -103,4 +103,6 @@
--exclude */nsprpub/* \
--exclude mozilla/modules/libimg/png \
+ --exclude mozilla/modules/libbz2 \
+ --exclude mozilla/modules/zlib \
--exclude mozilla/jpeg \
--exclude mozilla/dbm \
@@ -140,5 +142,4 @@
# Standard options from README
MOZ_OPTIONS+= --enable-crypto \
- --disable-tests \
--enable-default-toolkit=gtk2 \
--enable-xft \
--Boundary-00=_Yb8UFlfOpWAcHdk
Content-Type: text/x-diff;
charset="us-ascii";
name="patch-sysbz2"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="patch-sysbz2"
--- Makefile.in Thu Sep 14 14:07:02 2006
+++ Makefile.in Sat Oct 28 13:30:00 2006
@@ -108,5 +106,4 @@
ifdef MOZ_UPDATER
-tier_1_dirs += modules/libbz2
tier_1_dirs += modules/libmar
endif
--- toolkit/mozapps/update/src/updater/Makefile.in Tue Aug 15 13:33:40 2006
+++ toolkit/mozapps/update/src/updater/Makefile.in Sat Oct 28 13:33:07 2006
@@ -53,9 +53,10 @@
PROGRAM = updater$(BIN_SUFFIX)
-REQUIRES = libmar libbz2
+REQUIRES = libmar
+
+OS_LIBS += -lbz2
LIBS += \
$(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
$(NULL)
--- extensions/metrics/build/Makefile.in Mon Jun 5 15:48:49 2006
+++ extensions/metrics/build/Makefile.in Sat Oct 28 13:34:30 2006
@@ -62,5 +62,4 @@
SHARED_LIBRARY_LIBS = \
../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
$(NULL)
--- extensions/metrics/src/Makefile.in Fri Aug 25 13:32:51 2006
+++ extensions/metrics/src/Makefile.in Sat Oct 28 13:34:41 2006
@@ -58,5 +58,4 @@
layout \
widget \
- libbz2 \
xulapp \
extensions \
--- extensions/metrics/test/Makefile.in Fri Jun 2 02:04:27 2006
+++ extensions/metrics/test/Makefile.in Sat Oct 28 13:34:50 2006
@@ -64,5 +64,4 @@
LIBS = \
../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \
--Boundary-00=_Yb8UFlfOpWAcHdk--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611091924.56887.mi%2Bmx>