cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to thunderbird 13.0.

Browse Source 
See https://www.mozilla.org/en-US/thunderbird/13.0/releasenotes/ for details
- update enigmail to 1.4.2, lightning to 1.5b1
- adapt Makefile to cope with SEPARATE_BUILD
- add a rpath hack in config/rules.mk, temporary workaround for #668869
This commit is contained in:
landry 2012-06-11 15:33:26 +00:00
parent 8d05605311
commit e5024918a2
25 changed files with 227 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mail/mozilla-thunderbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.149 2012/04/30 15:32:06 landry Exp $
# $OpenBSD: Makefile,v 1.150 2012/06/11 15:33:26 landry Exp $
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
@ -8,17 +8,18 @@ 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 = 12.0.1
MOZILLA_VERSION = 13.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = thunderbird
MOZILLA_CODENAME = mail
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-1.4beta1
ENIG_V = 1.4.1
PKGNAME-enigmail = enigmail-1.5pre
PKGNAME-lightning = lightning-1.5beta1
ENIG_V = 1.4.2
PKGNAME-enigmail = enigmail-${ENIG_V}
EPOCH-lightning = 0
EPOCH-enigmail = 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/
@ -26,7 +27,7 @@ DISTFILES += ${MOZILLA_PROJECT}-${MOZILLA_VERSION}.source.tar.bz2 \
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 = 24.0
SO_VERSION = 25.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@ -59,6 +60,8 @@ CONFIGURE_ARGS += --with-system-libevent=/usr/
CONFIGURE_ARGS += --with-system-zlib=/usr/ --with-system-bz2=${LOCALBASE}
WANTLIB += event
# bug #736961
SEPARATE_BUILD = Yes
# XXX solved in firefox by patch-config-autoconf_mk_in ?
CONFIGURE_ENV += CPPFLAGS=-I${X11BASE}/include
@ -91,14 +94,14 @@ ALL_TARGET = default
MOZILLA_AUTOCONF_DIRS = ldap/sdks/c-sdk mozilla mozilla/js/src
MOZILLA_SUBST_FILES += config/autoconf.mk.in
ENIGMAIL_DIR = ${WRKSRC}/mailnews/extensions/enigmail
ENIGMAIL_DIR = mailnews/extensions/enigmail
post-build:
# build enigmail
cd ${ENIGMAIL_DIR} && ./makemake -r
cd ${ENIGMAIL_DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
cd ${MOB}/chrome/enigmail && zip -r ../enigmail.jar .
cd ${ENIGMAIL_DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
cd ${WRKSRC}/${ENIGMAIL_DIR} && ./makemake -o ${WRKBUILD} -r
cd ${WRKBUILD}/${ENIGMAIL_DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
cd ${WRKBUILD}/mozilla/dist/bin/chrome/enigmail && zip -r ../enigmail.jar .
cd ${WRKBUILD}/${ENIGMAIL_DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
GNU_ARCH = ${MACHINE_ARCH:S/amd64/x86_64/}
# guid for gdata-provider comes from em:id in install.rdf
@ -110,11 +113,14 @@ GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc} \
EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/
post-install:
.for xpi guid in ${GUIDS}
unzip -q ${MOB}/../xpi-stage/${xpi}.xpi -d ${EXTDIR}/${guid}
unzip -q ${WRKBUILD}/mozilla/dist/xpi-stage/${xpi}.xpi -d ${EXTDIR}/${guid}
.endfor
# install desktop file
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ ; \
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
${PREFIX}/share/applications/${MOZILLA_PROJECT}.desktop ; \
# cleanup useless dirs from #717616
rm -Rf ${PREFIX}/lib/thunderbird-${MOZILLA_VERSION:C/b.//}/js{sub,}loader
.include <bsd.port.mk>

20
mail/mozilla-thunderbird/distinfo
View File

@ -1,10 +1,10 @@
MD5 (mozilla/enigmail-1.4.1.tar.gz) = Drp1+8+PC7MtU43xAvu46Q==
MD5 (mozilla/thunderbird-12.0.1.source.tar.bz2) = ZMrN5MsrHoc28cOg6moC2w==
RMD160 (mozilla/enigmail-1.4.1.tar.gz) = 8jXiZqzTkJkvEoog9zKIwuzDxaU=
RMD160 (mozilla/thunderbird-12.0.1.source.tar.bz2) = XfElE92NNVTmZv+Ti4SmexingUQ=
SHA1 (mozilla/enigmail-1.4.1.tar.gz) = XGKaXQbiPFvruGyED0TwTwcy29o=
SHA1 (mozilla/thunderbird-12.0.1.source.tar.bz2) = tfz+I4NHIuqkQSdODiiCrfntdXU=
SHA256 (mozilla/enigmail-1.4.1.tar.gz) = EAvH+axrygPkUH3yXFsp1qOdCQTEYwHMfe82dnedcgs=
SHA256 (mozilla/thunderbird-12.0.1.source.tar.bz2) = 2JFPJ7DscdlAR1qJQslRsQbs2mn9OilUBHWEZjpqsYM=
SIZE (mozilla/enigmail-1.4.1.tar.gz) = 1344516
SIZE (mozilla/thunderbird-12.0.1.source.tar.bz2) = 101253776
MD5 (mozilla/enigmail-1.4.2.tar.gz) = 7WCOHNTNILlvf1r9vwgRQQ==
MD5 (mozilla/thunderbird-13.0.source.tar.bz2) = ATTGfDDoWY8qZOoATVvEvA==
RMD160 (mozilla/enigmail-1.4.2.tar.gz) = +gEVQI0LQ/NHzLfSxtVO9u5INs4=
RMD160 (mozilla/thunderbird-13.0.source.tar.bz2) = VAbQDmv+ijslvh/Dt9Wxm9GxAgY=
SHA1 (mozilla/enigmail-1.4.2.tar.gz) = tMB2hRzgcY0YlWkheFk1mHEyVKk=
SHA1 (mozilla/thunderbird-13.0.source.tar.bz2) = fNN056Ej2YnsWPZCU9JCKV+WGBo=
SHA256 (mozilla/enigmail-1.4.2.tar.gz) = 30Y2IPR6MNKg4WNHk7QaKF4aLIYbAk4aV8nZHPa/NYE=
SHA256 (mozilla/thunderbird-13.0.source.tar.bz2) = UPuy5Q2SlAZ5dNMnCJnzL762HnlRvstd6vCaxc+HTfs=
SIZE (mozilla/enigmail-1.4.2.tar.gz) = 1319995
SIZE (mozilla/thunderbird-13.0.source.tar.bz2) = 102799262

13
mail/mozilla-thunderbird/patches/patch-config_rules_mk
View File

@ -1,7 +1,10 @@
$OpenBSD: patch-config_rules_mk,v 1.10 2012/01/11 01:10:24 nigel 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
$OpenBSD: patch-config_rules_mk,v 1.11 2012/06/11 15:33:26 landry Exp $
Add -rpath $(installdir) to be sure libxul/libxpcom can open their
depending libs when being dlopen()'ed themselves
Workarounds https://bugzilla.mozilla.org/show_bug.cgi?id=668869
--- config/rules.mk.orig Fri Jun 1 19:11:49 2012
+++ config/rules.mk Wed Jun 6 12:49:40 2012
@@ -555,6 +555,14 @@ endif
endif
endif
@ -9,6 +12,8 @@ $OpenBSD: patch-config_rules_mk,v 1.10 2012/01/11 01:10:24 nigel Exp $
+ifdef IS_COMPONENT
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+endif
+DSO_LDOPTS += -Wl,-rpath,'$(installdir)'
+OS_LDFLAGS += -Wl,-rpath,'$(installdir)'
+endif
+
#

8
mail/mozilla-thunderbird/patches/patch-mail_installer_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mail_installer_Makefile_in,v 1.2 2012/04/30 15:32:06 landry Exp $
$OpenBSD: patch-mail_installer_Makefile_in,v 1.3 2012/06/11 15:33:26 landry Exp $
Don't install the sdk (revert bug #639462)
--- mail/installer/Makefile.in.orig Sat Apr 21 00:32:38 2012
+++ mail/installer/Makefile.in Wed Apr 25 18:48:38 2012
--- mail/installer/Makefile.in.orig Tue May 29 23:18:57 2012
+++ mail/installer/Makefile.in Thu May 31 16:50:43 2012
@@ -105,10 +105,6 @@ endif
NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
@ -12,4 +12,4 @@ Don't install the sdk (revert bug #639462)
-
GENERATE_CACHE=1
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/signing.mk

12
mail/mozilla-thunderbird/patches/patch-mozilla_browser_app_profile_firefox_js
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.10 2012/04/30 15:32:06 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
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.11 2012/06/11 15:33:26 landry Exp $
--- mozilla/browser/app/profile/firefox.js.orig Fri May 18 06:10:34 2012
+++ mozilla/browser/app/profile/firefox.js Fri May 18 09:27:57 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,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.10 2012/04/30 15:32:0
// 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
@@ -589,7 +589,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
@@ -596,7 +596,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
@ -19,7 +19,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.10 2012/04/30 15:32:0
pref("plugins.hide_infobar_for_outdated_plugin", false);
#ifdef XP_MACOSX
@@ -713,10 +713,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
@@ -720,10 +720,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
#ifdef MOZ_SAFE_BROWSING
// Safe browsing does nothing unless this pref is set
@ -32,7 +32,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.10 2012/04/30 15:32:0
// 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");
@@ -770,10 +770,8 @@ pref("browser.EULA.version", 3);
@@ -777,10 +777,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);

8
mail/mozilla-thunderbird/patches/patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml,v 1.3 2012/03/16 21:35:25 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 @@
$OpenBSD: patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml,v 1.4 2012/06/11 15:33:26 landry Exp $
--- mozilla/browser/components/certerror/content/aboutCertError.xhtml.orig Fri May 18 06:10:34 2012
+++ mozilla/browser/components/certerror/content/aboutCertError.xhtml Fri May 18 09:27:57 2012
@@ -134,6 +134,9 @@
tech.textContent = getDescription();
addDomainErrorLink();

8
mail/mozilla-thunderbird/patches/patch-mozilla_gfx_thebes_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.8 2012/04/30 15:32:06 landry Exp $
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.9 2012/06/11 15:33:26 landry Exp $
????
--- 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)
--- mozilla/gfx/thebes/Makefile.in.orig Fri May 18 06:10:44 2012
+++ mozilla/gfx/thebes/Makefile.in Fri May 18 09:27:57 2012
@@ -389,6 +389,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

14
mail/mozilla-thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.1 2012/04/30 15:32:06 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)
$OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.2 2012/06/11 15:33:26 landry Exp $
--- mozilla/gfx/thebes/gfxPlatform.cpp.orig Fri May 18 06:10:44 2012
+++ mozilla/gfx/thebes/gfxPlatform.cpp Fri May 18 09:27:57 2012
@@ -458,6 +458,7 @@ void SourceBufferDestroy(void *srcBuffer)
static_cast<SourceSurface*>(srcBuffer)->Release();
}
@ -9,7 +9,7 @@ $OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.1 2012/04/30 15:32:06 lan
void SourceSnapshotDetached(cairo_surface_t *nullSurf)
{
gfxImageSurface* origSurf =
@@ -443,6 +444,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
@@ -465,6 +466,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
origSurf->SetData(&kSourceSurface, NULL, NULL);
}
@ -17,7 +17,7 @@ $OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.1 2012/04/30 15:32:06 lan
RefPtr<SourceSurface>
gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
@@ -512,6 +514,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
@@ -534,6 +536,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
imgSurface->Stride(),
format);
@ -25,7 +25,7 @@ $OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.1 2012/04/30 15:32:06 lan
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
@@ -542,6 +545,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
NULL);
cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
cairo_surface_destroy(nullSurf);

8
mail/mozilla-thunderbird/patches/patch-mozilla_js_src_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_js_src_Makefile_in,v 1.6 2012/05/09 20:36:40 landry Exp $
$OpenBSD: patch-mozilla_js_src_Makefile_in,v 1.7 2012/06/11 15:33:26 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- mozilla/js/src/Makefile.in.orig Sat Apr 28 21:39:18 2012
+++ mozilla/js/src/Makefile.in Wed May 9 22:08:15 2012
@@ -349,20 +349,23 @@ CPPSRCS += checks.cc \
--- mozilla/js/src/Makefile.in.orig Fri May 18 06:10:47 2012
+++ mozilla/js/src/Makefile.in Fri May 18 09:27:57 2012
@@ -337,20 +337,23 @@ CPPSRCS += checks.cc \
# END enclude sources for V8 dtoa
#############################################

8
mail/mozilla-thunderbird/patches/patch-mozilla_js_src_assembler_jit_ExecutableAllocator_h
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_js_src_assembler_jit_ExecutableAllocator_h,v 1.1 2012/05/09 20:36:40 landry Exp $
$OpenBSD: patch-mozilla_js_src_assembler_jit_ExecutableAllocator_h,v 1.2 2012/06/11 15:33:26 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- mozilla/js/src/assembler/jit/ExecutableAllocator.h.orig Wed May 9 22:06:52 2012
+++ mozilla/js/src/assembler/jit/ExecutableAllocator.h Wed May 9 22:07:02 2012
@@ -445,8 +445,6 @@ class ExecutableAllocator { (public)
--- mozilla/js/src/assembler/jit/ExecutableAllocator.h.orig Fri May 18 06:10:47 2012
+++ mozilla/js/src/assembler/jit/ExecutableAllocator.h Fri May 18 09:27:57 2012
@@ -467,8 +467,6 @@ class ExecutableAllocator { (public)
{
sync_instruction_memory((caddr_t)code, size);
}

19
mail/mozilla-thunderbird/patches/patch-mozilla_js_src_configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.10 2012/04/30 15:32:06 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: patch-mozilla_js_src_configure_in,v 1.11 2012/06/11 15:33:26 landry Exp $
--- mozilla/js/src/configure.in.orig Fri May 18 06:10:47 2012
+++ mozilla/js/src/configure.in Fri May 18 09:27:57 2012
@@ -2583,7 +2583,12 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -15,16 +15,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.10 2012/04/30 15:32:06 landry Ex
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2805,7 +2810,7 @@ arm*-*)
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
-sparc*-*)
+sparc-*)
ENABLE_METHODJIT=1
ENABLE_MONOIC=1
ENABLE_POLYIC=1
@@ -2820,6 +2825,10 @@ mips*-*)
@@ -2871,6 +2876,10 @@ mips*-*)
ENABLE_METHODJIT_TYPED_ARRAY=1
AC_DEFINE(JS_CPU_MIPS)
AC_DEFINE(JS_NUNBOX32)

75
mail/mozilla-thunderbird/patches/patch-mozilla_js_src_vm_RegExpObject-inl_h
View File

@ -1,78 +1,19 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject-inl_h,v 1.3 2012/04/30 15:32:06 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);
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject-inl_h,v 1.4 2012/06/11 15:33:26 landry Exp $
--- mozilla/js/src/vm/RegExpObject-inl.h.orig Fri May 18 06:10:51 2012
+++ mozilla/js/src/vm/RegExpObject-inl.h Fri May 18 09:31:55 2012
@@ -137,6 +137,7 @@ RegExpObject::setSticky(bool enabled)
setSlot(STICKY_FLAG_SLOT, BooleanValue(enabled));
}
+#if ENABLE_YARR_JIT
/* This function should be deleted once bad Android platforms phase out. See bug 604774. */
inline bool
detail::RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
@@ -367,12 +368,12 @@ detail::RegExpPrivateCode::isJITRuntimeEnabled(JSConte
detail::RegExpCode::isJITRuntimeEnabled(JSContext *cx)
@@ -147,6 +148,7 @@ detail::RegExpCode::isJITRuntimeEnabled(JSContext *cx)
return true;
#endif
}
+#endif
inline bool
detail::RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts,
uintN *parenCount, RegExpFlag flags)
{
-#if ENABLE_YARR_JIT
/* Parse the pattern. */
ErrorCode yarrError;
YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
@@ -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->runtime->getExecutableAllocator(cx);
if (!execAlloc) {
@@ -410,21 +411,11 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLi
return false;
}
+#if ENABLE_YARR_JIT
codeBlock.setFallBack(true);
+#endif
byteCode = byteCompile(yarrPattern, bumpAlloc).get();
return true;
-#else /* !defined(ENABLE_YARR_JIT) */
- int error = 0;
- compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
- ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
- multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
- parenCount, &error);
- if (error) {
- reportPCREError(cx, error);
- return false;
- }
- return true;
-#endif
}
inline bool
@@ -466,18 +457,11 @@ detail::RegExpPrivateCode::execute(JSContext *cx, cons
else
result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
#else
- result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
+ result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
#endif
if (result == -1)
return RegExpRunStatus_Success_NotFound;
-
-#if !ENABLE_YARR_JIT
- if (result < 0) {
- reportPCREError(cx, result);
- return RegExpRunStatus_Error;
- }
-#endif
JS_ASSERT(result >= 0);
return RegExpRunStatus_Success;
RegExpToShared(JSContext *cx, JSObject &obj, RegExpGuard *g)

83
mail/mozilla-thunderbird/patches/patch-mozilla_js_src_vm_RegExpObject_cpp
View File

@ -1,23 +1,22 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.2 2012/03/16 21:35:25 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 = {
regexp_trace
};
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.3 2012/06/11 15:33:26 landry Exp $
--- mozilla/js/src/vm/RegExpObject.cpp.orig Fri May 18 06:10:51 2012
+++ mozilla/js/src/vm/RegExpObject.cpp Fri May 18 09:34:54 2012
@@ -167,7 +167,6 @@ MatchPairs::checkAgainst(size_t inputLength)
/* detail::RegExpCode */
-#if ENABLE_YARR_JIT
void
RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
RegExpCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
{
@@ -423,42 +422,6 @@ RegExpPrivateCode::reportYarrError(JSContext *cx, Toke
JS_NOT_REACHED("Unknown Yarr error code");
@@ -199,46 +198,9 @@ RegExpCode::reportYarrError(JSContext *cx, TokenStream
}
}
-
-#else /* !ENABLE_YARR_JIT */
-
-void
-RegExpPrivateCode::reportPCREError(JSContext *cx, int error)
-RegExpCode::reportPCREError(JSContext *cx, int error)
-{
-#define REPORT(msg_) \
- JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \
@ -49,6 +48,64 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.2 2012/03/16 21:35:25 lan
-}
-
-#endif /* ENABLE_YARR_JIT */
-
bool
js::ParseRegExpFlags(JSContext *cx, JSString *flagStr, RegExpFlag *flagsOut)
RegExpCode::compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags)
{
-#if ENABLE_YARR_JIT
/* Parse the pattern. */
ErrorCode yarrError;
YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
@@ -255,7 +217,7 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
* 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->runtime->getExecutableAllocator(cx);
if (!execAlloc) {
@@ -276,21 +238,11 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
return false;
}
+#if ENABLE_YARR_JIT
codeBlock.setFallBack(true);
+#endif
byteCode = byteCompile(yarrPattern, bumpAlloc).get();
return true;
-#else /* !defined(ENABLE_YARR_JIT) */
- int error = 0;
- compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
- ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
- multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
- parenCount, &error);
- if (error) {
- reportPCREError(cx, error);
- return false;
- }
- return true;
-#endif
}
RegExpRunStatus
@@ -305,18 +257,11 @@ RegExpCode::execute(JSContext *cx, const jschar *chars
else
result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
#else
- result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
+ result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
#endif
if (result == -1)
return RegExpRunStatus_Success_NotFound;
-
-#if !ENABLE_YARR_JIT
- if (result < 0) {
- reportPCREError(cx, result);
- return RegExpRunStatus_Error;
- }
-#endif
JS_ASSERT(result >= 0);
return RegExpRunStatus_Success;

22
mail/mozilla-thunderbird/patches/patch-mozilla_js_src_vm_RegExpObject_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.3 2012/04/30 15:32:06 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
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.4 2012/06/11 15:33:26 landry Exp $
--- mozilla/js/src/vm/RegExpObject.h.orig Fri May 18 06:10:51 2012
+++ mozilla/js/src/vm/RegExpObject.h Fri May 18 09:36:17 2012
@@ -52,8 +52,6 @@
#if ENABLE_YARR_JIT
#include "yarr/YarrJIT.h"
@ -9,10 +9,10 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.3 2012/04/30 15:32:06 landr
-#include "yarr/pcre/pcre.h"
#endif
namespace js {
@@ -242,40 +240,33 @@ static const jschar GreedyStarChars[] = {'.', '*'};
/* Abstracts away the gross |RegExpPrivate| backend details. */
class RegExpPrivateCode
/*
@@ -112,40 +110,33 @@ namespace detail {
class RegExpCode
{
-#if ENABLE_YARR_JIT
typedef JSC::Yarr::BytecodePattern BytecodePattern;
@ -32,7 +32,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.3 2012/04/30 15:32:06 landr
+ BytecodePattern *byteCode;
public:
RegExpPrivateCode()
RegExpCode()
:
#if ENABLE_YARR_JIT
codeBlock(),
@ -43,7 +43,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.3 2012/04/30 15:32:06 landr
+ byteCode(NULL)
{ }
~RegExpPrivateCode() {
~RegExpCode() {
#if ENABLE_YARR_JIT
codeBlock.release();
+#endif
@ -56,7 +56,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.3 2012/04/30 15:32:06 landr
}
static bool checkSyntax(JSContext *cx, TokenStream *tokenStream, JSLinearString *source) {
@@ -287,23 +278,17 @@ class RegExpPrivateCode
@@ -157,23 +148,17 @@ class RegExpCode
reportYarrError(cx, tokenStream, error);
return false;
#else
@ -81,4 +81,4 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.3 2012/04/30 15:32:06 landr
-#endif
}
inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount,
bool compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags);

8
mail/mozilla-thunderbird/patches/patch-mozilla_netwerk_base_src_nsSocketTransportService2_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_netwerk_base_src_nsSocketTransportService2_cpp,v 1.1 2012/03/16 21:35:25 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
$OpenBSD: patch-mozilla_netwerk_base_src_nsSocketTransportService2_cpp,v 1.2 2012/06/11 15:33:26 landry Exp $
--- mozilla/netwerk/base/src/nsSocketTransportService2.cpp.orig Fri May 18 06:11:00 2012
+++ mozilla/netwerk/base/src/nsSocketTransportService2.cpp Fri May 18 09:27:58 2012
@@ -54,14 +54,6 @@
#include "mozilla/FunctionTimer.h"
@ -25,7 +25,7 @@ $OpenBSD: patch-mozilla_netwerk_base_src_nsSocketTransportService2_cpp,v 1.1 201
gSocketThread = PR_GetCurrentThread();
// add thread event to poll list (mThreadEvent may be NULL)
@@ -674,8 +664,6 @@ nsSocketTransportService::Run()
@@ -677,8 +667,6 @@ nsSocketTransportService::Run()
NS_ProcessPendingEvents(thread);
gSocketThread = nsnull;

8
mail/mozilla-thunderbird/patches/patch-mozilla_parser_html_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_parser_html_Makefile_in,v 1.6 2012/04/30 15:32:06 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 += \
$OpenBSD: patch-mozilla_parser_html_Makefile_in,v 1.7 2012/06/11 15:33:26 landry Exp $
--- mozilla/parser/html/Makefile.in.orig Fri May 18 06:11:00 2012
+++ mozilla/parser/html/Makefile.in Fri May 18 09:27:58 2012
@@ -128,4 +128,7 @@ INCLUDES += \
-I$(srcdir)/../../content/base/src \
$(NULL)

8
mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_ssl_src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_Makefile_in,v 1.5 2012/03/16 21:35:25 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
$OpenBSD: patch-mozilla_security_manager_ssl_src_Makefile_in,v 1.6 2012/06/11 15:33:26 landry Exp $
--- mozilla/security/manager/ssl/src/Makefile.in.orig Fri May 18 06:11:01 2012
+++ mozilla/security/manager/ssl/src/Makefile.in Fri May 18 09:27:58 2012
@@ -116,7 +116,10 @@ CSRCS += md4.c
EXTRA_DEPS = $(NSS_DEP_LIBS)

28
mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/03/16 21:35:25 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 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.8 2012/06/11 15:33:26 landry Exp $
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Fri May 18 06:11:01 2012
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Fri May 18 09:27:58 2012
@@ -111,6 +111,7 @@
#include "secerr.h"
#include "sslerr.h"
#include "cert.h"
@ -9,7 +9,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
#include "nsXULAppAPI.h"
@@ -125,6 +126,7 @@ extern "C" {
@@ -124,6 +125,7 @@ extern "C" {
}
using namespace mozilla;
@ -17,7 +17,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
#ifdef PR_LOGGING
PRLogModuleInfo* gPIPNSSLog = nsnull;
@@ -396,6 +398,8 @@ nsNSSComponent::deleteBackgroundThreads()
@@ -395,6 +397,8 @@ nsNSSComponent::deleteBackgroundThreads()
delete mCertVerificationThread;
mCertVerificationThread = nsnull;
}
@ -26,7 +26,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
}
void
@@ -403,21 +407,20 @@ nsNSSComponent::createBackgroundThreads()
@@ -402,21 +406,20 @@ nsNSSComponent::createBackgroundThreads()
{
NS_ASSERTION(mCertVerificationThread == nsnull,
"Cert verification thread already created.");
@ -50,7 +50,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
if (mUpdateTimerInitialized) {
{
MutexAutoLock lock(mCrlTimerLock);
@@ -845,7 +848,7 @@ nsNSSComponent::InstallLoadableRoots()
@@ -844,7 +847,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{
@ -59,7 +59,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
}
else
{
@@ -1863,6 +1866,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
@@ -1881,6 +1884,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
LaunchSmartCardThreads();
@ -68,7 +68,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
}
}
@@ -2006,16 +2011,6 @@ nsNSSComponent::Init()
@@ -2023,16 +2028,6 @@ nsNSSComponent::Init()
if (mClientAuthRememberService)
mClientAuthRememberService->Init();
@ -85,7 +85,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
InitializeCRLUpdateTimer();
RegisterPSMContentListener();
@@ -2230,6 +2225,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
@@ -2247,6 +2242,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
DoProfileChangeTeardown(aSubject);
}
else if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_TEARDOWN_VETO_TOPIC) == 0) {
@ -93,7 +93,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
mShutdownObjectList->allowUI();
}
else if (nsCRT::strcmp(aTopic, PROFILE_BEFORE_CHANGE_TOPIC) == 0) {
@@ -2277,6 +2273,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
@@ -2294,6 +2290,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
InitializeCRLUpdateTimer();
}
else if (nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
@ -101,7 +101,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: XPCom shutdown observed\n"));
@@ -2565,6 +2562,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
@@ -2584,6 +2581,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
void
nsNSSComponent::DoProfileChangeTeardown(nsISupports* aSubject)
{
@ -111,7 +111,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2012/0
bool callVeto = false;
if (!mShutdownObjectList->ifPossibleDisallowUI()) {
@@ -2618,9 +2618,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
@@ -2637,9 +2637,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
void
nsNSSComponent::DoProfileChangeNetRestore()
{

8
mail/mozilla-thunderbird/patches/patch-mozilla_storage_src_mozStorageConnection_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.9 2012/04/30 15:32:06 landry Exp $
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.10 2012/06/11 15:33:26 landry Exp $
force the use of secure_delete instead of using internal sqlite copy
--- 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,
--- mozilla/storage/src/mozStorageConnection.cpp.orig Fri May 18 06:11:03 2012
+++ mozilla/storage/src/mozStorageConnection.cpp Fri May 18 09:27:59 2012
@@ -700,6 +700,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
return convertResultCode(srv);
}

10
mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp,v 1.4 2012/04/30 15:32:06 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
$OpenBSD: patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp,v 1.5 2012/06/11 15:33:26 landry Exp $
--- mozilla/toolkit/components/downloads/nsDownloadManager.cpp.orig Fri May 18 06:11:04 2012
+++ mozilla/toolkit/components/downloads/nsDownloadManager.cpp Fri May 18 09:27:59 2012
@@ -1162,7 +1162,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);
}
}
@@ -1273,7 +1273,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
@@ -1270,7 +1270,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
(void)customDirectory->Exists(&exists);
if (!exists) {

10
mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.12 2012/04/30 15:32:06 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 += \
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.13 2012/06/11 15:33:26 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Fri May 18 06:11:05 2012
+++ mozilla/toolkit/library/Makefile.in Fri May 18 09:27:59 2012
@@ -455,6 +455,12 @@ OS_LIBS += \
$(NULL)
endif
@ -14,7 +14,7 @@ $OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.12 2012/04/30 15:32:06 l
ifeq ($(OS_ARCH),Darwin)
ifdef MOZ_SYDNEYAUDIO
OS_LIBS += \
@@ -495,12 +501,6 @@ OS_LIBS += \
@@ -466,12 +472,6 @@ OS_LIBS += \
-framework Foundation \
-framework AppKit \
$(NULL)

8
mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_xre_nsXREDirProvider_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.9 2012/03/16 21:35:25 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
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.10 2012/06/11 15:33:26 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Fri May 18 06:11:07 2012
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Fri May 18 09:27:59 2012
@@ -1168,11 +1168,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
static const char *const sysSExtDir =

3
mail/mozilla-thunderbird/pkg/PLIST-enigmail
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-enigmail,v 1.3 2012/04/30 15:32:06 landry Exp $
@comment $OpenBSD: PLIST-enigmail,v 1.4 2012/06/11 15:33:26 landry Exp $
@conflict enigmail-<=1.2
@pkgpath mail/enigmail/thunderbird
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/
@ -23,6 +23,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-00
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/pipeTransport.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

15
mail/mozilla-thunderbird/pkg/PLIST-lightning
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-lightning,v 1.9 2012/04/30 15:32:06 landry Exp $
@comment $OpenBSD: PLIST-lightning,v 1.10 2012/06/11 15:33:26 landry Exp $
@conflict lightning-<=1.0b1
@pkgpath productivity/sunbird,-lightning
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/calendar-timezones@mozilla.org/
@ -240,7 +240,18 @@ 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-views.css
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-daypicker.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-management.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-task-tree.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-task-view.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-unifinder.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-views.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/dialogs/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/dialogs/calendar-alarm-dialog.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/dialogs/calendar-event-dialog.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/today-pane.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/widgets/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/widgets/calendar-widgets.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/datetimepickers/
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
@ -301,6 +312,8 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
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/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/skin/lightning/accountCentral.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/skin/lightning/common/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/skin/lightning/common/imip.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/skin/lightning/imip.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/skin/lightning/lightning-toolbar.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/skin/lightning/lightning-widgets.css

7
mail/mozilla-thunderbird/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.12 2012/04/30 15:32:06 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2012/06/11 15:33:26 landry Exp $
@conflict mozilla-thunderbird-<=3.1.11
@pkgpath mail/mozilla-thunderbird
bin/${MOZILLA_PROJECT}
@ -22,6 +22,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/messenger/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/messenger/mailViews.dat
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/pref/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/pref/channel-prefs.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dependentlibs.list
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/en-US.aff
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/en-US.dic
@ -42,8 +43,6 @@ 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}
@ -64,7 +63,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/eBay.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/twitter.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/wikipedia.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/yahoo.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}-bin
share/applications/${MOZILLA_PROJECT}.desktop
share/doc/pkg-readmes/${FULLPKGNAME}