Update fennec to 9.0

Change for macppc from mpi@

Ok landry@ stsp@ mpi@
This commit is contained in:
nigel 2012-01-11 02:17:13 +00:00
parent eb815403f0
commit 88bc52d7de
30 changed files with 160 additions and 254 deletions

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.17 2011/12/15 23:09:44 nigel Exp $
# $OpenBSD: Makefile,v 1.18 2012/01/11 02:17:13 nigel Exp $
COMMENT = Mozilla mobile web browser
MOZILLA_VERSION = 8.0
MOZILLA_VERSION = 9.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = fennec
MOZILLA_CODENAME = mobile
REVISION = 0
SO_VERSION = 4.0
SO_VERSION = 5.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = mozalloc xpcom xul
@ -23,6 +22,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/mobile/releases/${MOZILLA_VERSION}/source/ \
https://ftp.mozilla.org/pub/mozilla.org/mobile/releases/${MOZILLA_VERSION}/source/ \
ftp://ftp.mozilla.org/pub/mozilla.org/mobile/releases/${MOZILLA_VERSION}/source/
HOMEPAGE = http://www.mozilla.com/en-US/mobile/

View File

@ -1,5 +1,5 @@
MD5 (mozilla/fennec-8.0.source.tar.bz2) = 5fTiYaLF+59D/o+GwCYelg==
RMD160 (mozilla/fennec-8.0.source.tar.bz2) = 6A1D8vHTJyUyyBvaXVsWGfn2X0o=
SHA1 (mozilla/fennec-8.0.source.tar.bz2) = 85w0FYbCyOSnuV/IzFsvr66KMOI=
SHA256 (mozilla/fennec-8.0.source.tar.bz2) = 5XdfP3shbNBUGW5PYO5lbGoyklTH1sxw4NRonlTAmig=
SIZE (mozilla/fennec-8.0.source.tar.bz2) = 70377669
MD5 (mozilla/fennec-9.0.source.tar.bz2) = cfW4HVZlDIFRSjAoRivD9g==
RMD160 (mozilla/fennec-9.0.source.tar.bz2) = E5Tm/R3/uKGV5W4GZ0WHtFomhe4=
SHA1 (mozilla/fennec-9.0.source.tar.bz2) = OKDHhhQCeYLApOnRSL6pG30Myfk=
SHA256 (mozilla/fennec-9.0.source.tar.bz2) = oVgWxlIWvFQ8s2Qbsf6gzsqxTNBy5gW46XlRNvXLeac=
SIZE (mozilla/fennec-9.0.source.tar.bz2) = 74201513

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.5 2011/12/08 00:42:54 nigel Exp $
--- browser/app/profile/firefox.js.orig Fri Nov 4 23:51:43 2011
+++ browser/app/profile/firefox.js Thu Nov 17 19:34:16 2011
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.6 2012/01/11 02:17:13 nigel Exp $
--- browser/app/profile/firefox.js.orig Fri Dec 16 21:59:03 2011
+++ browser/app/profile/firefox.js Thu Dec 22 00:39:29 2011
@@ -140,7 +140,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
pref("app.update.certs.2.commonName", "aus3.mozilla.org");
@ -32,7 +32,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.5 2011/12/08 00:42:54 nigel E
// Non-enhanced mode (local url lists) URL list to check for updates
pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
@@ -756,10 +756,8 @@ pref("browser.EULA.version", 3);
@@ -748,10 +748,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_autoconf_mk_in,v 1.5 2011/12/08 00:42:54 nigel Exp $
--- config/autoconf.mk.in.orig Fri Nov 4 23:51:44 2011
+++ config/autoconf.mk.in Thu Nov 17 19:34:16 2011
@@ -299,7 +299,7 @@ OS_LDFLAGS = @LDFLAGS@
$OpenBSD: patch-config_autoconf_mk_in,v 1.6 2012/01/11 02:17:13 nigel Exp $
--- config/autoconf.mk.in.orig Fri Dec 16 21:59:04 2011
+++ config/autoconf.mk.in Thu Dec 22 00:39:29 2011
@@ -295,7 +295,7 @@ OS_LDFLAGS = @LDFLAGS@
OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-config_rules_mk,v 1.5 2011/12/08 00:42:54 nigel Exp $
$OpenBSD: patch-config_rules_mk,v 1.6 2012/01/11 02:17:13 nigel Exp $
Add -rpath $(installdir) to be sure libxul/libxpcom can open their
depending libs when being dlopen()'ed themselves
--- config/rules.mk.orig Fri Nov 4 23:51:44 2011
+++ config/rules.mk Thu Nov 17 19:34:16 2011
@@ -559,6 +559,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--- config/rules.mk.orig Fri Dec 16 21:59:04 2011
+++ config/rules.mk Thu Dec 22 00:39:29 2011
@@ -583,6 +583,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
endif
endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.4 2011/12/08 00:42:54 nigel Exp $
--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig Fri Nov 4 23:51:49 2011
+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Thu Nov 17 19:34:16 2011
@@ -63,6 +63,7 @@
$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.5 2012/01/11 02:17:13 nigel Exp $
--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig Fri Dec 16 21:59:09 2011
+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Thu Dec 22 00:39:29 2011
@@ -64,6 +64,7 @@
#include "nsISimpleEnumerator.h"
#include "nsIDirectoryEnumerator.h"
#include "nsIFile.h"
@ -9,7 +9,7 @@ $OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.4 2011/12
#include "nsDirectoryServiceUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "mozISpellI18NManager.h"
@@ -370,6 +371,16 @@ mozHunspell::LoadDictionaryList()
@@ -404,6 +405,16 @@ mozHunspell::LoadDictionaryList()
appDir->AppendNative(NS_LITERAL_CSTRING("dictionaries"));
LoadDictionariesFromDir(appDir);
}
@ -25,4 +25,4 @@ $OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.4 2011/12
+ LoadDictionariesFromDir(mozillaDir);
}
nsCOMPtr<nsISimpleEnumerator> dictDirs;
// find dictionaries from extensions requiring restart

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-gfx_qcms_qcmstypes_h,v 1.5 2012/01/11 02:17:13 nigel Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=651444
--- gfx/qcms/qcmstypes.h.orig Tue Dec 13 01:33:56 2011
+++ gfx/qcms/qcmstypes.h Mon Dec 19 00:34:27 2011
@@ -12,7 +12,7 @@
#include <sys/int_types.h>
#elif defined (_AIX)
#include <sys/types.h>
-#elif !defined(ANDROID) && !defined(__OpenBSD__)
+#elif !defined(ANDROID)
typedef PRInt8 int8_t;
typedef PRUint8 uint8_t;
typedef PRInt16 int16_t;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.3 2011/12/08 00:42:54 nigel Exp $
--- gfx/thebes/Makefile.in.orig Fri Nov 4 23:51:50 2011
+++ gfx/thebes/Makefile.in Thu Nov 17 19:34:16 2011
@@ -389,6 +389,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.4 2012/01/11 02:17:13 nigel Exp $
--- gfx/thebes/Makefile.in.orig Fri Dec 16 21:59:10 2011
+++ gfx/thebes/Makefile.in Thu Dec 22 00:39:32 2011
@@ -382,6 +382,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ipc_chromium_src_base_atomicops_h,v 1.2 2011/10/28 13:09:26 robert Exp $
$OpenBSD: patch-ipc_chromium_src_base_atomicops_h,v 1.3 2012/01/11 02:17:13 nigel Exp $
--- ipc/chromium/src/base/atomicops.h.orig Wed Sep 28 22:24:48 2011
+++ ipc/chromium/src/base/atomicops.h Fri Oct 28 14:46:18 2011
@@ -40,12 +40,16 @@ namespace subtle {
@@ -40,7 +40,7 @@ namespace subtle {
#endif
typedef __w64 int32 Atomic32;
#ifdef ARCH_CPU_64_BITS
@ -10,12 +10,3 @@ $OpenBSD: patch-ipc_chromium_src_base_atomicops_h,v 1.2 2011/10/28 13:09:26 robe
#endif
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
// Atomic64 routines below, depending on your architecture.
+#if defined(OS_OPENBSD) && !defined(ARCH_CPU_64_BITS)
+typedef Atomic32 AtomicWord;
+#else
typedef intptr_t AtomicWord;
+#endif
// Atomically execute:
// result = *ptr;

View File

@ -1,35 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_debug_util_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/debug_util_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/debug_util_posix.cc Wed Jun 1 08:48:32 2011
@@ -8,10 +8,12 @@
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
+#include <limits.h>
#include <sys/stat.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <unistd.h>
-#ifndef ANDROID
+#ifdef __GLIBC__
#include <execinfo.h>
#include <sys/sysctl.h>
#endif
@@ -119,7 +121,7 @@ StackTrace::StackTrace() {
const int kMaxCallers = 256;
void* callers[kMaxCallers];
-#ifndef ANDROID
+#ifdef __GLIBC__
int count = backtrace(callers, kMaxCallers);
#else
int count = 0;
@@ -138,7 +140,7 @@ StackTrace::StackTrace() {
void StackTrace::PrintBacktrace() {
fflush(stderr);
-#ifndef ANDROID
+#ifdef __GLIBC__
backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
#endif
}

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-ipc_chromium_src_base_dir_reader_posix_h,v 1.1 2012/01/11 02:17:13 nigel Exp $
--- ipc/chromium/src/base/dir_reader_posix.h.orig Tue Dec 13 01:33:57 2011
+++ ipc/chromium/src/base/dir_reader_posix.h Mon Dec 19 00:36:16 2011
@@ -18,7 +18,7 @@
// seems worse than falling back to enumerating all file descriptors so we will
// probably never implement this on the Mac.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && ! defined(OS_OPENBSD)
#include "base/dir_reader_linux.h"
#else
#include "base/dir_reader_fallback.h"
@@ -26,7 +26,7 @@
namespace base {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && ! defined(OS_OPENBSD)
typedef DirReaderLinux DirReaderPosix;
#else
typedef DirReaderFallback DirReaderPosix;

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_file_util_h,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/file_util.h.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/file_util.h Wed Jun 1 08:48:32 2011
@@ -15,6 +15,7 @@
#elif defined(ANDROID)
#include <sys/stat.h>
#elif defined(OS_POSIX)
+#include <sys/types.h>
#include <fts.h>
#include <sys/stat.h>
#endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/file_util_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/file_util_posix.cc Wed Jun 1 08:48:32 2011
@@ -71,8 +71,8 @@ int CountFilesCreatedAfter(const FilePath& path,
$OpenBSD: patch-ipc_chromium_src_base_file_util_posix_cc,v 1.2 2012/01/11 02:17:13 nigel Exp $
--- ipc/chromium/src/base/file_util_posix.cc.orig Fri Dec 16 21:59:11 2011
+++ ipc/chromium/src/base/file_util_posix.cc Thu Dec 22 00:39:29 2011
@@ -76,8 +76,8 @@ int CountFilesCreatedAfter(const FilePath& path,
(strcmp(ent->d_name, "..") == 0))
continue;
@ -12,7 +12,7 @@ $OpenBSD: patch-ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/06/28 22:01:
if (test != 0) {
LOG(ERROR) << "stat64 failed: " << strerror(errno);
continue;
@@ -106,8 +106,8 @@ int CountFilesCreatedAfter(const FilePath& path,
@@ -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();
@ -23,7 +23,7 @@ $OpenBSD: patch-ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/06/28 22:01:
if (test != 0) {
// The Windows version defines this condition as success.
bool ret = (errno == ENOENT || errno == ENOTDIR);
@@ -286,19 +286,19 @@ bool CopyDirectory(const FilePath& from_path,
@@ -291,19 +291,19 @@ bool CopyDirectory(const FilePath& from_path,
}
bool PathExists(const FilePath& path) {
@ -48,7 +48,7 @@ $OpenBSD: patch-ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/06/28 22:01:
return false;
}
if (S_IWOTH & file_info.st_mode)
@@ -311,8 +311,8 @@ bool PathIsWritable(const FilePath& path) {
@@ -316,8 +316,8 @@ bool PathIsWritable(const FilePath& path) {
}
bool DirectoryExists(const FilePath& path) {
@ -59,7 +59,7 @@ $OpenBSD: patch-ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/06/28 22:01:
return S_ISDIR(file_info.st_mode);
return false;
}
@@ -449,8 +449,8 @@ bool CreateDirectory(const FilePath& full_path) {
@@ -454,8 +454,8 @@ bool CreateDirectory(const FilePath& full_path) {
}
bool GetFileInfo(const FilePath& file_path, FileInfo* results) {

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_platform_file_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/platform_file_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/platform_file_posix.cc Wed Jun 1 08:48:32 2011
@@ -4,6 +4,9 @@
#include "base/platform_file.h"
+#ifdef __OpenBSD__
+#include <sys/stat.h>
+#endif
#include <fcntl.h>
#include <errno.h>
#ifdef ANDROID

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_platform_thread_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/platform_thread_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/platform_thread_posix.cc Wed Jun 1 08:48:32 2011
@@ -33,6 +33,8 @@ PlatformThreadId PlatformThread::CurrentId() {
// into the kernel.
#if defined(OS_MACOSX)
return mach_thread_self();
+#elif defined(__OpenBSD__)
+ return getpid();
#elif defined(OS_LINUX)
return syscall(__NR_gettid);
#endif

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h Wed Jun 1 08:48:32 2011
$OpenBSD: patch-ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.2 2012/01/11 02:17:13 nigel Exp $
--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig Fri Dec 16 21:59:11 2011
+++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h Thu Dec 22 00:39:29 2011
@@ -34,7 +34,7 @@
#include "base/third_party/nspr/prcpucfg_win.h"
#elif defined(__APPLE__)
@ -8,5 +8,5 @@ $OpenBSD: patch-ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.1 2011/06/
-#elif defined(__linux__) || defined(ANDROID)
+#elif defined(__linux__) || defined(ANDROID) || defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_linux.h"
#else
#error Provide a prcpucfg.h appropriate for your platform
#elif defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_openbsd.h"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_base_time_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/time_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/time_posix.cc Wed Jun 1 08:48:32 2011
@@ -164,7 +164,7 @@ TimeTicks TimeTicks::Now() {
// With numer and denom = 1 (the expected case), the 64-bit absolute time
// reported in nanoseconds is enough to last nearly 585 years.
-#elif defined(OS_POSIX) && \
+#elif defined(__OpenBSD__) || defined(OS_POSIX) && \
defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
struct timespec ts;

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-ipc_chromium_src_build_build_config_h,v 1.2 2011/08/23 20:55:53 landry Exp $
--- ipc/chromium/src/build/build_config.h.orig Fri Jul 22 00:18:39 2011
+++ ipc/chromium/src/build/build_config.h Sat Jul 30 15:38:37 2011
@@ -19,6 +19,8 @@
#define OS_MACOSX 1
#elif defined(__linux__) || defined(ANDROID)
#define OS_LINUX 1
+#elif defined(__OpenBSD__)
+#define OS_OPENBSD 1
#elif defined(_WIN32)
#define OS_WIN 1
#else
@@ -27,7 +29,7 @@
// For access to standard POSIX features, use OS_POSIX instead of a more
// specific macro.
-#if defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD)
#define OS_POSIX 1
#endif
@@ -60,6 +62,9 @@
#elif defined(__ppc__) || defined(__powerpc__)
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
+#elif defined(__sparc64__)
+#define ARCH_CPU_SPARC 1
+#define ARCH_CPU_64_BITS 1
#else
#error Please add support for your architecture in build/build_config.h
#endif

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc Wed Jun 1 08:48:32 2011
@@ -12,6 +12,9 @@
#include <sys/stat.h>
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.2 2012/01/11 02:17:13 nigel Exp $
--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig Fri Dec 16 21:59:11 2011
+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc Thu Dec 22 00:39:29 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>

View File

@ -1,21 +1,33 @@
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.2 2011/10/28 13:09:26 robert Exp $
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.3 2012/01/11 02:17:13 nigel Exp $
--- ipc/chromium/src/chrome/common/ipc_message_utils.h.orig Wed Sep 28 22:24:48 2011
+++ ipc/chromium/src/chrome/common/ipc_message_utils.h Fri Oct 28 14:46:29 2011
@@ -219,7 +219,7 @@ struct ParamTraits<unsigned long> {
@@ -193,6 +193,29 @@ struct ParamTraits<unsigned long long> {
l->append(StringPrintf(L"%ull", p));
}
};
+
+template <>
+struct ParamTraits<long long> {
+ typedef long long param_type;
+ static void Write(Message* m, const param_type& p) {
+ m->WriteData(reinterpret_cast<const char*>(&p), sizeof(param_type));
+ }
+ static bool Read(const Message* m, void** iter, param_type* r) {
+ const char *data;
+ int data_size = 0;
+ bool result = m->ReadData(iter, &data, &data_size);
+ if (result && data_size == sizeof(param_type)) {
+ memcpy(r, data, sizeof(param_type));
+ } else {
+ result = false;
+ NOTREACHED();
+ }
+ return result;
+ }
+ static void Log(const param_type& p, std::wstring* l) {
+ l->append(StringPrintf(L"%ull", p));
+ }
+};
#endif
-#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
// There size_t is a synonym for |unsigned long| ...
template <>
struct ParamTraits<size_t> {
@@ -272,7 +272,7 @@ struct ParamTraits<uint32> {
};
#endif // defined(OS_MACOSX)
-#if !(defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS))
+#if !(defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(OS_OPENBSD)
// int64 is |long int| on 64-bit systems, uint64 is |unsigned long|
template <>
struct ParamTraits<int64> {
#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-js_src_Makefile_in,v 1.5 2011/12/08 01:35:08 nigel Exp $: patch-js_src_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
--- js/src/Makefile.in.orig Thu Nov 17 19:43:54 2011
+++ js/src/Makefile.in Thu Nov 17 19:47:41 2011
@@ -438,6 +438,9 @@ else
###############################################
# BEGIN include sources for the Nitro assembler
#
+
+ENABLE_YARR_JIT = 1
+
VPATH += $(srcdir)/assembler \
$(srcdir)/assembler/wtf \
$(srcdir)/assembler/jit \
@@ -1081,7 +1084,11 @@ endif
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
+
+ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
+CXXFLAGS += -DENABLE_JIT=1
+endif
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-js_src_configure_in,v 1.5 2011/12/08 01:35:08 nigel Exp $
$OpenBSD: patch-js_src_configure_in,v 1.6 2012/01/11 02:17:13 nigel Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648721
https://bugzilla.mozilla.org/show_bug.cgi?id=650742
https://bugzilla.mozilla.org/show_bug.cgi?id=589754
--- js/src/configure.in.orig Fri Nov 4 23:51:52 2011
+++ js/src/configure.in Thu Nov 17 19:34:16 2011
@@ -2440,7 +2440,8 @@ ia64*-hpux*)
--- js/src/configure.in.orig Fri Dec 16 21:59:12 2011
+++ js/src/configure.in Thu Dec 22 00:39:29 2011
@@ -2231,7 +2231,8 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2763,7 +2764,7 @@ arm*-*)
@@ -2511,7 +2512,7 @@ arm*-*)
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
@ -23,7 +23,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
ENABLE_TRACEJIT=1
NANOJIT_ARCH=Sparc
ENABLE_METHODJIT=1
@@ -2837,6 +2838,10 @@ arm*-*)
@@ -2585,6 +2586,10 @@ arm*-*)
sparc-*)
AC_DEFINE(AVMPLUS_SPARC)
;;
@ -34,7 +34,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
esac
case "$target" in
@@ -2851,6 +2856,9 @@ case "$target" in
@@ -2599,6 +2604,9 @@ case "$target" in
AC_DEFINE(AVMPLUS_UNIX)
;;
*-freebsd*|*-kfreebsd*)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.5 2011/12/08 01:35:08 nigel Exp $
--- js/src/xpconnect/src/Makefile.in.orig Fri Nov 4 23:51:56 2011
+++ js/src/xpconnect/src/Makefile.in Thu Nov 17 19:34:16 2011
@@ -179,6 +179,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.6 2012/01/11 02:17:13 nigel Exp $
--- js/src/xpconnect/src/Makefile.in.orig Fri Dec 16 21:59:15 2011
+++ js/src/xpconnect/src/Makefile.in Thu Dec 22 00:39:32 2011
@@ -170,6 +170,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
--makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
$(ENABLE_TRACEABLE_FLAGS) \
$(srcdir)/dom_quickstubs.qsconf

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
--- security/manager/ssl/src/Makefile.in.orig Fri May 27 18:12:40 2011
+++ security/manager/ssl/src/Makefile.in Tue May 31 22:18:26 2011
@@ -115,7 +115,10 @@ CSRCS += md4.c
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.4 2012/01/11 02:17:13 nigel Exp $
--- security/manager/ssl/src/Makefile.in.orig Fri Dec 16 21:59:24 2011
+++ security/manager/ssl/src/Makefile.in Thu Dec 22 00:39:32 2011
@@ -114,7 +114,10 @@ CSRCS += md4.c
EXTRA_DEPS = $(NSS_DEP_LIBS)

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.5 2011/12/08 01:35:08 nigel Exp $
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.6 2012/01/11 02:17:13 nigel Exp $
set secure_delete PRAGMA on by default, instead of using internal sqlite copy
https://bugzilla.mozilla.org/show_bug.cgi?id=546162
--- storage/src/mozStorageConnection.cpp.orig Fri Nov 4 23:52:08 2011
+++ storage/src/mozStorageConnection.cpp Thu Nov 17 19:34:16 2011
@@ -591,6 +591,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
--- storage/src/mozStorageConnection.cpp.orig Fri Dec 16 21:59:25 2011
+++ storage/src/mozStorageConnection.cpp Thu Dec 22 00:39:30 2011
@@ -593,6 +593,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
return convertResultCode(srv);
}

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.5 2011/12/08 01:35:08 nigel Exp $
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.6 2012/01/11 02:17:13 nigel Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
https://bugzilla.mozilla.org/show_bug.cgi?id=648730
--- toolkit/library/Makefile.in.orig Fri Nov 4 23:52:10 2011
+++ toolkit/library/Makefile.in Thu Nov 17 19:40:27 2011
@@ -157,6 +157,12 @@ OS_LIBS += \
--- toolkit/library/Makefile.in.orig Fri Dec 16 21:59:27 2011
+++ toolkit/library/Makefile.in Thu Dec 22 00:39:32 2011
@@ -156,6 +156,12 @@ OS_LIBS += \
$(NULL)
endif
@ -16,7 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=648730
ifeq ($(OS_ARCH),Darwin)
ifdef MOZ_SYDNEYAUDIO
EXTRA_DSO_LDOPTS += \
@@ -168,12 +174,6 @@ EXTRA_DSO_LDOPTS += \
@@ -167,12 +173,6 @@ EXTRA_DSO_LDOPTS += \
-framework Foundation \
-framework AppKit \
$(NULL)

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.5 2011/12/08 01:35:08 nigel Exp $
$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.6 2012/01/11 02:17:13 nigel Exp $
Ensure systemwide nss is taken
Ensure local libjs is taken (build failure when spidermonkey is installed,
its libjs_static.a is found first in lib search path)
https://bugzilla.mozilla.org/show_bug.cgi?id=646375
--- toolkit/library/libxul-config.mk.orig Fri Nov 4 23:52:10 2011
+++ toolkit/library/libxul-config.mk Thu Nov 17 19:40:27 2011
@@ -320,14 +320,15 @@ EXTRA_DSO_LDOPTS += \
--- toolkit/library/libxul-config.mk.orig Fri Dec 16 21:59:27 2011
+++ toolkit/library/libxul-config.mk Thu Dec 22 00:39:30 2011
@@ -321,14 +321,15 @@ EXTRA_DSO_LDOPTS += \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(QCMS_LIBS) \

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.5 2011/12/08 01:35:08 nigel Exp $
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.6 2012/01/11 02:17:13 nigel Exp $
install headers/idl/sdk libs only if xulrunner
--- toolkit/mozapps/installer/packager.mk.orig Fri Nov 4 23:52:10 2011
+++ toolkit/mozapps/installer/packager.mk Thu Nov 17 19:34:16 2011
@@ -759,7 +759,7 @@ endif
--- toolkit/mozapps/installer/packager.mk.orig Fri Dec 16 21:59:28 2011
+++ toolkit/mozapps/installer/packager.mk Thu Dec 22 00:39:30 2011
@@ -785,7 +785,7 @@ endif
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.4 2011/12/08 01:35:08 nigel Exp $
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.5 2012/01/11 02:17:13 nigel Exp $
chunk 2: https://bugzilla.mozilla.org/show_bug.cgi?id=650749
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Fri Nov 4 23:52:12 2011
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Thu Nov 17 19:34:16 2011
@@ -219,7 +219,7 @@ endif
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Fri Dec 16 21:59:29 2011
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Thu Dec 22 00:39:32 2011
@@ -199,7 +199,7 @@ endif
#
# OpenBSD/ARM
#

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2011/12/08 01:35:08 nigel Exp $
@comment $OpenBSD: PLIST,v 1.7 2012/01/11 02:17:13 nigel Exp $
bin/${MOZILLA_PROJECT}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/application.ini
@ -18,6 +18,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/AutoCompleteCache.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/BlocklistPrompt.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/BrowserCLH.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/BrowserStartup.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/CapturePicker.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/ConsoleAPI.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/ContentDispatchChooser.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/ContentPermissionPrompt.js
@ -30,13 +31,13 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/HelperAppDialog.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/LoginManager.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/LoginManagerPrompter.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/NetworkGeolocationProvider.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/OpenWebapps.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/PlacesCategoriesStarter.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/PromptService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/SessionStore.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/Sidebar.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/TelemetryPing.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/Weave.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/WebappsSupport.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/XPIDialogService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/addonManager.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/amContentHandler.js
@ -114,8 +115,10 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_fr.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_gl.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hr.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hsb.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hu.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ia.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_is.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_it.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_kmr.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_la.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_lt.dic
@ -128,6 +131,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ru.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sh.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sl.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sv.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_tr.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_uk.dic
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libmozalloc.so.${LIBmozalloc_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxpcom.so.${LIBxpcom_VERSION}
@ -140,6 +144,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/AddonUpdateChecker.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/CSPUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/CertUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/CommonDialog.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/ConsoleAPIStorage.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/Dict.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/DownloadLastDir.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/DownloadPaths.jsm
@ -153,6 +158,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/LightweightThemeManager.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/LocaleRepository.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/Microformats.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/NetUtil.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/OpenWebapps.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PageMenu.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PerfMeasurement.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PlacesDBUtils.jsm
@ -167,6 +173,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/XPIProvider.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/contacts.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/ctypes.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/debug.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/jsdebugger.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/linuxTypes.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/nsFormAutoCompleteResult.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/reflect.jsm