Update to seamonkey 2.9.1/lightning 1.4b1/enigmail 1.5pre.

- See http://www.seamonkey-project.org/releases/seamonkey2.9/
- add patch-suite_installer_Makefile_in to avoid installing the SDk
  (corollary of Tb's patch-mail_installer_Makefile_in)
- use MOZ_DEBUG_FLAGS="-Os" on ppc as done in Tb to avoid a
  relocation overflow when linking libxul on ppc (reminded by aja@)
This commit is contained in:
landry 2012-04-30 15:38:09 +00:00
parent fd66a02930
commit 013d6c65d9
58 changed files with 316 additions and 327 deletions

View File

@ -1,24 +1,23 @@
# $OpenBSD: Makefile,v 1.101 2012/04/24 06:14:53 espie Exp $
# $OpenBSD: Makefile,v 1.102 2012/04/30 15:38:09 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
COMMENT-enigmail = Mozilla Seamonkey GnuPG extension
BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
MOZILLA_VERSION= 2.8
MOZILLA_VERSION= 2.9.1
MOZILLA_BRANCH = release
MOZILLA_PROJECT = seamonkey
MOZILLA_CODENAME = suite
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
REVISION-main = 0
PKGNAME-lightning = lightning-seamonkey-1.3beta1
ENIG_V = 1.4
PKGNAME-enigmail = enigmail-seamonkey-${ENIG_V}
PKGNAME-lightning = lightning-seamonkey-1.4beta1
ENIG_V = 1.4.1
PKGNAME-enigmail = enigmail-seamonkey-1.5pre
EPOCH-lightning = 0
SO_VERSION= 23.0
SO_VERSION= 24.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = ldap60 ldif60 mozalloc prldap60 suite xpcom xul calbasecomps enigmime ipc
@ -67,6 +66,11 @@ CONFIGURE_ARGS += --with-system-libevent=/usr/
CONFIGURE_ARGS += --with-system-zlib=/usr/ --with-system-bz2=${LOCALBASE}
WANTLIB += event
# XXX needed since 2.7b?, relocation overflow otherwise...
# replaces -g by -Os
.if ${MACHINE_ARCH} == "powerpc"
CONFIGURE_ENV += MOZ_DEBUG_FLAGS="-Os"
.endif
ALL_TARGET= default
MOZILLA_AUTOCONF_DIRS = ldap/sdks/c-sdk mozilla mozilla/js/src
@ -86,7 +90,7 @@ GNU_ARCH = ${MACHINE_ARCH:S/amd64/x86_64/}
GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc} \
lightning {e2fda1a4-762b-4020-b5ad-a41df1933103} \
calendar-timezones calendar-timezones@mozilla.org \
../bin/enigmail-1.4-openbsd-${GNU_ARCH} {847b3a00-7ab1-11d4-8f02-006008948af5}
../bin/enigmail-1.5-openbsd-${GNU_ARCH} {847b3a00-7ab1-11d4-8f02-006008948af5}
EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION:C/b.//}/extensions/

View File

@ -1,10 +1,10 @@
MD5 (mozilla/enigmail-1.4.tar.gz) = XPPZcg7RzaGyLqvlRXdywg==
MD5 (mozilla/seamonkey-2.8.source.tar.bz2) = pxKPa80Wvr7Up8NIe2nDjw==
RMD160 (mozilla/enigmail-1.4.tar.gz) = s8cX4VDIJvquHaoJgG4H3RZhnFE=
RMD160 (mozilla/seamonkey-2.8.source.tar.bz2) = eqGQwAWFz5yy97zL31jmyYC+NEw=
SHA1 (mozilla/enigmail-1.4.tar.gz) = HuS82NOGha9Ewa7upPu6e/MFE+Q=
SHA1 (mozilla/seamonkey-2.8.source.tar.bz2) = j174yyo6xJWt2Z+zOU2MAHpdka8=
SHA256 (mozilla/enigmail-1.4.tar.gz) = xjmQ2tRda84+aR91qiJqID9vu8I5dBXfcrKJIw4smCo=
SHA256 (mozilla/seamonkey-2.8.source.tar.bz2) = LU0XiSY84YLLUV2ho3tIwOip6467sDli1zC2RLJX/io=
SIZE (mozilla/enigmail-1.4.tar.gz) = 1323467
SIZE (mozilla/seamonkey-2.8.source.tar.bz2) = 101616662
MD5 (mozilla/enigmail-1.4.1.tar.gz) = Drp1+8+PC7MtU43xAvu46Q==
MD5 (mozilla/seamonkey-2.9.1.source.tar.bz2) = jdGNk6ZXDDyfOHO7F3zMaw==
RMD160 (mozilla/enigmail-1.4.1.tar.gz) = 8jXiZqzTkJkvEoog9zKIwuzDxaU=
RMD160 (mozilla/seamonkey-2.9.1.source.tar.bz2) = mgJKkIth2yQlDJPRLUmTkdWwvS4=
SHA1 (mozilla/enigmail-1.4.1.tar.gz) = XGKaXQbiPFvruGyED0TwTwcy29o=
SHA1 (mozilla/seamonkey-2.9.1.source.tar.bz2) = BLQXIiw0W9RXMtrPB9PjOjsM1T0=
SHA256 (mozilla/enigmail-1.4.1.tar.gz) = EAvH+axrygPkUH3yXFsp1qOdCQTEYwHMfe82dnedcgs=
SHA256 (mozilla/seamonkey-2.9.1.source.tar.bz2) = HW5lVpuy2WQ8dGoa/zs1Ff9WVlAU6VMWsZ4HMd+cZaw=
SIZE (mozilla/enigmail-1.4.1.tar.gz) = 1344516
SIZE (mozilla/seamonkey-2.9.1.source.tar.bz2) = 102164308

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-config_rules_mk,v 1.8 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-config_rules_mk,v 1.9 2012/04/30 15:38:09 landry Exp $
--- config/rules.mk.orig Thu Dec 15 01:11:08 2011
+++ config/rules.mk Mon Dec 19 22:30:23 2011
@@ -573,6 +573,12 @@ endif

View File

@ -1,12 +1,16 @@
$OpenBSD: patch-ldap_sdks_c-sdk_configure_in,v 1.3 2012/03/16 21:38:33 landry Exp $
--- ldap/sdks/c-sdk/configure.in.orig Sun Feb 13 12:23:20 2011
+++ ldap/sdks/c-sdk/configure.in Sun Feb 13 12:23:37 2011
@@ -1853,7 +1853,7 @@ mips-sony-newsos*)
AC_DEFINE(HAVE_SOCKLEN_T)
$OpenBSD: patch-ldap_sdks_c-sdk_configure_in,v 1.4 2012/04/30 15:38:09 landry Exp $
Fix typo.. doh
--- ldap/sdks/c-sdk/configure.in.orig Wed Apr 25 19:45:57 2012
+++ ldap/sdks/c-sdk/configure.in Wed Apr 25 19:46:16 2012
@@ -1854,9 +1854,9 @@ mips-sony-newsos*)
CFLAGS="$CFLAGS -ansi -Wall"
CXXFLAGS="$CXXFLAGS -ansi -Wall"
- DLL_SUFFIX=so.1.0
+ DLL_SUFFIX=so.${SO_VERSION}
if test "$SO_VERSION"; then
- DLL_SUFFIX=".so.$SO_VERSION"
+ DLL_SUFFIX="so.$SO_VERSION"
else
- DLL_SUFFIX=".so.1.0"
+ DLL_SUFFIX=so.1.0
fi
DSO_CFLAGS=-fPIC
USE_NSPR_THREADS=1
DSO_LDOPTS='-shared -fPIC'

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mailnews_extensions_enigmail_genxpi,v 1.4 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mailnews_extensions_enigmail_genxpi,v 1.5 2012/04/30 15:38:09 landry Exp $
Remove ABI=xxx marker and xpcomAbi from lib naming.
--- mailnews/extensions/enigmail/genxpi.orig Mon Aug 15 17:59:15 2011
+++ mailnews/extensions/enigmail/genxpi Tue Sep 27 18:59:33 2011

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.7 2012/03/16 21:38:33 landry Exp $
--- mozilla/browser/app/profile/firefox.js.orig Fri Mar 9 21:28:36 2012
+++ mozilla/browser/app/profile/firefox.js Sat Mar 10 13:20:26 2012
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.8 2012/04/30 15:38:09 landry Exp $
--- mozilla/browser/app/profile/firefox.js.orig Sat Apr 21 00:39:54 2012
+++ mozilla/browser/app/profile/firefox.js Wed Apr 25 17:49:59 2012
@@ -152,7 +152,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
pref("app.update.certs.2.commonName", "aus3.mozilla.org");
@ -10,7 +10,16 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.7 2012/03/16 21:38:33
// This preference turns on app.update.mode and allows automatic download and
// install to take place. We use a separate boolean toggle for this to make
@@ -708,10 +708,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
@@ -589,7 +589,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
// by default we show an infobar message when pages require plugins the user has not installed, or are outdated
-pref("plugins.hide_infobar_for_missing_plugin", false);
+pref("plugins.hide_infobar_for_missing_plugin", true);
pref("plugins.hide_infobar_for_outdated_plugin", false);
#ifdef XP_MACOSX
@@ -713,10 +713,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
#ifdef MOZ_SAFE_BROWSING
// Safe browsing does nothing unless this pref is set
@ -23,7 +32,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.7 2012/03/16 21:38:33
// 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");
@@ -765,10 +765,8 @@ pref("browser.EULA.version", 3);
@@ -770,10 +770,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml,v 1.4 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/browser/components/certerror/content/aboutCertError.xhtml.orig Fri Mar 9 21:28:36 2012
+++ mozilla/browser/components/certerror/content/aboutCertError.xhtml Sat Mar 10 13:20:26 2012
@@ -136,6 +136,9 @@

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_build_unix_mozilla_in,v 1.4 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_build_unix_mozilla_in,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/build/unix/mozilla.in.orig Sat Nov 5 09:20:24 2011
+++ mozilla/build/unix/mozilla.in Tue Nov 8 15:36:39 2011
@@ -50,6 +50,11 @@

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_build_unix_run-mozilla_sh,v 1.4 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_build_unix_run-mozilla_sh,v 1.5 2012/04/30 15:38:09 landry Exp $
help finding our debugger
--- mozilla/build/unix/run-mozilla.sh.orig Fri Jan 14 23:21:21 2011
+++ mozilla/build/unix/run-mozilla.sh Sun Feb 13 23:19:41 2011

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-mozilla_extensions_auth_nsAuthGSSAPI_cpp,v 1.4 2012/03/16 21:38:33 landry Exp $
--- mozilla/extensions/auth/nsAuthGSSAPI.cpp.orig Wed Jan 18 10:41:10 2012
+++ mozilla/extensions/auth/nsAuthGSSAPI.cpp Sun Jan 22 22:18:18 2012
@@ -163,9 +163,8 @@ gssInit()
};
const char *const verLibNames[] = {
- "libgssapi_krb5.so.2", /* MIT - FC, Suse10, Debian */
- "libgssapi.so.4", /* Heimdal - Suse10, MDK */
- "libgssapi.so.1" /* Heimdal - Suse9, CITI - FC, MDK, Suse10*/
+ "libgssapi_krb5.so",
+ "libgssapi.so"
};
for (size_t i = 0; i < ArrayLength(verLibNames) && !lib; ++i) {

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.6 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.7 2012/04/30 15:38:09 landry Exp $
????
--- mozilla/gfx/thebes/Makefile.in.orig Fri Mar 9 21:28:48 2012
+++ mozilla/gfx/thebes/Makefile.in Sat Mar 10 13:20:45 2012
@@ -403,6 +403,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
--- mozilla/gfx/thebes/Makefile.in.orig Sat Apr 21 00:40:03 2012
+++ mozilla/gfx/thebes/Makefile.in Wed Apr 25 17:50:11 2012
@@ -387,6 +387,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

View File

@ -0,0 +1,35 @@
$OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.1 2012/04/30 15:38:09 landry Exp $
--- mozilla/gfx/thebes/gfxPlatform.cpp.orig Sat Apr 21 00:40:03 2012
+++ mozilla/gfx/thebes/gfxPlatform.cpp Wed Apr 25 17:50:15 2012
@@ -436,6 +436,7 @@ void SourceBufferDestroy(void *srcBuffer)
static_cast<SourceSurface*>(srcBuffer)->Release();
}
+#ifdef MOZ_TREE_CAIRO
void SourceSnapshotDetached(cairo_surface_t *nullSurf)
{
gfxImageSurface* origSurf =
@@ -443,6 +444,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
origSurf->SetData(&kSourceSurface, NULL, NULL);
}
+#endif
RefPtr<SourceSurface>
gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
@@ -512,6 +514,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
imgSurface->Stride(),
format);
+ #ifdef MOZ_TREE_CAIRO
cairo_surface_t *nullSurf =
cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
cairo_surface_set_user_data(nullSurf,
@@ -520,6 +523,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
NULL);
cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
cairo_surface_destroy(nullSurf);
+ #endif
}
srcBuffer->AddRef();

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_atomicops_h,v 1.5 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_ipc_chromium_src_base_atomicops_h,v 1.6 2012/04/30 15:38:09 landry Exp $
--- mozilla/ipc/chromium/src/base/atomicops.h.orig Thu Dec 15 01:22:33 2011
+++ mozilla/ipc/chromium/src/base/atomicops.h Tue Dec 20 00:40:52 2011
@@ -40,7 +40,7 @@ namespace subtle {

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_dir_reader_posix_h,v 1.3 2012/03/16 21:38:33 landry Exp $
New issue to be sent upstream.
--- mozilla/ipc/chromium/src/base/dir_reader_posix.h.orig Thu Dec 15 01:22:33 2011
+++ mozilla/ipc/chromium/src/base/dir_reader_posix.h Mon Dec 19 22:41:00 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,4 +1,4 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_posix_cc,v 1.3 2012/03/16 21:38:33 landry Exp $
$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,

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.3 2012/03/16 21:38:33 landry Exp $
$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 @@

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_linux_h,v 1.3 2012/03/16 21:38:33 landry Exp $
$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 @@

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.3 2012/03/16 21:38:33 landry Exp $
$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 @@

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.5 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.6 2012/04/30 15:38:09 landry Exp $
Add new long long template, may not be best solution.

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-mozilla_js_src_Makefile_in,v 1.4 2012/03/16 21:38:33 landry Exp $
--- mozilla/js/src/Makefile.in.orig Fri Mar 9 21:28:55 2012
+++ mozilla/js/src/Makefile.in Sat Mar 10 13:20:44 2012
@@ -361,15 +361,20 @@ CPPSRCS += checks.cc \
$OpenBSD: patch-mozilla_js_src_Makefile_in,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/Makefile.in.orig Sat Apr 21 00:40:07 2012
+++ mozilla/js/src/Makefile.in Wed Apr 25 17:50:15 2012
@@ -354,15 +354,20 @@ CPPSRCS += checks.cc \
ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
-VPATH += $(srcdir)/yarr/pcre \
+VPATH += $(srcdir)/assembler \
@ -28,7 +28,7 @@ $OpenBSD: patch-mozilla_js_src_Makefile_in,v 1.4 2012/03/16 21:38:33 landry Exp
$(NULL)
else
@@ -921,10 +926,10 @@ endif
@@ -896,10 +901,10 @@ 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.

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.7 2012/03/16 21:38:33 landry Exp $
--- mozilla/js/src/configure.in.orig Fri Mar 9 21:28:55 2012
+++ mozilla/js/src/configure.in Sat Mar 10 12:26:33 2012
@@ -2559,7 +2559,12 @@ ia64*-hpux*)
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.8 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/configure.in.orig Sat Apr 21 00:40:07 2012
+++ mozilla/js/src/configure.in Wed Apr 25 17:50:16 2012
@@ -2534,7 +2534,12 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -15,7 +15,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.7 2012/03/16 21:38:33 landry Exp
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2830,7 +2835,7 @@ arm*-*)
@@ -2805,7 +2810,7 @@ arm*-*)
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
@ -24,35 +24,14 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.7 2012/03/16 21:38:33 landry Exp
ENABLE_METHODJIT=1
ENABLE_MONOIC=1
ENABLE_POLYIC=1
@@ -2838,6 +2843,10 @@ sparc*-*)
AC_DEFINE(JS_CPU_SPARC)
@@ -2820,6 +2825,10 @@ mips*-*)
ENABLE_METHODJIT_TYPED_ARRAY=1
AC_DEFINE(JS_CPU_MIPS)
AC_DEFINE(JS_NUNBOX32)
;;
+ ;;
+sparc64-*)
+ AC_DEFINE(AVMPLUS_SPARC)
+ AC_DEFINE(AVMPLUS_64BIT)
+ ;;
;;
esac
MOZ_ARG_DISABLE_BOOL(methodjit,
@@ -2947,6 +2956,20 @@ MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 1
MOZ_CHECK_HEADERS(endian.h)
if test "$ac_cv_header_endian_h" = yes; then
AC_DEFINE(JS_HAVE_ENDIAN_H)
+fi
+
+AC_MSG_CHECKING(for machine/endian.h)
+AC_CACHE_VAL(ac_cv_header_machine_endian_h,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <machine/endian.h>],
+ [int foo = 0;],
+ [ac_cv_header_machine_endian_h = yes],
+ [ac_cv_header_machine_endian_h = no])])
+if test "$ac_cv_header_machine_endian_h" = yes; then
+ AC_DEFINE(JS_HAVE_MACHINE_ENDIAN_H)
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
fi
MOZ_CHECK_HEADERS(sys/isa_defs.h)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_ctypes_libffi_configure,v 1.4 2012/03/16 21:38:33 landry Exp $
--- mozilla/js/src/ctypes/libffi/configure.orig Sat Nov 5 09:20:38 2011
+++ mozilla/js/src/ctypes/libffi/configure Tue Nov 8 15:21:46 2011
@@ -11212,7 +11212,7 @@ case "$host" in
$OpenBSD: patch-mozilla_js_src_ctypes_libffi_configure,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/ctypes/libffi/configure.orig Sat Apr 21 00:40:07 2012
+++ mozilla/js/src/ctypes/libffi/configure Wed Apr 25 17:50:16 2012
@@ -11213,7 +11213,7 @@ case "$host" in
TARGET=FRV; TARGETDIR=frv
;;
@ -10,12 +10,12 @@ $OpenBSD: patch-mozilla_js_src_ctypes_libffi_configure,v 1.4 2012/03/16 21:38:33
TARGET=PA_LINUX; TARGETDIR=pa
;;
hppa*64-*-hpux*)
@@ -11255,7 +11255,7 @@ case "$host" in
@@ -11256,7 +11256,7 @@ case "$host" in
mips-sgi-irix5.* | mips-sgi-irix6.*)
TARGET=MIPS; TARGETDIR=mips
;;
- mips*-*-linux*)
+ mips*-*-linux* | mips*-*-openbsd*)
+ mips*-*-linux* | mips*-*-openbsd* )
# Support 128-bit long double for NewABI.
HAVE_LONG_DOUBLE='defined(__mips64)'
TARGET=MIPS; TARGETDIR=mips

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c,v 1.3 2012/03/08 12:13:01 ajacoutot Exp $
--- mozilla/js/src/ctypes/libffi/src/dlmalloc.c.orig Thu Feb 16 09:09:04 2012
+++ mozilla/js/src/ctypes/libffi/src/dlmalloc.c Wed Mar 7 00:13:44 2012
$OpenBSD: patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c,v 1.4 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/ctypes/libffi/src/dlmalloc.c.orig Thu Feb 16 05:25:02 2012
+++ mozilla/js/src/ctypes/libffi/src/dlmalloc.c Tue Mar 6 13:23:24 2012
@@ -2517,7 +2517,6 @@ static int init_mparams(void) {
#if (FOOTERS && !INSECURE)

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-mozilla_js_src_js-config_h_in,v 1.2 2012/03/16 21:38:33 landry Exp $
--- mozilla/js/src/js-config.h.in.orig Fri Mar 9 21:28:59 2012
+++ mozilla/js/src/js-config.h.in Sat Mar 10 13:20:27 2012
@@ -59,6 +59,10 @@
useable. See jscpucfg.h. */
#undef JS_HAVE_ENDIAN_H
+/* Define to 1 if the <machine/endian.h> header is present and
+ useable. See jscpucfg.h. */
+#undef JS_HAVE_MACHINE_ENDIAN_H
+
/* Define to 1 if the <sys/isa_defs.h> header is present and
useable. See jscpucfg.h. */
#undef JS_HAVE_SYS_ISA_DEFS_H

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-mozilla_js_src_jsapi_cpp,v 1.1 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/jsapi.cpp.orig Sat Apr 21 00:40:08 2012
+++ mozilla/js/src/jsapi.cpp Wed Apr 25 19:01:18 2012
@@ -699,7 +699,9 @@ JSRuntime::JSRuntime()
ownerThread_(NULL),
#endif
tempLifoAlloc(TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
+#if ENABLE_ASSEMBLER
execAlloc_(NULL),
+#endif
bumpAlloc_(NULL),
repCache_(NULL),
interpreterFrames(NULL),
@@ -841,7 +843,9 @@ JSRuntime::~JSRuntime()
{
JS_ASSERT(onOwnerThread());
+#if ENABLE_ASSEMBLER
delete_<JSC::ExecutableAllocator>(execAlloc_);
+#endif
delete_<WTF::BumpPointerAllocator>(bumpAlloc_);
JS_ASSERT(!repCache_);

View File

@ -1,51 +1,31 @@
$OpenBSD: patch-mozilla_js_src_jscntxt_cpp,v 1.1 2012/03/16 21:38:33 landry Exp $
--- mozilla/js/src/jscntxt.cpp.orig Tue Mar 13 03:43:15 2012
+++ mozilla/js/src/jscntxt.cpp Wed Mar 14 22:27:51 2012
@@ -106,7 +106,9 @@ ThreadData::ThreadData(JSRuntime *rt)
#endif
waiveGCQuota(false),
tempLifoAlloc(TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
$OpenBSD: patch-mozilla_js_src_jscntxt_cpp,v 1.2 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/jscntxt.cpp.orig Sat Apr 21 00:40:08 2012
+++ mozilla/js/src/jscntxt.cpp Wed Apr 25 19:00:11 2012
@@ -104,9 +104,11 @@ JSRuntime::sizeOfExcludingThis(JSMallocSizeOfFun mallo
if (regexpCode) {
size_t method = 0, regexp = 0, unused = 0;
+#if ENABLE_ASSEMBLER
execAlloc(NULL),
if (execAlloc_)
execAlloc_->sizeOfCode(&method, &regexp, &unused);
JS_ASSERT(method == 0); /* this execAlloc is only used for regexp code */
+#endif
bumpAlloc(NULL),
repCache(NULL),
dtoaState(NULL),
@@ -123,7 +125,9 @@ ThreadData::~ThreadData()
{
JS_ASSERT(!repCache);
*regexpCode = regexp + unused;
}
+#if ENABLE_ASSEMBLER
rt->delete_<JSC::ExecutableAllocator>(execAlloc);
+#endif
rt->delete_<WTF::BumpPointerAllocator>(bumpAlloc);
if (dtoaState)
@@ -157,9 +161,11 @@ ThreadData::sizeOfExcludingThis(JSMallocSizeOfFun mall
*temporary = tempLifoAlloc.sizeOfExcludingThis(mallocSizeOf);
size_t method = 0, regexp = 0, unused = 0;
+#if ENABLE_ASSEMBLER
if (execAlloc)
execAlloc->sizeOfCode(&method, &regexp, &unused);
JS_ASSERT(method == 0); /* this execAlloc is only used for regexp code */
+#endif
*regexpCode = regexp + unused;
*stackCommitted = stackSpace.sizeOfCommitted();
@@ -188,6 +194,7 @@ ThreadData::triggerOperationCallback(JSRuntime *rt)
#endif
@@ -124,6 +126,7 @@ JSRuntime::triggerOperationCallback()
JS_ATOMIC_SET(&interrupt, 1);
}
+#if ENABLE_ASSEMBLER
JSC::ExecutableAllocator *
ThreadData::createExecutableAllocator(JSContext *cx)
JSRuntime::createExecutableAllocator(JSContext *cx)
{
@@ -199,6 +206,7 @@ ThreadData::createExecutableAllocator(JSContext *cx)
@@ -135,6 +138,7 @@ JSRuntime::createExecutableAllocator(JSContext *cx)
js_ReportOutOfMemory(cx);
return execAlloc;
return execAlloc_;
}
+#endif
WTF::BumpPointerAllocator *
ThreadData::createBumpPointerAllocator(JSContext *cx)
JSRuntime::createBumpPointerAllocator(JSContext *cx)

View File

@ -1,15 +1,15 @@
$OpenBSD: patch-mozilla_js_src_jscntxt_h,v 1.1 2012/03/16 21:38:33 landry Exp $
--- mozilla/js/src/jscntxt.h.orig Tue Mar 13 03:43:15 2012
+++ mozilla/js/src/jscntxt.h Wed Mar 14 22:27:48 2012
@@ -153,21 +153,27 @@ struct ThreadData {
$OpenBSD: patch-mozilla_js_src_jscntxt_h,v 1.2 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/jscntxt.h.orig Sat Apr 21 00:40:08 2012
+++ mozilla/js/src/jscntxt.h Wed Apr 25 17:50:16 2012
@@ -221,18 +221,24 @@ struct JSRuntime
* Both of these allocators are used for regular expression code which is shared at the
* thread-data level.
*/
+#if ENABLE_ASSEMBLER
JSC::ExecutableAllocator *execAlloc;
JSC::ExecutableAllocator *execAlloc_;
+#endif
WTF::BumpPointerAllocator *bumpAlloc;
js::RegExpPrivateCache *repCache;
WTF::BumpPointerAllocator *bumpAlloc_;
js::RegExpPrivateCache *repCache_;
+#if ENABLE_ASSEMBLER
JSC::ExecutableAllocator *createExecutableAllocator(JSContext *cx);
@ -19,13 +19,10 @@ $OpenBSD: patch-mozilla_js_src_jscntxt_h,v 1.1 2012/03/16 21:38:33 landry Exp $
public:
+#if ENABLE_ASSEMBLER
JSC::ExecutableAllocator *getOrCreateExecutableAllocator(JSContext *cx) {
if (execAlloc)
return execAlloc;
return createExecutableAllocator(cx);
JSC::ExecutableAllocator *getExecutableAllocator(JSContext *cx) {
return execAlloc_ ? execAlloc_ : createExecutableAllocator(cx);
}
+#endif
WTF::BumpPointerAllocator *getOrCreateBumpPointerAllocator(JSContext *cx) {
if (bumpAlloc)
WTF::BumpPointerAllocator *getBumpPointerAllocator(JSContext *cx) {
return bumpAlloc_ ? bumpAlloc_ : createBumpPointerAllocator(cx);
}

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-mozilla_js_src_jscpucfg_h,v 1.2 2012/03/16 21:38:33 landry Exp $
--- mozilla/js/src/jscpucfg.h.orig Fri Mar 9 21:28:59 2012
+++ mozilla/js/src/jscpucfg.h Sat Mar 10 13:20:27 2012
@@ -92,6 +92,23 @@
# error "endian.h does not define __BYTE_ORDER. Cannot determine endianness."
# endif
+/* BSDs */
+#elif defined(JS_HAVE_MACHINE_ENDIAN_H)
+# include <sys/types.h>
+# include <machine/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 "machine/endian.h does not define _BYTE_ORDER. Cannot determine endianness."
+# endif
+
#elif defined(JS_HAVE_SYS_ISA_DEFS_H)
# include <sys/isa_defs.h>

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-mozilla_js_src_jsprvtd_h,v 1.1 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/jsprvtd.h.orig Sat Apr 21 00:40:08 2012
+++ mozilla/js/src/jsprvtd.h Wed Apr 25 19:01:18 2012
@@ -329,12 +329,13 @@ typedef Handle<Value> HandleValue;
} /* namespace js */
+#if ENABLE_ASSEMBLER
namespace JSC {
class ExecutableAllocator;
} /* namespace JSC */
-
+#endif
namespace WTF {
class BumpPointerAllocator;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject-inl_h,v 1.2 2012/03/16 21:38:33 landry Exp $
--- mozilla/js/src/vm/RegExpObject-inl.h.orig Fri Mar 9 21:29:07 2012
+++ mozilla/js/src/vm/RegExpObject-inl.h Sat Mar 10 12:26:50 2012
@@ -367,6 +367,7 @@ detail::RegExpPrivate::create(JSContext *cx, JSLinearS
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject-inl_h,v 1.3 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/vm/RegExpObject-inl.h.orig Sat Apr 21 00:40:11 2012
+++ mozilla/js/src/vm/RegExpObject-inl.h Wed Apr 25 17:50:16 2012
@@ -357,6 +357,7 @@ detail::RegExpPrivate::create(JSContext *cx, JSLinearS
return RetType(priv);
}
@ -9,7 +9,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject-inl_h,v 1.2 2012/03/16 21:38:33 l
/* This function should be deleted once bad Android platforms phase out. See bug 604774. */
inline bool
detail::RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
@@ -377,12 +378,12 @@ detail::RegExpPrivateCode::isJITRuntimeEnabled(JSConte
@@ -367,12 +368,12 @@ detail::RegExpPrivateCode::isJITRuntimeEnabled(JSConte
return true;
#endif
}
@ -23,16 +23,16 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject-inl_h,v 1.2 2012/03/16 21:38:33 l
/* Parse the pattern. */
ErrorCode yarrError;
YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
@@ -399,7 +400,7 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLi
@@ -389,7 +390,7 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLi
* case we have to bytecode compile it.
*/
-#ifdef JS_METHODJIT
+#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
JSC::ExecutableAllocator *execAlloc = cx->threadData()->getOrCreateExecutableAllocator(cx);
JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
if (!execAlloc) {
@@ -420,21 +421,11 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLi
@@ -410,21 +411,11 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLi
return false;
}
@ -56,7 +56,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject-inl_h,v 1.2 2012/03/16 21:38:33 l
}
inline bool
@@ -476,18 +467,11 @@ detail::RegExpPrivateCode::execute(JSContext *cx, cons
@@ -466,18 +457,11 @@ detail::RegExpPrivateCode::execute(JSContext *cx, cons
else
result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
#else

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.2 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.3 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/vm/RegExpObject.cpp.orig Fri Mar 9 21:29:07 2012
+++ mozilla/js/src/vm/RegExpObject.cpp Sat Mar 10 12:27:05 2012
@@ -392,7 +392,6 @@ Class js::RegExpClass = {

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.2 2012/03/16 21:38:33 landry Exp $
--- mozilla/js/src/vm/RegExpObject.h.orig Fri Mar 9 21:29:07 2012
+++ mozilla/js/src/vm/RegExpObject.h Sat Mar 10 12:27:17 2012
@@ -50,8 +50,6 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.3 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/vm/RegExpObject.h.orig Sat Apr 21 00:40:11 2012
+++ mozilla/js/src/vm/RegExpObject.h Wed Apr 25 17:50:16 2012
@@ -52,8 +52,6 @@
#if ENABLE_YARR_JIT
#include "yarr/YarrJIT.h"
#include "yarr/YarrSyntaxChecker.h"
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.2 2012/03/16 21:38:33 landr
#endif
namespace js {
@@ -240,40 +238,33 @@ static const jschar GreedyStarChars[] = {'.', '*'};
@@ -242,40 +240,33 @@ static const jschar GreedyStarChars[] = {'.', '*'};
/* Abstracts away the gross |RegExpPrivate| backend details. */
class RegExpPrivateCode
{
@ -56,7 +56,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.2 2012/03/16 21:38:33 landr
}
static bool checkSyntax(JSContext *cx, TokenStream *tokenStream, JSLinearString *source) {
@@ -285,23 +276,17 @@ class RegExpPrivateCode
@@ -287,23 +278,17 @@ class RegExpPrivateCode
reportYarrError(cx, tokenStream, error);
return false;
#else

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_js_src_yarr_wtfbridge_h,v 1.2 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_js_src_yarr_wtfbridge_h,v 1.3 2012/04/30 15:38:09 landry Exp $
--- mozilla/js/src/yarr/wtfbridge.h.orig Wed Jan 18 10:43:18 2012
+++ mozilla/js/src/yarr/wtfbridge.h Mon Jan 23 07:58:57 2012
@@ -49,9 +49,7 @@

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-mozilla_media_libsydneyaudio_include_sydney_audio_h,v 1.4 2012/03/16 21:38:33 landry Exp $
--- mozilla/media/libsydneyaudio/include/sydney_audio.h.orig Wed Jan 18 10:43:27 2012
+++ mozilla/media/libsydneyaudio/include/sydney_audio.h Sun Jan 22 22:20:44 2012
$OpenBSD: patch-mozilla_media_libsydneyaudio_include_sydney_audio_h,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/media/libsydneyaudio/include/sydney_audio.h.orig Sat Apr 21 00:40:17 2012
+++ mozilla/media/libsydneyaudio/include/sydney_audio.h Wed Apr 25 17:50:16 2012
@@ -48,7 +48,7 @@ async-signal safe.
#if !defined (WIN32)
#include <sys/param.h>
#include <inttypes.h>
-#if defined(__FreeBSD__) || defined(ANDROID)
+#if defined(__FreeBSD__) || defined(ANDROID) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(ANDROID)
#include <sys/endian.h>
#endif
#else

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_media_libsydneyaudio_src_Makefile_in,v 1.5 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_media_libsydneyaudio_src_Makefile_in,v 1.6 2012/04/30 15:38:09 landry Exp $
--- mozilla/media/libsydneyaudio/src/Makefile.in.orig Fri Mar 9 21:29:23 2012
+++ mozilla/media/libsydneyaudio/src/Makefile.in Sat Mar 10 13:20:45 2012
@@ -100,6 +100,12 @@ CSRCS = \

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_memory_mozalloc_mozalloc_cpp,v 1.4 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_memory_mozalloc_mozalloc_cpp,v 1.5 2012/04/30 15:38:09 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=633857
--- mozilla/memory/mozalloc/mozalloc.cpp.orig Fri Jul 15 07:51:40 2011
+++ mozilla/memory/mozalloc/mozalloc.cpp Sun Jul 31 22:20:15 2011

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_netwerk_base_src_nsSocketTransportService2_cpp,v 1.1 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_netwerk_base_src_nsSocketTransportService2_cpp,v 1.2 2012/04/30 15:38:09 landry Exp $
--- mozilla/netwerk/base/src/nsSocketTransportService2.cpp.orig Tue Mar 13 03:43:37 2012
+++ mozilla/netwerk/base/src/nsSocketTransportService2.cpp Thu Mar 15 08:39:59 2012
@@ -54,14 +54,6 @@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_parser_html_Makefile_in,v 1.5 2012/03/16 21:38:33 landry Exp $
--- mozilla/parser/html/Makefile.in.orig Fri Mar 9 21:29:36 2012
+++ mozilla/parser/html/Makefile.in Sat Mar 10 13:20:44 2012
@@ -120,4 +120,7 @@ INCLUDES += \
$OpenBSD: patch-mozilla_parser_html_Makefile_in,v 1.6 2012/04/30 15:38:09 landry Exp $
--- mozilla/parser/html/Makefile.in.orig Sat Apr 21 00:40:21 2012
+++ mozilla/parser/html/Makefile.in Wed Apr 25 17:50:16 2012
@@ -122,4 +122,7 @@ INCLUDES += \
-I$(srcdir)/../../content/base/src \
$(NULL)

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js,v 1.4 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/security/manager/pki/resources/content/exceptionDialog.js.orig Fri Jan 14 23:21:51 2011
+++ mozilla/security/manager/pki/resources/content/exceptionDialog.js Sun Feb 13 23:01:39 2011
@@ -283,6 +283,7 @@ function updateCertStatus() {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_Makefile_in,v 1.4 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_security_manager_ssl_src_Makefile_in,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/security/manager/ssl/src/Makefile.in.orig Wed Jan 18 10:44:10 2012
+++ mozilla/security/manager/ssl/src/Makefile.in Sun Jan 22 22:18:19 2012
@@ -115,7 +115,10 @@ CSRCS += md4.c

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_SSLServerCertVerification_cpp,v 1.1 2012/03/16 21:38:33 landry Exp $
--- mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp.orig Tue Mar 13 03:43:59 2012
+++ mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp Thu Mar 15 08:41:59 2012
@@ -163,23 +163,25 @@ NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
$OpenBSD: patch-mozilla_security_manager_ssl_src_SSLServerCertVerification_cpp,v 1.2 2012/04/30 15:38:09 landry Exp $
--- mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp.orig Sat Apr 21 00:40:21 2012
+++ mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp Wed Apr 25 17:50:16 2012
@@ -164,23 +164,25 @@ NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
NSSCleanupAutoPtrClass_WithParam(PRArenaPool, PORT_FreeArena, FalseParam, false)
@ -37,7 +37,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_SSLServerCertVerification_cpp,v
// TODO: tuning, make parameters preferences
// XXX: instantiate nsThreadPool directly, to make this more bulletproof.
// Currently, the nsThreadPool.h header isn't exported for us to do so.
@@ -207,10 +209,19 @@ InitializeSSLServerCertVerificationThreads()
@@ -208,10 +210,19 @@ InitializeSSLServerCertVerificationThreads()
// nsNSSShutdownPreventionLock where needed (not here) to prevent that.
void StopSSLServerCertVerificationThreads()
{

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_SSLServerCertVerification_h,v 1.1 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_security_manager_ssl_src_SSLServerCertVerification_h,v 1.2 2012/04/30 15:38:09 landry Exp $
--- mozilla/security/manager/ssl/src/SSLServerCertVerification.h.orig Tue Mar 13 03:43:59 2012
+++ mozilla/security/manager/ssl/src/SSLServerCertVerification.h Thu Mar 15 08:42:17 2012
@@ -51,6 +51,10 @@ namespace mozilla { namespace psm {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.8 2012/04/30 15:38:09 landry Exp $
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Tue Mar 13 03:43:40 2012
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Thu Mar 15 08:47:21 2012
@@ -112,6 +112,7 @@

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.7 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.8 2012/04/30 15:38:09 landry Exp $
force the use of secure_delete instead of using internal sqlite copy
--- mozilla/storage/src/mozStorageConnection.cpp.orig Fri Mar 9 21:29:39 2012
+++ mozilla/storage/src/mozStorageConnection.cpp Sat Mar 10 13:20:27 2012
@@ -642,6 +642,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
--- mozilla/storage/src/mozStorageConnection.cpp.orig Sat Apr 21 00:40:23 2012
+++ mozilla/storage/src/mozStorageConnection.cpp Wed Apr 25 17:50:16 2012
@@ -701,6 +701,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
return convertResultCode(srv);
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp,v 1.4 2012/03/16 21:38:33 landry Exp $
--- mozilla/toolkit/components/downloads/nsDownloadManager.cpp.orig Wed Jan 18 10:44:14 2012
+++ mozilla/toolkit/components/downloads/nsDownloadManager.cpp Sun Jan 22 22:18:19 2012
@@ -1164,7 +1164,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
$OpenBSD: patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/toolkit/components/downloads/nsDownloadManager.cpp.orig Sat Apr 21 00:40:23 2012
+++ mozilla/toolkit/components/downloads/nsDownloadManager.cpp Wed Apr 25 17:50:16 2012
@@ -1165,7 +1165,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
rv = downloadDir->Exists(&exists);
NS_ENSURE_SUCCESS(rv, rv);
if (!exists) {
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp,v 1.4
NS_ENSURE_SUCCESS(rv, rv);
}
}
@@ -1272,7 +1272,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
@@ -1273,7 +1273,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
(void)customDirectory->Exists(&exists);
if (!exists) {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.4 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/toolkit/crashreporter/client/crashreporter_linux.cpp.orig Mon Mar 14 14:57:39 2011
+++ mozilla/toolkit/crashreporter/client/crashreporter_linux.cpp Mon Mar 14 22:10:06 2011
@@ -364,11 +364,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i

View File

@ -1,26 +1,29 @@
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.7 2012/03/16 21:38:33 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Fri Mar 9 21:29:43 2012
+++ mozilla/toolkit/library/Makefile.in Sat Mar 10 13:20:44 2012
@@ -503,12 +503,6 @@ OS_LIBS += \
endif
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.8 2012/04/30 15:38:09 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Sat Apr 21 00:40:25 2012
+++ mozilla/toolkit/library/Makefile.in Wed Apr 25 17:50:16 2012
@@ -484,6 +484,12 @@ OS_LIBS += \
$(NULL)
endif
-ifneq (,$(filter NetBSD OpenBSD,$(OS_ARCH)))
-ifdef MOZ_SYDNEYAUDIO
-EXTRA_DSO_LDOPTS += -lossaudio
+ifeq ($(OS_ARCH),OpenBSD)
+ifdef MOZ_SYDNEYAUDIO
+EXTRA_DSO_LDOPTS += -lsndio
+endif
+endif
+
ifeq ($(OS_ARCH),Darwin)
ifdef MOZ_SYDNEYAUDIO
OS_LIBS += \
@@ -495,12 +501,6 @@ OS_LIBS += \
-framework Foundation \
-framework AppKit \
$(NULL)
-endif
-endif
-
ifdef MOZ_PLATFORM_MAEMO
EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
-ifneq (,$(filter NetBSD OpenBSD,$(OS_ARCH)))
-ifdef MOZ_SYDNEYAUDIO
-EXTRA_DSO_LDOPTS += -lossaudio
endif
@@ -600,6 +594,9 @@ OS_LIBS += $(call EXPAND_LIBNAME,usp10 oleaut32)
endif
ifeq ($(OS_ARCH),OpenBSD)
+# GTK2 widget and Sydney audio sndio backends.
+EXTRA_DSO_LDOPTS += -lsndio
+
# Needed by nsAuthGSSAPI
EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
endif

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.8 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.9 2012/04/30 15:38:09 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Fri Mar 9 21:29:48 2012
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Sat Mar 10 13:20:27 2012
@@ -1131,11 +1131,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-mozilla_widget_gtk2_Makefile_in,v 1.1 2012/04/30 15:38:09 landry Exp $
--- mozilla/widget/gtk2/Makefile.in.orig Sat Apr 21 00:40:26 2012
+++ mozilla/widget/gtk2/Makefile.in Wed Apr 25 17:50:16 2012
@@ -53,6 +53,11 @@ LIBXUL_LIBRARY = 1
NATIVE_THEME_SUPPORT = 1
+ifeq ($(OS_ARCH),OpenBSD)
+ifdef MOZ_SYDNEYAUDIO
+EXTRA_DSO_LDOPTS += -lsndio
+endif
+endif
CSRCS = \
mozcontainer.c \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_widget_src_gtk2_Makefile_in,v 1.4 2012/03/16 21:38:33 landry Exp $
--- mozilla/widget/src/gtk2/Makefile.in.orig Fri Jan 14 23:21:59 2011
+++ mozilla/widget/src/gtk2/Makefile.in Sun Feb 13 23:01:39 2011
@@ -53,6 +53,8 @@ LIBXUL_LIBRARY = 1
NATIVE_THEME_SUPPORT = 1
+# GTK2 widget sndio backend.
+EXTRA_DSO_LDOPTS += -lsndio
CSRCS = \
mozcontainer.c \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_widget_src_xpwidgets_nsPrintSettingsImpl_cpp,v 1.4 2012/03/16 21:38:33 landry Exp $
--- mozilla/widget/src/xpwidgets/nsPrintSettingsImpl.cpp.orig Wed Jan 18 10:44:18 2012
+++ mozilla/widget/src/xpwidgets/nsPrintSettingsImpl.cpp Sun Jan 22 22:21:11 2012
@@ -61,7 +61,7 @@ nsPrintSettings::nsPrintSettings() :
mIsCancelled(false),
mPrintSilent(false),
mPrintPreview(false),
- mShrinkToFit(true),
+ mShrinkToFit(false),
mShowPrintProgress(true),
mPrintPageDelay(50),
mPaperData(0),

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mozilla_widget_xpwidgets_nsPrintSettingsImpl_cpp,v 1.1 2012/04/30 15:38:09 landry Exp $
--- mozilla/widget/xpwidgets/nsPrintSettingsImpl.cpp.orig Sat Apr 21 00:40:27 2012
+++ mozilla/widget/xpwidgets/nsPrintSettingsImpl.cpp Wed Apr 25 17:50:16 2012
@@ -61,7 +61,7 @@ nsPrintSettings::nsPrintSettings() :
mIsCancelled(false),
mPrintSilent(false),
mPrintPreview(false),
- mShrinkToFit(true),
+ mShrinkToFit(false),
mShowPrintProgress(true),
mPrintPageDelay(50),
mPaperData(0),

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_xpcom_io_SpecialSystemDirectory_cpp,v 1.5 2012/03/16 21:38:33 landry Exp $
--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.orig Fri Jul 15 07:51:50 2011
+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp Sun Jul 31 22:20:16 2011
@@ -459,7 +459,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
$OpenBSD: patch-mozilla_xpcom_io_SpecialSystemDirectory_cpp,v 1.6 2012/04/30 15:38:09 landry Exp $
--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.orig Sat Apr 21 00:40:27 2012
+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp Wed Apr 25 17:50:16 2012
@@ -445,7 +445,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
if (NS_FAILED(rv))
return rv;
if (!exists) {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_xpcom_io_nsAppFileLocationProvider_cpp,v 1.4 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_xpcom_io_nsAppFileLocationProvider_cpp,v 1.5 2012/04/30 15:38:09 landry Exp $
--- mozilla/xpcom/io/nsAppFileLocationProvider.cpp.orig Wed Jan 18 10:44:19 2012
+++ mozilla/xpcom/io/nsAppFileLocationProvider.cpp Sun Jan 22 22:21:49 2012
@@ -240,12 +240,7 @@ nsAppFileLocationProvider::GetFile(const char *prop, b

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.5 2012/03/16 21:38:33 landry Exp $
$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.6 2012/04/30 15:38:09 landry Exp $
--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Fri Mar 9 21:29:51 2012
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in Sat Mar 10 13:20:45 2012
@@ -197,7 +197,7 @@ endif

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-suite_installer_Makefile_in,v 1.1 2012/04/30 15:38:09 landry Exp $
Don't install the sdk
--- suite/installer/Makefile.in.orig Thu Apr 26 20:29:23 2012
+++ suite/installer/Makefile.in Thu Apr 26 20:29:41 2012
@@ -150,10 +150,6 @@ NON_OMNIJAR_FILES = \
defaults/profile/panels.rdf \
$(NULL)
-ifndef LIBXUL_SDK
-INSTALL_SDK = 1
-endif
-
GENERATE_CACHE=1
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-enigmail,v 1.2 2012/03/16 21:38:33 landry Exp $
@comment $OpenBSD: PLIST-enigmail,v 1.3 2012/04/30 15:38:09 landry Exp $
@conflict enigmail-seamonkey-<=1.2
@pkgpath mail/enigmail/seamonkey
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/
@ -21,6 +21,8 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-00
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/commonFuncs.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCommon.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/keyManagement.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeConsole.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_unix.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_win.js
@ -29,6 +31,3 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-00
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/OpenBSD/components/
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/OpenBSD/components/libenigmime.so.${LIBenigmime_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/OpenBSD/components/libipc.so.${LIBipc_VERSION}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-wrapper.sh

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-lightning,v 1.7 2012/03/16 21:38:33 landry Exp $
@comment $OpenBSD: PLIST-lightning,v 1.8 2012/04/30 15:38:09 landry Exp $
@conflict lightning-seamonkey-<=1.0b1
@pkgpath productivity/sunbird,-seamonkey
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/calendar-timezones@mozilla.org/
@ -245,7 +245,6 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/datetimepickers/datetimepickers.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/day-box-item-image.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/daypicker-background.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-dialog-keepduration-button.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grip${MODPY_PY_PREFIX}bottom.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grip${MODPY_PY_PREFIX}left.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grip${MODPY_PY_PREFIX}right.png
@ -297,6 +296,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/messenger-overlay-sidebar.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/messenger-overlay-sidebar.xul
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/suite-overlay-preferences.xul
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/suite-overlay-sidebar.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/suite-overlay-sidebar.xul
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/skin/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/skin/lightning/