Author: jbeich
Date: Fri Jun 22 19:02:20 2012
New Revision: 790
Log:
update Nightly
Added:
branches/experimental/www/firefox-nightly/files/patch-config-baseconfig.mk
Deleted:
branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox-nightly/distinfo
branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in
branches/experimental/www/firefox-nightly/files/patch-configure.in
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Fri Jun 22 01:30:54 2012
(r789)
+++ branches/experimental/Mk/bsd.gecko.mk Fri Jun 22 19:02:20 2012
(r790)
@@ -798,8 +798,13 @@
$$f; \
fi; \
done
- @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
- ${WRKSRC}/config/autoconf.mk.in
+ @if [ -f ${WRKSRC}/config/baseconfig.mk ] ; then \
+ ${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
+ ${WRKSRC}/config/baseconfig.mk; \
+ else \
+ ${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
+ ${WRKSRC}/config/autoconf.mk.in; \
+ fi
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' \
${MOZSRC}/build/unix/run-mozilla.sh
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Fri Jun 22 01:30:54
2012 (r789)
+++ branches/experimental/www/firefox-nightly/Makefile Fri Jun 22 19:02:20
2012 (r790)
@@ -57,7 +57,7 @@
OPTIONS_DEFINE= PGO
PGO_DESC= Enable Profile-Guided Optimization
-HGREV= 96890:9602a9e99045
+HGREV= 97387:93439ef24979
.include <bsd.port.pre.mk>
Modified: branches/experimental/www/firefox-nightly/distinfo
==============================================================================
--- branches/experimental/www/firefox-nightly/distinfo Fri Jun 22 01:30:54
2012 (r789)
+++ branches/experimental/www/firefox-nightly/distinfo Fri Jun 22 19:02:20
2012 (r790)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/9602a9e99045.tar.bz2) =
f94d4cdaf0a05b543dce113dfe2c208fc80d4c9e63966e4db4b5f85c7dcd6056
-SIZE (firefox-nightly/9602a9e99045.tar.bz2) = 82641467
+SHA256 (firefox-nightly/93439ef24979.tar.bz2) =
15bf9dc23ce68ea681b43ed0885328f4ef6c6f9d69cd9626fdd5c17327ac3fcc
+SIZE (firefox-nightly/93439ef24979.tar.bz2) = 86930297
Added:
branches/experimental/www/firefox-nightly/files/patch-config-baseconfig.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-config-baseconfig.mk
Fri Jun 22 19:02:20 2012 (r790)
@@ -0,0 +1,16 @@
+--- config/baseconfig.mk~
++++ config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/%%MOZILLA%%
++idldir = $(datadir)/idl/%%MOZILLA%%
++installdir = $(libdir)/%%MOZILLA%%
++sdkdir = $(libdir)/%%MOZILLA%%
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
Modified:
branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in
Fri Jun 22 01:30:54 2012 (r789)
+++ branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in
Fri Jun 22 19:02:20 2012 (r790)
@@ -1,30 +1,11 @@
--- 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@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/%%MOZILLA%%
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = $(datadir)/idl/%%MOZILLA%%
+@@ -287,7 +287,7 @@ WCHAR_CFLAGS = @WCHAR_CFLAGS@
+ OS_CPPFLAGS = @OS_CPPFLAGS@
+ OS_CFLAGS = @OS_CFLAGS@
+ OS_CXXFLAGS = @OS_CXXFLAGS@
+-OS_LDFLAGS = @OS_LDFLAGS@
++OS_LDFLAGS = @OS_LDFLAGS@ -lc
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/%%MOZILLA%%
-+sdkdir = $(libdir)/%%MOZILLA%%
-
- 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@
+ OS_COMPILE_CFLAGS = @OS_COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = @OS_COMPILE_CXXFLAGS@
Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-configure.in Fri Jun
22 01:30:54 2012 (r789)
+++ branches/experimental/www/firefox-nightly/files/patch-configure.in Fri Jun
22 19:02:20 2012 (r790)
@@ -41,14 +41,14 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
+@@ -4101,7 +4105,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a
"$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
+-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then
++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a
"$MOZ_NATIVE_ZLIB" = 1; then
+ MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
+ MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
fi
@@ -6022,6 +6024,14 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
Deleted:
branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
==============================================================================
---
branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
Fri Jun 22 19:02:20 2012 (r789)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- content/media/gstreamer/nsGStreamerReader.cpp~
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO),
static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
Deleted:
branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp
==============================================================================
---
branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp
Fri Jun 22 19:02:20 2012 (r789)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- dom/system/OSFileConstants.cpp~
-+++ dom/system/OSFileConstants.cpp
-@@ -9,9 +9,9 @@
- #include "unistd.h"
- #endif // defined(XP_UNIX)
-
--#if defined(XP_MACOSX) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(XP_MACOSX)
- #include "copyfile.h"
--#endif // defined(XP_MAC) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#endif // defined(XP_MAC)
-
- #if defined(XP_WIN)
- #include <windows.h>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
