Date: Mon, 11 May 2009 14:12:53 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r29 - in trunk/www/firefox3-devel: . files Message-ID: <200905111412.n4BECr0M067515@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Mon May 11 14:12:52 2009
New Revision: 29
Log:
- fix build for RELENG_6
Added:
trunk/www/firefox3-devel/files/libsydney_oss
trunk/www/firefox3-devel/files/patch-js-src-Makefile.in
trunk/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp
trunk/www/firefox3-devel/files/releng6_pulseaudio
Deleted:
trunk/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in
Modified:
trunk/www/firefox3-devel/Makefile
trunk/www/firefox3-devel/files/patch-config_autoconf.mk.in
trunk/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in
Modified: trunk/www/firefox3-devel/Makefile
==============================================================================
--- trunk/www/firefox3-devel/Makefile Wed May 6 12:05:32 2009 (r28)
+++ trunk/www/firefox3-devel/Makefile Mon May 11 14:12:52 2009 (r29)
@@ -59,8 +59,12 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 700042
-BROKEN= does not build on 6.x.
+
+.if ${OSVERSION} < 700000
+LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
+EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio
+.else
+EXTRA_PATCHES= ${FILESDIR}/libsydney_oss
.endif
WRKSRC:= ${WRKSRC}-1.9.1
Added: trunk/www/firefox3-devel/files/libsydney_oss
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/libsydney_oss Mon May 11 14:12:52 2009 (r29)
@@ -0,0 +1,16 @@
+--- media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
++++ media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME = sydneyaudio
+ FORCE_STATIC_LIB= 1
+
++ifeq ($(OS_ARCH),FreeBSD)
++CSRCS = \
++ sydney_audio_oss.c \
++ $(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS = \
+ sydney_audio_alsa.c \
+
Modified: trunk/www/firefox3-devel/files/patch-config_autoconf.mk.in
==============================================================================
--- trunk/www/firefox3-devel/files/patch-config_autoconf.mk.in Wed May 6 12:05:32 2009 (r28)
+++ trunk/www/firefox3-devel/files/patch-config_autoconf.mk.in Mon May 11 14:12:52 2009 (r29)
@@ -1,5 +1,5 @@
---- config/autoconf.mk.in.orig 2009-04-28 10:03:50.583691270 +0000
-+++ config/autoconf.mk.in 2009-04-28 10:05:25.152703253 +0000
+--- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200
++++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200
@@ -57,14 +57,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -19,3 +19,12 @@
DIST = $(DEPTH)/dist
LIBXUL_SDK = @LIBXUL_SDK@
+@@ -275,7 +275,7 @@
+ OS_CPPFLAGS = @CPPFLAGS@
+ OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@
+ OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@
+-OS_LDFLAGS = @LDFLAGS@
++OS_LDFLAGS = @LDFLAGS@ -lc
+
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
Modified: trunk/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- trunk/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in Wed May 6 12:05:32 2009 (r28)
+++ trunk/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in Mon May 11 14:12:52 2009 (r29)
@@ -5,7 +5,7 @@
include $(DEPTH)/config/autoconf.mk
+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%%
++OS_LIBS = %%PTHREAD_LIBS%% -lc
MODULE = sqlite3
LIBRARY_NAME = sqlite3
FORCE_SHARED_LIB = 1
Added: trunk/www/firefox3-devel/files/patch-js-src-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-js-src-Makefile.in Mon May 11 14:12:52 2009 (r29)
@@ -0,0 +1,11 @@
+--- js/src/Makefile.in.orig 2009-05-11 15:21:19.000000000 +0200
++++ js/src/Makefile.in 2009-05-11 15:21:34.000000000 +0200
+@@ -427,7 +427,7 @@
+ endif # WINNT
+
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS += -pthread
++EXTRA_LIBS += -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
Added: trunk/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-js-src-xpconnect-src-xpcquickstubs.cpp Mon May 11 14:12:52 2009 (r29)
@@ -0,0 +1,32 @@
+--- js/src/xpconnect/src/xpcquickstubs.cpp.orig 2009-05-10 14:31:55.000000000 +0200
++++ js/src/xpconnect/src/xpcquickstubs.cpp 2009-05-10 14:33:07.000000000 +0200
+@@ -210,8 +210,8 @@
+ if(setterobjp)
+ *setterobjp = setterobj;
+ return JS_DefinePropertyById(cx, obj, interned_id, JSVAL_VOID,
+- (JSPropertyOp)getterobj,
+- (JSPropertyOp)setterobj,
++ JS_DATA_TO_FUNC_PTR(JSPropertyOp, getterobj),
++ JS_DATA_TO_FUNC_PTR(JSPropertyOp, setterobj),
+ attrs);
+ }
+
+@@ -255,7 +255,7 @@
+ if(attrs & JSPROP_GETTER)
+ {
+ JS_SET_RVAL(cx, vp,
+- OBJECT_TO_JSVAL(reinterpret_cast<JSObject *>(getter)));
++ OBJECT_TO_JSVAL(JS_FUNC_TO_DATA_PTR(JSObject *, getter)));
+ return JS_TRUE;
+ }
+ }
+@@ -264,7 +264,7 @@
+ if(attrs & JSPROP_SETTER)
+ {
+ JS_SET_RVAL(cx, vp,
+- OBJECT_TO_JSVAL(reinterpret_cast<JSObject *>(setter)));
++ OBJECT_TO_JSVAL(JS_FUNC_TO_DATA_PTR(JSObject *, setter)));
+ return JS_TRUE;
+ }
+ }
+
Deleted: trunk/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in
==============================================================================
--- trunk/www/firefox3-devel/files/patch-media_liboggplay_audio_Makefile.in Mon May 11 14:12:52 2009 (r28)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_oss.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
Added: trunk/www/firefox3-devel/files/releng6_pulseaudio
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/releng6_pulseaudio Mon May 11 14:12:52 2009 (r29)
@@ -0,0 +1,34 @@
+--- media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
++++ media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.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 2009-04-24 03:47:06.000000000 +0200
++++ toolkit/library/Makefile.in 2009-05-11 11:05:23.000000000 +0200
+@@ -228,12 +228,12 @@
+ endif
+
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(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)
+ endif
+
+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905111412.n4BECr0M067515>