Date: Fri, 9 Jul 2010 06:39:52 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r346 - in branches/experimental/www/firefox3-devel: . files Message-ID: <201007090639.o696dqiB078747@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Fri Jul 9 06:39:51 2010
New Revision: 346
Log:
- Update to 3.7 Alpha 5
- TODO: Fix build on FreeBSD 6.x and fix libsydney_oss patch (does not link
at the moment)
Deleted:
branches/experimental/www/firefox3-devel/files/patch-config-Makefile.in
branches/experimental/www/firefox3-devel/files/patch-config-gcc-stl-wrapper.template.h
branches/experimental/www/firefox3-devel/files/patch-js-src-jslock.cpp
branches/experimental/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
branches/experimental/www/firefox3-devel/files/patch-memory-mozalloc-mozalloc.cpp
branches/experimental/www/firefox3-devel/files/releng6_pulseaudio
Modified:
branches/experimental/www/firefox3-devel/Makefile
branches/experimental/www/firefox3-devel/distinfo
branches/experimental/www/firefox3-devel/files/libsydney_oss
Modified: branches/experimental/www/firefox3-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox3-devel/Makefile Tue Jul 6 11:04:13 2010 (r345)
+++ branches/experimental/www/firefox3-devel/Makefile Fri Jul 9 06:39:51 2010 (r346)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 3.7a4
+DISTVERSION= 3.7a5
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -17,6 +17,7 @@
COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
+LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib
USE_AUTOTOOLS= autoconf:213
LATEST_LINK= firefox3-devel
@@ -58,10 +59,9 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 700000
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio
-.else
-EXTRA_PATCHES= ${FILESDIR}/libsydney_oss
+BROKEN= Does not build
+#.else
+#EXTRA_PATCHES= ${FILESDIR}/libsydney_oss
.endif
.if defined(WITH_OOPP_IPC)
Modified: branches/experimental/www/firefox3-devel/distinfo
==============================================================================
--- branches/experimental/www/firefox3-devel/distinfo Tue Jul 6 11:04:13 2010 (r345)
+++ branches/experimental/www/firefox3-devel/distinfo Fri Jul 9 06:39:51 2010 (r346)
@@ -1,3 +1,3 @@
-MD5 (mozilladeveloperpreview-3.7a4.source.tar.bz2) = 528066f92ca78d8e81aeded4424b8295
-SHA256 (mozilladeveloperpreview-3.7a4.source.tar.bz2) = 5b68dc2f259df595746236a4cf595d25c6f266f1a9e6f82ca713eefe955e1d74
-SIZE (mozilladeveloperpreview-3.7a4.source.tar.bz2) = 50905907
+MD5 (mozilladeveloperpreview-3.7a5.source.tar.bz2) = 0629fc3b6517f3a97e0d02e5a263facb
+SHA256 (mozilladeveloperpreview-3.7a5.source.tar.bz2) = b69cc26c2383cb8268aacdc127a08925f301e2b71643534d2fcc4117f144c148
+SIZE (mozilladeveloperpreview-3.7a5.source.tar.bz2) = 56376468
Modified: branches/experimental/www/firefox3-devel/files/libsydney_oss
==============================================================================
--- branches/experimental/www/firefox3-devel/files/libsydney_oss Tue Jul 6 11:04:13 2010 (r345)
+++ branches/experimental/www/firefox3-devel/files/libsydney_oss Fri Jul 9 06:39:51 2010 (r346)
@@ -1,15 +1,20 @@
---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-11 16:28:21.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in 2009-08-11 16:29:08.000000000 +0200
-@@ -45,6 +45,12 @@
+--- media/libsydneyaudio/src/Makefile.in.orig 2010-06-10 14:24:56.000000000 +0200
++++ media/libsydneyaudio/src/Makefile.in 2010-07-05 22:06:07.000000000 +0200
+@@ -45,7 +45,7 @@
LIBRARY_NAME = sydneyaudio
FORCE_STATIC_LIB= 1
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_oss.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
+-ifneq (,$(filter DragonFly FreeBSD GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
++ifneq (,$(filter DragonFly GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
+ CSRCS = \
+ sydney_audio_oss.c \
+ $(NULL)
+@@ -55,7 +55,7 @@
+ CSRCS = \
+ sydney_audio_android.c \
+ $(NULL)
+-else ifeq ($(OS_ARCH),Linux)
++else ifeq ($(OS_ARCH),FreeBSD)
CSRCS = \
sydney_audio_alsa.c \
+ $(NULL)
Deleted: branches/experimental/www/firefox3-devel/files/patch-config-Makefile.in
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-config-Makefile.in Fri Jul 9 06:39:51 2010 (r345)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- 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
-
Deleted: branches/experimental/www/firefox3-devel/files/patch-config-gcc-stl-wrapper.template.h
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-config-gcc-stl-wrapper.template.h Fri Jul 9 06:39:51 2010 (r345)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- 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
Deleted: branches/experimental/www/firefox3-devel/files/patch-js-src-jslock.cpp
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-js-src-jslock.cpp Fri Jul 9 06:39:51 2010 (r345)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,18 +0,0 @@
---- js/src/jslock.cpp.orig 2009-10-07 20:15:38.000000000 +0200
-+++ js/src/jslock.cpp 2009-10-07 21:36:14.000000000 +0200
-@@ -160,8 +160,13 @@
- unsigned int res;
-
- __asm__ __volatile__ (
-- "stbar\n"
-- "cas [%1],%2,%3\n"
-+ "membar #StoreLoad | #LoadLoad\n"
-+# if defined (__sparc64__)
-+ "casx [%1],%2,%3\n"
-+# else
-+ "cas [%1],%2,%3\n" /* 32-bit version */
-+# endif
-+ "membar #StoreLoad | #LoadLoad\n"
- "cmp %2,%3\n"
- "be,a 1f\n"
- "mov 1,%0\n"
Deleted: branches/experimental/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h Fri Jul 9 06:39:51 2010 (r345)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2009-08-07 00:49:53.000000000 +0200
-+++ media/liboggz/include/oggz/oggz_off_t_generated.h 2009-08-09 20:57:55.000000000 +0200
-@@ -59,7 +59,7 @@
-
- #include <sys/types.h>
-
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (__FreeBSD__)
- typedef off_t oggz_off_t;
- #else
- typedef loff_t oggz_off_t;
Deleted: branches/experimental/www/firefox3-devel/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-memory-mozalloc-mozalloc.cpp Fri Jul 9 06:39:51 2010 (r345)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- 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
Deleted: branches/experimental/www/firefox3-devel/files/releng6_pulseaudio
==============================================================================
--- branches/experimental/www/firefox3-devel/files/releng6_pulseaudio Fri Jul 9 06:39:51 2010 (r345)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,33 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-11 17:22:08.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in 2009-08-11 17:22:36.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_pulseaudio.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
-
---- 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 += $(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) $(MOZ_PANGO_LIBS)
- endif
-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007090639.o696dqiB078747>