diff options
11 files changed, 19 insertions, 285 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index b84befefe4b..f746dbc01e0 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.88 2013/02/06 23:24:04 jperkin Exp $ +# $NetBSD: Makefile,v 1.89 2013/02/08 18:13:03 ryoon Exp $ # DISTNAME= # empty PKGNAME= seamonkey-${SM_VER} -SM_VER= 2.15 -LIGHTNINGVER= 1.9 -PKGREVISION= 2 +SM_VER= 2.15.2 +#LIGHTNINGVER= 1.9 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} \ ${MASTER_SITE_MOZILLA_ALL:=seamonkey/releases/${SM_VER}/source/} diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 1f3334c87ab..38755007b1b 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.92 2013/01/20 08:33:13 ryoon Exp $ +$NetBSD: distinfo,v 1.93 2013/02/08 18:13:03 ryoon Exp $ -SHA1 (enigmail-1.4.5.tar.gz) = 16d0450a9f5fb4de0e9cc5b9f8091dce4b070aaf -RMD160 (enigmail-1.4.5.tar.gz) = 860a1ca813fd2ccae69ac0afe07affd39611e56a -Size (enigmail-1.4.5.tar.gz) = 1269207 bytes -SHA1 (seamonkey-2.15.source.tar.bz2) = bfdd7596f45d950b0e2e2dbf4a91b2c8811aa81f -RMD160 (seamonkey-2.15.source.tar.bz2) = 38640758afd8c2dcccc26c6fa2926e5aac2debe5 -Size (seamonkey-2.15.source.tar.bz2) = 120128259 bytes +SHA1 (seamonkey-2.15.2.source.tar.bz2) = 55f9ace450da6f731d553afc59f08335305a9100 +RMD160 (seamonkey-2.15.2.source.tar.bz2) = 7f09e1849b6d2e6d5f75e03eb5f47ed7dfce9c1e +Size (seamonkey-2.15.2.source.tar.bz2) = 120132969 bytes SHA1 (patch-aa) = 01abb03b890db1b4c69cdc0851fc4004fe25306c SHA1 (patch-aa-toplevel) = 74648cc7c80310aa506fe8196730cac25dd64c9e SHA1 (patch-ab) = 9cca7b0b97c4c38b30a125a6daf116b4064d451e @@ -23,12 +20,11 @@ SHA1 (patch-at) = 97980a58f0b2f3b2f81e9ce6373ce947941ae942 SHA1 (patch-au) = fbe3e8a0bbf0048ae8a394807ba87ae6ec7d4e6e SHA1 (patch-av) = 7bd426be930e2a9670cffdc37fd4e5290a8091f2 SHA1 (patch-aw) = 4e3927a66c7f78ffba3b2079ef2263b91395330e -SHA1 (patch-ax) = b2e968aa9e31c49b22d18568f23522f6e856fcbd SHA1 (patch-ay) = 303f226d44ef7ddf87b634e66b0bd6d18dfdf52b SHA1 (patch-az) = 74191395f7cae0914111e86af390b8d115c3b93d SHA1 (patch-ba) = 453e13f23c8935a6d6edb4a12f6f128558227257 SHA1 (patch-bd) = d148a08d6aa03c559d9250cf9a30ca66f1a76859 -SHA1 (patch-bf) = 12253405416bd1b56cec028e5c47a345deb54a44 +SHA1 (patch-bf) = dcb301d4688d944790d31ba31800440dc755f6df SHA1 (patch-bg) = 1b4da74724d24693d863392e1963fa674d34b72e SHA1 (patch-bi) = 904ec1a966d6224f873836d8cbee2eb80eb2d2a9 SHA1 (patch-config_baseconfig.mk) = 3fdb27d227ef0d858b56023b9c709117d5cc5e00 @@ -42,24 +38,17 @@ SHA1 (patch-me) = 4c5f293574e9bdbe3ad8fa2abd7649622750f24f SHA1 (patch-mm) = 3c0f229c2a029d9d68e2330a68a9170da0b17157 SHA1 (patch-mozilla_build_autoconf_nss.m4) = 3b05127e72a76ac2f87c8362cbde13ce76485a19 SHA1 (patch-mozilla_config_baseconfig.mk) = 22135e1dd081529afc217009b2f2e860d8c51cd9 -SHA1 (patch-mozilla_config_system-headers) = 379ef94cf49804a0ebb0d7a517a8c3f755304610 SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = fae216f075aa0643ee310ce5f40b808fd7cedc0e SHA1 (patch-mozilla_gfx_skia_Makefile.in) = 9adc38011a2186d8671360f6635a6c83dc758c9a SHA1 (patch-mozilla_gfx_skia_src_sfnt_SkOTTable__head.h) = 75a54359e2ebc4a019e4b5ed027df654b612ea34 SHA1 (patch-mozilla_gfx_skia_src_sfnt_SkOTTable__name.h) = f8ef35f6d4ede4d02baee2c2905089b307724b95 SHA1 (patch-mozilla_gfx_skia_src_sfnt_SkSFNTHeader.h) = eab1973eb9cee2440d59147b40fc861ccdae2fb5 SHA1 (patch-mozilla_gfx_thebes_gfxPlatform.cpp) = e5d5aa6e8919226c9249693334c2c54b843bd627 -SHA1 (patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h) = 3b69cda097c3c01d9977e27da3693265d60c436a SHA1 (patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp) = abdf8ee597ec867b63c8274911ff6c162d30835b SHA1 (patch-mozilla_ipc_ipdl_ipdl_lower.py) = 2bf473a505692adc68c9cdc75a23d53d61c0fc8b -SHA1 (patch-mozilla_js_src_config_system-headers) = f1f76c79081cb7ea0c81eb1759d4138e170af8b0 -SHA1 (patch-mozilla_js_src_jscpucfg.h) = 733ac4f0bac5205cf3ea16b1ed909c2eb5d82e8b SHA1 (patch-mozilla_js_src_jsgc.cpp) = 79710d555551f62ac3510eede3cbc9aa314c1809 SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = ba789e9206f830d4925eb377627eb113be52351c SHA1 (patch-mozilla_media_libcubeb_src_Makefile.in) = 2643dc7265d38a51cfcd98fd121bd65369957f18 -SHA1 (patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c) = 0d6d5ce3e3f996fad4426755739c36fccce16279 -SHA1 (patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp) = ac5d74490f5ba3bfd0c9862f1131730a24251370 -SHA1 (patch-mozilla_storage_src_Makefile.in) = 31414ae8661378083547172ffb55783cf79411ba SHA1 (patch-mozilla_toolkit_components_osfile_osfileutils.cpp) = d72f7aadc9f447acf43dd98ea7baaadc51db2bc4 SHA1 (patch-mozilla_toolkit_xre_nsAppRunner.cpp) = f64002003e185d87cb44bf92e6a5c04e89aa25d7 SHA1 (patch-mozilla_xpcom_Makefile.in) = fcd068eb5c2c96e9bf9ba275689e99ce5f6e5034 diff --git a/www/seamonkey/patches/patch-ax b/www/seamonkey/patches/patch-ax deleted file mode 100644 index f847054155d..00000000000 --- a/www/seamonkey/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax,v 1.13 2013/01/07 21:55:30 ryoon Exp $ - ---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2012-11-18 10:19:54.000000000 +0000 -+++ mozilla/xpcom/base/nsStackWalk.cpp -@@ -23,7 +23,7 @@ struct CriticalAddress { - }; - static CriticalAddress gCriticalAddress; - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__NetBSD__) - #include <dlfcn.h> - #endif - diff --git a/www/seamonkey/patches/patch-bf b/www/seamonkey/patches/patch-bf index e43395bbca0..96aea2cc6ff 100644 --- a/www/seamonkey/patches/patch-bf +++ b/www/seamonkey/patches/patch-bf @@ -1,31 +1,28 @@ -$NetBSD: patch-bf,v 1.10 2013/01/07 21:55:30 ryoon Exp $ +$NetBSD: patch-bf,v 1.11 2013/02/08 18:13:04 ryoon Exp $ ---- mozilla/js/src/jsnativestack.cpp.orig 2012-11-18 10:19:39.000000000 +0000 +--- mozilla/js/src/jsnativestack.cpp.orig 2013-01-16 16:01:13.000000000 +0000 +++ mozilla/js/src/jsnativestack.cpp -@@ -19,10 +19,16 @@ +@@ -19,13 +19,10 @@ #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) # include <pthread.h> -# if defined(__FreeBSD__) || defined(__OpenBSD__) -+# if defined(__OpenBSD__) || defined(__DragonFly__) ++# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) # include <pthread_np.h> # endif -+# if defined(__FreeBSD__) -+_Pragma("GCC visibility push(default)") -+# include <pthread_np.h> -+_Pragma("GCC visibility pop") -+# endif -+ - #else - # error "Unsupported platform" +-#else +-# error "Unsupported platform" +- + #endif -@@ -114,7 +120,7 @@ GetNativeStackBaseImpl() + namespace js { +@@ -114,7 +111,7 @@ GetNativeStackBaseImpl() pthread_attr_init(&sattr); # if defined(__OpenBSD__) stack_t ss; -# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) -+# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */ ++# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__) /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */ pthread_attr_get_np(thread, &sattr); # else diff --git a/www/seamonkey/patches/patch-mozilla_config_system-headers b/www/seamonkey/patches/patch-mozilla_config_system-headers deleted file mode 100644 index 5d057f28d6c..00000000000 --- a/www/seamonkey/patches/patch-mozilla_config_system-headers +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mozilla_config_system-headers,v 1.4 2013/01/20 08:33:13 ryoon Exp $ - ---- mozilla/config/system-headers.orig 2013-01-06 06:26:09.000000000 +0000 -+++ mozilla/config/system-headers -@@ -1119,6 +1119,10 @@ gst/gst.h - gst/app/gstappsink.h - gst/app/gstappsrc.h - gst/video/video.h -+sys/thr.h -+sys/user.h -+kvm.h -+spawn.h - sys/msg.h - sys/ipc.h - sys/thr.h diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h deleted file mode 100644 index e79d0f9648c..00000000000 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h +++ /dev/null @@ -1,120 +0,0 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h,v 1.5 2013/01/20 08:33:14 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/dir_reader_bsd.h.orig 2013-01-06 06:26:16.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h -@@ -110,3 +110,115 @@ class DirReaderBSD { - } // namespace base - - #endif // BASE_DIR_READER_BSD_H_ -+// Copyright (c) 2010 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. -+ -+// derived from dir_reader_linux.h -+ -+#ifndef BASE_DIR_READER_BSD_H_ -+#define BASE_DIR_READER_BSD_H_ -+#pragma once -+ -+#include <dirent.h> -+#include <errno.h> -+#include <fcntl.h> -+#include <stdint.h> -+#include <unistd.h> -+ -+#include "base/logging.h" -+#include "base/eintr_wrapper.h" -+ -+// See the comments in dir_reader_posix.h about this. -+ -+namespace base { -+ -+class DirReaderBSD { -+ public: -+ explicit DirReaderBSD(const char* directory_path) -+#ifdef O_DIRECTORY -+ : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)), -+#else -+ : fd_(open(directory_path, O_RDONLY)), -+#endif -+ offset_(0), -+ size_(0) { -+ memset(buf_, 0, sizeof(buf_)); -+ } -+ -+ ~DirReaderBSD() { -+ if (fd_ >= 0) { -+ if (HANDLE_EINTR(close(fd_))) -+ DLOG(ERROR) << "Failed to close directory handle"; -+ } -+ } -+ -+ bool IsValid() const { -+ return fd_ >= 0; -+ } -+ -+ // Move to the next entry returning false if the iteration is complete. -+ bool Next() { -+ if (size_) { -+ struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]); -+#ifdef OS_DRAGONFLY -+ offset_ += _DIRENT_DIRSIZ(dirent); -+#else -+ offset_ += dirent->d_reclen; -+#endif -+ } -+ -+ if (offset_ != size_) -+ return true; -+ -+#ifdef OS_OPENBSD -+ const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); -+#else -+ const int r = getdents(fd_, buf_, sizeof(buf_)); -+#endif -+ if (r == 0) -+ return false; -+ if (r == -1) { -+#ifdef OS_OPENBSD -+ DLOG(ERROR) << "getdirentries returned an error: " << errno; -+#else -+ DLOG(ERROR) << "getdents returned an error: " << errno; -+#endif -+ return false; -+ } -+ size_ = r; -+ offset_ = 0; -+ return true; -+ } -+ -+ const char* name() const { -+ if (!size_) -+ return NULL; -+ -+ const struct dirent* dirent = -+ reinterpret_cast<const struct dirent*>(&buf_[offset_]); -+ return dirent->d_name; -+ } -+ -+ int fd() const { -+ return fd_; -+ } -+ -+ static bool IsFallback() { -+ return false; -+ } -+ -+ private: -+ const int fd_; -+ char buf_[512]; -+#ifdef OS_OPENBSD -+ off_t *basep_; -+#endif -+ size_t offset_, size_; -+ -+ DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); -+}; -+ -+} // namespace base -+ -+#endif // BASE_DIR_READER_BSD_H_ diff --git a/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers b/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers deleted file mode 100644 index ec6ffc6ae18..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mozilla_js_src_config_system-headers,v 1.4 2013/01/20 08:33:14 ryoon Exp $ - ---- mozilla/js/src/config/system-headers.orig 2013-01-06 06:26:17.000000000 +0000 -+++ mozilla/js/src/config/system-headers -@@ -1119,6 +1119,10 @@ gst/gst.h - gst/app/gstappsink.h - gst/app/gstappsrc.h - gst/video/video.h -+sys/thr.h -+sys/user.h -+kvm.h -+spawn.h - sys/msg.h - sys/ipc.h - sys/thr.h diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h b/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h deleted file mode 100644 index 0001834bdc2..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-mozilla_js_src_jscpucfg.h,v 1.6 2013/01/07 21:55:30 ryoon Exp $ - ---- mozilla/js/src/jscpucfg.h.orig 2012-11-18 10:19:39.000000000 +0000 -+++ mozilla/js/src/jscpucfg.h -@@ -44,6 +44,21 @@ - # define IS_BIG_ENDIAN 1 - # endif - -+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__MirBSD__) || defined(__DragonFly__) -+#include <sys/endian.h> -+ -+#if defined(_BYTE_ORDER) -+#if _BYTE_ORDER == _LITTLE_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#elif _BYTE_ORDER == _BIG_ENDIAN -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#endif -+#else /* !defined(_BYTE_ORDER) */ -+#error "sys/endian.h does not define _BYTE_ORDER. Cannot determine endianness." -+#endif -+ - #elif defined(JS_HAVE_ENDIAN_H) - # include <endian.h> - diff --git a/www/seamonkey/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c b/www/seamonkey/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c deleted file mode 100644 index 2fac992b488..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c,v 1.4 2013/01/07 21:55:30 ryoon Exp $ - ---- mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig 2012-11-18 10:19:46.000000000 +0000 -+++ mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c -@@ -6,7 +6,9 @@ - #include <stdio.h> - #include <string.h> - #include <pthread.h> -+_Pragma("GCC visibility push(default)") - #include <pulse/pulseaudio.h> -+_Pragma("GCC visibility pop") - #include "sydney_audio.h" - - /* Pulseaudio implementation based heavily on sydney_audio_alsa.c */ diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp b/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp deleted file mode 100644 index 925df005a62..00000000000 --- a/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.6 2013/01/07 21:55:30 ryoon Exp $ - -* Fix build with gcc<4.5, for example, DragonFly 3.0.1. - See https://bugzilla.mozilla.org/show_bug.cgi?id=621446 - ---- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig 2012-11-18 10:19:49.000000000 +0000 -+++ mozilla/netwerk/protocol/http/HttpChannelParent.cpp -@@ -313,6 +313,13 @@ HttpChannelParent::RecvUpdateAssociatedC - return true; - } - -+// Compiling with a version of GCC <= 4.4 fails with an internal compiler -+// error. -+#if !defined(__GNUC__) || \ -+ (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -+#pragma GCC optimize ("O0") -+#endif -+ - bool - HttpChannelParent::RecvRedirect2Verify(const nsresult& result, - const RequestHeaderTuples& changedHeaders) diff --git a/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in b/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in deleted file mode 100644 index e08b714268f..00000000000 --- a/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.5 2013/01/07 21:55:30 ryoon Exp $ - ---- mozilla/storage/src/Makefile.in.orig 2012-11-18 10:19:51.000000000 +0000 -+++ mozilla/storage/src/Makefile.in -@@ -34,6 +34,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY - endif - endif - -+ifeq ($(OS_ARCH),DragonFly) -+DEFINES += -DXP_BSD -+endif -+ -+ifeq ($(OS_ARCH),FreeBSD) -+DEFINES += -DXP_BSD -+endif -+ -+ifeq ($(OS_ARCH),NetBSD) -+DEFINES += -DXP_BSD -+endif -+ -+ifeq ($(OS_ARCH),FreeBSD) -+DEFINES += -DXP_BSD -+endif -+ - EXPORTS_NAMESPACES = mozilla/storage - - EXPORTS_mozilla/storage = \ |