Date: Fri, 18 Sep 2020 10:02:23 +0000 (UTC) From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548882 - in head: . mail/thunderbird mail/thunderbird/files Message-ID: <202009181002.08IA2Nfh083091@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cmt Date: Fri Sep 18 10:02:23 2020 New Revision: 548882 URL: https://svnweb.freebsd.org/changeset/ports/548882 Log: update mail/thunderbird to 78.2.2 See https://support.mozilla.org/en-US/kb/new-thunderbird-78 for major changes in Thunderbird 78, the release announcement in https://blog.thunderbird.net/2020/07/whats-new-in-thunderbird-78/ and https://blog.thunderbird.net/2020/09/openpgp-in-thunderbird-78/ info for OpenPGP users. Also check UPDATING 20200918. Current release notes are in https://www.thunderbird.net/en-US/thunderbird/78.2.2/releasenotes/ PR: 249346 Submitted by: jbeich Added: head/mail/thunderbird/files/patch-browser-app-nsBrowserApp.cpp (contents, props changed) head/mail/thunderbird/files/patch-bug1269654_comment5 (contents, props changed) head/mail/thunderbird/files/patch-bug1504834_comment10 (contents, props changed) head/mail/thunderbird/files/patch-bug1504834_comment5 (contents, props changed) head/mail/thunderbird/files/patch-bug1504834_comment9 (contents, props changed) head/mail/thunderbird/files/patch-bug1550891 (contents, props changed) head/mail/thunderbird/files/patch-bug1602730_comment5 (contents, props changed) head/mail/thunderbird/files/patch-bug1612181_comment1 (contents, props changed) head/mail/thunderbird/files/patch-bug1612184 (contents, props changed) head/mail/thunderbird/files/patch-bug1626236 (contents, props changed) head/mail/thunderbird/files/patch-bug1628567 (contents, props changed) head/mail/thunderbird/files/patch-bug1640982 (contents, props changed) head/mail/thunderbird/files/patch-bug1659612 (contents, props changed) head/mail/thunderbird/files/patch-bug1664607 (contents, props changed) head/mail/thunderbird/files/patch-freebsd11.3 (contents, props changed) Deleted: head/mail/thunderbird/files/patch-bug1624128 head/mail/thunderbird/files/patch-bug726479 head/mail/thunderbird/files/patch-cubeb-dlopen head/mail/thunderbird/files/patch-cubeb-sndio Modified: head/UPDATING head/mail/thunderbird/Makefile head/mail/thunderbird/distinfo head/mail/thunderbird/files/patch-bug1288587 head/mail/thunderbird/files/patch-bug1618914 head/mail/thunderbird/files/patch-bug847568 head/mail/thunderbird/files/patch-cubeb-oss head/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp head/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Sep 18 09:41:48 2020 (r548881) +++ head/UPDATING Fri Sep 18 10:02:23 2020 (r548882) @@ -5,6 +5,23 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20200918: + AFFECTS: users of mail/thunderbird + AUTHOR: cmt@FreeBSD.org + + Thunderbird has been updated to the 78esr series. Thunderbird will + try to convert old profiles on first start, but conversion may fail + especially on old profiles. Also, older versions of Thunderbird will + not be able to use a profile once it has been converted. It is + strongly recommended to move any ~/.thunderbird folder away before + starting Thunderbird 78 for the first time, thus creating a new and + empty profile. + Also note that OpenPGP functionality has been integrated into Thunderbird, + obsoleting the Enigmail extension. + Check https://wiki.mozilla.org/Thunderbird:OpenPGP for details, and + especially https://wiki.mozilla.org/Thunderbird:OpenPGP:Smartcards + if your private key lives on a smartcard. + 20200914: AFFECTS: users of lang/php72 AUTHOR: tz@FreeBSD.org Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Fri Sep 18 09:41:48 2020 (r548881) +++ head/mail/thunderbird/Makefile Fri Sep 18 10:02:23 2020 (r548882) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 68.12.0 -PORTREVISION= 2 +DISTVERSION= 78.2.2 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source @@ -14,27 +13,31 @@ COMMENT= Mozilla Thunderbird is standalone mail and ne BROKEN_powerpc64= fails to build: gmake[4]: *** [backend.mk:47: .deps/node.stub.stub] Error 246 -BUILD_DEPENDS= nspr>=4.21:devel/nspr \ - nss>=3.52.1:security/nss \ - icu>=63.1,1:devel/icu \ +BUILD_DEPENDS= nspr>=4.26:devel/nspr \ + nss>=3.56:security/nss \ + icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=2.4.0:print/harfbuzz \ - graphite2>=1.3.13:graphics/graphite2 \ + harfbuzz>=2.6.6:print/harfbuzz \ + graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ - libvpx>=1.5.0:multimedia/libvpx \ - sqlite3>=3.28.0:databases/sqlite3 \ + libvpx>=1.8.2:multimedia/libvpx \ + py${PYTHON3_DEFAULT:S/.//}-sqlite3>0:databases/py-sqlite3@py${PYTHON3_DEFAULT:S/.//} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ + yasm:devel/yasm \ zip:archivers/zip +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libbotan-2.so:security/botan2 SSP_UNSAFE= yes USE_GECKO= gecko -USE_MOZILLA= -vpx +USE_MOZILLA= -sqlite USES= tar:xz MOZ_OPTIONS= --enable-application=comm/mail --enable-official-branding +MOZ_OPTIONS+= --with-system-bz2 --with-system-jsonc --with-system-botan MOZ_MK_OPTIONS= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 Modified: head/mail/thunderbird/distinfo ============================================================================== --- head/mail/thunderbird/distinfo Fri Sep 18 09:41:48 2020 (r548881) +++ head/mail/thunderbird/distinfo Fri Sep 18 10:02:23 2020 (r548882) @@ -1,3 +1,3 @@ -TIMESTAMP = 1598386363 -SHA256 (thunderbird-68.12.0.source.tar.xz) = 8cf582d03125df86044626072c0d924d4b7c3e984d9228d62acdf4e9918eec02 -SIZE (thunderbird-68.12.0.source.tar.xz) = 331226160 +TIMESTAMP = 1599607340 +SHA256 (thunderbird-78.2.2.source.tar.xz) = 63e8641551d21f6a185e100260bae33d4ab529e30eb0e4d85a57f3aed974ec67 +SIZE (thunderbird-78.2.2.source.tar.xz) = 353246904 Added: head/mail/thunderbird/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-browser-app-nsBrowserApp.cpp Fri Sep 18 10:02:23 2020 (r548882) @@ -0,0 +1,12 @@ +--- browser/app/nsBrowserApp.cpp.orig 2016-09-19 16:19:28 UTC ++++ browser/app/nsBrowserApp.cpp +@@ -324,6 +324,9 @@ int main(int argc, char* argv[], char* e + { + mozilla::TimeStamp start = mozilla::TimeStamp::Now(); + ++ setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); ++ + #ifdef HAS_DLL_BLOCKLIST + DllBlocklist_Initialize(); + Added: head/mail/thunderbird/files/patch-bug1269654_comment5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1269654_comment5 Fri Sep 18 10:02:23 2020 (r548882) @@ -0,0 +1,43 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1269654#c5 +https://bug1269654.bmoattachments.org/attachment.cgi?id=8749234 +handle big-endian formats in Cairo format conversions + +# HG changeset patch +# User Lee Salzman <lsalzman@mozilla.com> +# Date 1462463631 14400 +# Thu May 05 11:53:51 2016 -0400 +# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d +# Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5 +handle big-endian formats in Cairo format conversions + +--- gfx/2d/HelpersCairo.h.orig 2019-12-02 17:51:16.633474000 +0100 ++++ gfx/2d/HelpersCairo.h 2019-12-02 17:52:44.939998000 +0100 +@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su + case SurfaceFormat::R5G6B5_UINT16: + return CAIRO_FORMAT_RGB16_565; + default: +- gfxCriticalError() << "Unknown image format " << (int)format; ++ // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms, ++ // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32. ++ // See bug 1269654 ++ if (format == SurfaceFormat::B8G8R8X8) { ++ return CAIRO_FORMAT_RGB24; ++ } else if (format != SurfaceFormat::B8G8R8A8) { ++ gfxCriticalError() << "Unknown image format " << (int)format; ++ } + return CAIRO_FORMAT_ARGB32; + } + } +@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent( + case SurfaceFormat::A8: + return CAIRO_CONTENT_ALPHA; + default: +- gfxCriticalError() << "Unknown image content format " << (int)format; ++ if (format == SurfaceFormat::B8G8R8X8) { ++ return CAIRO_CONTENT_COLOR; ++ } else if (format != SurfaceFormat::B8G8R8A8) { ++ gfxCriticalError() << "Unknown image content format " << (int)format; ++ } + return CAIRO_CONTENT_COLOR_ALPHA; + } + } Modified: head/mail/thunderbird/files/patch-bug1288587 ============================================================================== --- head/mail/thunderbird/files/patch-bug1288587 Fri Sep 18 09:41:48 2020 (r548881) +++ head/mail/thunderbird/files/patch-bug1288587 Fri Sep 18 10:02:23 2020 (r548882) @@ -2,66 +2,36 @@ diff --git a/build/moz.configure/init.configure b/buil index 855214a..1e91d51 100644 --- build/moz.configure/init.configure +++ build/moz.configure/init.configure -@@ -165,16 +165,17 @@ option(env='PYTHON', nargs=1, help='Python interpreter') - # ============================================================== - @depends('PYTHON', check_build_environment, mozconfig, '--help') - @imports('os') - @imports('sys') - @imports('subprocess') - @imports(_from='mozbuild.configure.util', _import='LineIO') - @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager') - @imports(_from='mozbuild.virtualenv', _import='verify_python_version') +@@ -251,6 +251,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre + @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') + @imports(_from='mozbuild.pythonutil', _import='python_executable_version') + @imports(_from='six', _import='ensure_text') +@imports(_from='__builtin__', _import='KeyError') - @imports('distutils.sysconfig') - def virtualenv_python(env_python, build_env, mozconfig, help): + def virtualenv_python3(env_python, build_env, mozconfig, help): + # Avoid re-executing python when running configure --help. if help: - return - - python = env_python[0] if env_python else None - - # Ideally we'd rely on the mozconfig injection from mozconfig_options, -@@ -184,16 +185,22 @@ def virtualenv_python(env_python, build_env, mozconfig, help): - if 'PYTHON' in mozconfig['env']['added']: - python = mozconfig['env']['added']['PYTHON'] - elif 'PYTHON' in mozconfig['env']['modified']: - python = mozconfig['env']['modified']['PYTHON'][1] - elif 'PYTHON' in mozconfig['vars']['added']: - python = mozconfig['vars']['added']['PYTHON'] - elif 'PYTHON' in mozconfig['vars']['modified']: - python = mozconfig['vars']['modified']['PYTHON'][1] +@@ -283,6 +284,12 @@ def virtualenv_python3(env_python, build_env, mozconfi + python = mozconfig['vars']['added']['PYTHON3'] + elif 'PYTHON3' in mozconfig['vars']['modified']: + python = mozconfig['vars']['modified']['PYTHON3'][1] + for i in ('env', 'vars'): + for j in ('added', 'modified'): + try: -+ del mozconfig[i][j]['PYTHON'] ++ del mozconfig[i][j]['PYTHON3'] + except KeyError: + pass - with LineIO(lambda l: log.error(l)) as out: - verify_python_version(out) - topsrcdir, topobjdir = build_env.topsrcdir, build_env.topobjdir - if topobjdir.endswith('/js/src'): - topobjdir = topobjdir[:-7] + log.debug("python3: executable from configuration: %r" % python) - with LineIO(lambda l: log.info(l)) as out: -@@ -255,17 +262,20 @@ def virtualenv_python(env_python, build_env, mozconfig - log.info('Creating Python environment') - manager.build(python) - - python = normsep(manager.python_path) - - if not normsep(sys.executable).startswith(normsep(virtualenvs_root)): - log.info('Reexecuting in the virtualenv') +@@ -365,7 +372,10 @@ def virtualenv_python3(env_python, build_env, mozconfi + sys.executable, manager.python_path)) + log.info('Re-executing in the virtualenv') if env_python: -- del os.environ['PYTHON'] -+ try: -+ del os.environ['PYTHON'] -+ except KeyError: -+ pass - # One would prefer to use os.execl, but that's completely borked on - # Windows. - sys.exit(subprocess.call([python] + sys.argv)) - - # We are now in the virtualenv - if not distutils.sysconfig.get_python_lib(): - die('Could not determine python site packages directory') - +- del os.environ['PYTHON3'] ++ try: ++ del os.environ['PYTHON3'] ++ except KeyError: ++ pass + # Homebrew on macOS will change Python's sys.executable to a custom + # value which messes with mach's virtualenv handling code. Override + # Homebrew's changes with the correct sys.executable value. Added: head/mail/thunderbird/files/patch-bug1504834_comment10 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1504834_comment10 Fri Sep 18 10:02:23 2020 (r548882) @@ -0,0 +1,34 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c10 +https://bug1504834.bmoattachments.org/attachment.cgi?id=9111147 +mozilla-bmo1504834-part4.patch + +# HG changeset patch +# Parent 46ea866ca3acb8bb5e1709ceb799b9c94f591dec +Problem description: Tab-titles that are too long to fit into a tab get faded out. + On big endian this is broken and instead of fading out, the + tab gets white and the font transparent, leading to an unreadable + tab-title +Solution: This is not a real solution, but a hack. The real solution would have been + to byte-swap the correct buffer, but I could not find it. + So the next best thing is to deactivate the fading-effect. Now all tab-titles + are readable, albeit not as pretty to look at as they could be. +Side-effects: I have not yet found an unwanted side-effect. + +diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp +--- gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 ++++ gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 +@@ -1861,6 +1861,14 @@ + SkCanvas::kPreserveLCDText_SaveLayerFlag | + (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); + ++#if MOZ_BIG_ENDIAN ++ // Pushing a layer where an aMask is defined produces wrong output. ++ // We _should_ endian swap the data, but I couldn't find a workable way to do so ++ // Therefore I deactivate those layers in the meantime. ++ // The result is: Tab-titles that are longer than the available space should be faded out. ++ // The fading doesn't work, so we deactivate the fading-effect here. ++ if (!aMask) ++#endif + mCanvas->saveLayer(saveRec); + + SetPermitSubpixelAA(aOpaque); Added: head/mail/thunderbird/files/patch-bug1504834_comment5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1504834_comment5 Fri Sep 18 10:02:23 2020 (r548882) @@ -0,0 +1,80 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5 +https://bugzilla.mozilla.org/attachment.cgi?id=9028600 +Rough progress patch + + +diff -r 53107afbc21e gfx/skia/skia/third_party/skcms/skcms.cc +--- gfx/skia/skia/third_party/skcms/skcms.cc Wed Nov 07 04:50:21 2018 +0000 ++++ gfx/skia/skia/third_party/skcms/skcms.cc Thu Nov 29 12:49:35 2018 +0000 +@@ -30,6 +30,8 @@ + #include <avx512fintrin.h> + #include <avx512dqintrin.h> + #endif ++#else ++ #define SKCMS_PORTABLE + #endif + + // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others. +@@ -280,20 +282,28 @@ enum { + static uint16_t read_big_u16(const uint8_t* ptr) { + uint16_t be; + memcpy(&be, ptr, sizeof(be)); +-#if defined(_MSC_VER) +- return _byteswap_ushort(be); ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++ return be; + #else ++ #if defined(_MSC_VER) ++ return _byteswap_ushort(be); ++ #else + return __builtin_bswap16(be); ++ #endif + #endif + } + + static uint32_t read_big_u32(const uint8_t* ptr) { + uint32_t be; + memcpy(&be, ptr, sizeof(be)); +-#if defined(_MSC_VER) +- return _byteswap_ulong(be); ++#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__ ++ return be; + #else ++ #if defined(_MSC_VER) ++ return _byteswap_ulong(be); ++ #else + return __builtin_bswap32(be); ++ #endif + #endif + } + +--- gfx/2d/DrawTargetSkia.cpp.orig 2019-09-21 15:51:04.129603000 +0200 ++++ gfx/2d/DrawTargetSkia.cpp 2019-09-21 15:52:11.900316000 +0200 +@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a + return surfaceBounds.Intersect(bounds); + } + +-static const int kARGBAlphaOffset = +- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0; ++static const int kARGBAlphaOffset = 0; + + static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, + const int32_t aStride, SurfaceFormat aFormat) { +--- gfx/2d/Types.h.orig 2019-09-21 15:52:47.044803000 +0200 ++++ gfx/2d/Types.h 2019-09-21 15:53:40.113641000 +0200 +@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t { + // The following values are endian-independent synonyms. The _UINT32 suffix + // indicates that the name reflects the layout when viewed as a uint32_t + // value. +-#if MOZ_LITTLE_ENDIAN() + A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB + X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB +-#elif MOZ_BIG_ENDIAN() +- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB +- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB +-#else +-# error "bad endianness" +-#endif + + // The following values are OS and endian-independent synonyms. + // Added: head/mail/thunderbird/files/patch-bug1504834_comment9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1504834_comment9 Fri Sep 18 10:02:23 2020 (r548882) @@ -0,0 +1,49 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c9 +https://bugzilla.mozilla.org/attachment.cgi?id=9111146 +mozilla-bmo1504834-part3.patch + + +# HG changeset patch +# Parent aecb4600e5da17443b224c79eee178c1d8e155e3 +For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the +right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). + +diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h +--- gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 ++++ gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 +@@ -238,7 +238,18 @@ + AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } + AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } + ++ // On Big endian the commented out variant doesn't work, ++ // and honestly, I have no idea why it exists in the first place. ++ // The reason its broken is, I think, that it defaults to the double-variant of ToBits() ++ // which gets a 64-bit integer, and FromBits returns 32-bit, ++ // cutting off the wrong half again. ++ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles). ++ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system) ++#ifdef SK_CPU_BENDIAN ++ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; } ++#else + AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); } ++#endif + AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); } + AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } + +diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h +--- gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 ++++ gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 +@@ -203,7 +203,13 @@ + // ~~~> + // a = 1*aa + d(1-1*aa) = aa + d(1-aa) + // c = 0*aa + d(1-1*aa) = d(1-aa) ++ ++ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0 ++#ifdef SK_CPU_BENDIAN ++ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0)) ++#else + return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255)) ++#endif + + d.approxMulDiv255(aa.inv()); + }; + while (h --> 0) { Added: head/mail/thunderbird/files/patch-bug1550891 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1550891 Fri Sep 18 10:02:23 2020 (r548882) @@ -0,0 +1,80 @@ +commit 965eb33c5e86 +Author: Greg V <greg@unrelenting.technology> +Date: Wed Jan 8 15:06:00 2020 -0800 + + Bug 1550891 - re-add SHM_ANON support in IPC shared memory, freezing via capabilities +--- + config/system-headers.mozbuild | 1 + + ipc/chromium/src/base/shared_memory_posix.cc | 20 +++++++++++++++++--- + 2 files changed, 18 insertions(+), 3 deletions(-) + +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index 88afca1070f86..beff3e2542c9f 100644 +--- config/system-headers.mozbuild ++++ config/system-headers.mozbuild +@@ -816,6 +816,7 @@ system_headers = [ + 'sys/bitypes.h', + 'sys/byteorder.h', + 'syscall.h', ++ 'sys/capsicum.h', + 'sys/cdefs.h', + 'sys/cfgodm.h', + 'sys/elf.h', +diff --git ipc/chromium/src/base/shared_memory_posix.cc ipc/chromium/src/base/shared_memory_posix.cc +index 0be9cce0b4bed..89e67483e4c16 100644 +--- ipc/chromium/src/base/shared_memory_posix.cc ++++ ipc/chromium/src/base/shared_memory_posix.cc +@@ -16,6 +16,10 @@ + # include "mozilla/Ashmem.h" + #endif + ++#ifdef __FreeBSD__ ++# include <sys/capsicum.h> ++#endif ++ + #include "base/eintr_wrapper.h" + #include "base/logging.h" + #include "base/string_util.h" +@@ -77,7 +81,7 @@ SharedMemoryHandle SharedMemory::NULLHandle() { return SharedMemoryHandle(); } + + // static + bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) { +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(__FreeBSD__) + return false; + #else + *str += '/'; +@@ -103,7 +107,7 @@ bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) { + // enough for this. + StringAppendF(str, "org.mozilla.ipc.%d.", static_cast<int>(pid)); + return true; +-#endif // !ANDROID ++#endif // !ANDROID && !__FreeBSD__ + } + + bool SharedMemory::CreateInternal(size_t size, bool freezeable) { +@@ -125,6 +129,9 @@ bool SharedMemory::CreateInternal(size_t size, bool freezeable) { + return false; + } + needs_truncate = false; ++#elif defined(__FreeBSD__) ++ // FreeBSD supports anonymous shm_open ++ fd.reset(shm_open(SHM_ANON, O_RDWR, 0600)); + #else + // Generic Unix: shm_open + shm_unlink + do { +@@ -224,6 +231,14 @@ bool SharedMemory::ReadOnlyCopy(SharedMemory* ro_out) { + return false; + } + ro_file = mapped_file_; ++#elif defined(__FreeBSD__) ++ cap_rights_t rights; ++ cap_rights_init(&rights, CAP_MMAP_R); ++ if (cap_rights_limit(mapped_file_, &rights) != 0) { ++ CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno); ++ return false; ++ } ++ ro_file = mapped_file_; + #else + DCHECK(frozen_file_ >= 0); + DCHECK(mapped_file_ >= 0); Added: head/mail/thunderbird/files/patch-bug1602730_comment5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1602730_comment5 Fri Sep 18 10:02:23 2020 (r548882) @@ -0,0 +1,24 @@ +--- gfx/layers/composite/CompositableHost.cpp.orig 2020-09-12 21:47:42 UTC ++++ gfx/layers/composite/CompositableHost.cpp +@@ -13,6 +13,7 @@ + #include "ImageHost.h" // for ImageHostBuffered, etc + #include "Layers.h" + #include "TiledContentHost.h" // for TiledContentHost ++#include "mozilla/EndianUtils.h" + #include "mozilla/gfx/gfxVars.h" + #include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor + #include "mozilla/layers/TextureHost.h" // for TextureHost, etc +@@ -92,9 +93,13 @@ bool CompositableHost::AddMaskEffect(EffectChain& aEff + } + MOZ_ASSERT(source); + ++ // Setting an alpha-mask here breaks the URL-bar on big endian (s390x) ++ // if the typed URL is too long for the textbox (automatic scrolling needed) ++#if MOZ_LITTLE_ENDIAN() + RefPtr<EffectMask> effect = + new EffectMask(source, source->GetSize(), aTransform); + aEffects.mSecondaryEffects[EffectTypes::MASK] = effect; ++#endif + return true; + } + Added: head/mail/thunderbird/files/patch-bug1612181_comment1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1612181_comment1 Fri Sep 18 10:02:23 2020 (r548882) @@ -0,0 +1,191 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1612181 +https://bug1612181.bmoattachments.org/attachment.cgi?id=9123550 + + +--- xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc64_linux.S.orig 2020-01-29 19:25:30.967574000 +0100 ++++ xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc64_linux.S 2020-01-29 19:26:50.465737000 +0100 +@@ -62,11 +62,11 @@ NS_InvokeByIndex: + .NS_InvokeByIndex: + #endif + mflr 0 +- std 0,16(r1) ++ std 0,16(%r1) + +- std r29,-24(r1) +- std r30,-16(r1) +- std r31,-8(r1) ++ std r29,-24(%r1) ++ std r30,-16(%r1) ++ std r31,-8(%r1) + + mr r29,r3 # Save 'that' in r29 + mr r30,r4 # Save 'methodIndex' in r30 +@@ -79,7 +79,7 @@ NS_InvokeByIndex: + # + # | (fixed area + | | 7 GP | 13 FP | 3 NV | + # | param. save) |(params)........| regs | regs | regs | +- # (r1)......(+STACK_PARAMS)... (-23*8).(-16*8).(-3*8)..(r31) ++ # (%r1)......(+STACK_PARAMS)... (-23*8).(-16*8).(-3*8)..(%r31) + + # +stack frame, -unused stack params, +regs storage, +1 for alignment + addi r7,r5,((STACK_PARAMS/8)-7+7+13+3+1) +@@ -105,56 +105,56 @@ NS_InvokeByIndex: + + # Set up to invoke function + +- ld r9,0(r29) # vtable (r29 is 'that') ++ ld r9,0(%r29) # vtable (%r29 is 'that') + mr r3,r29 # self is first arg, obviously + + sldi r30,r30,3 # Find function descriptor + add r9,r9,r30 +- ld r12,0(r9) ++ ld r12,0(%r9) + +- std r2,STACK_TOC(r1) # Save r2 (TOC pointer) ++ std r2,STACK_TOC(%r1) # Save r2 (TOC pointer) + + #if _CALL_ELF == 2 + mtctr r12 + #else +- ld r0,0(r12) # Actual address from fd. ++ ld r0,0(%r12) # Actual address from fd. + mtctr 0 +- ld r11,16(r12) # Environment pointer from fd. +- ld r2,8(r12) # TOC pointer from fd. ++ ld r11,16(%r12) # Environment pointer from fd. ++ ld r2,8(%r12) # TOC pointer from fd. + #endif + + # Load FP and GP registers as required +- ld r4, -(23*8)(r31) +- ld r5, -(22*8)(r31) +- ld r6, -(21*8)(r31) +- ld r7, -(20*8)(r31) +- ld r8, -(19*8)(r31) +- ld r9, -(18*8)(r31) +- ld r10, -(17*8)(r31) ++ ld r4, -(23*8)(%r31) ++ ld r5, -(22*8)(%r31) ++ ld r6, -(21*8)(%r31) ++ ld r7, -(20*8)(%r31) ++ ld r8, -(19*8)(%r31) ++ ld r9, -(18*8)(%r31) ++ ld r10, -(17*8)(%r31) + +- lfd f1, -(16*8)(r31) +- lfd f2, -(15*8)(r31) +- lfd f3, -(14*8)(r31) +- lfd f4, -(13*8)(r31) +- lfd f5, -(12*8)(r31) +- lfd f6, -(11*8)(r31) +- lfd f7, -(10*8)(r31) +- lfd f8, -(9*8)(r31) +- lfd f9, -(8*8)(r31) +- lfd f10, -(7*8)(r31) +- lfd f11, -(6*8)(r31) +- lfd f12, -(5*8)(r31) +- lfd f13, -(4*8)(r31) ++ lfd f1, -(16*8)(%r31) ++ lfd f2, -(15*8)(%r31) ++ lfd f3, -(14*8)(%r31) ++ lfd f4, -(13*8)(%r31) ++ lfd f5, -(12*8)(%r31) ++ lfd f6, -(11*8)(%r31) ++ lfd f7, -(10*8)(%r31) ++ lfd f8, -(9*8)(%r31) ++ lfd f9, -(8*8)(%r31) ++ lfd f10, -(7*8)(%r31) ++ lfd f11, -(6*8)(%r31) ++ lfd f12, -(5*8)(%r31) ++ lfd f13, -(4*8)(%r31) + + bctrl # Do it + +- ld r2,STACK_TOC(r1) # Load our own TOC pointer +- ld r1,0(r1) # Revert stack frame +- ld 0,16(r1) # Reload lr ++ ld r2,STACK_TOC(%r1) # Load our own TOC pointer ++ ld r1,0(%r1) # Revert stack frame ++ ld 0,16(%r1) # Reload lr + mtlr 0 +- ld 29,-24(r1) # Restore NVGPRS +- ld 30,-16(r1) +- ld 31,-8(r1) ++ ld 29,-24(%r1) # Restore NVGPRS ++ ld 30,-16(%r1) ++ ld 31,-8(%r1) + blr + + #if _CALL_ELF == 2 +--- xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc64_linux.S.orig 2020-01-29 19:25:51.465953000 +0100 ++++ xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc64_linux.S 2020-01-29 19:28:53.055137000 +0100 +@@ -58,35 +58,35 @@ SharedStub: + #endif + mflr r0 + +- std r4, -56(r1) # Save all GPRS +- std r5, -48(r1) +- std r6, -40(r1) +- std r7, -32(r1) +- std r8, -24(r1) +- std r9, -16(r1) +- std r10, -8(r1) ++ std r4, -56(%r1) # Save all GPRS ++ std r5, -48(%r1) ++ std r6, -40(%r1) ++ std r7, -32(%r1) ++ std r8, -24(%r1) ++ std r9, -16(%r1) ++ std r10, -8(%r1) + +- stfd f13, -64(r1) # ... and FPRS +- stfd f12, -72(r1) +- stfd f11, -80(r1) +- stfd f10, -88(r1) +- stfd f9, -96(r1) +- stfd f8, -104(r1) +- stfd f7, -112(r1) +- stfd f6, -120(r1) +- stfd f5, -128(r1) +- stfd f4, -136(r1) +- stfd f3, -144(r1) +- stfd f2, -152(r1) +- stfd f1, -160(r1) ++ stfd f13, -64(%r1) # ... and FPRS ++ stfd f12, -72(%r1) ++ stfd f11, -80(%r1) ++ stfd f10, -88(%r1) ++ stfd f9, -96(%r1) ++ stfd f8, -104(%r1) ++ stfd f7, -112(%r1) ++ stfd f6, -120(%r1) ++ stfd f5, -128(%r1) ++ stfd f4, -136(%r1) ++ stfd f3, -144(%r1) ++ stfd f2, -152(%r1) ++ stfd f1, -160(%r1) + + subi r6,r1,56 # r6 --> gprData + subi r7,r1,160 # r7 --> fprData + addi r5,r1,STACK_PARAMS # r5 --> extra stack args + +- std r0, 16(r1) ++ std r0, 16(%r1) + +- stdu r1,-288(r1) ++ stdu r1,-288(%r1) + # r3 has the 'self' pointer + # already + +@@ -97,8 +97,8 @@ SharedStub: + bl PrepareAndDispatch + nop + +- ld 1,0(r1) # restore stack +- ld r0,16(r1) # restore LR ++ ld 1,0(%r1) # restore stack ++ ld r0,16(%r1) # restore LR + mtlr r0 + blr + Added: head/mail/thunderbird/files/patch-bug1612184 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1612184 Fri Sep 18 10:02:23 2020 (r548882) @@ -0,0 +1,25961 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1612184 +https://bug1612184.bmoattachments.org/attachment.cgi?id=9126363 + + +diff -r 388a4d04e911 media/webrtc/gn-configs/ppc64_False_ppc64_freebsd.json +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ media/webrtc/gn-configs/ppc64_False_ppc64_freebsd.json Thu Feb 13 11:11:51 2020 +0100 +@@ -0,0 +1,13237 @@ ++{ ++ "gn_gen_args": { ++ "host_cpu": "ppc64", ++ "is_debug": false, ++ "target_cpu": "ppc64", ++ "target_os": "freebsd" ++ }, ++ "mozbuild_args": { ++ "CPU_ARCH": "ppc64", ++ "HOST_CPU_ARCH": "ppc64", ++ "MOZ_DEBUG": null, ++ "OS_TARGET": "FreeBSD" ++ }, ++ "sandbox_vars": { ++ "COMPILE_FLAGS": { ++ "WARNINGS_AS_ERRORS": [] ++ }, ++ "FINAL_LIBRARY": "webrtc" ++ }, ++ "targets": { ++ "//:webrtc": { ++ "cflags": [ ++ "-fno-strict-aliasing", ++ "--param=ssp-buffer-size=4", ++ "-fstack-protector", ++ "-Wno-builtin-macro-redefined", ++ "-D__DATE__=", ++ "-D__TIME__=", ++ "-D__TIMESTAMP__=", ++ "-funwind-tables", ++ "-fcolor-diagnostics", ++ "-Wall", ++ "-Werror", ++ "-Wextra", ++ "-Wno-missing-field-initializers", ++ "-Wno-unused-parameter", ++ "-Wno-c++11-narrowing", ++ "-Wno-covered-switch-default", ++ "-Wno-unneeded-internal-declaration", ++ "-Wno-inconsistent-missing-override", ++ "-Wno-undefined-var-template", ++ "-Wno-nonportable-include-path", ++ "-Wno-address-of-packed-member", ++ "-Wno-unused-lambda-capture", ++ "-Wno-user-defined-warnings", ++ "-O2", ++ "-fno-ident", ++ "-fdata-sections", ++ "-ffunction-sections", ++ "-fomit-frame-pointer", ++ "-g2", ++ "-fvisibility=hidden", ++ "-Xclang", ++ "-add-plugin", ++ "-Xclang", ++ "find-bad-constructs", ++ "-Xclang", ++ "-plugin-arg-find-bad-constructs", ++ "-Xclang", ++ "check-auto-raw-pointer", ++ "-Wheader-hygiene", ++ "-Wstring-conversion", ++ "-Wtautological-overlap-compare", ++ "-Wextra", ++ "-Wno-unused-parameter", ++ "-Wno-missing-field-initializers", ++ "-Wno-strict-overflow", ++ "-Wc++11-narrowing", ++ "-Wimplicit-fallthrough", ++ "-Wthread-safety", ++ "-Winconsistent-missing-override", ++ "-Wundef", ++ "-Wunused-lambda-capture" ++ ], ++ "defines": [ ++ "V8_DEPRECATION_WARNINGS", ++ "USE_X11=1", ++ "CHROMIUM_BUILD", ++ "_FILE_OFFSET_BITS=64", ++ "NDEBUG", ++ "NVALGRIND", ++ "DYNAMIC_ANNOTATIONS_ENABLED=0", ++ "WEBRTC_ENABLE_PROTOBUF=0", ++ "WEBRTC_RESTRICT_LOGGING", ++ "WEBRTC_MOZILLA_BUILD", ++ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0", ++ "WEBRTC_POSIX", ++ "WEBRTC_BSD", ++ "HAVE_WEBRTC_VIDEO", ++ "HAVE_WEBRTC_VOICE" ++ ], ++ "deps": [ ++ "//:webrtc_common", ++ "//api:base_peerconnection_api", ++ "//api:transport_api", ++ "//api:video_frame_api", ++ "//audio:audio", ++ "//call:call", ++ "//common_audio:common_audio", ++ "//common_video:common_video", ++ "//media:media", ++ "//modules:modules", ++ "//modules/video_capture:video_capture_internal_impl", ++ "//rtc_base:rtc_base", ++ "//system_wrappers:field_trial_default", ++ "//system_wrappers:metrics_default", ++ "//system_wrappers:system_wrappers_default", ++ "//video:video", ++ "//voice_engine:voice_engine" ++ ], ++ "include_dirs": [ ++ "//", ++ "/root/firefox_upstream/firefox/obj-powerpc64-unknown-freebsd13.0/media/webrtc/trunk/webrtc/gn-output/gen/", ++ "//common_audio/resampler/include/", ++ "//common_audio/signal_processing/include/", ++ "//common_audio/vad/include/", ++ "//common_video/include/", ++ "/media/libyuv/libyuv/include/", ++ "//modules/audio_coding/include/", ++ "//modules/include/", ++ "//modules/include/", ++ "//modules/audio_device/include/", ++ "//modules/audio_device/dummy/" ++ ], ++ "libs": [ ++ "X11", ++ "X11-xcb", ++ "xcb", ++ "Xcomposite", ++ "Xcursor", ++ "Xdamage", ++ "Xext", ++ "Xfixes", ++ "Xi", ++ "Xrender" ++ ], ++ "sources": [], ++ "type": "static_library" ++ }, ++ "//:webrtc_common": { ++ "cflags": [ ++ "-fno-strict-aliasing", ++ "--param=ssp-buffer-size=4", ++ "-fstack-protector", ++ "-Wno-builtin-macro-redefined", ++ "-D__DATE__=", ++ "-D__TIME__=", ++ "-D__TIMESTAMP__=", ++ "-funwind-tables", ++ "-fcolor-diagnostics", ++ "-Wall", ++ "-Werror", ++ "-Wextra", ++ "-Wno-missing-field-initializers", ++ "-Wno-unused-parameter", ++ "-Wno-c++11-narrowing", ++ "-Wno-covered-switch-default", ++ "-Wno-unneeded-internal-declaration", ++ "-Wno-inconsistent-missing-override", ++ "-Wno-undefined-var-template", ++ "-Wno-nonportable-include-path", ++ "-Wno-address-of-packed-member", ++ "-Wno-unused-lambda-capture", ++ "-Wno-user-defined-warnings", ++ "-O2", ++ "-fno-ident", ++ "-fdata-sections", ++ "-ffunction-sections", ++ "-fomit-frame-pointer", ++ "-g2", ++ "-fvisibility=hidden", ++ "-Wheader-hygiene", ++ "-Wstring-conversion", ++ "-Wtautological-overlap-compare", ++ "-Wextra", ++ "-Wno-unused-parameter", ++ "-Wno-missing-field-initializers", ++ "-Wno-strict-overflow", ++ "-Wc++11-narrowing", ++ "-Wimplicit-fallthrough", ++ "-Wthread-safety", ++ "-Winconsistent-missing-override", ++ "-Wundef", ++ "-Wunused-lambda-capture" ++ ], ++ "defines": [ ++ "V8_DEPRECATION_WARNINGS", ++ "USE_X11=1", ++ "CHROMIUM_BUILD", ++ "_FILE_OFFSET_BITS=64", ++ "NDEBUG", ++ "NVALGRIND", ++ "DYNAMIC_ANNOTATIONS_ENABLED=0", ++ "WEBRTC_ENABLE_PROTOBUF=0", ++ "WEBRTC_RESTRICT_LOGGING", ++ "WEBRTC_MOZILLA_BUILD", ++ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0", ++ "WEBRTC_POSIX", ++ "WEBRTC_BSD" ++ ], ++ "deps": [], ++ "include_dirs": [ ++ "//", ++ "/root/firefox_upstream/firefox/obj-powerpc64-unknown-freebsd13.0/media/webrtc/trunk/webrtc/gn-output/gen/" ++ ], ++ "libs": [], ++ "sources": [ ++ "//common_types.cc", ++ "//common_types.h", ++ "//typedefs.h" ++ ], ++ "type": "static_library" ++ }, ++ "//api/audio_codecs/L16:audio_decoder_L16": { ++ "cflags": [ ++ "-fno-strict-aliasing", ++ "--param=ssp-buffer-size=4", ++ "-fstack-protector", ++ "-Wno-builtin-macro-redefined", ++ "-D__DATE__=", ++ "-D__TIME__=", ++ "-D__TIMESTAMP__=", ++ "-funwind-tables", ++ "-fcolor-diagnostics", ++ "-Wall", ++ "-Werror", ++ "-Wextra", ++ "-Wno-missing-field-initializers", ++ "-Wno-unused-parameter", ++ "-Wno-c++11-narrowing", ++ "-Wno-covered-switch-default", ++ "-Wno-unneeded-internal-declaration", ++ "-Wno-inconsistent-missing-override", ++ "-Wno-undefined-var-template", ++ "-Wno-nonportable-include-path", ++ "-Wno-address-of-packed-member", ++ "-Wno-unused-lambda-capture", ++ "-Wno-user-defined-warnings", ++ "-O2", ++ "-fno-ident", ++ "-fdata-sections", ++ "-ffunction-sections", ++ "-fomit-frame-pointer", ++ "-g2", ++ "-fvisibility=hidden", ++ "-Xclang", ++ "-add-plugin", ++ "-Xclang", ++ "find-bad-constructs", ++ "-Xclang", ++ "-plugin-arg-find-bad-constructs", ++ "-Xclang", ++ "check-auto-raw-pointer", ++ "-Wheader-hygiene", ++ "-Wstring-conversion", ++ "-Wtautological-overlap-compare", ++ "-Wextra", ++ "-Wno-unused-parameter", ++ "-Wno-missing-field-initializers", ++ "-Wno-strict-overflow", ++ "-Wc++11-narrowing", ++ "-Wimplicit-fallthrough", ++ "-Wthread-safety", ++ "-Winconsistent-missing-override", ++ "-Wundef", ++ "-Wunused-lambda-capture" ++ ], ++ "defines": [ ++ "V8_DEPRECATION_WARNINGS", ++ "USE_X11=1", ++ "CHROMIUM_BUILD", ++ "_FILE_OFFSET_BITS=64", ++ "NDEBUG", *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009181002.08IA2Nfh083091>