Date: Thu, 4 Feb 2010 15:30:10 +0100 From: Sascha Holzleiter <sascha@holzleiter.name> To: gecko@freebsd.org Cc: ports@freebsd.org, gnome@freebsd.org Subject: Re: [CFT] Firefox 3.6 for FreeBSD Message-ID: <201002041530.10533.sascha@holzleiter.name> In-Reply-To: <20100204001933.GA11586@bsdcrew.de> References: <20100204001933.GA11586@bsdcrew.de>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_yntaLiiXRQGwt8A
Content-Type: Text/Plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
On Thursday 04 February 2010 01:19:33 Martin Wilke wrote:
> Howdy,
>
> We know that a lot people are waiting for Firefox 3.6,
> but nox@ found a strange bug which is now solved.
> The problem was that starting Firefox 3.6 with certain
> addons installed was not possible. Now it looks like all
> problems are solved and we can start a CFT.
> If everything works fine we plan to commit Firefox 3.6 next
> weekend. We should also note that the java plugin currently
> does not work with 3.6.
>
Thanks for fixing it and porting it over, it works great so far!
I had to adjust the weave port a bit as it seems that the location of the idl
files has changed. The former path was /usr/local/share/idl/firefox3/stable
and /usr/local/share/idl/firefox3/unstable which now just seems to be
/usr/local/share/idl/firefox3. I'll append a simple diff if someone is
interested.
--Boundary-00=_yntaLiiXRQGwt8A
Content-Type: text/x-patch;
charset="UTF-8";
name="weave.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="weave.diff"
--- weave.orig/Makefile 2010-02-04 15:03:14.000000000 +0100
+++ weave/Makefile 2010-02-04 15:25:23.000000000 +0100
@@ -15,7 +15,7 @@
MAINTAINER= magik@roorback.net
COMMENT= Mozilla Weave extension
-BUILD_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35 \
+BUILD_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox \
${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul
RUN_DEPENDS= ${BUILD_DEPENDS}
--- weave.orig/files/patch-crypto-src-Makefile 2010-02-04 15:03:14.000000000 +0100
+++ weave/files/patch-crypto-src-Makefile 2010-02-04 15:15:41.000000000 +0100
@@ -1,11 +1,11 @@
---- crypto/src/Makefile.orig 2009-08-27 22:08:18.000000000 +0200
-+++ crypto/src/Makefile 2009-09-18 21:52:06.000000000 +0200
+--- crypto/src/Makefile.orig 2010-01-29 00:14:05.000000000 +0100
++++ crypto/src/Makefile 2010-02-04 15:11:47.000000000 +0100
@@ -45,6 +45,10 @@
sys := $(shell uname -s)
wince = $(WINCE)
+ifeq ($(sys), FreeBSD)
-+ xpidl = $(PREFIX)/lib/libxul/xpidl -I$(PREFIX)/share/idl/firefox3/stable
++ xpidl = $(PREFIX)/lib/libxul/xpidl -I$(PREFIX)/share/idl/firefox3
+endif
+
ifeq ($(wince), 1)
@@ -52,21 +52,20 @@
# Universal binary so no need for $(arch) for Darwin
-@@ -188,6 +205,13 @@
+@@ -188,6 +205,12 @@
-I$(sdkdir)/include/nspr \
-I$(sdkdir)/sdk/include
+ifeq ($(sys), FreeBSD)
-+ headers += -I$(PREFIX)/include/firefox3/stable \
++ headers += -I$(PREFIX)/include/firefox3 \
+ -I$(PREFIX)/include/nspr \
-+ -I$(PREFIX)/include/nss \
-+ -I$(PREFIX)/include/firefox3/unstable
++ -I$(PREFIX)/include/nss
+endif
+
# libraries
libdirs := $(sdkdir)/lib $(sdkdir)/bin
ifeq ($(wince),1)
-@@ -202,6 +226,10 @@
+@@ -202,6 +225,10 @@
ifeq ($(os), Linux)
libs := xpcom_core $(libs)
@@ -77,7 +76,7 @@
endif
# compiler and Linker Flags
-@@ -264,6 +292,25 @@
+@@ -264,6 +291,25 @@
$(sdkdir)/lib/libxpcomglue_s.a \
$(libdirs) $(libs)
else
@@ -103,7 +102,7 @@
ifeq ($(os), SunOS)
libdirs := $(patsubst %,-L%,$(libdirs))
libs := $(patsubst %,-l%,$(libs))
-@@ -303,6 +350,7 @@
+@@ -303,6 +349,7 @@
endif
endif
endif
@@ -111,9 +110,9 @@
######################################################################
-@@ -361,6 +409,11 @@
- $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
- chmod +x $@
+@@ -361,6 +408,11 @@
+ $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
+ chmod +x $@
else
+ifeq ($(os), FreeBSD)
+ $(so_target): $(idl_headers)
@@ -122,8 +121,8 @@
+else
ifeq ($(os), SunOS)
$(so_target): $(idl_headers)
- $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
-@@ -380,3 +433,4 @@
+ $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
+@@ -380,3 +432,4 @@
endif
endif
endif
--Boundary-00=_yntaLiiXRQGwt8A--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002041530.10533.sascha>