Date: Sat, 24 Apr 2010 11:29:50 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r309 - in trunk/www/firefox3-devel: . files Message-ID: <201004241129.o3OBToSk026240@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sat Apr 24 11:29:50 2010
New Revision: 309
Log:
- Update to 3.7a4 (without Out-Of-Process-Plugins patches)
Added:
trunk/www/firefox3-devel/files/patch-config-Makefile.in
trunk/www/firefox3-devel/files/patch-config-gcc-stl-wrapper.template.h
trunk/www/firefox3-devel/files/patch-gfx-qcms-Makefile.in
trunk/www/firefox3-devel/files/patch-memory-mozalloc-mozalloc.cpp
Modified:
trunk/www/firefox3-devel/Makefile
trunk/www/firefox3-devel/distinfo
trunk/www/firefox3-devel/files/patch-js-src-configure.in
trunk/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk
trunk/www/firefox3-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
trunk/www/firefox3-devel/files/releng6_pulseaudio
trunk/www/firefox3-devel/pkg-message
Modified: trunk/www/firefox3-devel/Makefile
==============================================================================
--- trunk/www/firefox3-devel/Makefile Sat Apr 24 11:25:57 2010 (r308)
+++ trunk/www/firefox3-devel/Makefile Sat Apr 24 11:29:50 2010 (r309)
@@ -6,12 +6,12 @@
#
PORTNAME= firefox
-DISTVERSION= 3.6
+DISTVERSION= 3.7a4
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
-DISTNAME= ${PORTNAME}-${DISTVERSION}.source
+MASTER_SITE_SUBDIR= ${PORTNAME}/releases/devpreview/1.9.3a4/source
+DISTNAME= mozilladeveloperpreview-${DISTVERSION}.source
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
@@ -38,16 +38,17 @@
HAS_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GL= gl
MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.[0,5].*
+CONFLICTS= firefox-3.[0,5,6].*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-svg --enable-svg-renderer=cairo \
- --enable-application=browser \
+ --enable-application=browser --disable-ipc \
--enable-official-branding --disable-updater \
--enable-canvas --enable-libxul --disable-necko-wifi
@@ -66,7 +67,7 @@
EXTRA_PATCHES= ${FILESDIR}/libsydney_oss
.endif
-WRKSRC:= ${WRKSRC}-1.9.2
+WRKSRC:= ${WRKSRC}-central
GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
Modified: trunk/www/firefox3-devel/distinfo
==============================================================================
--- trunk/www/firefox3-devel/distinfo Sat Apr 24 11:25:57 2010 (r308)
+++ trunk/www/firefox3-devel/distinfo Sat Apr 24 11:29:50 2010 (r309)
@@ -1,3 +1,3 @@
-MD5 (firefox-3.6.source.tar.bz2) = 458051557ff49e6a352c1d56eee5782a
-SHA256 (firefox-3.6.source.tar.bz2) = 8d4f12fff7bc361d83e6b486f9ec4264c60114ed86c805e1221b3d30efec0a4b
-SIZE (firefox-3.6.source.tar.bz2) = 48206915
+MD5 (mozilladeveloperpreview-3.7a4.source.tar.bz2) = 528066f92ca78d8e81aeded4424b8295
+SHA256 (mozilladeveloperpreview-3.7a4.source.tar.bz2) = 5b68dc2f259df595746236a4cf595d25c6f266f1a9e6f82ca713eefe955e1d74
+SIZE (mozilladeveloperpreview-3.7a4.source.tar.bz2) = 50905907
Added: trunk/www/firefox3-devel/files/patch-config-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-config-Makefile.in Sat Apr 24 11:29:50 2010 (r309)
@@ -0,0 +1,16 @@
+--- config/Makefile.in
++++ config/Makefile.in
+@@ -139,10 +139,10 @@ GARBAGE_DIRS += system_wrappers
+ endif
+
+ ifdef WRAP_STL_INCLUDES
+-ifdef GCC_VERSION
+-stl_compiler = gcc
+-else
++ifdef _MSC_VER
+ stl_compiler = msvc
++else
++stl_compiler = gcc
+ endif
+ endif
+
Added: trunk/www/firefox3-devel/files/patch-config-gcc-stl-wrapper.template.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-config-gcc-stl-wrapper.template.h Sat Apr 24 11:29:50 2010 (r309)
@@ -0,0 +1,11 @@
+--- config/gcc-stl-wrapper.template.h.orig 2010-04-23 23:23:16.000000000 +0200
++++ config/gcc-stl-wrapper.template.h 2010-04-23 23:23:32.000000000 +0200
+@@ -79,7 +79,7 @@
+ // -fshort-wchar). We don't want that and so define our own inlined
+ // __throw_*().
+ #ifndef mozilla_functexcept_h
+-# include "mozilla/functexcept.h"
++# include "bits/functexcept.h"
+ #endif
+
+ #endif // if mozilla_${HEADER}_h
Added: trunk/www/firefox3-devel/files/patch-gfx-qcms-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-gfx-qcms-Makefile.in Sat Apr 24 11:29:50 2010 (r309)
@@ -0,0 +1,14 @@
+--- gfx/qcms/Makefile.in.orig 2010-02-11 23:24:58.000000000 +0100
++++ gfx/qcms/Makefile.in 2010-02-11 23:25:20.000000000 +0100
+@@ -41,6 +41,11 @@
+ endif
+ endif
+ endif
++ifeq ($(OS_TEST),amd64)
++ CSRCS += transform-sse2.c transform-sse1.c
++ SSE1_FLAGS=-msse
++ SSE2_FLAGS=-msse2
++endif
+
+ FORCE_STATIC_LIB = 1
+ # This library is used by other shared libs
Modified: trunk/www/firefox3-devel/files/patch-js-src-configure.in
==============================================================================
--- trunk/www/firefox3-devel/files/patch-js-src-configure.in Sat Apr 24 11:25:57 2010 (r308)
+++ trunk/www/firefox3-devel/files/patch-js-src-configure.in Sat Apr 24 11:29:50 2010 (r309)
@@ -1,13 +1,13 @@
---- js/src/configure.in.orig 2009-09-21 00:26:58.000000000 +0200
-+++ js/src/configure.in 2009-10-08 07:00:27.000000000 +0200
-@@ -2456,10 +2456,6 @@
- ENABLE_JIT=1
+--- js/src/configure.in.orig 2010-03-03 01:58:30.000000000 +0000
++++ js/src/configure.in 2010-03-03 01:59:33.000000000 +0000
+@@ -2507,10 +2507,6 @@
+ ENABLE_TRACEJIT=1
NANOJIT_ARCH=ARM
;;
-sparc*-*)
-- ENABLE_JIT=1
+- ENABLE_TRACEJIT=1
- NANOJIT_ARCH=Sparc
- ;;
esac
- MOZ_ARG_DISABLE_BOOL(jit,
+ MOZ_ARG_DISABLE_BOOL(tracejit,
Added: trunk/www/firefox3-devel/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-memory-mozalloc-mozalloc.cpp Sat Apr 24 11:29:50 2010 (r309)
@@ -0,0 +1,10 @@
+--- memory/mozalloc/mozalloc.cpp.orig 2010-03-16 19:39:25.000000000 +0100
++++ memory/mozalloc/mozalloc.cpp 2010-03-16 19:40:32.000000000 +0100
+@@ -47,6 +47,7 @@
+ #endif // if defined(MALLOC_H)
+ #include <stddef.h> // for size_t
+ #include <stdlib.h> // for malloc, free
++#include <unistd.h> // for valloc. obsoleted by malloc() ?
+
+ // Make sure that "malloc" et al. resolve to their libc variants.
+ #define MOZALLOC_DONT_DEFINE_MACRO_WRAPPERS
Modified: trunk/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- trunk/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk Sat Apr 24 11:25:57 2010 (r308)
+++ trunk/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk Sat Apr 24 11:29:50 2010 (r309)
@@ -1,31 +1,29 @@
---- security/coreconf/FreeBSD.mk.orig 2009-11-09 01:34:19.000000000 +0100
-+++ security/coreconf/FreeBSD.mk 2009-11-11 18:15:55.000000000 +0100
-@@ -45,8 +45,24 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH = alpha
- else
+--- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
++++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
+@@ -49,8 +49,20 @@
+ ifeq ($(CPU_ARCH),pc98)
+ CPU_ARCH = x86
+ endif
+-ifeq ($(CPU_ARCH),amd64)
+-CPU_ARCH = x86_64
++ifeq ($(OS_TEST),alpha)
++CPU_ARCH = alpha
++endif
+ifeq ($(OS_TEST),amd64)
+CPU_ARCH = amd64
-+else
++endif
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
-+else
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
-+else
++endif
+ifeq ($(OS_TEST),sparc64)
+CPU_ARCH = sparc64
-+else
- CPU_ARCH = x86
endif
-+endif
-+endif
-+endif
-+endif
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-@@ -73,7 +89,7 @@
+@@ -78,7 +90,7 @@
DLL_SUFFIX = so.1.0
endif
@@ -34,7 +32,7 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -82,4 +98,4 @@
+@@ -87,4 +99,4 @@
G++INCLUDES = -I/usr/include/g++
Modified: trunk/www/firefox3-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- trunk/www/firefox3-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Apr 24 11:25:57 2010 (r308)
+++ trunk/www/firefox3-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Apr 24 11:29:50 2010 (r309)
@@ -1,6 +1,6 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-09-16 04:41:25.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-10-03 21:30:21.000000000 +0200
-@@ -73,6 +73,9 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-02-08 15:42:25.000000000 +0100
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2010-02-09 18:31:15.000000000 +0100
+@@ -72,6 +72,9 @@
DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED
CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
endif
@@ -10,7 +10,7 @@
endif
endif
-@@ -96,7 +99,7 @@
+@@ -95,7 +98,7 @@
endif
endif
# IA64 Linux
@@ -19,18 +19,20 @@
ifneq (,$(findstring ia64,$(OS_TEST)))
CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -111,8 +114,8 @@
- #
- # FreeBSD/amd64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
--CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
-+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+@@ -108,6 +111,12 @@
+ CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
endif
#
++# FreeBSD/amd64
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
++CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
++endif
++#
# BeOS/Intel (uses the same unixish_x86 code)
-@@ -165,9 +168,15 @@
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -158,9 +167,15 @@
ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
endif
#
@@ -47,7 +49,7 @@
CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
endif
#
-@@ -322,7 +331,7 @@
+@@ -315,7 +330,7 @@
#
# Linux/PPC
#
@@ -56,7 +58,7 @@
CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
AS := $(CC) -c -x assembler-with-cpp
-@@ -400,6 +409,15 @@
+@@ -393,6 +408,15 @@
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
endif
#
Modified: trunk/www/firefox3-devel/files/releng6_pulseaudio
==============================================================================
--- trunk/www/firefox3-devel/files/releng6_pulseaudio Sat Apr 24 11:25:57 2010 (r308)
+++ trunk/www/firefox3-devel/files/releng6_pulseaudio Sat Apr 24 11:29:50 2010 (r309)
@@ -13,20 +13,21 @@
ifeq ($(OS_ARCH),Linux)
CSRCS = \
sydney_audio_alsa.c \
---- toolkit/library/Makefile.in.orig 2009-08-11 17:22:45.000000000 +0200
-+++ toolkit/library/Makefile.in 2009-08-11 17:23:22.000000000 +0200
-@@ -231,12 +231,12 @@
+
+--- toolkit/library/Makefile.in.orig 2010-03-15 13:56:01.000000000 +0000
++++ toolkit/library/Makefile.in 2010-03-19 16:02:11.000000000 +0000
+@@ -210,12 +210,12 @@
endif
ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
EXTRA_DSO_LDOPTS += $(FT2_LIBS)
endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+ EXTRA_DSO_LDOPTS += $(FT2_LIBS) $(MOZ_PANGO_LIBS)
endif
Modified: trunk/www/firefox3-devel/pkg-message
==============================================================================
--- trunk/www/firefox3-devel/pkg-message Sat Apr 24 11:25:57 2010 (r308)
+++ trunk/www/firefox3-devel/pkg-message Sat Apr 24 11:29:50 2010 (r309)
@@ -10,11 +10,11 @@
ssh-keygen -t dsa
cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys"
-The SSH sever on remote_host must allow pub key authentication.
+The SSH server on remote_host must allow pub key authentication.
======================================================================
-Firefox 3.5 and HTML5
+Firefox 3.7 and HTML5
Certain functions used to display HTML5 elements need the sem module.
@@ -37,7 +37,7 @@
Please include the following information with any bug report:
* Output from 'uname -a'.
-* Date/time stamp from www/firefox3-devel/Makefile.
+* Output from 'ident /usr/ports/www/firefox3-devel/Makefile'
* Where/when did the problem occur: configuring, building, or
running firefox
* How can you reproduce the problem?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004241129.o3OBToSk026240>