Update thunderbird v7.0.1 to v8.0, enigmail v1.3.4, lightning

This commit is contained in:
nigel 2011-12-08 02:25:59 +00:00
parent 765a9309be
commit 2fabd642b6
27 changed files with 182 additions and 577 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.139 2011/10/28 12:31:41 robert Exp $
# $OpenBSD: Makefile,v 1.140 2011/12/08 02:25:59 nigel Exp $
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
@ -8,27 +8,25 @@ BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
# Don't forget to bump mail/thunderbird-i18n after updates.
# Don't forget to update productivity/sunbird if patches changes.
MOZILLA_VERSION = 7.0.1
MOZILLA_VERSION = 8.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = thunderbird
MOZILLA_CODENAME = mail
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-1.0beta6
PKGNAME-enigmail = enigmail-1.3.2
REVISION-main = 0
REVISION-lightning = 0
REVISION-enigmail = 1
PKGNAME-lightning = lightning-1.0beta8
ENIG_V = 1.3.4
PKGNAME-enigmail = enigmail-${ENIG_V}
EPOCH-lightning = 0
#MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/nightly/${MOZILLA_VERSION}-candidates/build1/source/
MASTER_SITES0 = http://www.mozilla-enigmail.org/download/source/
DISTFILES += ${MOZILLA_PROJECT}-${MOZILLA_VERSION}.source.tar.bz2 \
enigmail-1.3.2.tar.gz:0
enigmail-${ENIG_V}.tar.gz:0
EXTRACT_CASES = enigmail-*.tar.gz) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | tar -C comm-${MOZILLA_BRANCH}/mailnews/extensions/ -xf -;;
SO_VERSION = 19.0
SO_VERSION = 20.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues. Whenever PKGNAME gets
# bumped and/or SO_VERSION changes, remember to update enigmail's

View File

@ -1,10 +1,10 @@
MD5 (mozilla/enigmail-1.3.2.tar.gz) = IxjWAyDcbD2zw02Wi7fVMw==
MD5 (mozilla/thunderbird-7.0.1.source.tar.bz2) = rRd/5SAt6r2kSIL/XIcfGw==
RMD160 (mozilla/enigmail-1.3.2.tar.gz) = +TICeeZ3Z6gCOshjuNCJ43ABggE=
RMD160 (mozilla/thunderbird-7.0.1.source.tar.bz2) = BNOUZLXHwxKKALDq/4BrMwfgoi4=
SHA1 (mozilla/enigmail-1.3.2.tar.gz) = i/OWZPIuOD0CbAfUrNcUocz9nW0=
SHA1 (mozilla/thunderbird-7.0.1.source.tar.bz2) = zPxv4/5K0HshTiC8RA0g4U0/++U=
SHA256 (mozilla/enigmail-1.3.2.tar.gz) = Rv+gdIKUcrpnFOGto3uMwIPQ3U4WwhrQwok8Xu9oiT0=
SHA256 (mozilla/thunderbird-7.0.1.source.tar.bz2) = g/V4u/oMtdD3+rpiFJk4BgUPqz4gOZljRKEclFdSUkI=
SIZE (mozilla/enigmail-1.3.2.tar.gz) = 1371388
SIZE (mozilla/thunderbird-7.0.1.source.tar.bz2) = 87405591
MD5 (mozilla/enigmail-1.3.4.tar.gz) = K18Yh5GBHSSLb/H8UaWAag==
MD5 (mozilla/thunderbird-8.0.source.tar.bz2) = My9gA2rr3Ofexu4rGvSUHQ==
RMD160 (mozilla/enigmail-1.3.4.tar.gz) = VpGmRDaJggODUsnaRaYzynLoXDY=
RMD160 (mozilla/thunderbird-8.0.source.tar.bz2) = NzQg7ACafyjxKmSg1V6dlZVzl04=
SHA1 (mozilla/enigmail-1.3.4.tar.gz) = YB7H5OjrGnMtJtZQOSaAtEFbVrk=
SHA1 (mozilla/thunderbird-8.0.source.tar.bz2) = GLd+RPFlPrPVkFaHD1NePDc9mf0=
SHA256 (mozilla/enigmail-1.3.4.tar.gz) = lnscP/JNh6sFIHr/b0CtqgazAvnnU8ABKJbkf373XDk=
SHA256 (mozilla/thunderbird-8.0.source.tar.bz2) = 9yi9LbwE5sOglteanuMgdA9TeUoovjB9qGVcj9kPd/U=
SIZE (mozilla/enigmail-1.3.4.tar.gz) = 1369381
SIZE (mozilla/thunderbird-8.0.source.tar.bz2) = 89435206

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_rules_mk,v 1.8 2011/10/03 21:07:05 landry Exp $
--- config/rules.mk.orig Wed Aug 31 23:20:24 2011
+++ config/rules.mk Thu Sep 1 10:23:15 2011
@@ -614,6 +614,12 @@ endif
$OpenBSD: patch-config_rules_mk,v 1.9 2011/12/08 02:25:59 nigel Exp $
--- config/rules.mk.orig Sat Nov 5 09:06:09 2011
+++ config/rules.mk Tue Nov 8 15:21:46 2011
@@ -606,6 +606,12 @@ endif
endif
endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.5 2011/10/03 21:07:05 landry Exp $
--- mozilla/browser/app/profile/firefox.js.orig Wed Aug 31 23:36:12 2011
+++ mozilla/browser/app/profile/firefox.js Thu Sep 1 10:23:15 2011
@@ -135,7 +135,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.6 2011/12/08 02:25:59 nigel Exp $
--- mozilla/browser/app/profile/firefox.js.orig Sat Nov 5 09:20:22 2011
+++ mozilla/browser/app/profile/firefox.js Tue Nov 8 15:21:46 2011
@@ -140,7 +140,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
pref("app.update.certs.2.commonName", "aus3.mozilla.org");
// Whether or not app updates are enabled
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.5 2011/10/03 21:07:05
// 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
@@ -687,10 +687,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
@@ -691,10 +691,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
#ifdef MOZ_SAFE_BROWSING
// Safe browsing does nothing unless this pref is set
@ -23,7 +23,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.5 2011/10/03 21:07:05
// 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");
@@ -752,10 +752,8 @@ pref("browser.EULA.version", 3);
@@ -756,10 +756,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_build_unix_mozilla_in,v 1.2 2010/07/27 17:01:16 landry Exp $
--- mozilla/build/unix/mozilla.in.orig Wed Jun 23 19:46:30 2010
+++ mozilla/build/unix/mozilla.in Wed Jul 7 08:43:04 2010
$OpenBSD: patch-mozilla_build_unix_mozilla_in,v 1.3 2011/12/08 02:25:59 nigel 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 @@
#uncomment for debugging
#set -x

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-mozilla_content_events_src_nsContentEventHandler_cpp,v 1.4 2011/10/03 21:07:05 landry Exp $
--- mozilla/content/events/src/nsContentEventHandler.cpp.orig Wed Aug 31 23:36:15 2011
+++ mozilla/content/events/src/nsContentEventHandler.cpp Thu Sep 1 10:23:16 2011
@@ -1096,7 +1096,8 @@ nsContentEventHandler::OnSelectionEvent(nsSelectionEve
selPrivate->EndBatchChanges();
NS_ENSURE_SUCCESS(rv, rv);
- nsCOMPtr<nsISelection2>(do_QueryInterface(mSelection))->ScrollIntoView(
+ nsCOMPtr<nsISelection2> sel2 = do_QueryInterface(mSelection);
+ sel2->ScrollIntoView(
nsISelectionController::SELECTION_FOCUS_REGION, PR_FALSE, -1, -1);
aEvent->mSucceeded = PR_TRUE;
return NS_OK;

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.3 2011/10/03 21:07:05 landry Exp $
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.4 2011/12/08 02:25:59 nigel Exp $
????
--- mozilla/gfx/thebes/Makefile.in.orig Wed Aug 31 23:36:21 2011
+++ mozilla/gfx/thebes/Makefile.in Thu Sep 1 10:23:16 2011
@@ -383,6 +383,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
--- mozilla/gfx/thebes/Makefile.in.orig Sat Nov 5 09:20:35 2011
+++ mozilla/gfx/thebes/Makefile.in Tue Nov 8 15:21:46 2011
@@ -389,6 +389,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-mozilla_js_src_Makefile_in,v 1.1 2011/12/08 02:25:59 nigel Exp $
--- mozilla/js/src/Makefile.in.orig Thu Nov 17 15:22:31 2011
+++ mozilla/js/src/Makefile.in Thu Nov 17 16:59:24 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,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.5 2011/10/03 21:07:05 landry Exp $
--- mozilla/js/src/configure.in.orig Wed Aug 31 23:36:31 2011
+++ mozilla/js/src/configure.in Thu Sep 1 10:23:17 2011
@@ -1208,7 +1208,7 @@ WIN_TOP_SRC=
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.6 2011/12/08 02:25:59 nigel Exp $
--- mozilla/js/src/configure.in.orig Sat Nov 5 09:20:38 2011
+++ mozilla/js/src/configure.in Tue Nov 8 15:21:46 2011
@@ -1256,7 +1256,7 @@ WIN_TOP_SRC=
MOZ_USER_DIR=".mozilla"
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
@ -10,8 +10,8 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.5 2011/10/03 21:07:05 landry Exp
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
@@ -2424,7 +2424,7 @@ ia64*-hpux*)
;;
@@ -2440,7 +2440,7 @@ ia64*-hpux*)
;;
*-openbsd*)
- DLL_SUFFIX=".so.1.0"
@ -19,7 +19,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.5 2011/10/03 21:07:05 landry Exp
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2759,7 +2759,7 @@ arm*-*)
@@ -2763,7 +2763,7 @@ arm*-*)
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
@ -28,7 +28,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.5 2011/10/03 21:07:05 landry Exp
ENABLE_TRACEJIT=1
NANOJIT_ARCH=Sparc
ENABLE_METHODJIT=1
@@ -2846,7 +2846,7 @@ case "$target" in
@@ -2850,7 +2850,7 @@ case "$target" in
*-solaris*)
AC_DEFINE(AVMPLUS_UNIX)
;;

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_js_src_ctypes_libffi_configure,v 1.1 2011/07/24 07:10:12 landry Exp $
--- mozilla/js/src/ctypes/libffi/configure.orig Fri Jan 14 23:21:32 2011
+++ mozilla/js/src/ctypes/libffi/configure Sun Feb 13 23:16:00 2011
$OpenBSD: patch-mozilla_js_src_ctypes_libffi_configure,v 1.2 2011/12/08 02:25:59 nigel 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
TARGET=FRV; TARGETDIR=frv
;;
@ -19,12 +19,3 @@ $OpenBSD: patch-mozilla_js_src_ctypes_libffi_configure,v 1.1 2011/07/24 07:10:12
# Support 128-bit long double for NewABI.
HAVE_LONG_DOUBLE='defined(__mips64)'
TARGET=MIPS; TARGETDIR=mips
@@ -11277,7 +11277,7 @@ case "$host" in
powerpc-*-aix* | rs6000-*-aix*)
TARGET=POWERPC_AIX; TARGETDIR=powerpc
;;
- powerpc-*-freebsd*)
+ powerpc-*-freebsd* | powerpc-*-openbsd* )
TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
;;
powerpc*-*-rtems*)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_js_src_xpconnect_shell_Makefile_in,v 1.2 2011/07/24 07:10:12 landry Exp $
--- mozilla/js/src/xpconnect/shell/Makefile.in.orig Fri Jan 14 23:21:36 2011
+++ mozilla/js/src/xpconnect/shell/Makefile.in Mon Feb 14 21:57:10 2011
$OpenBSD: patch-mozilla_js_src_xpconnect_shell_Makefile_in,v 1.3 2011/12/08 02:25:59 nigel Exp $
--- mozilla/js/src/xpconnect/shell/Makefile.in.orig Sat Nov 5 09:20:48 2011
+++ mozilla/js/src/xpconnect/shell/Makefile.in Tue Nov 8 15:36:39 2011
@@ -54,6 +54,8 @@ CMMSRCS += xpcshellMacUtils.mm
endif

View File

@ -1,34 +0,0 @@
$OpenBSD: patch-mozilla_modules_libimg_png_pngerror_c,v 1.1 2011/07/28 08:12:50 landry Exp $
Fix for CVE-2011-2691 backported from png 1.4.8
--- mozilla/modules/libimg/png/pngerror.c.orig Fri Jun 24 22:18:28 2011
+++ mozilla/modules/libimg/png/pngerror.c Tue Jul 26 22:55:43 2011
@@ -88,11 +88,11 @@ void PNGAPI
png_err(png_structp png_ptr)
{
if (png_ptr != NULL && png_ptr->error_fn != NULL)
- (*(png_ptr->error_fn))(png_ptr, '\0');
+ (*(png_ptr->error_fn))(png_ptr, "");
/* If the custom handler doesn't exist, or if it returns,
use the default handler, which will not return. */
- png_default_error(png_ptr, '\0');
+ png_default_error(png_ptr, "");
}
#endif /* PNG_ERROR_TEXT_SUPPORTED */
@@ -181,8 +181,13 @@ png_format_buffer(png_structp png_ptr, png_charp buffe
{
buffer[iout++] = ':';
buffer[iout++] = ' ';
- png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT);
- buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0';
+
+ iin = 0;
+ while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
+ buffer[iout++] = error_message[iin++];
+
+ /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
+ buffer[iout] = '\0';
}
}

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-mozilla_parser_html_Makefile_in,v 1.2 2011/10/03 21:07:05 landry Exp $
--- mozilla/parser/html/Makefile.in.orig Wed Aug 31 23:37:11 2011
+++ mozilla/parser/html/Makefile.in Thu Sep 1 10:23:18 2011
@@ -88,3 +88,6 @@ include $(topsrcdir)/config/rules.mk
INCLUDES += \
$OpenBSD: patch-mozilla_parser_html_Makefile_in,v 1.3 2011/12/08 02:25:59 nigel Exp $
--- mozilla/parser/html/Makefile.in.orig Sat Nov 5 09:21:02 2011
+++ mozilla/parser/html/Makefile.in Tue Nov 8 15:21:46 2011
@@ -113,4 +113,7 @@ INCLUDES += \
-I$(srcdir)/../../content/base/src \
$(NULL)
+
+nsHtml5NamedCharacters.o: CXXFLAGS := $(filter-out -O%,$(CXXFLAGS))
+nsHtml5ElementName.o: CXXFLAGS := $(CXXFLAGS) -O1
+
#DEFINES += -DENABLE_VOID_MENUITEM

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.4 2011/10/03 21:07:05 landry Exp $
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Wed Aug 31 23:37:26 2011
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Thu Sep 1 10:23:18 2011
@@ -849,11 +849,10 @@ nsNSSComponent::InstallLoadableRoots()
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.5 2011/12/08 02:25:59 nigel Exp $
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Sat Nov 5 09:21:03 2011
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Tue Nov 8 15:21:46 2011
@@ -847,11 +847,10 @@ nsNSSComponent::InstallLoadableRoots()
return;
const char *possible_ckbi_locations[] = {
@ -16,7 +16,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.4 2011/1
};
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
@@ -862,7 +861,7 @@ nsNSSComponent::InstallLoadableRoots()
@@ -860,7 +859,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.5 2011/10/03 21:07:05 landry Exp $
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.6 2011/12/08 02:25:59 nigel Exp $
force the use of secure_delete instead of using internal sqlite copy
--- mozilla/storage/src/mozStorageConnection.cpp.orig Wed Aug 31 23:37:33 2011
+++ mozilla/storage/src/mozStorageConnection.cpp Thu Sep 1 10:23:18 2011
@@ -595,6 +595,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
--- mozilla/storage/src/mozStorageConnection.cpp.orig Sat Nov 5 09:21:06 2011
+++ mozilla/storage/src/mozStorageConnection.cpp Tue Nov 8 15:21:46 2011
@@ -591,6 +591,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
return convertResultCode(srv);
}

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.7 2011/10/03 21:07:05 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Wed Aug 31 23:37:37 2011
+++ mozilla/toolkit/library/Makefile.in Thu Sep 1 10:23:18 2011
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.8 2011/12/08 02:25:59 nigel Exp $
--- mozilla/toolkit/library/Makefile.in.orig Tue Nov 8 15:36:13 2011
+++ mozilla/toolkit/library/Makefile.in Tue Nov 8 16:55:35 2011
@@ -171,12 +171,6 @@ EXTRA_DSO_LDOPTS += \
endif
endif
-ifneq (,$(filter GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
-ifneq (,$(filter NetBSD OpenBSD,$(OS_ARCH)))
-ifdef MOZ_SYDNEYAUDIO
-EXTRA_DSO_LDOPTS += -lossaudio
-endif
@ -14,16 +14,13 @@ $OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.7 2011/10/03 21:07:05 la
ifdef MOZ_PLATFORM_MAEMO
EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
endif
@@ -253,6 +247,12 @@ ifeq ($(OS_ARCH),OpenBSD)
# Needed by nsAuthGSSAPI
EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
endif
+
@@ -250,6 +244,9 @@ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UT
include $(srcdir)/libxul-rules.mk
ifeq ($(OS_ARCH),OpenBSD)
+# GTK2 widget and Sydney audio sndio backends.
+EXTRA_DSO_LDOPTS += -lsndio
+
+# Needed by nsAuthGSSAPI
+EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
ifdef MOZ_JAVAXPCOM
dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
# Needed by nsAuthGSSAPI
EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
endif

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_toolkit_library_libxul-config_mk,v 1.3 2011/10/03 21:07:05 landry Exp $
$OpenBSD: patch-mozilla_toolkit_library_libxul-config_mk,v 1.4 2011/12/08 02:25:59 nigel Exp $
'no target to build -lnss3, needed by libxul.so.17.1'
--- mozilla/toolkit/library/libxul-config.mk.orig Wed Aug 31 23:37:37 2011
+++ mozilla/toolkit/library/libxul-config.mk Thu Sep 1 10:23:18 2011
@@ -337,12 +337,13 @@ EXTRA_DSO_LDOPTS += \
--- mozilla/toolkit/library/libxul-config.mk.orig Sat Nov 5 09:21:09 2011
+++ mozilla/toolkit/library/libxul-config.mk Tue Nov 15 01:47:24 2011
@@ -321,13 +321,14 @@ EXTRA_DSO_LDOPTS += \
$(PNG_LIBS) \
$(QCMS_LIBS) \
$(MOZ_JS_LIBS) \
@ -11,9 +11,10 @@ $OpenBSD: patch-mozilla_toolkit_library_libxul-config_mk,v 1.3 2011/10/03 21:07:
$(MOZ_HARFBUZZ_LIBS) \
$(MOZ_OTS_LIBS) \
$(MOZ_APP_EXTRA_LIBS) \
$(SQLITE_LIBS) \
$(NULL)
+
+OS_LIBS += $(NSS_LIBS)
+OS_LIBS += $(NSS_LIBS)
ifdef MOZ_NATIVE_ZLIB
EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)

View File

@ -1,8 +1,19 @@
$OpenBSD: patch-mozilla_toolkit_mozapps_installer_packager_mk,v 1.3 2011/10/03 21:07:05 landry Exp $
$OpenBSD: patch-mozilla_toolkit_mozapps_installer_packager_mk,v 1.4 2011/12/08 02:25:59 nigel Exp $
precompile fix undo bug fix
https://bugzilla.mozilla.org/show_bug.cgi?id=674352
We don't want the sdk
--- mozilla/toolkit/mozapps/installer/packager.mk.orig Wed Aug 31 23:37:41 2011
+++ mozilla/toolkit/mozapps/installer/packager.mk Thu Sep 1 10:23:18 2011
@@ -730,7 +730,7 @@ endif
--- mozilla/toolkit/mozapps/installer/packager.mk.orig Sat Nov 5 09:21:10 2011
+++ mozilla/toolkit/mozapps/installer/packager.mk Tue Nov 15 12:38:17 2011
@@ -401,7 +401,7 @@ PRECOMPILE_GRE=$$PWD
endif
GENERATE_CACHE = \
- $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
+ $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(topsrcdir)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
rm -rf jsloader && \
$(UNZIP) startupCache.zip && \
rm startupCache.zip && \
@@ -759,7 +759,7 @@ endif
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.6 2011/10/03 21:07:05 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Wed Aug 31 23:37:41 2011
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Thu Sep 1 10:23:18 2011
@@ -1119,11 +1119,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.7 2011/12/08 02:25:59 nigel Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Sat Nov 5 09:21:11 2011
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Tue Nov 8 15:36:39 2011
@@ -1116,11 +1116,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
static const char *const sysSExtDir =

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-mozilla_widget_public_nsIGfxInfo_idl,v 1.2 2011/10/28 12:31:41 robert Exp $
$OpenBSD: patch-mozilla_widget_public_nsIGfxInfo_idl,v 1.3 2011/12/08 02:25:59 nigel Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=681026
https://hg.mozilla.org/mozilla-central/rev/bb708067dd57
--- mozilla/widget/public/nsIGfxInfo.idl.orig Thu Sep 29 14:32:15 2011
+++ mozilla/widget/public/nsIGfxInfo.idl Fri Oct 28 11:12:03 2011
@@ -132,5 +132,8 @@ interface nsIGfxInfo : nsISupports
--- mozilla/widget/public/nsIGfxInfo.idl.orig Sat Nov 5 09:21:11 2011
+++ mozilla/widget/public/nsIGfxInfo.idl Tue Nov 8 15:21:46 2011
@@ -143,5 +143,8 @@ interface nsIGfxInfo : nsISupports
* underlying GL impl that's used to implement WebGL.
*/
DOMString getWebGLParameter(in DOMString aParam);

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h,v 1.2 2011/10/28 12:31:41 robert Exp $
$OpenBSD: patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h,v 1.3 2011/12/08 02:25:59 nigel Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=681026
https://hg.mozilla.org/mozilla-central/rev/bb708067dd57
--- mozilla/widget/src/xpwidgets/GfxInfoX11.h.orig Thu Sep 29 14:32:16 2011
+++ mozilla/widget/src/xpwidgets/GfxInfoX11.h Fri Oct 28 11:12:03 2011
@@ -68,6 +68,8 @@ class GfxInfo : public GfxInfoBase (public)
--- mozilla/widget/src/xpwidgets/GfxInfoX11.h.orig Sat Nov 5 09:21:12 2011
+++ mozilla/widget/src/xpwidgets/GfxInfoX11.h Tue Nov 8 15:21:46 2011
@@ -76,6 +76,8 @@ class GfxInfo : public GfxInfoBase (public)
using GfxInfoBase::GetWebGLParameter;
virtual nsresult Init();
@ -13,7 +13,7 @@ https://hg.mozilla.org/mozilla-central/rev/bb708067dd57
protected:
@@ -82,7 +84,6 @@ class GfxInfo : public GfxInfoBase (public)
@@ -91,7 +93,6 @@ class GfxInfo : public GfxInfoBase (public)
int mMajorVersion, mMinorVersion, mRevisionVersion;
void AddCrashReportAnnotations();

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_xpcom_io_nsAppFileLocationProvider_cpp,v 1.4 2011/08/23 20:19:33 landry Exp $
--- mozilla/xpcom/io/nsAppFileLocationProvider.cpp.orig Mon Aug 1 04:58:01 2011
+++ mozilla/xpcom/io/nsAppFileLocationProvider.cpp Thu Aug 4 23:24:42 2011
$OpenBSD: patch-mozilla_xpcom_io_nsAppFileLocationProvider_cpp,v 1.5 2011/12/08 02:25:59 nigel Exp $
--- mozilla/xpcom/io/nsAppFileLocationProvider.cpp.orig Sat Nov 5 09:21:12 2011
+++ mozilla/xpcom/io/nsAppFileLocationProvider.cpp Tue Nov 8 15:36:39 2011
@@ -234,12 +234,7 @@ nsAppFileLocationProvider::GetFile(const char *prop, P
}
#ifdef XP_UNIX

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2011/07/24 07:10:12 landry Exp $
--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Sat May 28 00:44:40 2011
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in Mon May 30 14:28:56 2011
$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.4 2011/12/08 02:25:59 nigel Exp $
--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Sat Nov 5 09:21:13 2011
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue Nov 8 15:21:46 2011
@@ -219,7 +219,7 @@ endif
#
# OpenBSD/ARM
@ -10,11 +10,3 @@ $OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2011
CPPSRCS := xptcinvoke_arm_openbsd.cpp xptcstubs_arm_openbsd.cpp
endif
@@ -370,6 +370,7 @@ endif
ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDpowerpc)
CPPSRCS := xptcinvoke_ppc_openbsd.cpp xptcstubs_ppc_openbsd.cpp
ASFILES := xptcinvoke_asm_ppc_openbsd.s xptcstubs_asm_ppc_openbsd.s
+AS := $(CC) -c -x assembler-with-cpp
endif
#

View File

@ -1,227 +0,0 @@
$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s.orig Sat Dec 5 02:56:52 2009
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s Sat Jan 16 16:28:38 2010
@@ -1,43 +1,43 @@
-# -*- Mode: Asm -*-
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http:#www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-# beard@netscape.com (Patrick Beard)
-# waterson@netscape.com (Chris Waterson)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+// -*- Mode: Asm -*-
+//
+// ***** BEGIN LICENSE BLOCK *****
+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
+//
+// The contents of this file are subject to the Mozilla Public License Version
+// 1.1 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+// http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+//
+// The Original Code is mozilla.org code.
+//
+// The Initial Developer of the Original Code is
+// Netscape Communications Corporation.
+// Portions created by the Initial Developer are Copyright (C) 1999
+// the Initial Developer. All Rights Reserved.
+//
+// Contributor(s):
+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
+// beard@netscape.com (Patrick Beard)
+// waterson@netscape.com (Chris Waterson)
+//
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 2 or later (the "GPL"), or
+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+// in which case the provisions of the GPL or the LGPL are applicable instead
+// of those above. If you wish to allow use of your version of this file only
+// under the terms of either the GPL or the LGPL, and not to allow others to
+// use your version of this file under the terms of the MPL, indicate your
+// decision by deleting the provisions above and replace them with the notice
+// and other provisions required by the GPL or the LGPL. If you do not delete
+// the provisions above, a recipient may use your version of this file under
+// the terms of any one of the MPL, the GPL or the LGPL.
+//
+// ***** END LICENSE BLOCK *****
.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
@@ -53,80 +53,80 @@
.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
.set f30,30; .set f31,31
-
- .section ".text"
+
+ .section ".text"
.align 2
.globl NS_InvokeByIndex_P
.type NS_InvokeByIndex_P,@function
-#
-# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-# PRUint32 paramCount, nsXPTCVariant* params)
-#
+//
+// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
+// PRUint32 paramCount, nsXPTCVariant* params)
+//
NS_InvokeByIndex_P:
- stwu sp,-32(sp) # setup standard stack frame
- mflr r0 # save LR
- stw r3,8(sp) # r3 <= that
- stw r4,12(sp) # r4 <= methodIndex
- stw r30,16(sp)
- stw r31,20(sp)
+ stwu sp,-32(sp) // setup standard stack frame
+ mflr r0 // save LR
+ stw r3,8(sp) // r3 <= that
+ stw r4,12(sp) // r4 <= methodIndex
+ stw r30,16(sp)
+ stw r31,20(sp)
- stw r0,36(sp) # store LR backchain
- mr r31,sp
+ stw r0,36(sp) // store LR backchain
+ mr r31,sp
- rlwinm r10,r5,3,0,27 # r10 = (ParamCount * 2 * 4) & ~0x0f
- addi r0,r10,96 # reserve stack for GPR and FPR register save area r0 = r10 + 96
- lwz r9,0(sp) # r9 = backchain
- neg r0,r0
- stwux r9,sp,r0 # reserve stack space and save SP backchain
+ rlwinm r10,r5,3,0,27 // r10 = (ParamCount * 2 * 4) & ~0x0f
+ addi r0,r10,96 // reserve stack for GPR and FPR register save area r0 = r10 + 96
+ lwz r9,0(sp) // r9 = backchain
+ neg r0,r0
+ stwux r9,sp,r0 // reserve stack space and save SP backchain
- addi r3,sp,8 # r3 <= args
- mr r4,r5 # r4 <= paramCount
- mr r5,r6 # r5 <= params
- add r6,r3,r10 # r6 <= gpregs ( == args + r10 )
- mr r30,r6 # store in r30 for use later...
- addi r7,r6,32 # r7 <= fpregs ( == gpregs + 32 )
+ addi r3,sp,8 // r3 <= args
+ mr r4,r5 // r4 <= paramCount
+ mr r5,r6 // r5 <= params
+ add r6,r3,r10 // r6 <= gpregs ( == args + r10 )
+ mr r30,r6 // store in r30 for use later...
+ addi r7,r6,32 // r7 <= fpregs ( == gpregs + 32 )
- bl invoke_copy_to_stack@local # (args, paramCount, params, gpregs, fpregs)
+ bl invoke_copy_to_stack@local // (args, paramCount, params, gpregs, fpregs)
- lfd f1,32(r30) # load FP registers with method parameters
- lfd f2,40(r30)
- lfd f3,48(r30)
- lfd f4,56(r30)
- lfd f5,64(r30)
- lfd f6,72(r30)
- lfd f7,80(r30)
- lfd f8,88(r30)
+ lfd f1,32(r30) // load FP registers with method parameters
+ lfd f2,40(r30)
+ lfd f3,48(r30)
+ lfd f4,56(r30)
+ lfd f5,64(r30)
+ lfd f6,72(r30)
+ lfd f7,80(r30)
+ lfd f8,88(r30)
- lwz r3,8(r31) # r3 <= that
- lwz r4,12(r31) # r4 <= methodIndex
- lwz r5,0(r3) # r5 <= vtable ( == *that )
-#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION >= 100) # G++ pre-V3 ABI
- addi r4,r4,2 # skip first two vtable entries
+ lwz r3,8(r31) // r3 <= that
+ lwz r4,12(r31) // r4 <= methodIndex
+ lwz r5,0(r3) // r5 <= vtable ( == *that )
+#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION >= 100) // G++ pre-V3 ABI
+ addi r4,r4,2 // skip first two vtable entries
#endif
- slwi r4,r4,2 # convert to offset ( *= 4 )
- lwzx r0,r5,r4 # r0 <= methodpointer ( == vtable + offset )
+ slwi r4,r4,2 // convert to offset ( *= 4 )
+ lwzx r0,r5,r4 // r0 <= methodpointer ( == vtable + offset )
- lwz r4,4(r30) # load GP regs with method parameters
- lwz r5,8(r30)
- lwz r6,12(r30)
- lwz r7,16(r30)
- lwz r8,20(r30)
- lwz r9,24(r30)
- lwz r10,28(r30)
+ lwz r4,4(r30) // load GP regs with method parameters
+ lwz r5,8(r30)
+ lwz r6,12(r30)
+ lwz r7,16(r30)
+ lwz r8,20(r30)
+ lwz r9,24(r30)
+ lwz r10,28(r30)
- mtlr r0 # copy methodpointer to LR
- blrl # call method
-
- lwz r30,16(r31) # restore r30 & r31
- lwz r31,20(r31)
-
- lwz r11,0(sp) # clean up the stack
- lwz r0,4(r11)
- mtlr r0
- mr sp,r11
+ mtlr r0 // copy methodpointer to LR
+ blrl // call method
+
+ lwz r30,16(r31) // restore r30 & r31
+ lwz r31,20(r31)
+
+ lwz r11,0(sp) // clean up the stack
+ lwz r0,4(r11)
+ mtlr r0
+ mr sp,r11
blr
-# Magic indicating no need for an executable stack
+// Magic indicating no need for an executable stack
.section .note.GNU-stack, "", @progbits ; .previous

View File

@ -1,170 +0,0 @@
$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s.orig Sat Dec 5 02:56:52 2009
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s Sat Jan 16 16:28:38 2010
@@ -1,43 +1,43 @@
-# -*- Mode: Asm -*-
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http:#www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-# beard@netscape.com (Patrick Beard)
-# waterson@netscape.com (Chris Waterson)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+// -*- Mode: Asm -*-
+//
+// ***** BEGIN LICENSE BLOCK *****
+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
+//
+// The contents of this file are subject to the Mozilla Public License Version
+// 1.1 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+// http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+//
+// The Original Code is mozilla.org code.
+//
+// The Initial Developer of the Original Code is
+// Netscape Communications Corporation.
+// Portions created by the Initial Developer are Copyright (C) 1999
+// the Initial Developer. All Rights Reserved.
+//
+// Contributor(s):
+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
+// beard@netscape.com (Patrick Beard)
+// waterson@netscape.com (Chris Waterson)
+//
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 2 or later (the "GPL"), or
+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+// in which case the provisions of the GPL or the LGPL are applicable instead
+// of those above. If you wish to allow use of your version of this file only
+// under the terms of either the GPL or the LGPL, and not to allow others to
+// use your version of this file under the terms of the MPL, indicate your
+// decision by deleting the provisions above and replace them with the notice
+// and other provisions required by the GPL or the LGPL. If you do not delete
+// the provisions above, a recipient may use your version of this file under
+// the terms of any one of the MPL, the GPL or the LGPL.
+//
+// ***** END LICENSE BLOCK *****
.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
@@ -54,29 +54,29 @@
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
.set f30,30; .set f31,31
- .section ".text"
- .align 2
+ .section ".text"
+ .align 2
.globl SharedStub
.type SharedStub,@function
SharedStub:
- stwu sp,-112(sp) # room for
- # linkage (8),
- # gprData (32),
- # fprData (64),
- # stack alignment(8)
- mflr r0
- stw r0,116(sp) # save LR backchain
+ stwu sp,-112(sp) // room for
+ // linkage (8),
+ // gprData (32),
+ // fprData (64),
+ // stack alignment(8)
+ mflr r0
+ stw r0,116(sp) // save LR backchain
- stw r4,12(sp) # save GP registers
- stw r5,16(sp) # (n.b. that we don't save r3
- stw r6,20(sp) # because PrepareAndDispatch() is savvy)
+ stw r4,12(sp) // save GP registers
+ stw r5,16(sp) // (n.b. that we don't save r3
+ stw r6,20(sp) // because PrepareAndDispatch() is savvy)
stw r7,24(sp)
stw r8,28(sp)
stw r9,32(sp)
stw r10,36(sp)
- stfd f1,40(sp) # save FP registers
+ stfd f1,40(sp) // save FP registers
stfd f2,48(sp)
stfd f3,56(sp)
stfd f4,64(sp)
@@ -85,23 +85,23 @@ SharedStub:
stfd f7,88(sp)
stfd f8,96(sp)
- # r3 has the 'self' pointer already
-
- mr r4,r11 # r4 <= methodIndex selector, passed
- # via r11 in the nsXPTCStubBase::StubXX() call
-
- addi r5,sp,120 # r5 <= pointer to callers args area,
- # beyond r3-r10/f1-f8 mapped range
-
- addi r6,sp,8 # r6 <= gprData
- addi r7,sp,40 # r7 <= fprData
-
- bl PrepareAndDispatch@local # Go!
-
- lwz r0,116(sp) # restore LR
+ // r3 has the 'self' pointer already
+
+ mr r4,r11 // r4 <= methodIndex selector, passed
+ // via r11 in the nsXPTCStubBase::StubXX() call
+
+ addi r5,sp,120 // r5 <= pointer to callers args area,
+ // beyond r3-r10/f1-f8 mapped range
+
+ addi r6,sp,8 // r6 <= gprData
+ addi r7,sp,40 // r7 <= fprData
+
+ bl PrepareAndDispatch@local // Go!
+
+ lwz r0,116(sp) // restore LR
mtlr r0
- la sp,112(sp) # clean up the stack
+ la sp,112(sp) // clean up the stack
blr
-# Magic indicating no need for an executable stack
+// Magic indicating no need for an executable stack
.section .note.GNU-stack, "", @progbits ; .previous

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-lightning,v 1.5 2011/10/03 21:07:05 landry Exp $
@comment $OpenBSD: PLIST-lightning,v 1.6 2011/12/08 02:25:59 nigel Exp $
@conflict lightning-<=1.0b1
@pkgpath productivity/sunbird,-lightning
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/calendar-timezones@mozilla.org/
@ -79,7 +79,6 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceInfo.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRelation.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calStartupService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTimezoneService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTodo.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTransactionManager.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calUtils.js
@ -113,6 +112,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-clipboard.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-common-sets.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-common-sets.xul
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-conflicts-dialog.xul
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-creation.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-daypicker.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-dialog-utils.js
@ -215,7 +215,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/calendar-alarm-dialog.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-alarms.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-creation-wizard.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-day-label-back.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-daypicker.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-event-dialog-attendees.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-event-dialog-toolbar-small.png
@ -239,7 +238,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/calendar-timezone-highlighter.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-unifinder.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-views.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/category-overlay.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/checkbox-images.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-task-tree.css
@ -252,8 +250,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/event-grippy-left.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grippy-right.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grippy-top.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/gradient-overlay.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/mini-day-background.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/ok-cancel.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/task-images.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/tasks-actions.png
@ -265,7 +261,9 @@ 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/widgets/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/calendar-widgets.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/minimonth.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/nav-buttons.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/nav-arrow.svg
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/nav-today-hov.svg
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/nav-today.svg
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/view-navigation.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/
@ -326,6 +324,8 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calMemoryCalendar.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calStorageCalendar.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calStorageCalendar.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calTimezoneService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calTimezoneService.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calWcapCalendarModule.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calWcapCalendarModule.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calbase.xpt

View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.7 2011/10/03 21:07:05 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2011/12/08 02:25:59 nigel Exp $
@conflict mozilla-thunderbird-<=3.1.11
@pkgpath mail/mozilla-thunderbird
bin/${MOZILLA_PROJECT}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/README.txt
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/application.ini
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/blocklist.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/
@ -33,12 +32,45 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-32
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_af.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_bg.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ca.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_cy.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_da.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_de-1901.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_de-1996.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_de-CH.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_en_US.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_eo.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_es.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_et.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_fi.dic
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_ia.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_is.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
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_mn.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_nb.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_nl.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_nn.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_pt.dic
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_uk.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/SpamAssassin.sfd
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/SpamPal.sfd
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/movemail.rdf
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/rss.rdf
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/jsloader/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/jsloader/resource/
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libldap60.so.${LIBldap60_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libldif60.so.${LIBldif60_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libmozalloc.so.${LIBmozalloc_VERSION}