# HG changeset patch # User Wolfgang Rosenauer # Date 1334569624 -7200 # Node ID 35be97f6fdf709692a97989766f0be40e52767ce # Parent 3711e2f7e3e750a0033605b79addc9b4916ddd0a fix some gcc 4.7 issues (not complete; still not building) diff -r 3711e2f7e3e7 -r 35be97f6fdf7 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sun Apr 15 08:41:36 2012 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Mon Apr 16 11:47:04 2012 +0200 @@ -93,6 +93,7 @@ Patch15: mozilla-yarr-pcre.patch Patch16: mozilla-revert_621446.patch Patch17: mozilla-libnotify.patch +Patch18: mozilla-gcc47.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -224,6 +225,7 @@ #%patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 # %patch31 -p1 %patch32 -p1 diff -r 3711e2f7e3e7 -r 35be97f6fdf7 MozillaFirefox/mozilla-gcc47.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/mozilla-gcc47.patch Mon Apr 16 11:47:04 2012 +0200 @@ -0,0 +1,1 @@ +../mozilla-gcc47.patch \ No newline at end of file diff -r 3711e2f7e3e7 -r 35be97f6fdf7 mozilla-gcc47.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-gcc47.patch Mon Apr 16 11:47:04 2012 +0200 @@ -0,0 +1,73 @@ +# HG changeset patch +# Parent 7014aafc8d4c8862f3064adc46536f6aa9730644 +Patch to make Mozilla build with gcc 4.7, including +- Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13) + +diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc +--- a/ipc/chromium/src/base/file_util_linux.cc ++++ b/ipc/chromium/src/base/file_util_linux.cc +@@ -1,15 +1,18 @@ + // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/file_util.h" + + #include ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include + #include + + #include "base/eintr_wrapper.h" + #include "base/file_path.h" + #include "base/string_util.h" + +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -1,16 +1,19 @@ + // Copyright (c) 2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/message_pump_libevent.h" + + #include + #include ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" + #include "third_party/libevent/event.h" + +diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc +--- a/ipc/chromium/src/base/time_posix.cc ++++ b/ipc/chromium/src/base/time_posix.cc +@@ -8,16 +8,19 @@ + #include + #endif + #include + #ifdef ANDROID + #include + #else + #include + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { + diff -r 3711e2f7e3e7 -r 35be97f6fdf7 series --- a/series Sun Apr 15 08:41:36 2012 +0200 +++ b/series Mon Apr 16 11:47:04 2012 +0200 @@ -20,6 +20,7 @@ mozilla-disable-neon-option.patch mozilla-revert_621446.patch mozilla-libnotify.patch +mozilla-gcc47.patch #mozilla-yarr-pcre.patch # Firefox patches diff -r 3711e2f7e3e7 -r 35be97f6fdf7 xulrunner/mozilla-gcc47.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xulrunner/mozilla-gcc47.patch Mon Apr 16 11:47:04 2012 +0200 @@ -0,0 +1,1 @@ +../mozilla-gcc47.patch \ No newline at end of file diff -r 3711e2f7e3e7 -r 35be97f6fdf7 xulrunner/xulrunner.spec --- a/xulrunner/xulrunner.spec Sun Apr 15 08:41:36 2012 +0200 +++ b/xulrunner/xulrunner.spec Mon Apr 16 11:47:04 2012 +0200 @@ -82,6 +82,7 @@ Patch16: mozilla-revert_621446.patch Patch17: mozilla-yarr-pcre.patch Patch18: mozilla-libnotify.patch +Patch19: mozilla-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js = %{version} Requires(post): update-alternatives coreutils @@ -203,6 +204,7 @@ %patch16 -p1 #%patch17 -p1 %patch18 -p1 +%patch19 -p1 %build # no need to add build time to binaries