[SVN-Commit] r1103 - in trunk/www/firefox: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sun Nov 25 09:19:34 2012
New Revision: 1103

Log:
add missed patches from Nightly, still fails with gcc42

  {standard input}: Assembler messages:
  {standard input}:7643: Error: junk at end of line, first unrecognized character is `*'
  gmake[5]: *** [nsDOMFile.o] Error 1

Added:
   trunk/www/firefox/files/patch-bug783505
   trunk/www/firefox/files/patch-bug798354
Modified:
   trunk/www/firefox/Makefile
   trunk/www/firefox/files/extra-bug780531

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Sat Nov 24 02:29:41 2012	(r1102)
+++ trunk/www/firefox/Makefile	Sun Nov 25 09:19:34 2012	(r1103)
@@ -104,6 +104,8 @@
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
 
 post-patch:
+	@${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \
+		${WRKSRC}/configure.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 

Modified: trunk/www/firefox/files/extra-bug780531
==============================================================================
--- trunk/www/firefox/files/extra-bug780531	Sat Nov 24 02:29:41 2012	(r1102)
+++ trunk/www/firefox/files/extra-bug780531	Sun Nov 25 09:19:34 2012	(r1103)
@@ -8,6 +8,6 @@
 -arm*)
 +case "$target" in
 +arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
-     MOZ_SAMPLE_TYPE_S16LE=1
-     AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
-     AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
+     MOZ_SAMPLE_TYPE_S16=1
+     AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
+     AC_SUBST(MOZ_SAMPLE_TYPE_S16)

Added: trunk/www/firefox/files/patch-bug783505
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug783505	Sun Nov 25 09:19:34 2012	(r1103)
@@ -0,0 +1,52 @@
+commit b5f97ee
+Author: Rafael Ávila de Espíndola <respindola at mozilla.com>
+Date:   Mon Aug 20 10:28:08 2012 -0400
+
+    Bug 783505 - OS X gcc builds failing. r=jorendorff.
+    This patch adds a workaround for
+    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608
+---
+ js/src/jstypedarray.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git js/src/jstypedarray.cpp js/src/jstypedarray.cpp
+index 1eaeea0..1957086 100644
+--- js/src/jstypedarray.cpp
++++ js/src/jstypedarray.cpp
+@@ -1423,8 +1423,14 @@ class TypedArrayTemplate
+     Getter(JSContext *cx, unsigned argc, Value *vp)
+     {
+         CallArgs args = CallArgsFromVp(argc, vp);
++        // FIXME: Hack to keep us building with gcc 4.2. Remove this once we
++        // drop support for gcc 4.2. See bug 783505 for the details.
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
++        return CallNonGenericMethod(cx, IsThisClass, GetterImpl<ValueGetter>, args);
++#else
+         return CallNonGenericMethod<ThisTypeArray::IsThisClass,
+                                     ThisTypeArray::GetterImpl<ValueGetter> >(cx, args);
++#endif
+     }
+ 
+     // Define an accessor for a read-only property that invokes a native getter
+--- build/autoconf/gcc-pr39608.m4~
++++ build/autoconf/gcc-pr39608.m4
+@@ -31,7 +31,6 @@ AC_LANG_RESTORE
+ 
+ AC_MSG_RESULT($ac_have_gcc_pr39608)
+ if test "$ac_have_gcc_pr39608" = "yes"; then
+-   echo This compiler would fail to build firefox, plase upgrade.
+-   exit 1
++   echo This compiler may fail to build firefox, plase upgrade.
+ fi
+ ])
+--- js/src/build/autoconf/gcc-pr39608.m4~
++++ js/src/build/autoconf/gcc-pr39608.m4
+@@ -31,7 +31,6 @@ AC_LANG_RESTORE
+ 
+ AC_MSG_RESULT($ac_have_gcc_pr39608)
+ if test "$ac_have_gcc_pr39608" = "yes"; then
+-   echo This compiler would fail to build firefox, plase upgrade.
+-   exit 1
++   echo This compiler may fail to build firefox, plase upgrade.
+ fi
+ ])

Added: trunk/www/firefox/files/patch-bug798354
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug798354	Sun Nov 25 09:19:34 2012	(r1103)
@@ -0,0 +1,15 @@
+--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc~
++++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) {
+ }
+ 
+ //------------------------------------------------------------------------------
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
++sockaddr_un sizecheck;
++const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path);
++#else
+ const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path);
++#endif
+ 
+ // Creates a Fifo with the specified name ready to listen on.
+ bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) {