Remove useless patches which should have gone in the attic when updating

to mozilla 9. Better late than never.. Still from upstream bug #648735.
Revs https://hg.mozilla.org/mozilla-central/rev/ea33ddde6ade,
https://hg.mozilla.org/mozilla-central/rev/226136c5812e and
https://hg.mozilla.org/mozilla-central/rev/f78d9f4f5234.

While here add a comment stating the failure fixed by last two remaining
ipc patches.
This commit is contained in:
landry 2012-05-09 17:16:01 +00:00
parent 40cced5fcb
commit b4e577b37e
18 changed files with 6 additions and 446 deletions

View File

@ -1,72 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_posix_cc,v 1.2 2012/01/11 01:19:43 nigel Exp $
--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig Thu Dec 15 01:22:33 2011
+++ mozilla/ipc/chromium/src/base/file_util_posix.cc Mon Dec 19 22:30:24 2011
@@ -76,8 +76,8 @@ int CountFilesCreatedAfter(const FilePath& path,
(strcmp(ent->d_name, "..") == 0))
continue;
- struct stat64 st;
- int test = stat64(path.Append(ent->d_name).value().c_str(), &st);
+ struct stat st;
+ int test = stat(path.Append(ent->d_name).value().c_str(), &st);
if (test != 0) {
LOG(ERROR) << "stat64 failed: " << strerror(errno);
continue;
@@ -111,8 +111,8 @@ int CountFilesCreatedAfter(const FilePath& path,
// here.
bool Delete(const FilePath& path, bool recursive) {
const char* path_str = path.value().c_str();
- struct stat64 file_info;
- int test = stat64(path_str, &file_info);
+ struct stat file_info;
+ int test = stat(path_str, &file_info);
if (test != 0) {
// The Windows version defines this condition as success.
bool ret = (errno == ENOENT || errno == ENOTDIR);
@@ -291,19 +291,19 @@ bool CopyDirectory(const FilePath& from_path,
}
bool PathExists(const FilePath& path) {
- struct stat64 file_info;
- return (stat64(path.value().c_str(), &file_info) == 0);
+ struct stat file_info;
+ return (stat(path.value().c_str(), &file_info) == 0);
}
bool PathIsWritable(const FilePath& path) {
FilePath test_path(path);
- struct stat64 file_info;
- if (stat64(test_path.value().c_str(), &file_info) != 0) {
+ struct stat file_info;
+ if (stat(test_path.value().c_str(), &file_info) != 0) {
// If the path doesn't exist, test the parent dir.
test_path = test_path.DirName();
// If the parent dir doesn't exist, then return false (the path is not
// directly writable).
- if (stat64(test_path.value().c_str(), &file_info) != 0)
+ if (stat(test_path.value().c_str(), &file_info) != 0)
return false;
}
if (S_IWOTH & file_info.st_mode)
@@ -316,8 +316,8 @@ bool PathIsWritable(const FilePath& path) {
}
bool DirectoryExists(const FilePath& path) {
- struct stat64 file_info;
- if (stat64(path.value().c_str(), &file_info) == 0)
+ struct stat file_info;
+ if (stat(path.value().c_str(), &file_info) == 0)
return S_ISDIR(file_info.st_mode);
return false;
}
@@ -454,8 +454,8 @@ bool CreateDirectory(const FilePath& full_path) {
}
bool GetFileInfo(const FilePath& file_path, FileInfo* results) {
- struct stat64 file_info;
- if (stat64(file_path.value().c_str(), &file_info) != 0)
+ struct stat file_info;
+ if (stat(file_path.value().c_str(), &file_info) != 0)
return false;
results->is_directory = S_ISDIR(file_info.st_mode);
results->size = file_info.st_size;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.2 2012/01/11 01:19:43 nigel Exp $
--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig Thu Dec 15 01:22:33 2011
+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h Mon Dec 19 22:30:24 2011
@@ -34,7 +34,7 @@
#include "base/third_party/nspr/prcpucfg_win.h"
#elif defined(__APPLE__)
#include "base/third_party/nspr/prcpucfg_mac.h"
-#elif defined(__linux__) || defined(ANDROID)
+#elif defined(__linux__) || defined(ANDROID) || defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_linux.h"
#elif defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_openbsd.h"

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_linux_h,v 1.1 2011/07/24 07:10:12 landry Exp $
--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h.orig Sat May 28 00:43:47 2011
+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h Mon May 30 17:12:06 2011
@@ -42,10 +42,6 @@
#define XP_UNIX
#endif
-#ifndef LINUX
-#define LINUX
-#endif
-
#define PR_AF_INET6 10 /* same as AF_INET6 */
#ifdef __powerpc64__

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.2 2012/01/11 01:19:43 nigel Exp $
--- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig Thu Dec 15 01:22:33 2011
+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc Mon Dec 19 22:30:24 2011
@@ -13,6 +13,9 @@
#include <sys/un.h>
#include <sys/uio.h>
+// error: variable 'iovec iov' has initializer but incomplete type
+#include <sys/uio.h>
+
#include <string>
#include <map>

View File

@ -1,72 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_file_util_posix_cc,v 1.3 2012/02/20 20:21:43 landry Exp $
--- ipc/chromium/src/base/file_util_posix.cc.orig Wed Dec 7 06:27:43 2011
+++ ipc/chromium/src/base/file_util_posix.cc Sat Dec 10 16:53:04 2011
@@ -76,8 +76,8 @@ int CountFilesCreatedAfter(const FilePath& path,
(strcmp(ent->d_name, "..") == 0))
continue;
- struct stat64 st;
- int test = stat64(path.Append(ent->d_name).value().c_str(), &st);
+ struct stat st;
+ int test = stat(path.Append(ent->d_name).value().c_str(), &st);
if (test != 0) {
LOG(ERROR) << "stat64 failed: " << strerror(errno);
continue;
@@ -111,8 +111,8 @@ int CountFilesCreatedAfter(const FilePath& path,
// here.
bool Delete(const FilePath& path, bool recursive) {
const char* path_str = path.value().c_str();
- struct stat64 file_info;
- int test = stat64(path_str, &file_info);
+ struct stat file_info;
+ int test = stat(path_str, &file_info);
if (test != 0) {
// The Windows version defines this condition as success.
bool ret = (errno == ENOENT || errno == ENOTDIR);
@@ -291,19 +291,19 @@ bool CopyDirectory(const FilePath& from_path,
}
bool PathExists(const FilePath& path) {
- struct stat64 file_info;
- return (stat64(path.value().c_str(), &file_info) == 0);
+ struct stat file_info;
+ return (stat(path.value().c_str(), &file_info) == 0);
}
bool PathIsWritable(const FilePath& path) {
FilePath test_path(path);
- struct stat64 file_info;
- if (stat64(test_path.value().c_str(), &file_info) != 0) {
+ struct stat file_info;
+ if (stat(test_path.value().c_str(), &file_info) != 0) {
// If the path doesn't exist, test the parent dir.
test_path = test_path.DirName();
// If the parent dir doesn't exist, then return false (the path is not
// directly writable).
- if (stat64(test_path.value().c_str(), &file_info) != 0)
+ if (stat(test_path.value().c_str(), &file_info) != 0)
return false;
}
if (S_IWOTH & file_info.st_mode)
@@ -316,8 +316,8 @@ bool PathIsWritable(const FilePath& path) {
}
bool DirectoryExists(const FilePath& path) {
- struct stat64 file_info;
- if (stat64(path.value().c_str(), &file_info) == 0)
+ struct stat file_info;
+ if (stat(path.value().c_str(), &file_info) == 0)
return S_ISDIR(file_info.st_mode);
return false;
}
@@ -454,8 +454,8 @@ bool CreateDirectory(const FilePath& full_path) {
}
bool GetFileInfo(const FilePath& file_path, FileInfo* results) {
- struct stat64 file_info;
- if (stat64(file_path.value().c_str(), &file_info) != 0)
+ struct stat file_info;
+ if (stat(file_path.value().c_str(), &file_info) != 0)
return false;
results->is_directory = S_ISDIR(file_info.st_mode);
results->size = file_info.st_size;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.3 2012/02/20 20:21:43 landry Exp $
--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig Wed Dec 7 06:27:43 2011
+++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h Sat Dec 10 16:53:04 2011
@@ -34,7 +34,7 @@
#include "base/third_party/nspr/prcpucfg_win.h"
#elif defined(__APPLE__)
#include "base/third_party/nspr/prcpucfg_mac.h"
-#elif defined(__linux__) || defined(ANDROID)
+#elif defined(__linux__) || defined(ANDROID) || defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_linux.h"
#elif defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_openbsd.h"

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_third_party_nspr_prcpucfg_linux_h,v 1.2 2012/02/20 20:21:43 landry Exp $
--- ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h Wed Jun 1 08:48:32 2011
@@ -42,10 +42,6 @@
#define XP_UNIX
#endif
-#ifndef LINUX
-#define LINUX
-#endif
-
#define PR_AF_INET6 10 /* same as AF_INET6 */
#ifdef __powerpc64__

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.3 2012/02/20 20:21:43 landry Exp $
--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig Wed Dec 7 06:27:43 2011
+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc Sat Dec 10 16:53:04 2011
@@ -13,6 +13,9 @@
#include <sys/un.h>
#include <sys/uio.h>
+// error: variable 'iovec iov' has initializer but incomplete type
+#include <sys/uio.h>
+
#include <string>
#include <map>

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-ipc_chromium_src_base_atomicops_h,v 1.3 2012/01/11 02:42:48 nigel Exp $
$OpenBSD: patch-ipc_chromium_src_base_atomicops_h,v 1.4 2012/05/09 17:16:01 landry Exp $
../../ipc/chromium/src/base/singleton.h:118: error: invalid conversion from 'base::subtle::AtomicWord*' to 'const volatile base::subtle::Atomic64*'
--- ipc/chromium/src/base/atomicops.h.orig Wed Dec 7 06:27:43 2011
+++ ipc/chromium/src/base/atomicops.h Sat Dec 10 17:33:13 2011
@@ -40,7 +40,7 @@ namespace subtle {

View File

@ -1,72 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_file_util_posix_cc,v 1.2 2012/01/11 02:42:48 nigel Exp $
--- ipc/chromium/src/base/file_util_posix.cc.orig Wed Dec 7 06:27:43 2011
+++ ipc/chromium/src/base/file_util_posix.cc Sat Dec 10 16:53:04 2011
@@ -76,8 +76,8 @@ int CountFilesCreatedAfter(const FilePath& path,
(strcmp(ent->d_name, "..") == 0))
continue;
- struct stat64 st;
- int test = stat64(path.Append(ent->d_name).value().c_str(), &st);
+ struct stat st;
+ int test = stat(path.Append(ent->d_name).value().c_str(), &st);
if (test != 0) {
LOG(ERROR) << "stat64 failed: " << strerror(errno);
continue;
@@ -111,8 +111,8 @@ int CountFilesCreatedAfter(const FilePath& path,
// here.
bool Delete(const FilePath& path, bool recursive) {
const char* path_str = path.value().c_str();
- struct stat64 file_info;
- int test = stat64(path_str, &file_info);
+ struct stat file_info;
+ int test = stat(path_str, &file_info);
if (test != 0) {
// The Windows version defines this condition as success.
bool ret = (errno == ENOENT || errno == ENOTDIR);
@@ -291,19 +291,19 @@ bool CopyDirectory(const FilePath& from_path,
}
bool PathExists(const FilePath& path) {
- struct stat64 file_info;
- return (stat64(path.value().c_str(), &file_info) == 0);
+ struct stat file_info;
+ return (stat(path.value().c_str(), &file_info) == 0);
}
bool PathIsWritable(const FilePath& path) {
FilePath test_path(path);
- struct stat64 file_info;
- if (stat64(test_path.value().c_str(), &file_info) != 0) {
+ struct stat file_info;
+ if (stat(test_path.value().c_str(), &file_info) != 0) {
// If the path doesn't exist, test the parent dir.
test_path = test_path.DirName();
// If the parent dir doesn't exist, then return false (the path is not
// directly writable).
- if (stat64(test_path.value().c_str(), &file_info) != 0)
+ if (stat(test_path.value().c_str(), &file_info) != 0)
return false;
}
if (S_IWOTH & file_info.st_mode)
@@ -316,8 +316,8 @@ bool PathIsWritable(const FilePath& path) {
}
bool DirectoryExists(const FilePath& path) {
- struct stat64 file_info;
- if (stat64(path.value().c_str(), &file_info) == 0)
+ struct stat file_info;
+ if (stat(path.value().c_str(), &file_info) == 0)
return S_ISDIR(file_info.st_mode);
return false;
}
@@ -454,8 +454,8 @@ bool CreateDirectory(const FilePath& full_path) {
}
bool GetFileInfo(const FilePath& file_path, FileInfo* results) {
- struct stat64 file_info;
- if (stat64(file_path.value().c_str(), &file_info) != 0)
+ struct stat file_info;
+ if (stat(file_path.value().c_str(), &file_info) != 0)
return false;
results->is_directory = S_ISDIR(file_info.st_mode);
results->size = file_info.st_size;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.2 2012/01/11 02:42:48 nigel Exp $
--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig Wed Dec 7 06:27:43 2011
+++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h Sat Dec 10 16:53:04 2011
@@ -34,7 +34,7 @@
#include "base/third_party/nspr/prcpucfg_win.h"
#elif defined(__APPLE__)
#include "base/third_party/nspr/prcpucfg_mac.h"
-#elif defined(__linux__) || defined(ANDROID)
+#elif defined(__linux__) || defined(ANDROID) || defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_linux.h"
#elif defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_openbsd.h"

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_third_party_nspr_prcpucfg_linux_h,v 1.1 2011/06/28 05:43:57 landry Exp $
--- ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h Wed Jun 1 08:48:32 2011
@@ -42,10 +42,6 @@
#define XP_UNIX
#endif
-#ifndef LINUX
-#define LINUX
-#endif
-
#define PR_AF_INET6 10 /* same as AF_INET6 */
#ifdef __powerpc64__

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.2 2012/01/11 02:42:48 nigel Exp $
--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig Wed Dec 7 06:27:43 2011
+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc Sat Dec 10 16:53:04 2011
@@ -13,6 +13,9 @@
#include <sys/un.h>
#include <sys/uio.h>
+// error: variable 'iovec iov' has initializer but incomplete type
+#include <sys/uio.h>
+
#include <string>
#include <map>

View File

@ -1,4 +1,7 @@
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.4 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.5 2012/05/09 17:16:01 landry Exp $
64 bits only
ipc_message_utils.h: In static member function 'static void IPC::ParamTraits<base::Time>::Write(IPC::Message*, const base::Time&)':
ipc_message_utils.h:310: error: 'Write' is not a member of 'IPC::ParamTraits<long long int>'
--- ipc/chromium/src/chrome/common/ipc_message_utils.h.orig Wed Jan 11 18:14:43 2012
+++ ipc/chromium/src/chrome/common/ipc_message_utils.h Sat Jan 14 20:21:44 2012
@@ -193,6 +193,29 @@ struct ParamTraits<unsigned long long> {

View File

@ -1,72 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_posix_cc,v 1.4 2012/04/30 15:38:09 landry Exp $
--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig Thu Dec 15 01:22:33 2011
+++ mozilla/ipc/chromium/src/base/file_util_posix.cc Mon Dec 19 22:30:24 2011
@@ -76,8 +76,8 @@ int CountFilesCreatedAfter(const FilePath& path,
(strcmp(ent->d_name, "..") == 0))
continue;
- struct stat64 st;
- int test = stat64(path.Append(ent->d_name).value().c_str(), &st);
+ struct stat st;
+ int test = stat(path.Append(ent->d_name).value().c_str(), &st);
if (test != 0) {
LOG(ERROR) << "stat64 failed: " << strerror(errno);
continue;
@@ -111,8 +111,8 @@ int CountFilesCreatedAfter(const FilePath& path,
// here.
bool Delete(const FilePath& path, bool recursive) {
const char* path_str = path.value().c_str();
- struct stat64 file_info;
- int test = stat64(path_str, &file_info);
+ struct stat file_info;
+ int test = stat(path_str, &file_info);
if (test != 0) {
// The Windows version defines this condition as success.
bool ret = (errno == ENOENT || errno == ENOTDIR);
@@ -291,19 +291,19 @@ bool CopyDirectory(const FilePath& from_path,
}
bool PathExists(const FilePath& path) {
- struct stat64 file_info;
- return (stat64(path.value().c_str(), &file_info) == 0);
+ struct stat file_info;
+ return (stat(path.value().c_str(), &file_info) == 0);
}
bool PathIsWritable(const FilePath& path) {
FilePath test_path(path);
- struct stat64 file_info;
- if (stat64(test_path.value().c_str(), &file_info) != 0) {
+ struct stat file_info;
+ if (stat(test_path.value().c_str(), &file_info) != 0) {
// If the path doesn't exist, test the parent dir.
test_path = test_path.DirName();
// If the parent dir doesn't exist, then return false (the path is not
// directly writable).
- if (stat64(test_path.value().c_str(), &file_info) != 0)
+ if (stat(test_path.value().c_str(), &file_info) != 0)
return false;
}
if (S_IWOTH & file_info.st_mode)
@@ -316,8 +316,8 @@ bool PathIsWritable(const FilePath& path) {
}
bool DirectoryExists(const FilePath& path) {
- struct stat64 file_info;
- if (stat64(path.value().c_str(), &file_info) == 0)
+ struct stat file_info;
+ if (stat(path.value().c_str(), &file_info) == 0)
return S_ISDIR(file_info.st_mode);
return false;
}
@@ -454,8 +454,8 @@ bool CreateDirectory(const FilePath& full_path) {
}
bool GetFileInfo(const FilePath& file_path, FileInfo* results) {
- struct stat64 file_info;
- if (stat64(file_path.value().c_str(), &file_info) != 0)
+ struct stat file_info;
+ if (stat(file_path.value().c_str(), &file_info) != 0)
return false;
results->is_directory = S_ISDIR(file_info.st_mode);
results->size = file_info.st_size;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.4 2012/04/30 15:38:09 landry Exp $
--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig Thu Dec 15 01:22:33 2011
+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h Mon Dec 19 22:30:24 2011
@@ -34,7 +34,7 @@
#include "base/third_party/nspr/prcpucfg_win.h"
#elif defined(__APPLE__)
#include "base/third_party/nspr/prcpucfg_mac.h"
-#elif defined(__linux__) || defined(ANDROID)
+#elif defined(__linux__) || defined(ANDROID) || defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_linux.h"
#elif defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_openbsd.h"

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_linux_h,v 1.4 2012/04/30 15:38:09 landry Exp $
--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h.orig Sat May 28 00:43:47 2011
+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h Mon May 30 17:12:06 2011
@@ -42,10 +42,6 @@
#define XP_UNIX
#endif
-#ifndef LINUX
-#define LINUX
-#endif
-
#define PR_AF_INET6 10 /* same as AF_INET6 */
#ifdef __powerpc64__

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.4 2012/04/30 15:38:09 landry Exp $
--- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig Thu Dec 15 01:22:33 2011
+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc Mon Dec 19 22:30:24 2011
@@ -13,6 +13,9 @@
#include <sys/un.h>
#include <sys/uio.h>
+// error: variable 'iovec iov' has initializer but incomplete type
+#include <sys/uio.h>
+
#include <string>
#include <map>