diff options
author | flo <flo@FreeBSD.org> | 2012-10-11 05:13:06 +0800 |
---|---|---|
committer | flo <flo@FreeBSD.org> | 2012-10-11 05:13:06 +0800 |
commit | 266179525f1a084fa74c16305d6d4da159776222 (patch) | |
tree | 16010259bfe88bdd615bd9a206f3377ee212913d /mail | |
parent | 3d9a75591adc33236ca0cbe18932d77eb9cd706a (diff) | |
download | freebsd-ports-gnome-266179525f1a084fa74c16305d6d4da159776222.tar.gz freebsd-ports-gnome-266179525f1a084fa74c16305d6d4da159776222.tar.zst freebsd-ports-gnome-266179525f1a084fa74c16305d6d4da159776222.zip |
- Update firefox-esr, thunderbird-esr, linux-firefox and linux-thunderbird to 10.0.8
- Update firefox and thunderbird to 16.0
- Update seamonkey to 2.13
- Update all -i18n ports respectively
- switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better
latency during pause and seeking with HTML5 video
- remove fedisableexcept() hacks, obsolete since FreeBSD 4.0
- support system hunspell dictionaries [1]
- unbreak -esr ports with clang3.2 [2]
- unbreak nss build when CC contains full path [3]
- remove GNOME option grouping [4]
- integrate enigmail into thunderbird/seamonkey as an option [5]
- remove mail/enigmail* [6]
- enable ENIGMAIL, LIGHTNING and GIO options by default
- add more reporters in about:memory: page-faults-hard, page-faults-soft,
resident, vsize
- use bundled jemalloc 3.0.0 on FreeBSD < 10.0 for gecko 16.0,
only heap-allocated reporter works in about:memory (see bug 762445)
- use lrintf() instead of slow C cast in bundled libopus
- use libjpeg-turbo's faster color conversion if available during build
- record startup time for telemetry
- use -z origin instead of hardcoding path to gecko runtime
- fail early if incompatible libxul version is installed (in USE_GECKO)
- *miscellaneous cleanups and fixups*
PR: ports/171534 [1]
PR: ports/171566 [2]
PR: ports/172164 [3]
PR: ports/172201 [4]
Discussed with: ale, beat, Jan Beich [5]
Approved by: ale [6]
In collaboration with: Jan Beich <jbeich@tormail.org>
Security: 6e5a9afd-12d3-11e2-b47d-c8600054b392
Feature safe: yes
Approved by: portmgr (beat)
Diffstat (limited to 'mail')
58 files changed, 1460 insertions, 1174 deletions
diff --git a/mail/Makefile b/mail/Makefile index 76f72655eacf..51f69284c5eb 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -114,10 +114,6 @@ SUBDIR += emh SUBDIR += emh-xemacs21-mule SUBDIR += emil - SUBDIR += enigmail - SUBDIR += enigmail-seamonkey - SUBDIR += enigmail-thunderbird - SUBDIR += enigmail-thunderbird-esr SUBDIR += enma SUBDIR += eps SUBDIR += epstools diff --git a/mail/enigmail-seamonkey/Makefile b/mail/enigmail-seamonkey/Makefile deleted file mode 100644 index 3941c0b1209f..000000000000 --- a/mail/enigmail-seamonkey/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: enigmail -# Date created: 15 January 2006 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= A GnuPG extension for the Seamonkey mail client - -MASTERDIR= ${.CURDIR}/../enigmail - -GECKO= seamonkey -GECKO_PORTDIR= www/${GECKO} -GECKO_EXTDIR= comm-release - -.include "${MASTERDIR}/Makefile" diff --git a/mail/enigmail-thunderbird-esr/Makefile b/mail/enigmail-thunderbird-esr/Makefile deleted file mode 100644 index ff72e3ffd191..000000000000 --- a/mail/enigmail-thunderbird-esr/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# New ports collection makefile for: enigmail -# Date created: 19 April 2012 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -PKGNAMEPREFIX= ${GECKO}-esr- - -COMMENT= A GnuPG extension for the Thunderbird mail client - -MASTERDIR= ${.CURDIR}/../enigmail - -GECKO= thunderbird -GECKO_PORTDIR= mail/${GECKO}-esr -GECKO_EXTDIR= comm-esr10 - -PORTSCOUT= ignore:1 - -.include "${MASTERDIR}/Makefile" diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile deleted file mode 100644 index 6754e5c0f8e9..000000000000 --- a/mail/enigmail-thunderbird/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: enigmail -# Date created: 20 January 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= A GnuPG extension for the Thunderbird mail client - -MASTERDIR= ${.CURDIR}/../enigmail - -GECKO= thunderbird -GECKO_PORTDIR= mail/${GECKO} -GECKO_EXTDIR= comm-release - -.include "${MASTERDIR}/Makefile" diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile deleted file mode 100644 index 66b23eb6a7f8..000000000000 --- a/mail/enigmail/Makefile +++ /dev/null @@ -1,108 +0,0 @@ -# New ports collection makefile for: enigmail -# Date created: 20 January 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= enigmail -PORTVERSION?= 1.4.3 -PORTREVISION?= 0 -CATEGORIES= mail security -MASTER_SITES= http://www.mozilla-enigmail.org/download/source/ -PKGNAMEPREFIX?= ${GECKO}- - -MAINTAINER= ale@FreeBSD.org -COMMENT?= A GnuPG extension for the Mozilla mail clients - -.if defined(PACKAGE_BUILDING) -FETCH_DEPENDS= ${GECKO_DEPENDS} -.endif -EXTRACT_DEPENDS=${GECKO_DEPENDS} -BUILD_DEPENDS= ${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} -RUN_DEPENDS= ${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \ - gpg:${PORTSDIR}/security/gnupg - -.if !defined(GECKO) -GECKO= libxul -GECKO_PORTDIR= www/${GECKO} -IGNORE= is an abstract port: use one of the slave ports -.endif - -GECKO_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${GECKO_PORTDIR}:build \ - ${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \ - autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ - gmake:${PORTSDIR}/devel/gmake \ - intltool-extract:${PORTSDIR}/textproc/intltool \ - ${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto \ - unzip:${PORTSDIR}/archivers/unzip \ - yasm:${PORTSDIR}/devel/yasm - -GECKO_WRKSRC= ${WRKDIR}/../../../${GECKO_PORTDIR}/work/${GECKO_EXTDIR} -WRKSRC= ${WRKDIR}/${GECKO_EXTDIR} -MOZOBJ= ${WRKSRC} - -USE_GMAKE= yes - -.include <bsd.port.pre.mk> - -XPI_FILE= ${MOZOBJ}/mozilla/dist/bin/${DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi -XPI_LIBDIR= ${PREFIX}/lib/xpi -XPI_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} -XPI_ID= ${GECKO}@mozilla-enigmail.org -XPI_ID_RFILES= ${XPI_LIBDIR}/${XPI_ID}/install.rdf \ - ${XPI_LIBDIR}/${XPI_ID}/components/enigmail.js \ - ${XPI_LIBDIR}/${XPI_ID}/modules/enigmailCommon.jsm - -do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} - @${CP} -Rp ${GECKO_WRKSRC} ${WRKDIR} - @for f in ${EXTRACT_ONLY}; do \ - cd ${WRKSRC}/mailnews/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS}; \ - done - -pre-patch: - @${REINPLACE_CMD} -e "s|${GECKO_PORTDIR}|${GECKO_PORTDIR:S/www/mail/:S/\//\/enigmail-/}|g" \ - `${FIND} ${WRKSRC} -name autoconf.mk` - -post-patch: - ${REINPLACE_CMD} "s,/usr/bin/perl,${PERL}," \ - ${WRKSRC}/mailnews/extensions/enigmail/makemake - ${REINPLACE_CMD} "s/^XPI_MODULE_VERS = [0-9.]*/XPI_MODULE_VERS = ${PORTVERSION}/" \ - ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in - ${REINPLACE_CMD} "s,<em:version>[0-9.a-z]*</em:version>,<em:version>${PORTVERSION}</em:version>," \ - ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf -.if ${GECKO_PORTDIR:M*-esr} - ${REINPLACE_CMD} "s,<em:minVersion>12.0</em:minVersion>,<em:minVersion>10.0</em:minVersion>," \ - ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf -.endif - -do-build: - cd ${WRKSRC}/mailnews/extensions/enigmail && \ - ./makemake -r -o ${MOZOBJ} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \ - -C ${MOZOBJ}/mailnews/extensions/enigmail && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} xpi \ - -C ${MOZOBJ}/mailnews/extensions/enigmail - -do-install: - @${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/${GECKO} - @(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE}) - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID} - @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_ID_RFILES} - @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID} - @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/${GECKO}/extensions 2>/dev/null || true - @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/${GECKO} 2>/dev/null || true - @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \ - ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} 'lib/xpi/symlinks/${GECKO}/${XPI_ID}' >> ${TMPPLIST} - @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/${GECKO}/extensions 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${GECKO}/extensions/${XPI_ID}' >> ${TMPPLIST} - @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \ - ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${GECKO} 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST} - -.include <bsd.port.post.mk> diff --git a/mail/enigmail/distinfo b/mail/enigmail/distinfo deleted file mode 100644 index 6ff43a391b3e..000000000000 --- a/mail/enigmail/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (enigmail-1.4.3.tar.gz) = 440035f19a22e8e234c530a0e78fb9ee74bb934fcf721777868de79324636d27 -SIZE (enigmail-1.4.3.tar.gz) = 1337811 diff --git a/mail/enigmail/pkg-descr b/mail/enigmail/pkg-descr deleted file mode 100644 index 6dffe70a436d..000000000000 --- a/mail/enigmail/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Enigmail is an extension to the Thunderbird / Seamonkey mail client -which allows users to access the authentication and encryption features -provided by the popular GnuPG software. - -Enigmail can encrypt/sign mail when sending, and also decrypt/authenticate -received mail. It can also import/export public keys. Enigmail supports -both the inline PGP format, and the PGP/MIME format (RFC 3156), which can -be used to encrypt attachments. - -WWW: http://enigmail.mozdev.org/ diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile index 011fc4cf24fb..b8ccccd73589 100644 --- a/mail/linux-thunderbird/Makefile +++ b/mail/linux-thunderbird/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -PORTVERSION= 10.0.7 +PORTVERSION= 10.0.8 CATEGORIES= mail MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US DISTNAME= ${PORTNAME}-${DISTVERSION}esr diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo index 23f242ac90b4..2f6dc8ef059c 100644 --- a/mail/linux-thunderbird/distinfo +++ b/mail/linux-thunderbird/distinfo @@ -1,2 +1,2 @@ -SHA256 (thunderbird-10.0.7esr.tar.bz2) = 2b1fd99bcaa6b4288f86eba7bdf80fe467cde0cf2899a7ec106ba1e4fee0625c -SIZE (thunderbird-10.0.7esr.tar.bz2) = 18582085 +SHA256 (thunderbird-10.0.8esr.tar.bz2) = 7cf3daaf391864a265e8a0e17c49aee61fe63b3f92eba701f5a547216968330b +SIZE (thunderbird-10.0.8esr.tar.bz2) = 18579071 diff --git a/mail/thunderbird-esr-i18n/Makefile b/mail/thunderbird-esr-i18n/Makefile index 723022a7dc92..d7a3b53feec4 100644 --- a/mail/thunderbird-esr-i18n/Makefile +++ b/mail/thunderbird-esr-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird-i18n -PORTVERSION= 10.0.7 +PORTVERSION= 10.0.8 CATEGORIES= mail MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= diff --git a/mail/thunderbird-esr-i18n/distinfo b/mail/thunderbird-esr-i18n/distinfo index a4bbb304f9b5..1bb05952e1d1 100644 --- a/mail/thunderbird-esr-i18n/distinfo +++ b/mail/thunderbird-esr-i18n/distinfo @@ -1,84 +1,16 @@ -SHA256 (xpi/thunderbird-i18n-10.0.7/ar.xpi) = fe218825ba239511ebf490896fcd85416bf93867d12077afa2061087d9718e85 -SIZE (xpi/thunderbird-i18n-10.0.7/ar.xpi) = 441466 -SHA256 (xpi/thunderbird-i18n-10.0.7/br.xpi) = f560a951a8c6eb7ca89126cbb09a78f075379fc1af7ed8ff2f6bbe882030fc0d -SIZE (xpi/thunderbird-i18n-10.0.7/br.xpi) = 415527 -SHA256 (xpi/thunderbird-i18n-10.0.7/ca.xpi) = a8b00ba4f84055b54e03ae82a35836e6cd9c7d07a16b1940286b026aeb3e6be1 -SIZE (xpi/thunderbird-i18n-10.0.7/ca.xpi) = 416069 -SHA256 (xpi/thunderbird-i18n-10.0.7/cs.xpi) = 7cced93d103ae1775b064dc0c256494c3cda1971b4e4391f7f6f596c01df6171 -SIZE (xpi/thunderbird-i18n-10.0.7/cs.xpi) = 419419 -SHA256 (xpi/thunderbird-i18n-10.0.7/da.xpi) = ae3a98db9393ff020c6795b0fe3418258119299485569bd9d18210e8690b9781 -SIZE (xpi/thunderbird-i18n-10.0.7/da.xpi) = 363376 -SHA256 (xpi/thunderbird-i18n-10.0.7/de.xpi) = 8d94b8000182a52e93a3fcc04f4830f858bfbe95f1e08074f2b576b69468e61c -SIZE (xpi/thunderbird-i18n-10.0.7/de.xpi) = 418266 -SHA256 (xpi/thunderbird-i18n-10.0.7/en-GB.xpi) = 00a9e65eb3a1ca5194dbee9acf1fff84fc9ee3b1050dacbc42db04bf25532917 -SIZE (xpi/thunderbird-i18n-10.0.7/en-GB.xpi) = 391743 -SHA256 (xpi/thunderbird-i18n-10.0.7/en-US.xpi) = 410e503c93bc65fd26423f2afc440e42fbbaf2fb30d71a9ddb0bf992a464451d -SIZE (xpi/thunderbird-i18n-10.0.7/en-US.xpi) = 391242 -SHA256 (xpi/thunderbird-i18n-10.0.7/es-AR.xpi) = ca5002269cb602cac293da5e18c0c6d3273146afbd7a496deec2edccf8e87f16 -SIZE (xpi/thunderbird-i18n-10.0.7/es-AR.xpi) = 410726 -SHA256 (xpi/thunderbird-i18n-10.0.7/es-ES.xpi) = f3948a633ab98dc3ce233b5cd97eb84a2a40475336e8b4d31a9dd892832c2dda -SIZE (xpi/thunderbird-i18n-10.0.7/es-ES.xpi) = 355143 -SHA256 (xpi/thunderbird-i18n-10.0.7/et.xpi) = 6ce8c3a922a3ce944d4a125938081d032ce61776680e3d6f205a62f5f9441550 -SIZE (xpi/thunderbird-i18n-10.0.7/et.xpi) = 410724 -SHA256 (xpi/thunderbird-i18n-10.0.7/eu.xpi) = 4258ef8ceef02bcfd6e95f59198b67572e97023ac2558790d18acde5c5f7e2d1 -SIZE (xpi/thunderbird-i18n-10.0.7/eu.xpi) = 406387 -SHA256 (xpi/thunderbird-i18n-10.0.7/fi.xpi) = 2d2212368adac818ca5e2569f0d8c8a83f47ac8285584e7525de4add85fe3bd4 -SIZE (xpi/thunderbird-i18n-10.0.7/fi.xpi) = 411928 -SHA256 (xpi/thunderbird-i18n-10.0.7/fr.xpi) = 664b23ff9eeda1f9c7c073574e31bb33e8cb7ac3beeb888251f007fe87e97163 -SIZE (xpi/thunderbird-i18n-10.0.7/fr.xpi) = 414749 -SHA256 (xpi/thunderbird-i18n-10.0.7/fy-NL.xpi) = 62ae77f3a07becc2fb5444d0a39ff383c06690891b5560e24e9ba5b355bf42d6 -SIZE (xpi/thunderbird-i18n-10.0.7/fy-NL.xpi) = 413985 -SHA256 (xpi/thunderbird-i18n-10.0.7/ga-IE.xpi) = 1e1dc0f5d5603f70c08d0a42bf46f111e6881933f3622471f8311f635eac611c -SIZE (xpi/thunderbird-i18n-10.0.7/ga-IE.xpi) = 423261 -SHA256 (xpi/thunderbird-i18n-10.0.7/gd.xpi) = 85d57a2f5928b46a55b8fb94bddd0af18332a5c0c181f53f82db1bdb8fc8ca20 -SIZE (xpi/thunderbird-i18n-10.0.7/gd.xpi) = 425876 -SHA256 (xpi/thunderbird-i18n-10.0.7/gl.xpi) = 444afe24e82c6957e32d720fe786d2514a083af60401992631fb0cb5887704be -SIZE (xpi/thunderbird-i18n-10.0.7/gl.xpi) = 409229 -SHA256 (xpi/thunderbird-i18n-10.0.7/he.xpi) = 963b51119331019d01f6d3866a0919c900e6c478ba83a68d0b5c030706d38e32 -SIZE (xpi/thunderbird-i18n-10.0.7/he.xpi) = 439206 -SHA256 (xpi/thunderbird-i18n-10.0.7/hu.xpi) = 126ad900c30a335654f769bf59bcb56bfbefff21d865c0bf76bd0b3469036439 -SIZE (xpi/thunderbird-i18n-10.0.7/hu.xpi) = 426356 -SHA256 (xpi/thunderbird-i18n-10.0.7/is.xpi) = f3feeb6a0547f9ad1a9a80a155cdbcdd9c99fb7ada5f87e58e8611533058b031 -SIZE (xpi/thunderbird-i18n-10.0.7/is.xpi) = 412634 -SHA256 (xpi/thunderbird-i18n-10.0.7/it.xpi) = 7c02ef5f947e6fcaf75dd7aa08471bfc74700402d50cec5caaef51bdf72b4222 -SIZE (xpi/thunderbird-i18n-10.0.7/it.xpi) = 347634 -SHA256 (xpi/thunderbird-i18n-10.0.7/ja.xpi) = 90ca263411c5fe34a4ca09a32a26e4fcc59c697d5421f52a9bba1a491b5c72db -SIZE (xpi/thunderbird-i18n-10.0.7/ja.xpi) = 459031 -SHA256 (xpi/thunderbird-i18n-10.0.7/ko.xpi) = 4125d21e5490689a58cfa28d31bd82d3b26b08cbbcc57b70fc1944def3bc29bd -SIZE (xpi/thunderbird-i18n-10.0.7/ko.xpi) = 372016 -SHA256 (xpi/thunderbird-i18n-10.0.7/lt.xpi) = a69679f4fde548307cbc0da41cfe0d76f24d52cdc482fbb9fb35419886c2f135 -SIZE (xpi/thunderbird-i18n-10.0.7/lt.xpi) = 531022 -SHA256 (xpi/thunderbird-i18n-10.0.7/nb-NO.xpi) = d827073f2a1ef8d8789a02e99827dbfda5ed52aa8d10d1acfd3743ebc048d1a8 -SIZE (xpi/thunderbird-i18n-10.0.7/nb-NO.xpi) = 407729 -SHA256 (xpi/thunderbird-i18n-10.0.7/nl.xpi) = 063a650298c7eb33bf1e2317cd1d7cd88c5fa6070393de190eda4826108d0389 -SIZE (xpi/thunderbird-i18n-10.0.7/nl.xpi) = 407985 -SHA256 (xpi/thunderbird-i18n-10.0.7/nn-NO.xpi) = ece5f50981dd386346db2d0f2d75817d09389ae5c18ba43be1b075c823c06276 -SIZE (xpi/thunderbird-i18n-10.0.7/nn-NO.xpi) = 409459 -SHA256 (xpi/thunderbird-i18n-10.0.7/pl.xpi) = a45a9ebcea735a49960c3135a6b96a93f2e0186143c8b69df8b608cbfea52576 -SIZE (xpi/thunderbird-i18n-10.0.7/pl.xpi) = 393578 -SHA256 (xpi/thunderbird-i18n-10.0.7/pt-BR.xpi) = 8f616f2f40011ce1452282bde4527852ffc52f0a97a00e9139db2177a3e32549 -SIZE (xpi/thunderbird-i18n-10.0.7/pt-BR.xpi) = 417229 -SHA256 (xpi/thunderbird-i18n-10.0.7/pt-PT.xpi) = 6e92c09d7c4fecbcd9c5c54a44401ce571fab14216fa7f5a4c3484327cf3104e -SIZE (xpi/thunderbird-i18n-10.0.7/pt-PT.xpi) = 414266 -SHA256 (xpi/thunderbird-i18n-10.0.7/rm.xpi) = 52a6ecf1840e80b6bf4ac8bf0a7188c891f42606049f3fc1472fd107a0c1be77 -SIZE (xpi/thunderbird-i18n-10.0.7/rm.xpi) = 414709 -SHA256 (xpi/thunderbird-i18n-10.0.7/ru.xpi) = 80a78cb74462394387f85b7efbf94a5d1112419ba9ac891c3db8360624fa2f07 -SIZE (xpi/thunderbird-i18n-10.0.7/ru.xpi) = 411634 -SHA256 (xpi/thunderbird-i18n-10.0.7/si.xpi) = 97a8f425d2a37736235543e06338d8bde9b238d49b22b260fedd611fcb4a5fcc -SIZE (xpi/thunderbird-i18n-10.0.7/si.xpi) = 456607 -SHA256 (xpi/thunderbird-i18n-10.0.7/sk.xpi) = fec10c4f96780eb6c14f3d70e730cfb63f9cf285db4ec515c69160cd51e89926 -SIZE (xpi/thunderbird-i18n-10.0.7/sk.xpi) = 425029 -SHA256 (xpi/thunderbird-i18n-10.0.7/sl.xpi) = 58ef94c1badb82b5d7b236900d57290431bd72b7d8e0e63c43c46eca7a1f9e5a -SIZE (xpi/thunderbird-i18n-10.0.7/sl.xpi) = 410432 -SHA256 (xpi/thunderbird-i18n-10.0.7/sq.xpi) = 25e971347e1cc1fea876135eabb904f356396ade11f29a9a3151934d86c23ffc -SIZE (xpi/thunderbird-i18n-10.0.7/sq.xpi) = 360480 -SHA256 (xpi/thunderbird-i18n-10.0.7/sv-SE.xpi) = 66d4b30a2cafdfa9e384f301c0ba7f5999d9c4c3e8f035ed378909b23dbecf06 -SIZE (xpi/thunderbird-i18n-10.0.7/sv-SE.xpi) = 478281 -SHA256 (xpi/thunderbird-i18n-10.0.7/ta-LK.xpi) = f42cb0e4034c217dfdc7e86bd280805657374965037690f101a37bf8c0778575 -SIZE (xpi/thunderbird-i18n-10.0.7/ta-LK.xpi) = 475718 -SHA256 (xpi/thunderbird-i18n-10.0.7/tr.xpi) = 768c15d8bb6609655fecbc720ebde9834962730c82ff32f4d0dd6df1f880c046 -SIZE (xpi/thunderbird-i18n-10.0.7/tr.xpi) = 418210 -SHA256 (xpi/thunderbird-i18n-10.0.7/uk.xpi) = 00e09bd289a3a1bf569e4d13cb3f012052f8f36d4f852e1fe0b6a1d69d1ac1cf -SIZE (xpi/thunderbird-i18n-10.0.7/uk.xpi) = 463925 -SHA256 (xpi/thunderbird-i18n-10.0.7/zh-TW.xpi) = 3597c44d938c300eacab2de3a67f242a83d32b30ba9257f955740de480bad8b6 -SIZE (xpi/thunderbird-i18n-10.0.7/zh-TW.xpi) = 431827 +SHA256 (xpi/thunderbird-i18n-10.0.8/es-ES.xpi) = b2d651cf8e46979637b5e5c5a0ec95fb8d12e9f2f20c660504b0a509e42978cf +SIZE (xpi/thunderbird-i18n-10.0.8/es-ES.xpi) = 355142 +SHA256 (xpi/thunderbird-i18n-10.0.8/pt-BR.xpi) = d5604357b65b20a1e6acd4aa4eb9cb02154156b1836e90c4c18ac36fcbd3889f +SIZE (xpi/thunderbird-i18n-10.0.8/pt-BR.xpi) = 417229 +SHA256 (xpi/thunderbird-i18n-10.0.8/ru.xpi) = 675475afefed4ab8e8ac29bd74bd6b2619d403519db7a3b5159458a71e1138cc +SIZE (xpi/thunderbird-i18n-10.0.8/ru.xpi) = 411633 +SHA256 (xpi/thunderbird-i18n-10.0.8/ja.xpi) = 20c7b247db1b04b9c6299a13b348fdeaf320e683d6f36427cd468c30e4b102df +SIZE (xpi/thunderbird-i18n-10.0.8/ja.xpi) = 459030 +SHA256 (xpi/thunderbird-i18n-10.0.8/de.xpi) = 200c48b132653c1e72e580d73e471399cfd4e22ac3ef3f1df77c48840d0558f7 +SIZE (xpi/thunderbird-i18n-10.0.8/de.xpi) = 418265 +SHA256 (xpi/thunderbird-i18n-10.0.8/fr.xpi) = 4b00df0f3fa1092137b8735e86149183f7bcad9f97b3f36dd1f84aea430d1af6 +SIZE (xpi/thunderbird-i18n-10.0.8/fr.xpi) = 414748 +SHA256 (xpi/thunderbird-i18n-10.0.8/ko.xpi) = 3c60709ef8536f77be75b2659467d3e22ed327254c23e4812a5c756c59949ec0 +SIZE (xpi/thunderbird-i18n-10.0.8/ko.xpi) = 372015 +SHA256 (xpi/thunderbird-i18n-10.0.8/it.xpi) = 0bb9413db267342fbf8cea6abf180ab9aec174e98a1d59f3ed3b371f6ca54ae3 +SIZE (xpi/thunderbird-i18n-10.0.8/it.xpi) = 347632 diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index b9299623ddf5..0930420585ac 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -6,21 +6,24 @@ # PORTNAME= thunderbird -DISTVERSION= 10.0.7 +DISTVERSION= 10.0.8 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source -DISTNAME= ${PORTNAME}-${DISTVERSION}esr.source +DISTFILES= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ - nss>=3.13.1:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip +EM_VERSION= 1.4.5 + USE_AUTOTOOLS= autoconf213:env LATEST_LINK= thunderbird-esr USE_GECKO= gecko @@ -51,7 +54,8 @@ PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFINE= LIGHTNING +OPTIONS_DEFINE= ENIGMAIL LIGHTNING +OPTIONS_DEFAULT=ENIGMAIL LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.pre.mk> @@ -59,6 +63,8 @@ OPTIONS_DEFINE= LIGHTNING WRKSRC= ${WRKDIR}/comm-esr10 MOZSRC:= ${WRKSRC}/mozilla +XPI_LIBDIR= ${PREFIX}/lib/xpi + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 @@ -78,12 +84,25 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm CFLAGS+= -Wno-return-type-c-linkage .endif +.if ${PORT_OPTIONS:MENIGMAIL} +MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail +DISTFILES+= ${EM_DISTFILE}:enigmail +RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg +EM_DISTNAME= enigmail-${EM_VERSION} +EM_DISTFILE= ${EM_DISTNAME}.tar.gz +EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi +EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} +EM_ID= ${PORTNAME}@mozilla-enigmail.org +EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ + ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ + ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm +.endif + .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi -XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@thunderbird.mozilla.org .else @@ -93,16 +112,38 @@ MOZ_OPTIONS+= --disable-calendar post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop +.if ${PORT_OPTIONS:MENIGMAIL} + @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ + -C ${WRKSRC}/mailnews/extensions +.endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp +.if ${PORT_OPTIONS:MENIGMAIL} + @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ + ${WRKSRC}/mailnews/extensions/enigmail/makemake + @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ + -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ + ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in + @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ + -e '/em:maxVersion/s/pre//' \ + ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf +.endif pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) (cd ${MOZSRC} && ${AUTOCONF}) (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) +.if ${PORT_OPTIONS:MENIGMAIL} +post-build: + cd ${WRKSRC}/mailnews/extensions/enigmail && \ + ./makemake -r -o ${MOZ_OBJDIR} + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} all xpi \ + -C ${MOZ_OBJDIR}/mailnews/extensions/enigmail +.endif + port-pre-install: ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults @@ -130,7 +171,25 @@ post-install: @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST} @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \ ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/thunderbird 2>/dev/null || true' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MENIGMAIL} + @${MKDIR} ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} + @(cd ${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${EM_ID} + @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES} + @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${EM_ID} + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -not -type d) | ${SORT} | \ + ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST} + @${ECHO_CMD} 'lib/xpi/symlinks/${PORTNAME}/${EM_ID}' >> ${TMPPLIST} + @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} + @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -type d) | ${SORT} -r | \ + ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MLIGHTNING} || ${PORT_OPTIONS:MENIGMAIL} + @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${PORTNAME} 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST} .endif diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo index b9363cb1d1a8..5daa78ce2bd4 100644 --- a/mail/thunderbird-esr/distinfo +++ b/mail/thunderbird-esr/distinfo @@ -1,2 +1,4 @@ -SHA256 (thunderbird-10.0.7esr.source.tar.bz2) = 994ca16a01e4446747b54b1b5fb2bda11aec2c92359571bffa0f6c8e45f27c35 -SIZE (thunderbird-10.0.7esr.source.tar.bz2) = 97590919 +SHA256 (thunderbird-10.0.8esr.source.tar.bz2) = 9575f9f97fab48d36b3a24040db83fb9b92de913b3689e9910afaf39a486fbbd +SIZE (thunderbird-10.0.8esr.source.tar.bz2) = 97594384 +SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020 +SIZE (enigmail-1.4.5.tar.gz) = 1269207 diff --git a/mail/thunderbird-esr/files/patch-bug351181 b/mail/thunderbird-esr/files/patch-bug351181 deleted file mode 100644 index c52535eaca09..000000000000 --- a/mail/thunderbird-esr/files/patch-bug351181 +++ /dev/null @@ -1,28 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig Sun Nov 5 18:37:07 2006 -+++ mozilla/js/src/jsnum.cpp Sun Nov 5 18:42:31 2006 -@@ -45,6 +45,9 @@ - #if defined(XP_WIN) || defined(XP_OS2) - #include <float.h> - #endif -+#if defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #include <locale.h> - #include <limits.h> - #include <math.h> -@@ -532,7 +535,15 @@ static jsdouble NaN; - - #else - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 -+#include <fenv.h> -+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT)) -+ -+#else -+ - #define FIX_FPU() ((void)0) -+ -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ - - #endif - diff --git a/mail/thunderbird-esr/files/patch-bug543241 b/mail/thunderbird-esr/files/patch-bug543241 index 36f97229af92..6e4afce640ae 100644 --- a/mail/thunderbird-esr/files/patch-bug543241 +++ b/mail/thunderbird-esr/files/patch-bug543241 @@ -1,5 +1,16 @@ --- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -89,6 +89,11 @@ nsresult nsThreadManager::Init() diff --git a/mail/thunderbird-esr/files/patch-bug753046 b/mail/thunderbird-esr/files/patch-bug753046 index 7aff5f1c2a22..63700c2f41d8 100644 --- a/mail/thunderbird-esr/files/patch-bug753046 +++ b/mail/thunderbird-esr/files/patch-bug753046 @@ -451,7 +451,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:0 --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread.h -@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE +@@ -22,9 +22,12 @@ typedef void* PlatformThreadHandle; // HANDLE #elif defined(OS_POSIX) #include <pthread.h> typedef pthread_t PlatformThreadHandle; @@ -460,6 +460,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:0 #include <unistd.h> typedef pid_t PlatformThreadId; +#elif defined(OS_BSD) ++#include <sys/types.h> +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include <mach/mach.h> diff --git a/mail/thunderbird-esr/files/patch-bug781474 b/mail/thunderbird-esr/files/patch-bug781474 deleted file mode 100644 index 358d40c1f988..000000000000 --- a/mail/thunderbird-esr/files/patch-bug781474 +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200 -+++ mozilla/content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200 -@@ -54,7 +54,7 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ -+#if !defined(__amd64__) && !defined(__i386__) - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #else - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; diff --git a/mail/thunderbird-esr/files/patch-bug785638 b/mail/thunderbird-esr/files/patch-bug785638 deleted file mode 100644 index 99632c6b496f..000000000000 --- a/mail/thunderbird-esr/files/patch-bug785638 +++ /dev/null @@ -1,168 +0,0 @@ -diff --git configure.in configure.in -index cef992b..3bd39ca 100644 ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then - - dnl See if we have assembly on this platform. - case "$OS_ARCH:$CPU_ARCH" in -- Linux:x86) -- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -- VPX_X86_ASM=1 -- ;; -- Linux:x86_64) -- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -- VPX_X86_ASM=1 -- ;; -- SunOS:x86) -- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -- VPX_X86_ASM=1 -- ;; -- SunOS:x86_64) -- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -- VPX_X86_ASM=1 -- ;; - Darwin:x86) - VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC" - VPX_X86_ASM=1 -@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then - VPX_ASM_SUFFIX="$ASM_SUFFIX" - VPX_ARM_ASM=1 - fi -+ ;; -+ *:x86) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -+ VPX_X86_ASM=1 -+ fi -+ ;; -+ *:x86_64) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -+ VPX_X86_ASM=1 -+ fi -+ ;; - esac - - if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then -@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then - - dnl Do we support libjpeg-turbo on this platform? - case "$OS_ARCH:$OS_TEST" in -- Linux:x86|Linux:i?86) -- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -- LIBJPEG_TURBO_X86_ASM=1 -- ;; -- Linux:x86_64) -- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -- LIBJPEG_TURBO_X64_ASM=1 -- ;; -- SunOS:i?86) -- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -- LIBJPEG_TURBO_X86_ASM=1 -- ;; -- SunOS:x86_64) -- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -- LIBJPEG_TURBO_X64_ASM=1 -- ;; - Darwin:i?86) - LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO" - LIBJPEG_TURBO_X86_ASM=1 -@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then - LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon" - LIBJPEG_TURBO_ARM_ASM=1 - ;; -+ *:x86|*:i?86) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -+ LIBJPEG_TURBO_X86_ASM=1 -+ fi -+ ;; -+ *:x86_64) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -+ LIBJPEG_TURBO_X64_ASM=1 -+ fi -+ ;; - esac - - fi -diff --git media/libvpx/update.sh media/libvpx/update.sh -index 79e0fb1..51956af 100755 ---- mozilla/media/libvpx/update.sh -+++ mozilla/media/libvpx/update.sh -@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h - # Should be same for all platforms... - cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h - --# Config files for x86-linux-gcc and Solaris x86 -+# Config files for x86-linux-gcc and other x86 elf platforms - cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c - cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm - cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h - --# Config files for x86_64-linux-gcc and Solaris x86_64 -+# Config files for x86_64-linux-gcc and other x86_64 elf platforms - cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c - cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm - cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h -diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h -index 55433f3..36e1780 100644 ---- mozilla/media/libvpx/vpx_config.h -+++ mozilla/media/libvpx/vpx_config.h -@@ -16,20 +16,12 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.h" - --#elif defined(__linux__) && defined(__i386__) --/* 32 bit Linux. */ -+#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) -+/* 32 bit ELF platforms. */ - #include "vpx_config_x86-linux-gcc.h" - --#elif defined(__linux__) && defined(__x86_64__) --/* 64 bit Linux. */ --#include "vpx_config_x86_64-linux-gcc.h" -- --#elif defined(__sun) && defined(__i386) --/* 32 bit Solaris. */ --#include "vpx_config_x86-linux-gcc.h" -- --#elif defined(__sun) && defined(__x86_64) --/* 64 bit Solaris. */ -+#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) -+/* 64 bit ELF platforms. */ - #include "vpx_config_x86_64-linux-gcc.h" - - #else -diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c -index eedd515..c8b5375 100644 ---- mozilla/media/libvpx/vpx_config_c.c -+++ mozilla/media/libvpx/vpx_config_c.c -@@ -12,22 +12,14 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.c" - --#elif defined(__linux__) && defined(__i386__) --/* 32 bit Linux. */ -+#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) -+/* 32 bit ELF platforms. */ - #include "vpx_config_x86-linux-gcc.c" - --#elif defined(__linux__) && defined(__x86_64__) --/* 64 bit Linux. */ -+#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) -+/* 64 bit ELF platforms. */ - #include "vpx_config_x86_64-linux-gcc.c" - --#elif defined(__sun) && defined(__i386) --/* 32 bit Solaris. */ --#include "vpx_config_x86-linux-gcc.h" -- --#elif defined(__sun) && defined(__x86_64) --/* 64 bit Solaris. */ --#include "vpx_config_x86_64-linux-gcc.h" -- - #elif defined(_MSC_VER) && defined(_M_X64) - #include "vpx_config_x86_64-win64-vs8.c" - diff --git a/mail/thunderbird-esr/files/patch-bug788108 b/mail/thunderbird-esr/files/patch-bug788108 new file mode 100644 index 000000000000..db2399499397 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-bug788108 @@ -0,0 +1,20 @@ +--- mozilla/content/base/public/nsContentUtils.h~ ++++ mozilla/content/base/public/nsContentUtils.h +@@ -18,17 +18,6 @@ + #include <ieeefp.h> + #endif + +-//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. +-#ifdef __FreeBSD__ +-#include <ieeefp.h> +-#ifdef __alpha__ +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; +-#endif +-static fp_except_t oldmask = fpsetmask(~allmask); +-#endif +- + #include "nsAString.h" + #include "nsIStatefulFrame.h" + #include "nsNodeInfoManager.h" diff --git a/mail/thunderbird-esr/files/patch-bug789436 b/mail/thunderbird-esr/files/patch-bug789436 new file mode 100644 index 000000000000..2479d8e69c78 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-bug789436 @@ -0,0 +1,27 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include <ieeefp.h> +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + diff --git a/mail/thunderbird-esr/files/patch-bug789693 b/mail/thunderbird-esr/files/patch-bug789693 new file mode 100644 index 000000000000..82b76c8d0a7c --- /dev/null +++ b/mail/thunderbird-esr/files/patch-bug789693 @@ -0,0 +1,108 @@ +--- mozilla/toolkit/components/startup/nsAppStartup.cpp ++++ mozilla/toolkit/components/startup/nsAppStartup.cpp +@@ -50,17 +50,40 @@ + #include <sys/syscall.h> + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include <sys/param.h> + #include <sys/sysctl.h> + #endif + +-#ifdef __OpenBSD__ +-#include <sys/param.h> +-#include <sys/sysctl.h> ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <sys/user.h> + #endif + + #include "mozilla/Telemetry.h" + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + using namespace mozilla; +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ sizeof(KINFO_PROC), ++ 1, ++#endif ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[0]); + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- PRTime starttime = static_cast<PRTime>(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; +- starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &buffer_size, NULL, 0)) + return 0; + +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- PRTime starttime = static_cast<PRTime>(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast<PRTime>(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; + return starttime; + } + #else diff --git a/mail/thunderbird-esr/files/patch-bug791305 b/mail/thunderbird-esr/files/patch-bug791305 new file mode 100644 index 000000000000..e4c44a405f57 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-bug791305 @@ -0,0 +1,107 @@ +commit c269a16 +Author: Jeff Muizelaar <jmuizelaar@mozilla.com> +Date: Fri Sep 14 15:54:55 2012 -0400 + + Bug 791305. Use libjpeg's color conversion code instead of our own. r=joe,r=khuey + + libjpeg-turbo supports converting directly to a format compatible with cairo's + FORMAT_RGB24. Use that instead of our own handcoded function. This also gives + us SSE2 and NEON version of this function. + + --HG-- + extra : rebase_source : 18f48925f023a33ec2a097d4f4e5cc2ab40be1e9 +--- + configure.in | 6 +- + image/decoders/nsJPEGDecoder.cpp | 311 ++------------------------------------- + 2 files changed, 20 insertions(+), 297 deletions(-) + +diff --git mozilla/image/decoders/nsJPEGDecoder.cpp mozilla/image/decoders/nsJPEGDecoder.cpp +index c1fb515..1d2a259 100644 +--- mozilla/image/decoders/nsJPEGDecoder.cpp ++++ mozilla/image/decoders/nsJPEGDecoder.cpp +@@ -22,6 +22,13 @@ + extern "C" { + #include "iccjpeg.h" + ++#ifdef JCS_EXTENSIONS ++#if defined(IS_BIG_ENDIAN) ++#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB ++#else ++#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX ++#endif ++#else + /* Colorspace conversion (copied from jpegint.h) */ + struct jpeg_color_deconverter { + JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); +@@ -34,6 +41,7 @@ METHODDEF(void) + ycc_rgb_convert_argb (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, JDIMENSION input_row, + JSAMPARRAY output_buf, int num_rows); ++#endif + } + + static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); +@@ -329,7 +340,18 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + case JCS_GRAYSCALE: + case JCS_RGB: + case JCS_YCbCr: ++#ifdef JCS_EXTENSIONS ++ // if we're not color managing we can decode directly to ++ // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB ++ if (mCMSMode != eCMSMode_All) { ++ mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB; ++ mInfo.out_color_components = 4; ++ } else { ++ mInfo.out_color_space = JCS_RGB; ++ } ++#else + mInfo.out_color_space = JCS_RGB; ++#endif + break; + case JCS_CMYK: + case JCS_YCCK: +@@ -397,6 +419,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + return; /* I/O suspension */ + } + ++#ifndef JCS_EXTENSIONS + /* Force to use our YCbCr to Packed RGB converter when possible */ + if (!mTransform && (mCMSMode != eCMSMode_All) && + mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { +@@ -404,6 +427,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ + mInfo.cconvert->color_convert = ycc_rgb_convert_argb; + } ++#endif + + /* If this is a progressive JPEG ... */ + mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; +@@ -542,7 +566,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend) + PRUint32 *imageRow = ((PRUint32*)mImageData) + + (mInfo.output_scanline * mInfo.output_width); + ++#ifdef JCS_EXTENSIONS ++ if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) { ++#else + if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { ++#endif + /* Special case: scanline will be directly converted into packed ARGB */ + if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { + *suspend = true; /* suspend */ +@@ -858,6 +887,7 @@ term_source (j_decompress_ptr jd) + } // namespace mozilla + + ++#ifndef JCS_EXTENSIONS + /**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ + + /* +@@ -1130,7 +1160,8 @@ ycc_rgb_convert_argb (j_decompress_ptr cinfo, + } + } + } ++#endif + + + /**************** Inverted CMYK -> RGB conversion **************/ + /* diff --git a/mail/thunderbird-esr/files/patch-bug791366 b/mail/thunderbird-esr/files/patch-bug791366 new file mode 100644 index 000000000000..f7eb443b9a26 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-bug791366 @@ -0,0 +1,124 @@ +diff --git mozilla/xpcom/base/nsMemoryReporterManager.cpp mozilla/xpcom/base/nsMemoryReporterManager.cpp +index a9aff58..674e757 100644 +--- mozilla/xpcom/base/nsMemoryReporterManager.cpp ++++ mozilla/xpcom/base/nsMemoryReporterManager.cpp +@@ -64,7 +64,7 @@ extern void jemalloc_stats(jemalloc_stat + # endif // XP_LINUX + #endif // MOZ_MEMORY + +-#if defined(XP_LINUX) || defined(XP_MACOSX) ++#ifdef XP_UNIX + + #include <sys/time.h> + #include <sys/resource.h> +@@ -122,6 +122,78 @@ static PRInt64 GetResident() + return GetProcSelfStatmField(1); + } + ++#elif defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++ ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <sys/user.h> ++#endif ++ ++#include <unistd.h> ++ ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(__DragonFly__) ++#define KP_SIZE(kp) (kp.kp_vm_map_size) ++#define KP_RSS(kp) (kp.kp_vm_rssize * getpagesize()) ++#elif defined(__FreeBSD__) ++#define KP_SIZE(kp) (kp.ki_size) ++#define KP_RSS(kp) (kp.ki_rssize * getpagesize()) ++#elif defined(__NetBSD__) ++#define KP_SIZE(kp) (kp.p_vm_msize * getpagesize()) ++#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize()) ++#elif defined(__OpenBSD__) ++#define KP_SIZE(kp) ((kp.p_vm_dsize + kp.p_vm_ssize \ ++ + kp.p_vm_tsize) * getpagesize()) ++#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize()) ++#endif ++ ++static nsresult GetKinfoProcSelf(KINFO_PROC *proc) ++{ ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ sizeof(KINFO_PROC), ++ 1, ++#endif ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[0]); ++ size_t size = sizeof(KINFO_PROC); ++ if (sysctl(mib, miblen, proc, &size, NULL, 0)) ++ return NS_ERROR_FAILURE; ++ ++ return NS_OK; ++} ++ ++static PRInt64 GetVsize() ++{ ++ KINFO_PROC proc; ++ if (NS_SUCCEEDED(GetKinfoProcSelf(&proc))) ++ return KP_SIZE(proc); ++ ++ return -1; ++} ++ ++static PRInt64 GetResident() ++{ ++ KINFO_PROC proc; ++ if (NS_SUCCEEDED(GetKinfoProcSelf(&proc))) ++ return KP_RSS(proc); ++ ++ return -1; ++} ++ + #elif defined(XP_MACOSX) + + #include <mach/mach_init.h> +@@ -224,7 +297,7 @@ static PRInt64 GetResident() + + #endif + +-#if defined(XP_LINUX) || defined(XP_MACOSX) || defined(XP_WIN) ++#if defined(XP_UNIX) || defined(XP_WIN) + NS_MEMORY_REPORTER_IMPLEMENT(Vsize, + "vsize", + KIND_OTHER, +@@ -239,7 +312,7 @@ NS_MEMORY_REPORTER_IMPLEMENT(Vsize, + "measure of the memory resources used by the process.") + #endif + +-#if defined(XP_LINUX) || defined(XP_MACOSX) ++#if defined(XP_UNIX) + NS_MEMORY_REPORTER_IMPLEMENT(PageFaultsSoft, + "page-faults-soft", + KIND_OTHER, +@@ -457,11 +530,11 @@ nsMemoryReporterManager::Init() + REGISTER(HeapUnallocated); + REGISTER(Resident); + +-#if defined(XP_LINUX) || defined(XP_MACOSX) || defined(XP_WIN) ++#if defined(XP_UNIX) || defined(XP_WIN) + REGISTER(Vsize); + #endif + +-#if defined(XP_LINUX) || defined(XP_MACOSX) ++#if defined(XP_UNIX) + REGISTER(PageFaultsSoft); + REGISTER(PageFaultsHard); + #endif diff --git a/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack b/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack deleted file mode 100644 index 9b920f63be0f..000000000000 --- a/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack +++ /dev/null @@ -1,57 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -2855,6 +2855,7 @@ EOF - #pragma GCC visibility push(hidden) - #pragma GCC visibility push(default) - #include <string.h> -+#include <iterator> - #pragma GCC visibility pop - - __attribute__ ((visibility ("default"))) void Func() { -@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { - } - EOF - ac_cv_have_visibility_builtin_bug=no -- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then -+ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then - ac_cv_have_visibility_builtin_bug=yes - else - if test `grep -c "@PLT" conftest.S` = 0; then ---- mozilla/configure.in~ -+++ mozilla/configure.in -@@ -2855,6 +2855,7 @@ EOF - #pragma GCC visibility push(hidden) - #pragma GCC visibility push(default) - #include <string.h> -+#include <iterator> - #pragma GCC visibility pop - - __attribute__ ((visibility ("default"))) void Func() { -@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { - } - EOF - ac_cv_have_visibility_builtin_bug=no -- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then -+ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then - ac_cv_have_visibility_builtin_bug=yes - else - if test `grep -c "@PLT" conftest.S` = 0; then ---- mozilla/js/src/configure.in~ -+++ mozilla/js/src/configure.in -@@ -2855,6 +2855,7 @@ EOF - #pragma GCC visibility push(hidden) - #pragma GCC visibility push(default) - #include <string.h> -+#include <iterator> - #pragma GCC visibility pop - - __attribute__ ((visibility ("default"))) void Func() { -@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { - } - EOF - ac_cv_have_visibility_builtin_bug=no -- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then -+ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then - ac_cv_have_visibility_builtin_bug=yes - else - if test `grep -c "@PLT" conftest.S` = 0; then diff --git a/mail/thunderbird-esr/files/patch-clang32-visibility-hack b/mail/thunderbird-esr/files/patch-clang32-visibility-hack new file mode 100644 index 000000000000..010130bc7a44 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-clang32-visibility-hack @@ -0,0 +1,30 @@ +--- configure.in~ ++++ configure.in +@@ -3230,6 +3230,7 @@ EOF + ac_cv_have_visibility_class_bug, + [cat > conftest.c <<EOF + #pragma GCC visibility push(hidden) ++struct TestStruct; + struct __attribute__ ((visibility ("default"))) TestStruct { + static void Init(); + }; +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -3230,6 +3230,7 @@ EOF + ac_cv_have_visibility_class_bug, + [cat > conftest.c <<EOF + #pragma GCC visibility push(hidden) ++struct TestStruct; + struct __attribute__ ((visibility ("default"))) TestStruct { + static void Init(); + }; +--- mozilla/js/src/configure.in~ ++++ mozilla/js/src/configure.in +@@ -3230,6 +3230,7 @@ EOF + ac_cv_have_visibility_class_bug, + [cat > conftest.c <<EOF + #pragma GCC visibility push(hidden) ++struct TestStruct; + struct __attribute__ ((visibility ("default"))) TestStruct { + static void Init(); + }; diff --git a/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp b/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp new file mode 100644 index 000000000000..165e7f647be3 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, diff --git a/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp b/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp deleted file mode 100644 index f338b4bdedb5..000000000000 --- a/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp +++ /dev/null @@ -1,25 +0,0 @@ ---- mozilla/toolkit/xre/glxtest.cpp.orig 2011-08-19 18:57:10.604870746 +0300 -+++ mozilla/toolkit/xre/glxtest.cpp 2011-08-19 18:59:43.620447963 +0300 -@@ -51,6 +51,8 @@ - // which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that - // to the 'write' end of the pipe. - -+#include <sys/types.h> -+#include <sys/wait.h> - #include <cstdio> - #include <cstdlib> - #include <unistd.h> -@@ -224,6 +226,7 @@ - void fire_glxtest_process() - { - int pfd[2]; -+ int status; - if (pipe(pfd) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); -@@ -244,4 +247,5 @@ - close(pfd[1]); - mozilla::widget::glxtest_pipe = pfd[0]; - mozilla::widget::glxtest_pid = pid; -+ waitpid(pid, &status, 0); - } diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index d328aebc3567..70182a0d80cf 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird-i18n -PORTVERSION= 15.0.1 +PORTVERSION= 16.0 CATEGORIES= mail MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -27,7 +27,7 @@ RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-swit .endif NO_BUILD= yes -USE_THUNDERBIRD= 15 +USE_THUNDERBIRD= 16 USE_XPI= thunderbird linux-thunderbird THUNDERBIRD_I18N_ALL= ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \ diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo index 5057aa31e4ce..f59e08bbdc03 100644 --- a/mail/thunderbird-i18n/distinfo +++ b/mail/thunderbird-i18n/distinfo @@ -1,84 +1,84 @@ -SHA256 (xpi/thunderbird-i18n-15.0.1/ar.xpi) = 9af683a899abd10a3a4ff17bd5a797c60641c9da58cf01a4019b7c7c4f445194 -SIZE (xpi/thunderbird-i18n-15.0.1/ar.xpi) = 435262 -SHA256 (xpi/thunderbird-i18n-15.0.1/br.xpi) = 90fe132c2c1767595711a4536c2c93304bbea7c42fa6b0710b3bac49ddffa372 -SIZE (xpi/thunderbird-i18n-15.0.1/br.xpi) = 438660 -SHA256 (xpi/thunderbird-i18n-15.0.1/ca.xpi) = 8470c05da1c423fd38da9837f76c189971bb537381f0c0cb65ca95fca43b1556 -SIZE (xpi/thunderbird-i18n-15.0.1/ca.xpi) = 407348 -SHA256 (xpi/thunderbird-i18n-15.0.1/cs.xpi) = 90ca43eb261e99041fe2bd64f67e196dc1821de16b4b3f7f4024c991c2a8cba7 -SIZE (xpi/thunderbird-i18n-15.0.1/cs.xpi) = 434947 -SHA256 (xpi/thunderbird-i18n-15.0.1/da.xpi) = 0476b760f8d39cf7af512812e8d04eb51a4cc8c443b3ad0dd3aa230575a258f2 -SIZE (xpi/thunderbird-i18n-15.0.1/da.xpi) = 389626 -SHA256 (xpi/thunderbird-i18n-15.0.1/de.xpi) = 980032ab7db317ed04da3db5b3c631fb51d2436e027a12b1889f2b252bdfccc5 -SIZE (xpi/thunderbird-i18n-15.0.1/de.xpi) = 409788 -SHA256 (xpi/thunderbird-i18n-15.0.1/en-GB.xpi) = 06cb10c47703220689bc370c1897cc1fb94d74842982aa3d6274711e27e95901 -SIZE (xpi/thunderbird-i18n-15.0.1/en-GB.xpi) = 412989 -SHA256 (xpi/thunderbird-i18n-15.0.1/en-US.xpi) = b4f02ead4d9ff92b00f6fb979d510b1c0bbc562b8e0f363e54946ee07377e192 -SIZE (xpi/thunderbird-i18n-15.0.1/en-US.xpi) = 381215 -SHA256 (xpi/thunderbird-i18n-15.0.1/es-AR.xpi) = 1a7009430732bc38bc506d6138060e2bb0843a3f891ebc7b90479cfcfa24a651 -SIZE (xpi/thunderbird-i18n-15.0.1/es-AR.xpi) = 408795 -SHA256 (xpi/thunderbird-i18n-15.0.1/es-ES.xpi) = c41dc7e0bbc99cd54a18b1f9e465074a75a1441abe46413f3042d5375007eb0f -SIZE (xpi/thunderbird-i18n-15.0.1/es-ES.xpi) = 367306 -SHA256 (xpi/thunderbird-i18n-15.0.1/et.xpi) = 0604f6c45a049d51404dfaa5e8917c784c9661f6f083011bd5bb828165bcbe86 -SIZE (xpi/thunderbird-i18n-15.0.1/et.xpi) = 433783 -SHA256 (xpi/thunderbird-i18n-15.0.1/eu.xpi) = 24d546b00b6b93b7a36ab5d9b722a4f11042dd5730b941fcbc51e41acd3c4542 -SIZE (xpi/thunderbird-i18n-15.0.1/eu.xpi) = 396428 -SHA256 (xpi/thunderbird-i18n-15.0.1/fi.xpi) = 52232c71f8174d764aeae052dad31684a029924734c6dbd94641fe50ec42516c -SIZE (xpi/thunderbird-i18n-15.0.1/fi.xpi) = 435059 -SHA256 (xpi/thunderbird-i18n-15.0.1/fr.xpi) = 46c1d995b26b6d0caa23bcd5e568fe316f79d7700513fccafc649282782eed05 -SIZE (xpi/thunderbird-i18n-15.0.1/fr.xpi) = 433614 -SHA256 (xpi/thunderbird-i18n-15.0.1/fy-NL.xpi) = fcb869c52fae47cb6369b942e047157ddbe84f385b7c05d3f1356037788f4f21 -SIZE (xpi/thunderbird-i18n-15.0.1/fy-NL.xpi) = 437192 -SHA256 (xpi/thunderbird-i18n-15.0.1/ga-IE.xpi) = 78d5f0d549197fa0eb42f858423c357573f2d96ad9c9861a8b80bcab1dbf2d91 -SIZE (xpi/thunderbird-i18n-15.0.1/ga-IE.xpi) = 415281 -SHA256 (xpi/thunderbird-i18n-15.0.1/gd.xpi) = 7c4ab77458cbcb430f3fe2b822e278a1e4303fef0f32c77932a2acb3f57c4eb5 -SIZE (xpi/thunderbird-i18n-15.0.1/gd.xpi) = 440848 -SHA256 (xpi/thunderbird-i18n-15.0.1/gl.xpi) = c570c00bfb921ed45ef0139b61345c031028892424e0e114d0e6ef90a81da6bb -SIZE (xpi/thunderbird-i18n-15.0.1/gl.xpi) = 435423 -SHA256 (xpi/thunderbird-i18n-15.0.1/he.xpi) = c8bc1e2dce2ecc85c339d336031d82e1ec1b07881801cba5be95c406e04af4c0 -SIZE (xpi/thunderbird-i18n-15.0.1/he.xpi) = 469275 -SHA256 (xpi/thunderbird-i18n-15.0.1/hu.xpi) = f32b5368cd899d594a7865f385c3917f8eec47b81b799898e61d31f6d36e3d62 -SIZE (xpi/thunderbird-i18n-15.0.1/hu.xpi) = 421987 -SHA256 (xpi/thunderbird-i18n-15.0.1/is.xpi) = 0b60ebea597ab79cac7714bad836943cda8c50aa00ecb15763d737c60cb4e065 -SIZE (xpi/thunderbird-i18n-15.0.1/is.xpi) = 403711 -SHA256 (xpi/thunderbird-i18n-15.0.1/it.xpi) = d5696cb46497fc029c64a91166b0c5c3ec63155defeac8262a38099fd34e1d22 -SIZE (xpi/thunderbird-i18n-15.0.1/it.xpi) = 357249 -SHA256 (xpi/thunderbird-i18n-15.0.1/ja.xpi) = d8b98fb4d0212dd6273ede351736d4e2c746ab3cc5585ddc21e412dd0f8b1b8c -SIZE (xpi/thunderbird-i18n-15.0.1/ja.xpi) = 490588 -SHA256 (xpi/thunderbird-i18n-15.0.1/ko.xpi) = 80b098bf5a467e339ead3463d9a22b2041e899f73f1cfecddb51960ac5a516ba -SIZE (xpi/thunderbird-i18n-15.0.1/ko.xpi) = 401190 -SHA256 (xpi/thunderbird-i18n-15.0.1/lt.xpi) = 3f52a194b6db7539ddfb5a9111168de7c29668807a8973edfe89d1bb12a0fd72 -SIZE (xpi/thunderbird-i18n-15.0.1/lt.xpi) = 520468 -SHA256 (xpi/thunderbird-i18n-15.0.1/nb-NO.xpi) = 33576f29675c9caa8382fc567d52c7cc77664dc7ca64c220563e27e20a652ba6 -SIZE (xpi/thunderbird-i18n-15.0.1/nb-NO.xpi) = 430654 -SHA256 (xpi/thunderbird-i18n-15.0.1/nl.xpi) = df63c3d13bf1e659de4d044745e4047dd0643045c37d7c0c76072579d5347a51 -SIZE (xpi/thunderbird-i18n-15.0.1/nl.xpi) = 430881 -SHA256 (xpi/thunderbird-i18n-15.0.1/nn-NO.xpi) = bfae4cf04d4c798742e4b4731b074c6380595fc283112bc759e1b7cc0c4dfe04 -SIZE (xpi/thunderbird-i18n-15.0.1/nn-NO.xpi) = 436707 -SHA256 (xpi/thunderbird-i18n-15.0.1/pl.xpi) = ff4f8ca29f3aedaa9144ab9579d75e57e5ecec4d8ba6815d2e9fa7730f076bc8 -SIZE (xpi/thunderbird-i18n-15.0.1/pl.xpi) = 390140 -SHA256 (xpi/thunderbird-i18n-15.0.1/pt-BR.xpi) = 93eb71b913c8ea974c48ca7067b655131fd7900ac9941fb6f90862e0350e6830 -SIZE (xpi/thunderbird-i18n-15.0.1/pt-BR.xpi) = 427393 -SHA256 (xpi/thunderbird-i18n-15.0.1/pt-PT.xpi) = ebed48091fcfe4181d3e5a28a4faf0d6c21bf4672b8387c6a9e0d52717eb7ac8 -SIZE (xpi/thunderbird-i18n-15.0.1/pt-PT.xpi) = 438011 -SHA256 (xpi/thunderbird-i18n-15.0.1/rm.xpi) = b0d1d250f6721d6ad91a8439872a1b5593dcbb8efc7f00af0f9236e711ccd51d -SIZE (xpi/thunderbird-i18n-15.0.1/rm.xpi) = 440886 -SHA256 (xpi/thunderbird-i18n-15.0.1/ru.xpi) = d6dfb01e920c5806080c4739c034a9a7de3c44a6c88b92d612b39299f7ae667c -SIZE (xpi/thunderbird-i18n-15.0.1/ru.xpi) = 406859 -SHA256 (xpi/thunderbird-i18n-15.0.1/si.xpi) = 41e853d72f94369d236b69054e6b71309da48b8b207ab2f961fd7a5b4a7a43a7 -SIZE (xpi/thunderbird-i18n-15.0.1/si.xpi) = 485346 -SHA256 (xpi/thunderbird-i18n-15.0.1/sk.xpi) = c3ff8958a2440928d7a08b1721aa11bd630cbb1263c8f717508852b20c09704e -SIZE (xpi/thunderbird-i18n-15.0.1/sk.xpi) = 420003 -SHA256 (xpi/thunderbird-i18n-15.0.1/sl.xpi) = 58c4affe96600869e152f4acf881bbd6fa4e8f5be77185f263386151326d0307 -SIZE (xpi/thunderbird-i18n-15.0.1/sl.xpi) = 434000 -SHA256 (xpi/thunderbird-i18n-15.0.1/sq.xpi) = c19bae7063b858a3ce76c4c0eeb1fdcb697f3edf6de204ff93a37144ec9d6563 -SIZE (xpi/thunderbird-i18n-15.0.1/sq.xpi) = 388800 -SHA256 (xpi/thunderbird-i18n-15.0.1/sv-SE.xpi) = 6d885b7307e3beccf82b4aa151a83ce555bd3c6669995db288d93e99f1aa0a89 -SIZE (xpi/thunderbird-i18n-15.0.1/sv-SE.xpi) = 508104 -SHA256 (xpi/thunderbird-i18n-15.0.1/ta-LK.xpi) = 1eae23920ef5c604fc40ba61b3c0d0b0092ca8b5e61f85ea0ad818f2f827472b -SIZE (xpi/thunderbird-i18n-15.0.1/ta-LK.xpi) = 505280 -SHA256 (xpi/thunderbird-i18n-15.0.1/tr.xpi) = 217e02a366a0585a01d2cbacccce8a2db5a71cfd3dff67cce6607d8ceca47b7a -SIZE (xpi/thunderbird-i18n-15.0.1/tr.xpi) = 436085 -SHA256 (xpi/thunderbird-i18n-15.0.1/uk.xpi) = 92873d76263c4064927102a57ce8cf4834e0ac557b19c291794eebc8fa3ec64c -SIZE (xpi/thunderbird-i18n-15.0.1/uk.xpi) = 475372 -SHA256 (xpi/thunderbird-i18n-15.0.1/zh-TW.xpi) = 6d1b2e937d4aa4fa07f7654ea38725bd3c461915d8f3d297da748571cb5bf2bb -SIZE (xpi/thunderbird-i18n-15.0.1/zh-TW.xpi) = 426399 +SHA256 (xpi/thunderbird-i18n-16.0/ar.xpi) = f23ae8565cfdbcb1a133efebb5090c217edc98f6aa98c9c79b92899250a81a49 +SIZE (xpi/thunderbird-i18n-16.0/ar.xpi) = 442486 +SHA256 (xpi/thunderbird-i18n-16.0/br.xpi) = c09f9122eeb63a7fd9639906a39f09f8ff94ac2bc96b7e92807a351e7032418a +SIZE (xpi/thunderbird-i18n-16.0/br.xpi) = 444719 +SHA256 (xpi/thunderbird-i18n-16.0/ca.xpi) = 3fac11c76ca48a5696b07589bf8caf083adc64474a8c041431b3b1910ca27f0a +SIZE (xpi/thunderbird-i18n-16.0/ca.xpi) = 413617 +SHA256 (xpi/thunderbird-i18n-16.0/cs.xpi) = a3f038fe3b34bf257941c9b701310d3e4a743cdca24bd5a98e44ca383a573d9c +SIZE (xpi/thunderbird-i18n-16.0/cs.xpi) = 417486 +SHA256 (xpi/thunderbird-i18n-16.0/da.xpi) = ecd1dc1cf4ecc6897cd7176cd15de843190db28920975d606367e3b56242e949 +SIZE (xpi/thunderbird-i18n-16.0/da.xpi) = 400021 +SHA256 (xpi/thunderbird-i18n-16.0/de.xpi) = 1ace053d4505b7c430b6e204dec7f62bbbd396dae476700e267d81c5492ed0c7 +SIZE (xpi/thunderbird-i18n-16.0/de.xpi) = 389181 +SHA256 (xpi/thunderbird-i18n-16.0/en-GB.xpi) = 1a5ffdf73129290873e4ab8a37ef593592c90d79e197f849e8b76da59a92299c +SIZE (xpi/thunderbird-i18n-16.0/en-GB.xpi) = 418453 +SHA256 (xpi/thunderbird-i18n-16.0/en-US.xpi) = 1023c8e56c4ce882c9db89c120be32cccec79de774c65629501b91494267b41c +SIZE (xpi/thunderbird-i18n-16.0/en-US.xpi) = 388053 +SHA256 (xpi/thunderbird-i18n-16.0/es-AR.xpi) = 315f073af2a7a93141205698abc57dbd021e16eb150439e8f879a4665baf891f +SIZE (xpi/thunderbird-i18n-16.0/es-AR.xpi) = 413819 +SHA256 (xpi/thunderbird-i18n-16.0/es-ES.xpi) = 08f24f9ef17e82fac8d431544d1cf33fe5ac7ba03ac31fe2d55986c100a787ba +SIZE (xpi/thunderbird-i18n-16.0/es-ES.xpi) = 372048 +SHA256 (xpi/thunderbird-i18n-16.0/et.xpi) = 5d2ec3e11af2e9b28405f3d5fb0cbad55f12316040a929732c17ecb9bc4f6f68 +SIZE (xpi/thunderbird-i18n-16.0/et.xpi) = 438666 +SHA256 (xpi/thunderbird-i18n-16.0/eu.xpi) = 4cce51d26602f826a643a76d497e123302c9808e7fa8c75a8f423a6149882347 +SIZE (xpi/thunderbird-i18n-16.0/eu.xpi) = 402953 +SHA256 (xpi/thunderbird-i18n-16.0/fi.xpi) = cc94f6fc5687b6445eb9936218221f6c651a8a04ce684d736837a77a15507eab +SIZE (xpi/thunderbird-i18n-16.0/fi.xpi) = 440314 +SHA256 (xpi/thunderbird-i18n-16.0/fr.xpi) = 7d1e6882e843c9fdc3d892fcbb9d7d8d3d450b94479d3a812792e20c7678d573 +SIZE (xpi/thunderbird-i18n-16.0/fr.xpi) = 439396 +SHA256 (xpi/thunderbird-i18n-16.0/fy-NL.xpi) = 0fab7274cde2a3bbf66c3b20ad34b2acc68ee8a36fb7fad1bd8b2fec7e5f60ee +SIZE (xpi/thunderbird-i18n-16.0/fy-NL.xpi) = 438193 +SHA256 (xpi/thunderbird-i18n-16.0/ga-IE.xpi) = 67cbb3cbca84197f4633ca7c458e9c259cd32c723eedffc04dea457a8f3c0d4d +SIZE (xpi/thunderbird-i18n-16.0/ga-IE.xpi) = 422254 +SHA256 (xpi/thunderbird-i18n-16.0/gd.xpi) = 14a2bc29126768d4bfb68f1cf968116ba705013253df2e615656897268fd8333 +SIZE (xpi/thunderbird-i18n-16.0/gd.xpi) = 447082 +SHA256 (xpi/thunderbird-i18n-16.0/gl.xpi) = b597b26108c034235a748585ff7834dfdcec98e707951ef26c4c97b08d59b38c +SIZE (xpi/thunderbird-i18n-16.0/gl.xpi) = 444884 +SHA256 (xpi/thunderbird-i18n-16.0/he.xpi) = 841fc237f5e374eb9628711feba6f49a6bc8e760fab7e24d8f15705bad1eca6e +SIZE (xpi/thunderbird-i18n-16.0/he.xpi) = 479155 +SHA256 (xpi/thunderbird-i18n-16.0/hu.xpi) = a0493ee57ca31d7c7054e3c240e5524c4c81cee4f71bd0579333621ef773d3f8 +SIZE (xpi/thunderbird-i18n-16.0/hu.xpi) = 429235 +SHA256 (xpi/thunderbird-i18n-16.0/is.xpi) = 1f9e113df9b086e150ba04d3b5b5d99bd3adff2fb67b132c570e87253e99db34 +SIZE (xpi/thunderbird-i18n-16.0/is.xpi) = 410929 +SHA256 (xpi/thunderbird-i18n-16.0/it.xpi) = 0d3f4af52ed22b66a97777604c2eabd6c9ae86ebc7043051cf84cbe9e82354c6 +SIZE (xpi/thunderbird-i18n-16.0/it.xpi) = 362260 +SHA256 (xpi/thunderbird-i18n-16.0/ja.xpi) = 8f3f1972cc7dcdccf7efe14a355e890d95234ec597426d532023945eb01ca2ea +SIZE (xpi/thunderbird-i18n-16.0/ja.xpi) = 460276 +SHA256 (xpi/thunderbird-i18n-16.0/ko.xpi) = bd5a6789be2969452b4f05d2f914b4c9b889dad506d1f96612423f3ef1cd14c1 +SIZE (xpi/thunderbird-i18n-16.0/ko.xpi) = 406180 +SHA256 (xpi/thunderbird-i18n-16.0/lt.xpi) = ec5544cffdd9a7557a1f5f9f638d3991900af3c6fb99d59dc6c9aecac39a5a2c +SIZE (xpi/thunderbird-i18n-16.0/lt.xpi) = 518234 +SHA256 (xpi/thunderbird-i18n-16.0/nb-NO.xpi) = eed1cbfe6aa57dbf516a1d07e618cf896e4a83e9b3c4a3cfe7f68e41760a5517 +SIZE (xpi/thunderbird-i18n-16.0/nb-NO.xpi) = 423719 +SHA256 (xpi/thunderbird-i18n-16.0/nl.xpi) = 2ea0d533613e39baed8db853445d24e30aa385e013148f99043e3a183bea38e1 +SIZE (xpi/thunderbird-i18n-16.0/nl.xpi) = 436518 +SHA256 (xpi/thunderbird-i18n-16.0/nn-NO.xpi) = 94b0f3d8730c4a09de0cc3b1ba5bbc239c5526b0a10826d67b7bc38f0acb1f8a +SIZE (xpi/thunderbird-i18n-16.0/nn-NO.xpi) = 428330 +SHA256 (xpi/thunderbird-i18n-16.0/pl.xpi) = f0e113d40ab6fcca36686efd6d564ecf2dd04616d856d2795bc86579efde8fa4 +SIZE (xpi/thunderbird-i18n-16.0/pl.xpi) = 400418 +SHA256 (xpi/thunderbird-i18n-16.0/pt-BR.xpi) = c4ab438acdf82154611c58986d0849ba25265856cc80b38bacdd185f8b8e06ef +SIZE (xpi/thunderbird-i18n-16.0/pt-BR.xpi) = 433901 +SHA256 (xpi/thunderbird-i18n-16.0/pt-PT.xpi) = c7218a6b2177396544a71371a1dacaa9f186b5bbd98753f4742fc7174b5a87d6 +SIZE (xpi/thunderbird-i18n-16.0/pt-PT.xpi) = 447507 +SHA256 (xpi/thunderbird-i18n-16.0/rm.xpi) = b77d811a832b8dce0c38e3a95017bc7a4d514006f7544cb98775fe3f2d3e76bd +SIZE (xpi/thunderbird-i18n-16.0/rm.xpi) = 450394 +SHA256 (xpi/thunderbird-i18n-16.0/ru.xpi) = cb0ff7917a63fcfabf54827f14658294c2b74859b6a7a012d60ac8add92a9754 +SIZE (xpi/thunderbird-i18n-16.0/ru.xpi) = 412751 +SHA256 (xpi/thunderbird-i18n-16.0/si.xpi) = 54b7288d80e0e760c4d80467bd958d8f0d6dbd47096c4586052ebb8915f1833f +SIZE (xpi/thunderbird-i18n-16.0/si.xpi) = 490680 +SHA256 (xpi/thunderbird-i18n-16.0/sk.xpi) = 2275b50042e20b77cae11b2e28e138dd239fc31a87564c304ad1b8401424704e +SIZE (xpi/thunderbird-i18n-16.0/sk.xpi) = 426652 +SHA256 (xpi/thunderbird-i18n-16.0/sl.xpi) = d48ae3d4127c7964da9dd5ea2e5cc2185980d155af28bd18671147cb5c17357a +SIZE (xpi/thunderbird-i18n-16.0/sl.xpi) = 439713 +SHA256 (xpi/thunderbird-i18n-16.0/sq.xpi) = 75c9df6ad4485f71546f577788ad2d2811d3493766a78f80efb3f394ac01b74c +SIZE (xpi/thunderbird-i18n-16.0/sq.xpi) = 395077 +SHA256 (xpi/thunderbird-i18n-16.0/sv-SE.xpi) = 171c348454f67a3961ccc96e4037cb8fdbaef4ebff3b4ea7665bc0721beeea28 +SIZE (xpi/thunderbird-i18n-16.0/sv-SE.xpi) = 516902 +SHA256 (xpi/thunderbird-i18n-16.0/ta-LK.xpi) = 469a5e6c4367f52f5f247ba577b70d028d36927e211edf0cb015dbc7195ce287 +SIZE (xpi/thunderbird-i18n-16.0/ta-LK.xpi) = 514905 +SHA256 (xpi/thunderbird-i18n-16.0/tr.xpi) = 684679710231f230b9ddb7d0a7eda87b25d9e0146f3671f8ef16e32ba2865711 +SIZE (xpi/thunderbird-i18n-16.0/tr.xpi) = 441867 +SHA256 (xpi/thunderbird-i18n-16.0/uk.xpi) = 3dec6654cc6a045f906a8620d8b4fd829d9a7d68cdf578c668e0d0051ef72099 +SIZE (xpi/thunderbird-i18n-16.0/uk.xpi) = 481713 +SHA256 (xpi/thunderbird-i18n-16.0/zh-TW.xpi) = 33b0f09d1126b42baf0266f3e6382c28329e76ae100920601ef435dc107fc3e0 +SIZE (xpi/thunderbird-i18n-16.0/zh-TW.xpi) = 433957 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index af83f3bca19d..0c8ec0cd9367 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -6,22 +6,25 @@ # PORTNAME= thunderbird -DISTVERSION= 15.0.1 +DISTVERSION= 16.0 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}.source +DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ - nss>=3.13.2:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip +EM_VERSION= 1.4.5 + USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=yes USE_GECKO= gecko @@ -52,7 +55,8 @@ PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFINE= GSTREAMER LIGHTNING +OPTIONS_DEFINE= ENIGMAIL GSTREAMER LIGHTNING +OPTIONS_DEFAULT=ENIGMAIL LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.pre.mk> @@ -60,6 +64,8 @@ OPTIONS_DEFINE= GSTREAMER LIGHTNING WRKSRC= ${WRKDIR}/comm-release MOZSRC:= ${WRKSRC}/mozilla +XPI_LIBDIR= ${PREFIX}/lib/xpi + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 @@ -75,12 +81,25 @@ CFLAGS+= -mminimal-toc BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if ${PORT_OPTIONS:MENIGMAIL} +MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail +DISTFILES+= ${EM_DISTFILE}:enigmail +RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg +EM_DISTNAME= enigmail-${EM_VERSION} +EM_DISTFILE= ${EM_DISTNAME}.tar.gz +EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi +EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} +EM_ID= ${PORTNAME}@mozilla-enigmail.org +EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ + ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ + ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm +.endif + .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi -XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@thunderbird.mozilla.org .else @@ -90,16 +109,38 @@ MOZ_OPTIONS+= --disable-calendar post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop +.if ${PORT_OPTIONS:MENIGMAIL} + @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ + -C ${WRKSRC}/mailnews/extensions +.endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp +.if ${PORT_OPTIONS:MENIGMAIL} + @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ + ${WRKSRC}/mailnews/extensions/enigmail/makemake + @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ + -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ + ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in + @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ + -e '/em:maxVersion/s/pre//' \ + ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf +.endif pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) (cd ${MOZSRC} && ${AUTOCONF}) (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) +.if ${PORT_OPTIONS:MENIGMAIL} +post-build: + cd ${WRKSRC}/mailnews/extensions/enigmail && \ + ./makemake -r -o ${MOZ_OBJDIR} + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} all xpi \ + -C ${MOZ_OBJDIR}/mailnews/extensions/enigmail +.endif + port-pre-install: ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults @@ -127,7 +168,25 @@ post-install: @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST} @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \ ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/thunderbird 2>/dev/null || true' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MENIGMAIL} + @${MKDIR} ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} + @(cd ${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${EM_ID} + @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES} + @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${EM_ID} + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -not -type d) | ${SORT} | \ + ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST} + @${ECHO_CMD} 'lib/xpi/symlinks/${PORTNAME}/${EM_ID}' >> ${TMPPLIST} + @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} + @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -type d) | ${SORT} -r | \ + ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MLIGHTNING} || ${PORT_OPTIONS:MENIGMAIL} + @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${PORTNAME} 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST} .endif diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index c853790998fd..e44280bdd031 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,2 +1,4 @@ -SHA256 (thunderbird-15.0.1.source.tar.bz2) = bfa24c3595dae6c3ee3cbaca789e8b81bb47096127a7149c571d553f538cefc7 -SIZE (thunderbird-15.0.1.source.tar.bz2) = 105942872 +SHA256 (thunderbird-16.0.source.tar.bz2) = 868f8f0e333a363170f61074a92b2ee102ab8901077783a5d941424b51284d6b +SIZE (thunderbird-16.0.source.tar.bz2) = 111414218 +SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020 +SIZE (enigmail-1.4.5.tar.gz) = 1269207 diff --git a/mail/thunderbird/files/extra-bug780531 b/mail/thunderbird/files/extra-bug780531 index a63bcaed35fa..a035ce397cc7 100644 --- a/mail/thunderbird/files/extra-bug780531 +++ b/mail/thunderbird/files/extra-bug780531 @@ -1,13 +1,12 @@ --- mozilla/configure.in~ +++ mozilla/configure.in -@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then +@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then MOZ_SYDNEYAUDIO=1 MOZ_CUBEB=1 MOZ_MEDIA=1 - case "$target_cpu" in -- arm*) + case "$target" in -+ arm-*-linux*) + arm*) MOZ_TREMOR=1 ;; + *-freebsd*) @@ -16,14 +15,13 @@ *) MOZ_VORBIS=1 ;; -@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV +@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then MOZ_SYDNEYAUDIO=1 MOZ_CUBEB=1 MOZ_MEDIA=1 - case "$target_cpu" in -- arm*) + case "$target" in -+ arm-*-linux*) + arm*) MOZ_TREMOR=1 ;; + *-freebsd*) diff --git a/mail/thunderbird/files/patch-bug351181 b/mail/thunderbird/files/patch-bug351181 deleted file mode 100644 index fdf4840c1441..000000000000 --- a/mail/thunderbird/files/patch-bug351181 +++ /dev/null @@ -1,31 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500 -+++ mozilla/js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500 -@@ -49,6 +49,9 @@ - // Avoid warnings about ASSERT being defined by the assembler as well. - #undef ASSERT - -+#if defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #ifdef XP_OS2 - #define _PC_53 PC_53 - #define _MCW_EM MCW_EM -@@ -691,8 +694,18 @@ - - #else - -+#if defined(__FreeBSD__) -+#if __BSD_VISIBLE == 0 -+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined -+#endif -+#include <fenv.h> -+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT)) -+#else -+ - #define FIX_FPU() ((void)0) - -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ -+ - #endif - - JSBool diff --git a/mail/thunderbird/files/patch-bug543241 b/mail/thunderbird/files/patch-bug543241 index 3cb45f175317..2aac3bb44466 100644 --- a/mail/thunderbird/files/patch-bug543241 +++ b/mail/thunderbird/files/patch-bug543241 @@ -1,5 +1,16 @@ --- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() diff --git a/mail/thunderbird/files/patch-bug723860 b/mail/thunderbird/files/patch-bug723860 deleted file mode 100644 index d76dbfe6d20c..000000000000 --- a/mail/thunderbird/files/patch-bug723860 +++ /dev/null @@ -1,54 +0,0 @@ -commit 4e07587 -Author: Matthew Gregan <kinetik@flim.org> -Date: Wed Jun 6 17:58:07 2012 +1200 - - Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec ---- - content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++ - content/media/ogg/nsOggReader.cpp | 3 +-- - content/media/wave/nsWaveReader.cpp | 3 +++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index 164fb2e..06a09b5 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -505,6 +505,10 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, - nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered, - PRInt64 aStartTime) - { -+ if (!mInfo.mHasVideo && !mInfo.mHasAudio) { -+ return NS_OK; -+ } -+ - GstFormat format = GST_FORMAT_TIME; - MediaResource* resource = mDecoder->GetResource(); - gint64 resourceLength = resource->GetLength(); -diff --git mozilla/content/media/ogg/nsOggReader.cpp mozilla/content/media/ogg/nsOggReader.cpp -index c6ff008..8d40e2c 100644 ---- mozilla/content/media/ogg/nsOggReader.cpp -+++ mozilla/content/media/ogg/nsOggReader.cpp -@@ -1532,8 +1532,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) - { - // HasAudio and HasVideo are not used here as they take a lock and cause - // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change -- // after metadata is read and GetBuffered isn't called before metadata is -- // read. -+ // after metadata is read. - if (!mInfo.mHasVideo && !mInfo.mHasAudio) { - // No need to search through the file if there are no audio or video tracks - return NS_OK; -diff --git mozilla/content/media/wave/nsWaveReader.cpp mozilla/content/media/wave/nsWaveReader.cpp -index 7242eb5..60fc1e1 100644 ---- mozilla/content/media/wave/nsWaveReader.cpp -+++ mozilla/content/media/wave/nsWaveReader.cpp -@@ -239,6 +239,9 @@ static double RoundToUsecs(double aSeconds) { - - nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) - { -+ if (!mInfo.mHasAudio) { -+ return NS_OK; -+ } - PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset); - while (startOffset >= 0) { - PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset); diff --git a/mail/thunderbird/files/patch-bug753046 b/mail/thunderbird/files/patch-bug753046 index d20eebb42a3c..658d47f827bb 100644 --- a/mail/thunderbird/files/patch-bug753046 +++ b/mail/thunderbird/files/patch-bug753046 @@ -456,7 +456,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:0 --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread.h -@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE +@@ -22,9 +22,12 @@ typedef void* PlatformThreadHandle; // HANDLE #elif defined(OS_POSIX) #include <pthread.h> typedef pthread_t PlatformThreadHandle; @@ -465,6 +465,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:0 #include <unistd.h> typedef pid_t PlatformThreadId; +#elif defined(OS_BSD) ++#include <sys/types.h> +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include <mach/mach.h> @@ -978,57 +979,6 @@ $NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.2 2011/11/27 13:09: #else long pages = sysconf(_SC_PHYS_PAGES); long page_size = sysconf(_SC_PAGE_SIZE); -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h -@@ -34,7 +34,7 @@ - #include "base/third_party/nspr/prcpucfg_win.h" - #elif defined(__APPLE__) - #include "base/third_party/nspr/prcpucfg_mac.h" --#elif defined(__linux__) || defined(ANDROID) -+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - #include "base/third_party/nspr/prcpucfg_linux.h" - #elif defined(__OpenBSD__) - #include "base/third_party/nspr/prcpucfg_openbsd.h" -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc -@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp - LL_ADD(retVal, retVal, temp); - - return retVal; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_DRAGONFLY) - struct tm exp_tm = {0}; - exp_tm.tm_sec = exploded->tm_sec; - exp_tm.tm_min = exploded->tm_min; -@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp - result *= kSecondsToMicroseconds; - result += exploded->tm_usec; - return result; -+#elif defined(OS_FREEBSD) || defined(OS_NETBSD) -+ struct tm exp_tm = {0}; -+ exp_tm.tm_sec = exploded->tm_sec; -+ exp_tm.tm_min = exploded->tm_min; -+ exp_tm.tm_hour = exploded->tm_hour; -+ exp_tm.tm_mday = exploded->tm_mday; -+ exp_tm.tm_mon = exploded->tm_month; -+ exp_tm.tm_year = exploded->tm_year - 1900; -+ -+ // time_t is 64bit -+ time_t absolute_time = timegm(&exp_tm); -+ -+ PRTime result = static_cast<PRTime>(absolute_time); -+ result -= exploded->tm_params.tp_gmt_offset + -+ exploded->tm_params.tp_dst_offset; -+ result *= kSecondsToMicroseconds; -+ result += exploded->tm_usec; -+ return result; - #else - #error No PR_ImplodeTime implemented on your platform. - #endif diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc index abf2a56..48791f6 100644 --- mozilla/ipc/chromium/src/base/time_posix.cc diff --git a/mail/thunderbird/files/patch-bug759459 b/mail/thunderbird/files/patch-bug759459 deleted file mode 100644 index 5434a759b353..000000000000 --- a/mail/thunderbird/files/patch-bug759459 +++ /dev/null @@ -1,24 +0,0 @@ -commit 4d0c5b9 -Author: Marco Perez <bugmail@millibyte.net> -Date: Sat Jun 9 12:24:56 2012 -0400 - - Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence ---- - js/src/gc/Memory.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp -index 815e90b..10c1a91 100644 ---- mozilla/js/src/gc/Memory.cpp -+++ mozilla/js/src/gc/Memory.cpp -@@ -292,9 +292,9 @@ GetPageFaultCount() - #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN) - - #include <sys/mman.h> --#include <unistd.h> - #include <sys/time.h> - #include <sys/resource.h> -+#include <unistd.h> - - void - InitMemorySubsystem() diff --git a/mail/thunderbird/files/patch-bug760899 b/mail/thunderbird/files/patch-bug760899 deleted file mode 100644 index c81b855e7fc2..000000000000 --- a/mail/thunderbird/files/patch-bug760899 +++ /dev/null @@ -1,54 +0,0 @@ -commit 667daed -Author: Stephen Moehle <stephen.moehle@gmail.com> -Date: Tue Jun 5 11:32:36 2012 +1200 - - Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik - - --HG-- - extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a ---- - content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 6a50e09..164fb2e 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - if (gst_element_query_duration(GST_ELEMENT(mPlayBin), - &format, &duration) && format == GST_FORMAT_TIME) { - ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); -- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration))); - duration = GST_TIME_AS_USECONDS (duration); - mDecoder->GetStateMachine()->SetDuration(duration); -@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, - nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen); - - if (timestamp < aTimeThreshold) { -- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT -- " threshold %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT -+ " threshold %" GST_TIME_FORMAT, - GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold))); - gst_buffer_unref(buffer); - buffer = NULL; -@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, - NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread."); - - gint64 seekPos = aTarget * GST_USECOND; -- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT, - mDecoder, GST_TIME_ARGS(seekPos))); - - if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME, -@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration() - if (gst_element_query_duration(GST_ELEMENT(mPlayBin), - &format, &duration)) { - if (format == GST_FORMAT_TIME) { -- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration))); - duration = GST_TIME_AS_USECONDS (duration); - } diff --git a/mail/thunderbird/files/patch-bug761030 b/mail/thunderbird/files/patch-bug761030 deleted file mode 100644 index d6b96cc697f3..000000000000 --- a/mail/thunderbird/files/patch-bug761030 +++ /dev/null @@ -1,25 +0,0 @@ -commit 8bc9e15 -Author: Stephen Moehle <stephen.moehle@gmail.com> -Date: Tue Jun 5 11:31:13 2012 +1200 - - Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik - - --HG-- - extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588 ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index 17374a3..6a50e09 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -452,6 +452,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, - i, height); - b.mPlanes[i].mWidth = gst_video_format_get_component_width(format, - i, width); -+ b.mPlanes[i].mOffset = 0; -+ b.mPlanes[i].mSkip = 0; - } - - bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, diff --git a/mail/thunderbird/files/patch-bug761419 b/mail/thunderbird/files/patch-bug761419 deleted file mode 100644 index 0c8c3d1d155a..000000000000 --- a/mail/thunderbird/files/patch-bug761419 +++ /dev/null @@ -1,22 +0,0 @@ -commit f0a73aa -Author: Paul Adenot <paul@paul.cx> -Date: Thu Jun 21 20:44:39 2012 -0400 - - Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 06a09b5..c48f92e 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - * stream but that are otherwise decodeable. - */ - guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, -- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; -+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)}; - guint default_flags, current_flags; - g_object_get(mPlayBin, "flags", &default_flags, NULL); - diff --git a/mail/thunderbird/files/patch-bug774671 b/mail/thunderbird/files/patch-bug774671 index 35fbe946041c..bc1c63bc2245 100644 --- a/mail/thunderbird/files/patch-bug774671 +++ b/mail/thunderbird/files/patch-bug774671 @@ -1,6 +1,31 @@ ---- mozilla/js/src/jsprvtd.h.orig 2012-08-25 02:31:13.000000000 +0200 -+++ mozilla/js/src/jsprvtd.h 2012-09-06 17:14:09.000000000 +0200 -@@ -149,9 +149,9 @@ +commit 7e9eda2 +Author: Rafael Ávila de Espíndola <respindola@mozilla.com> +Date: Tue Jul 17 12:54:41 2012 -0400 + + Bug 774671 - Fix mismatched declarations. r=luke. +--- + mozilla/js/src/jsproxy.h | 2 +- + mozilla/js/src/jsprvtd.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git mozilla/js/src/jsproxy.h mozilla/js/src/jsproxy.h +index ec26e3a..aa0e782 100644 +--- mozilla/js/src/jsproxy.h ++++ mozilla/js/src/jsproxy.h +@@ -13,7 +13,7 @@ + + namespace js { + +-class Wrapper; ++class JS_FRIEND_API(Wrapper); + + /* + * A proxy is a JSObject that implements generic behavior by providing custom +diff --git mozilla/js/src/jsprvtd.h mozilla/js/src/jsprvtd.h +index 19b5aef..93e1216 100644 +--- mozilla/js/src/jsprvtd.h ++++ mozilla/js/src/jsprvtd.h +@@ -146,9 +146,9 @@ struct TreeContext; class UpvarCookie; class Proxy; diff --git a/mail/thunderbird/files/patch-bug778056 b/mail/thunderbird/files/patch-bug778056 index 72eba848047d..468c103e4bf5 100644 --- a/mail/thunderbird/files/patch-bug778056 +++ b/mail/thunderbird/files/patch-bug778056 @@ -4,9 +4,9 @@ #if defined(XP_UNIX) # include <unistd.h> // for valloc on *BSD #endif //if defined(XP_UNIX) -+#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) +# include <malloc_np.h> // for malloc_usable_size -+#endif ++#endif // if defined(__FreeBSD__) #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) # define MOZALLOC_EXPORT __declspec(dllexport) diff --git a/mail/thunderbird/files/patch-bug778078 b/mail/thunderbird/files/patch-bug778078 index fc29c1ca5ecb..27be88312b95 100644 --- a/mail/thunderbird/files/patch-bug778078 +++ b/mail/thunderbird/files/patch-bug778078 @@ -1,9 +1,9 @@ --- mozilla/toolkit/xre/nsAppRunner.cpp~ +++ mozilla/toolkit/xre/nsAppRunner.cpp -@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[] +@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[] ScopedLogging log; - #if defined(MOZ_WIDGET_GTK2) + #if defined(MOZ_WIDGET_GTK) -#ifdef MOZ_MEMORY +#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) // Disable the slice allocator, since jemalloc already uses similar layout diff --git a/mail/thunderbird/files/patch-bug781474 b/mail/thunderbird/files/patch-bug781474 deleted file mode 100644 index 358d40c1f988..000000000000 --- a/mail/thunderbird/files/patch-bug781474 +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200 -+++ mozilla/content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200 -@@ -54,7 +54,7 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ -+#if !defined(__amd64__) && !defined(__i386__) - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #else - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; diff --git a/mail/thunderbird/files/patch-bug784776 b/mail/thunderbird/files/patch-bug784776 index fbc597902017..95d60a104809 100644 --- a/mail/thunderbird/files/patch-bug784776 +++ b/mail/thunderbird/files/patch-bug784776 @@ -1,20 +1,3 @@ ---- mozilla/content/media/MediaEngineDefault.cpp~ -+++ mozilla/content/media/MediaEngineDefault.cpp -@@ -232,12 +232,12 @@ nsresult - MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID) - { - if (mState != kAllocated) { -- return NULL; -+ return 0; - } - - mTimer = do_CreateInstance(NS_TIMER_CONTRACTID); - if (!mTimer) { -- return NULL; -+ return 0; - } - - mSource = aStream; --- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~ +++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp @@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources() diff --git a/mail/thunderbird/files/patch-bug785638 b/mail/thunderbird/files/patch-bug785638 deleted file mode 100644 index 2ce1cd35a78a..000000000000 --- a/mail/thunderbird/files/patch-bug785638 +++ /dev/null @@ -1,168 +0,0 @@ -diff --git configure.in configure.in -index cef992b..3bd39ca 100644 ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then - - dnl See if we have assembly on this platform. - case "$OS_ARCH:$CPU_ARCH" in -- Linux:x86) -- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -- VPX_X86_ASM=1 -- ;; -- Linux:x86_64) -- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -- VPX_X86_ASM=1 -- ;; -- SunOS:x86) -- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -- VPX_X86_ASM=1 -- ;; -- SunOS:x86_64) -- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -- VPX_X86_ASM=1 -- ;; - Darwin:x86) - VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC" - VPX_X86_ASM=1 -@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then - VPX_ASM_SUFFIX="$ASM_SUFFIX" - VPX_ARM_ASM=1 - fi -+ ;; -+ *:x86) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -+ VPX_X86_ASM=1 -+ fi -+ ;; -+ *:x86_64) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -+ VPX_X86_ASM=1 -+ fi -+ ;; - esac - - if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then -@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then - - dnl Do we support libjpeg-turbo on this platform? - case "$OS_ARCH:$OS_TEST" in -- Linux:x86|Linux:i?86) -- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -- LIBJPEG_TURBO_X86_ASM=1 -- ;; -- Linux:x86_64) -- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -- LIBJPEG_TURBO_X64_ASM=1 -- ;; -- SunOS:i?86) -- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -- LIBJPEG_TURBO_X86_ASM=1 -- ;; -- SunOS:x86_64) -- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -- LIBJPEG_TURBO_X64_ASM=1 -- ;; - Darwin:i?86) - LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO" - LIBJPEG_TURBO_X86_ASM=1 -@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then - LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon" - LIBJPEG_TURBO_ARM_ASM=1 - ;; -+ *:x86|*:i?86) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -+ LIBJPEG_TURBO_X86_ASM=1 -+ fi -+ ;; -+ *:x86_64) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -+ LIBJPEG_TURBO_X64_ASM=1 -+ fi -+ ;; - esac - - fi -diff --git media/libvpx/update.sh media/libvpx/update.sh -index 79e0fb1..51956af 100755 ---- mozilla/media/libvpx/update.sh -+++ mozilla/media/libvpx/update.sh -@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h - # Should be same for all platforms... - cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h - --# Config files for x86-linux-gcc and Solaris x86 -+# Config files for x86-linux-gcc and other x86 elf platforms - cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c - cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm - cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h - --# Config files for x86_64-linux-gcc and Solaris x86_64 -+# Config files for x86_64-linux-gcc and other x86_64 elf platforms - cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c - cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm - cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h -diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h -index 55433f3..36e1780 100644 ---- mozilla/media/libvpx/vpx_config.h -+++ mozilla/media/libvpx/vpx_config.h -@@ -16,20 +16,12 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.h" - --#elif defined(__linux__) && defined(__i386__) --/* 32 bit Linux. */ -+#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) -+/* 32 bit ELF platforms. */ - #include "vpx_config_x86-linux-gcc.h" - --#elif defined(__linux__) && defined(__x86_64__) --/* 64 bit Linux. */ --#include "vpx_config_x86_64-linux-gcc.h" -- --#elif defined(__sun) && defined(__i386) --/* 32 bit Solaris. */ --#include "vpx_config_x86-linux-gcc.h" -- --#elif defined(__sun) && defined(__x86_64) --/* 64 bit Solaris. */ -+#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) -+/* 64 bit ELF platforms. */ - #include "vpx_config_x86_64-linux-gcc.h" - - #else -diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c -index eedd515..c8b5375 100644 ---- mozilla/media/libvpx/vpx_config_c.c -+++ mozilla/media/libvpx/vpx_config_c.c -@@ -15,22 +15,14 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.c" - --#elif defined(__linux__) && defined(__i386__) --/* 32 bit Linux. */ -+#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) -+/* 32 bit ELF platforms. */ - #include "vpx_config_x86-linux-gcc.c" - --#elif defined(__linux__) && defined(__x86_64__) --/* 64 bit Linux. */ -+#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) -+/* 64 bit ELF platforms. */ - #include "vpx_config_x86_64-linux-gcc.c" - --#elif defined(__sun) && defined(__i386) --/* 32 bit Solaris. */ --#include "vpx_config_x86-linux-gcc.h" -- --#elif defined(__sun) && defined(__x86_64) --/* 64 bit Solaris. */ --#include "vpx_config_x86_64-linux-gcc.h" -- - #else - #error VPX_X86_ASM is defined, but assembly not supported on this platform! - #endif diff --git a/mail/thunderbird/files/patch-bug788108 b/mail/thunderbird/files/patch-bug788108 new file mode 100644 index 000000000000..db2399499397 --- /dev/null +++ b/mail/thunderbird/files/patch-bug788108 @@ -0,0 +1,20 @@ +--- mozilla/content/base/public/nsContentUtils.h~ ++++ mozilla/content/base/public/nsContentUtils.h +@@ -18,17 +18,6 @@ + #include <ieeefp.h> + #endif + +-//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. +-#ifdef __FreeBSD__ +-#include <ieeefp.h> +-#ifdef __alpha__ +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; +-#endif +-static fp_except_t oldmask = fpsetmask(~allmask); +-#endif +- + #include "nsAString.h" + #include "nsIStatefulFrame.h" + #include "nsNodeInfoManager.h" diff --git a/mail/thunderbird/files/patch-bug788955 b/mail/thunderbird/files/patch-bug788955 new file mode 100644 index 000000000000..3f6263c901b6 --- /dev/null +++ b/mail/thunderbird/files/patch-bug788955 @@ -0,0 +1,309 @@ +diff --git Makefile.in Makefile.in +index e341462..f75bd55 100644 +--- mozilla/Makefile.in ++++ mozilla/Makefile.in +@@ -48,8 +48,10 @@ endif + ifdef MOZ_MEMORY + tier_base_dirs += memory/mozjemalloc + ifdef MOZ_JEMALLOC ++ifndef MOZ_NATIVE_JEMALLOC + tier_base_dirs += memory/jemalloc + endif ++endif + tier_base_dirs += memory/build + endif + ifndef MOZ_NATIVE_ZLIB +diff --git allmakefiles.sh allmakefiles.sh +index 6a9be4b..d2e49e3 100755 +--- mozilla/allmakefiles.sh ++++ mozilla/allmakefiles.sh +@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then + mozglue/Makefile + mozglue/build/Makefile + " +- if [ "$MOZ_JEMALLOC" ]; then ++ if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then + add_makefiles " + memory/jemalloc/Makefile + " +--- mozilla/config/autoconf.mk.in ++++ mozilla/config/autoconf.mk.in +@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@ + MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@ + MOZ_MEMORY = @MOZ_MEMORY@ + MOZ_JEMALLOC = @MOZ_JEMALLOC@ ++MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@ + MOZ_PROFILING = @MOZ_PROFILING@ + MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ + MOZ_JPROF = @MOZ_JPROF@ +diff --git configure.in configure.in +index bb05782..2f32516 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -3711,21 +3711,22 @@ fi + + dnl Check for the existence of various allocation headers/functions + ++MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" + MALLOC_H= +-MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) +-if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) +- if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) ++ ++for file in $MALLOC_HEADERS; do ++ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) ++ if test "$MALLOC_H" != ""; then ++ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) ++ break + fi +-fi +-if test "$MALLOC_H" != ""; then +- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) +-fi ++done + + MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" + AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) + ++AC_CHECK_FUNCS(malloc_usable_size) ++ + dnl See if compiler supports some gcc-style attributes + + AC_CACHE_CHECK(for __attribute__((always_inline)), +@@ -6939,6 +6940,18 @@ else + fi + + if test -z "$MOZ_MEMORY"; then ++ if test -n "$MOZ_JEMALLOC"; then ++ MOZ_NATIVE_JEMALLOC=1 ++ AC_CHECK_FUNCS(mallctl nallocm,, ++ [MOZ_NATIVE_JEMALLOC= ++ break]) ++ if test -n "$MOZ_NATIVE_JEMALLOC"; then ++ MOZ_MEMORY=1 ++ AC_DEFINE(MOZ_MEMORY) ++ AC_DEFINE(MOZ_JEMALLOC) ++ AC_DEFINE(MOZ_NATIVE_JEMALLOC) ++ fi ++ fi + case "${target}" in + *-mingw*) + if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then +@@ -7033,6 +7046,7 @@ else + fi # MOZ_MEMORY + AC_SUBST(MOZ_MEMORY) + AC_SUBST(MOZ_JEMALLOC) ++AC_SUBST(MOZ_NATIVE_JEMALLOC) + AC_SUBST(MOZ_GLUE_LDFLAGS) + AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) + AC_SUBST(WIN32_CRT_LIBS) +@@ -8820,10 +8834,22 @@ fi + + # Run jemalloc configure script + +-if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then ++if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then + ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_" +- if test "$OS_ARCH" = "Linux"; then +- MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" ++ case "$OS_ARCH" in ++ Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) ++ MANGLE="malloc calloc valloc free realloc posix_memalign" ++ case "$OS_ARCH" in ++ Linux) ++ MANGLE="$MANGLE memalign malloc_usable_size" ++ ;; ++ FreeBSD) ++ MANGLE="$MANGLE malloc_usable_size" ++ ;; ++ esac ++ ;; ++ esac ++ if test -n "$MANGLE"; then + MANGLED= + JEMALLOC_WRAPPER= + if test -n "$_WRAP_MALLOC"; then +diff --git memory/build/Makefile.in memory/build/Makefile.in +index dca0f48..af93ee0 100644 +--- mozilla/memory/build/Makefile.in ++++ mozilla/memory/build/Makefile.in +@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c + + ifdef MOZ_JEMALLOC + CSRCS += mozjemalloc_compat.c ++ifndef MOZ_NATIVE_JEMALLOC + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) ++endif + else + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) + endif +diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c +index 9d87629..03c8320 100644 +--- mozilla/memory/build/extraMallocFuncs.c ++++ mozilla/memory/build/extraMallocFuncs.c +@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src) + #endif + + #ifdef MOZ_JEMALLOC ++ ++#undef wrap ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a ++#endif ++ + /* Override some jemalloc defaults */ +-const char *je_malloc_conf = "narenas:1,lg_chunk:20"; ++MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20"; + + #ifdef ANDROID + #include <android/log.h> +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 10a845a..94ad96e 100644 +--- mozilla/memory/build/mozjemalloc_compat.c ++++ mozilla/memory/build/mozjemalloc_compat.c +@@ -5,14 +5,21 @@ + #include "mozilla/Types.h" + #include "jemalloc_types.h" + +-extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a ++#endif + +-MOZ_EXPORT_API (void) ++extern MOZ_IMPORT_API(int) ++wrap(mallctl)(const char*, void*, size_t*, void*, size_t); ++ ++MOZ_EXPORT_API(void) + jemalloc_stats(jemalloc_stats_t *stats) + { + size_t size = sizeof(stats->mapped); +- je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0); +- je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0); ++ wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); ++ wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); + stats->committed = -1; + stats->dirty = -1; + } +diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c +index 37a843e..55e18c2 100644 +--- mozilla/memory/jemalloc/src/src/mutex.c ++++ mozilla/memory/jemalloc/src/src/mutex.c +@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread, + /******************************************************************************/ + + #ifdef JEMALLOC_MUTEX_INIT_CB +-int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, ++JEMALLOC_EXPORT int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, + void *(calloc_cb)(size_t, size_t)); + #endif + +diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp +index 5b61050b..5b3399a 100644 +--- mozilla/memory/mozalloc/mozalloc.cpp ++++ mozilla/memory/mozalloc/mozalloc.cpp +@@ -12,16 +12,13 @@ + #include <sys/types.h> + + #if defined(MALLOC_H) +-# include MALLOC_H // for memalign, valloc where available ++# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size + #endif // if defined(MALLOC_H) + #include <stddef.h> // for size_t + #include <stdlib.h> // for malloc, free + #if defined(XP_UNIX) + # include <unistd.h> // for valloc on *BSD + #endif //if defined(XP_UNIX) +-#if defined(__FreeBSD__) +-# include <malloc_np.h> // for malloc_usable_size +-#endif // if defined(__FreeBSD__) + + #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) + # define MOZALLOC_EXPORT __declspec(dllexport) +@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) +- // Android bionic libc doesn't have malloc_usable_size. ++#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY) + return malloc_usable_size(ptr); + #elif defined(XP_WIN) + return _msize(ptr); +diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h +index f0e0878..2486e83 100644 +--- mozilla/memory/mozjemalloc/jemalloc.h ++++ mozilla/memory/mozjemalloc/jemalloc.h +@@ -37,22 +37,29 @@ + #endif + #include "jemalloc_types.h" + ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define wrap(a) a ++#else ++#define wrap(a) je_ ## a ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif + +-#if defined(MOZ_MEMORY_LINUX) ++#if defined(MOZ_NATIVE_JEMALLOC) \ ++ || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) + __attribute__((weak)) + #endif + void jemalloc_stats(jemalloc_stats_t *stats); + + /* Computes the usable size in advance. */ + #if !defined(MOZ_MEMORY_DARWIN) +-#if defined(MOZ_MEMORY_LINUX) ++#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) + __attribute__((weak)) + #endif + #if defined(MOZ_JEMALLOC) +-int je_nallocm(size_t *rsize, size_t size, int flags); ++MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags); + #else + size_t je_malloc_good_size(size_t size); + #endif +@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) { + #if defined(MOZ_MEMORY_DARWIN) + return malloc_good_size(size); + #elif defined(MOZ_JEMALLOC) +- if (je_nallocm) { ++ if (wrap(nallocm)) { + size_t ret; + if (size == 0) + size = 1; +- if (!je_nallocm(&ret, size, 0)) ++ if (!wrap(nallocm)(&ret, size, 0)) + return ret; + } + return size; +@@ -113,4 +120,6 @@ void jemalloc_purge_freed_pages(); + } /* extern "C" */ + #endif + ++#undef wrap ++ + #endif /* _JEMALLOC_H_ */ +diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in +index c333647..15ba505 100644 +--- mozilla/mozglue/build/Makefile.in ++++ mozilla/mozglue/build/Makefile.in +@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1 + endif + + # Keep jemalloc separated when mozglue is statically linked +-ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB)) ++ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB))) + SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build) + else + # Temporary, until bug 662814 lands diff --git a/mail/thunderbird/files/patch-bug789436 b/mail/thunderbird/files/patch-bug789436 new file mode 100644 index 000000000000..2479d8e69c78 --- /dev/null +++ b/mail/thunderbird/files/patch-bug789436 @@ -0,0 +1,27 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include <ieeefp.h> +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + diff --git a/mail/thunderbird/files/patch-bug789656 b/mail/thunderbird/files/patch-bug789656 new file mode 100644 index 000000000000..17f1419897cc --- /dev/null +++ b/mail/thunderbird/files/patch-bug789656 @@ -0,0 +1,11 @@ +--- mozilla/media/libopus/Makefile.in~ ++++ mozilla/media/libopus/Makefile.in +@@ -20,7 +20,7 @@ DEFINES += \ + -Drestrict= \ + $(NULL) + +-ifneq ($(filter $(OS_ARCH),Linux Darwin),) ++ifneq ($(filter $(OS_ARCH),Linux Darwin DragonFly FreeBSD NetBSD OpenBSD),) + DEFINES += -DHAVE_LRINTF + endif + ifeq ($(OS_ARCH), WINNT) diff --git a/mail/thunderbird/files/patch-bug789693 b/mail/thunderbird/files/patch-bug789693 new file mode 100644 index 000000000000..f88228f5498b --- /dev/null +++ b/mail/thunderbird/files/patch-bug789693 @@ -0,0 +1,109 @@ +--- mozilla/toolkit/components/startup/nsAppStartup.cpp ++++ mozilla/toolkit/components/startup/nsAppStartup.cpp +@@ -50,18 +50,41 @@ + #include <sys/syscall.h> + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include <sys/param.h> + #include <sys/sysctl.h> + #endif + +-#ifdef __OpenBSD__ +-#include <sys/param.h> +-#include <sys/sysctl.h> ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <sys/user.h> + #endif + + #include "mozilla/Telemetry.h" + #include "mozilla/StartupTimeline.h" + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + #define kPrefLastSuccess "toolkit.startup.last_success" +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ sizeof(KINFO_PROC), ++ 1, ++#endif ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[0]); + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- PRTime starttime = static_cast<PRTime>(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; +- starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &buffer_size, NULL, 0)) + return 0; + +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- PRTime starttime = static_cast<PRTime>(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast<PRTime>(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; + return starttime; + } + #else diff --git a/mail/thunderbird/files/patch-bug791305 b/mail/thunderbird/files/patch-bug791305 new file mode 100644 index 000000000000..e4c44a405f57 --- /dev/null +++ b/mail/thunderbird/files/patch-bug791305 @@ -0,0 +1,107 @@ +commit c269a16 +Author: Jeff Muizelaar <jmuizelaar@mozilla.com> +Date: Fri Sep 14 15:54:55 2012 -0400 + + Bug 791305. Use libjpeg's color conversion code instead of our own. r=joe,r=khuey + + libjpeg-turbo supports converting directly to a format compatible with cairo's + FORMAT_RGB24. Use that instead of our own handcoded function. This also gives + us SSE2 and NEON version of this function. + + --HG-- + extra : rebase_source : 18f48925f023a33ec2a097d4f4e5cc2ab40be1e9 +--- + configure.in | 6 +- + image/decoders/nsJPEGDecoder.cpp | 311 ++------------------------------------- + 2 files changed, 20 insertions(+), 297 deletions(-) + +diff --git mozilla/image/decoders/nsJPEGDecoder.cpp mozilla/image/decoders/nsJPEGDecoder.cpp +index c1fb515..1d2a259 100644 +--- mozilla/image/decoders/nsJPEGDecoder.cpp ++++ mozilla/image/decoders/nsJPEGDecoder.cpp +@@ -22,6 +22,13 @@ + extern "C" { + #include "iccjpeg.h" + ++#ifdef JCS_EXTENSIONS ++#if defined(IS_BIG_ENDIAN) ++#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB ++#else ++#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX ++#endif ++#else + /* Colorspace conversion (copied from jpegint.h) */ + struct jpeg_color_deconverter { + JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); +@@ -34,6 +41,7 @@ METHODDEF(void) + ycc_rgb_convert_argb (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, JDIMENSION input_row, + JSAMPARRAY output_buf, int num_rows); ++#endif + } + + static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); +@@ -329,7 +340,18 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + case JCS_GRAYSCALE: + case JCS_RGB: + case JCS_YCbCr: ++#ifdef JCS_EXTENSIONS ++ // if we're not color managing we can decode directly to ++ // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB ++ if (mCMSMode != eCMSMode_All) { ++ mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB; ++ mInfo.out_color_components = 4; ++ } else { ++ mInfo.out_color_space = JCS_RGB; ++ } ++#else + mInfo.out_color_space = JCS_RGB; ++#endif + break; + case JCS_CMYK: + case JCS_YCCK: +@@ -397,6 +419,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + return; /* I/O suspension */ + } + ++#ifndef JCS_EXTENSIONS + /* Force to use our YCbCr to Packed RGB converter when possible */ + if (!mTransform && (mCMSMode != eCMSMode_All) && + mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { +@@ -404,6 +427,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ + mInfo.cconvert->color_convert = ycc_rgb_convert_argb; + } ++#endif + + /* If this is a progressive JPEG ... */ + mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; +@@ -542,7 +566,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend) + PRUint32 *imageRow = ((PRUint32*)mImageData) + + (mInfo.output_scanline * mInfo.output_width); + ++#ifdef JCS_EXTENSIONS ++ if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) { ++#else + if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { ++#endif + /* Special case: scanline will be directly converted into packed ARGB */ + if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { + *suspend = true; /* suspend */ +@@ -858,6 +887,7 @@ term_source (j_decompress_ptr jd) + } // namespace mozilla + + ++#ifndef JCS_EXTENSIONS + /**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ + + /* +@@ -1130,7 +1160,8 @@ ycc_rgb_convert_argb (j_decompress_ptr cinfo, + } + } + } ++#endif + + + /**************** Inverted CMYK -> RGB conversion **************/ + /* diff --git a/mail/thunderbird/files/patch-bug791366 b/mail/thunderbird/files/patch-bug791366 new file mode 100644 index 000000000000..90e9e523bbbe --- /dev/null +++ b/mail/thunderbird/files/patch-bug791366 @@ -0,0 +1,95 @@ +diff --git mozilla/xpcom/base/nsMemoryReporterManager.cpp mozilla/xpcom/base/nsMemoryReporterManager.cpp +index a9aff58..674e757 100644 +--- mozilla/xpcom/base/nsMemoryReporterManager.cpp ++++ mozilla/xpcom/base/nsMemoryReporterManager.cpp +@@ -32,7 +32,7 @@ using namespace mozilla; + # include "jemalloc.h" + #endif // MOZ_MEMORY + +-#if defined(XP_LINUX) || defined(XP_MACOSX) || defined(SOLARIS) ++#ifdef XP_UNIX + + #include <sys/time.h> + #include <sys/resource.h> +@@ -95,6 +95,81 @@ static nsresult GetResident(PRInt64 *n) + return GetProcSelfStatmField(1, n); + } + ++#elif defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++ ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <sys/user.h> ++#endif ++ ++#include <unistd.h> ++ ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(__DragonFly__) ++#define KP_SIZE(kp) (kp.kp_vm_map_size) ++#define KP_RSS(kp) (kp.kp_vm_rssize * getpagesize()) ++#elif defined(__FreeBSD__) ++#define KP_SIZE(kp) (kp.ki_size) ++#define KP_RSS(kp) (kp.ki_rssize * getpagesize()) ++#elif defined(__NetBSD__) ++#define KP_SIZE(kp) (kp.p_vm_msize * getpagesize()) ++#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize()) ++#elif defined(__OpenBSD__) ++#define KP_SIZE(kp) ((kp.p_vm_dsize + kp.p_vm_ssize \ ++ + kp.p_vm_tsize) * getpagesize()) ++#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize()) ++#endif ++ ++static nsresult GetKinfoProcSelf(KINFO_PROC *proc) ++{ ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ sizeof(KINFO_PROC), ++ 1, ++#endif ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[0]); ++ size_t size = sizeof(KINFO_PROC); ++ if (sysctl(mib, miblen, proc, &size, NULL, 0)) ++ return NS_ERROR_FAILURE; ++ ++ return NS_OK; ++} ++ ++#define HAVE_VSIZE_AND_RESIDENT_REPORTERS 1 ++static nsresult GetVsize(PRInt64 *n) ++{ ++ KINFO_PROC proc; ++ nsresult rv = GetKinfoProcSelf(&proc); ++ if (NS_SUCCEEDED(rv)) ++ *n = KP_SIZE(proc); ++ ++ return rv; ++} ++ ++static nsresult GetResident(PRInt64 *n) ++{ ++ KINFO_PROC proc; ++ nsresult rv = GetKinfoProcSelf(&proc); ++ if (NS_SUCCEEDED(rv)) ++ *n = KP_RSS(proc); ++ ++ return rv; ++} ++ + #elif defined(SOLARIS) + + #include <procfs.h> diff --git a/mail/thunderbird/files/patch-config-baseconfig.mk b/mail/thunderbird/files/patch-config-baseconfig.mk new file mode 100644 index 000000000000..f789129c3ba4 --- /dev/null +++ b/mail/thunderbird/files/patch-config-baseconfig.mk @@ -0,0 +1,16 @@ +--- mozilla/config/baseconfig.mk~ ++++ mozilla/config/baseconfig.mk +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/%%MOZILLA%% ++idldir = $(datadir)/idl/%%MOZILLA%% ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't diff --git a/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in b/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in deleted file mode 100644 index 7d3316500fa7..000000000000 --- a/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in +++ /dev/null @@ -1,22 +0,0 @@ ---- mozilla/config/autoconf.mk.in.orig 2007-08-28 12:02:43.000000000 -0400 -+++ mozilla/config/autoconf.mk.in 2007-09-26 14:21:51.000000000 -0400 -@@ -58,14 +58,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/%%MOZILLA%% - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ - diff --git a/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp b/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp new file mode 100644 index 000000000000..f31ba356b0ab --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp @@ -0,0 +1,14 @@ +--- mozilla/content/media/nsAudioStream.cpp~ ++++ mozilla/content/media/nsAudioStream.cpp +@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref + gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nsnull)); + } + } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { ++#if defined(__FreeBSD__) && __FreeBSD_version < 800097 ++ bool value = Preferences::GetBool(aPref, false); ++#else + bool value = Preferences::GetBool(aPref, true); ++#endif + mozilla::MutexAutoLock lock(*gAudioPrefsLock); + gUseCubeb = value; + } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) { diff --git a/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp b/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp new file mode 100644 index 000000000000..32241fdfe270 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, diff --git a/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp b/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp deleted file mode 100644 index f338b4bdedb5..000000000000 --- a/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp +++ /dev/null @@ -1,25 +0,0 @@ ---- mozilla/toolkit/xre/glxtest.cpp.orig 2011-08-19 18:57:10.604870746 +0300 -+++ mozilla/toolkit/xre/glxtest.cpp 2011-08-19 18:59:43.620447963 +0300 -@@ -51,6 +51,8 @@ - // which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that - // to the 'write' end of the pipe. - -+#include <sys/types.h> -+#include <sys/wait.h> - #include <cstdio> - #include <cstdlib> - #include <unistd.h> -@@ -224,6 +226,7 @@ - void fire_glxtest_process() - { - int pfd[2]; -+ int status; - if (pipe(pfd) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); -@@ -244,4 +247,5 @@ - close(pfd[1]); - mozilla::widget::glxtest_pipe = pfd[0]; - mozilla::widget::glxtest_pid = pid; -+ waitpid(pid, &status, 0); - } |