diff options
author | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-04-29 22:02:40 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-04-29 22:02:40 -0300 |
commit | a1e50fec714d1caf43a82d39ef0e29ccf9e0f4d2 (patch) | |
tree | 4f8845239d13b815f11dcbfdde12c73a94b48dff /libre/xulrunner-libre/gcc47.patch | |
parent | e40d53b7c0d220ecaa5d76a0318d8c4653aaab18 (diff) | |
download | abslibre-a1e50fec714d1caf43a82d39ef0e29ccf9e0f4d2.tar.gz abslibre-a1e50fec714d1caf43a82d39ef0e29ccf9e0f4d2.tar.bz2 abslibre-a1e50fec714d1caf43a82d39ef0e29ccf9e0f4d2.zip |
xulrunner-libre-12.0.3-1: updating version
Diffstat (limited to 'libre/xulrunner-libre/gcc47.patch')
-rw-r--r-- | libre/xulrunner-libre/gcc47.patch | 89 |
1 files changed, 61 insertions, 28 deletions
diff --git a/libre/xulrunner-libre/gcc47.patch b/libre/xulrunner-libre/gcc47.patch index 5bdd36c6f..5cea6769d 100644 --- a/libre/xulrunner-libre/gcc47.patch +++ b/libre/xulrunner-libre/gcc47.patch @@ -1,44 +1,77 @@ ---- mozilla-release.orig/ipc/chromium/src/base/file_util.cc 2012-03-06 14:26:03.000000000 -0200 -+++ mozilla-release/ipc/chromium/src/base/file_util.cc 2012-04-04 18:50:02.094431651 -0300 -@@ -8,7 +8,7 @@ - #include <io.h> - #endif - #include <stdio.h> --#if defined(ANDROID) -+#if defined(ANDROID) || defined(OS_POSIX) - #include <unistd.h> - #endif ---- mozilla-release.orig/ipc/chromium/src/base/message_pump_libevent.cc 2012-03-06 14:26:03.000000000 -0200 -+++ mozilla-release/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-04 19:55:24.140455837 -0300 -@@ -6,6 +6,7 @@ - - #include <errno.h> - #include <fcntl.h> -+#include <unistd.h> - - #include "eintr_wrapper.h" - #include "base/logging.h" +# HG changeset patch +# User Martin Stránský <stransky@redhat.com> +# Date 1328886461 -3600 +# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349 +# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049 +Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin ---- mozilla-release.orig/ipc/chromium/src/base/file_util_linux.cc 2012-03-06 14:26:03.000000000 -0200 -+++ mozilla-release/ipc/chromium/src/base/file_util_linux.cc 2012-04-04 20:49:49.756138306 -0300 -@@ -5,6 +5,7 @@ +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 <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> ++#endif #include <string> #include <vector> - ---- mozilla-release.orig/ipc/chromium/src/base/time_posix.cc 2012-03-06 14:26:03.000000000 -0200 -+++ mozilla-release/ipc/chromium/src/base/time_posix.cc 2012-04-04 20:55:12.678037291 -0300 -@@ -8,6 +8,7 @@ + + #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 <errno.h> + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#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 <mach/mach_time.h> #endif #include <sys/time.h> -+#include <unistd.h> #ifdef ANDROID #include <time64.h> #else + #include <time.h> + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <limits> + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { + |