From c9af64bb29d4857ed0df2b9d09cd2d0fbed6df4d Mon Sep 17 00:00:00 2001 From: robert Date: Fri, 28 Oct 2011 13:01:13 +0000 Subject: [PATCH] unbreak after nspr update and enable vswprintf --- www/mozilla-firefox/Makefile | 4 +- .../patches/patch-gfx_qcms_qcmstypes_h | 19 -------- .../patch-ipc_chromium_src_base_atomicops_h | 16 ++++--- ...-ipc_chromium_src_base_string_util_posix_h | 16 ------- ...mium_src_chrome_common_ipc_message_utils_h | 43 ++++++------------- 5 files changed, 26 insertions(+), 72 deletions(-) delete mode 100644 www/mozilla-firefox/patches/patch-gfx_qcms_qcmstypes_h delete mode 100644 www/mozilla-firefox/patches/patch-ipc_chromium_src_base_string_util_posix_h diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile index ef9c14effbb..4ddf6d8e57a 100644 --- a/www/mozilla-firefox/Makefile +++ b/www/mozilla-firefox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.192 2011/10/03 21:06:09 landry Exp $ +# $OpenBSD: Makefile,v 1.193 2011/10/28 13:01:13 robert Exp $ COMMENT = Mozilla web browser BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056 @@ -11,6 +11,8 @@ MOZILLA_BRANCH = release MOZILLA_PROJECT = firefox MOZILLA_CODENAME = browser +REVISION = 0 + # url for beta releases # MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/releases/${MOZILLA_VERSION}/source/ SO_VERSION = 26.0 diff --git a/www/mozilla-firefox/patches/patch-gfx_qcms_qcmstypes_h b/www/mozilla-firefox/patches/patch-gfx_qcms_qcmstypes_h deleted file mode 100644 index a9462efb4bf..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_qcms_qcmstypes_h +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-gfx_qcms_qcmstypes_h,v 1.3 2011/04/20 11:49:02 landry Exp $ -https://bugzilla.mozilla.org/show_bug.cgi?id=651444 ---- gfx/qcms/qcmstypes.h.orig Wed Jul 21 02:52:13 2010 -+++ gfx/qcms/qcmstypes.h Sun Aug 1 12:35:46 2010 -@@ -13,14 +13,6 @@ - #elif defined (_AIX) - #include - #elif !defined(ANDROID) --typedef PRInt8 int8_t; --typedef PRUint8 uint8_t; --typedef PRInt16 int16_t; --typedef PRUint16 uint16_t; --typedef PRInt32 int32_t; --typedef PRUint32 uint32_t; --typedef PRInt64 int64_t; --typedef PRUint64 uint64_t; - - #ifdef __OS2__ - /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ diff --git a/www/mozilla-firefox/patches/patch-ipc_chromium_src_base_atomicops_h b/www/mozilla-firefox/patches/patch-ipc_chromium_src_base_atomicops_h index f71420bc112..ceff0ff1466 100644 --- a/www/mozilla-firefox/patches/patch-ipc_chromium_src_base_atomicops_h +++ b/www/mozilla-firefox/patches/patch-ipc_chromium_src_base_atomicops_h @@ -1,9 +1,13 @@ -$OpenBSD: patch-ipc_chromium_src_base_atomicops_h,v 1.1 2011/06/28 05:43:57 landry Exp $ -../../ipc/chromium/src/base/singleton.h:118: error: invalid conversion from 'base::subtle::AtomicWord*' to 'const volatile base::subtle::Atomic32*' -https://bugzilla.mozilla.org/show_bug.cgi?id=648735 ---- ipc/chromium/src/base/atomicops.h.orig Wed Jun 22 10:23:36 2011 -+++ ipc/chromium/src/base/atomicops.h Wed Jun 22 10:24:21 2011 -@@ -45,7 +45,11 @@ typedef int64 Atomic64; +$OpenBSD: patch-ipc_chromium_src_base_atomicops_h,v 1.2 2011/10/28 13:01:13 robert 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 { + #endif + typedef __w64 int32 Atomic32; + #ifdef ARCH_CPU_64_BITS +-typedef int64 Atomic64; ++typedef intptr_t Atomic64; + #endif // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. diff --git a/www/mozilla-firefox/patches/patch-ipc_chromium_src_base_string_util_posix_h b/www/mozilla-firefox/patches/patch-ipc_chromium_src_base_string_util_posix_h deleted file mode 100644 index 0bc6dbd8792..00000000000 --- a/www/mozilla-firefox/patches/patch-ipc_chromium_src_base_string_util_posix_h +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-ipc_chromium_src_base_string_util_posix_h,v 1.1 2011/06/28 05:43:57 landry Exp $ ---- ipc/chromium/src/base/string_util_posix.h.orig Fri May 27 18:12:07 2011 -+++ ipc/chromium/src/base/string_util_posix.h Wed Jun 1 08:48:32 2011 -@@ -36,7 +36,12 @@ inline int vsnprintf(char* buffer, size_t size, - inline int vswprintf(wchar_t* buffer, size_t size, - const wchar_t* format, va_list arguments) { - DCHECK(IsWprintfFormatPortable(format)); -+#if defined(OS_OPENBSD) -+ // OpenBSD does not have a wide-char equivalent yet -+ return ::vsnprintf((char *)buffer, size, (const char *)format, arguments); -+#else - return ::vswprintf(buffer, size, format, arguments); -+#endif - } - - } // namespace base diff --git a/www/mozilla-firefox/patches/patch-ipc_chromium_src_chrome_common_ipc_message_utils_h b/www/mozilla-firefox/patches/patch-ipc_chromium_src_chrome_common_ipc_message_utils_h index d6352188895..0e4b034bce9 100644 --- a/www/mozilla-firefox/patches/patch-ipc_chromium_src_chrome_common_ipc_message_utils_h +++ b/www/mozilla-firefox/patches/patch-ipc_chromium_src_chrome_common_ipc_message_utils_h @@ -1,38 +1,21 @@ -$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.1 2011/06/28 05:43:57 landry Exp $ ---- ipc/chromium/src/chrome/common/ipc_message_utils.h.orig Wed Jun 15 02:35:08 2011 -+++ ipc/chromium/src/chrome/common/ipc_message_utils.h Wed Jun 22 09:08:48 2011 -@@ -219,7 +219,33 @@ struct ParamTraits { +$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.2 2011/10/28 13:01:13 robert 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 { } }; -#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS))) -+#if defined(OS_OPENBSD) && defined(ARCH_CPU_64_BITS) -+template <> -+struct ParamTraits { -+ typedef unsigned long long param_type; -+ static void Write(Message* m, const param_type& p) { -+ m->WriteData(reinterpret_cast(&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_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 { +@@ -272,7 +272,7 @@ struct ParamTraits { + }; + #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 {