Date: Sun, 11 Aug 2019 00:49:33 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508581 - in head/mail/thunderbird: . files Message-ID: <201908110049.x7B0nXht051708@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Aug 11 00:49:33 2019 New Revision: 508581 URL: https://svnweb.freebsd.org/changeset/ports/508581 Log: mail/thunderbird: update to 68.0 Changes: https://www.thunderbird.net/thunderbird/68.0/releasenotes/ Added: head/mail/thunderbird/files/patch-bug1507655 (contents, props changed) head/mail/thunderbird/files/patch-bug1559213 (contents, props changed) Deleted: head/mail/thunderbird/files/patch-bug1144632 head/mail/thunderbird/files/patch-bug1375074 head/mail/thunderbird/files/patch-bug1411481 head/mail/thunderbird/files/patch-bug1438678 head/mail/thunderbird/files/patch-bug1442583 head/mail/thunderbird/files/patch-bug1444798 head/mail/thunderbird/files/patch-bug1445907 head/mail/thunderbird/files/patch-bug1447359 head/mail/thunderbird/files/patch-bug1448770 head/mail/thunderbird/files/patch-bug1451292 head/mail/thunderbird/files/patch-bug1456556 head/mail/thunderbird/files/patch-bug1458219 head/mail/thunderbird/files/patch-bug1467882 head/mail/thunderbird/files/patch-bug1519729 head/mail/thunderbird/files/patch-bug1530098 head/mail/thunderbird/files/patch-bug991253 head/mail/thunderbird/files/patch-toolkit_moz.configure head/mail/thunderbird/files/patch-u2f-hid-rs62 head/mail/thunderbird/files/patch-z-bug1436911 Modified: head/mail/thunderbird/Makefile (contents, props changed) head/mail/thunderbird/distinfo (contents, props changed) head/mail/thunderbird/files/patch-addon-search (contents, props changed) head/mail/thunderbird/files/patch-bug1288587 (contents, props changed) head/mail/thunderbird/files/patch-bug847568 (contents, props changed) head/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp (contents, props changed) Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Sun Aug 11 00:46:40 2019 (r508580) +++ head/mail/thunderbird/Makefile Sun Aug 11 00:49:33 2019 (r508581) @@ -2,34 +2,33 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 60.8.0 -PORTREVISION= 3 +DISTVERSION= 68.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.19:devel/nspr \ - nss>=3.36.7:security/nss \ - icu>=59.1,1:devel/icu \ +BUILD_DEPENDS= nspr>=4.21:devel/nspr \ + nss>=3.44.1:security/nss \ + icu>=63.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=1.7.6:print/harfbuzz \ - graphite2>=1.3.11:graphics/graphite2 \ - png>=1.6.34:graphics/png \ + harfbuzz>=2.4.0:print/harfbuzz \ + graphite2>=1.3.13:graphics/graphite2 \ + png>=1.6.35:graphics/png \ libvpx>=1.5.0:multimedia/libvpx \ - sqlite3>=3.22.0:databases/sqlite3 \ + sqlite3>=3.28.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ - yasm:devel/yasm \ + nasm:devel/nasm \ zip:archivers/zip SSP_UNSAFE= yes USE_GECKO= gecko -USE_MOZILLA= -webp -vpx +USE_MOZILLA= -hunspell -vpx USES= tar:xz @@ -44,6 +43,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref OPTIONS_DEFINE= LIGHTNING OPTIONS_DEFAULT=CANBERRA LIGHTNING +OPTIONS_EXCLUDE=WAYLAND .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.pre.mk> Modified: head/mail/thunderbird/distinfo ============================================================================== --- head/mail/thunderbird/distinfo Sun Aug 11 00:46:40 2019 (r508580) +++ head/mail/thunderbird/distinfo Sun Aug 11 00:49:33 2019 (r508581) @@ -1,3 +1,3 @@ -TIMESTAMP = 1562167567 -SHA256 (thunderbird-60.8.0.source.tar.xz) = 1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1 -SIZE (thunderbird-60.8.0.source.tar.xz) = 285643576 +TIMESTAMP = 1565456453 +SHA256 (thunderbird-68.0.source.tar.xz) = 61812e9d4d65add8aff718454b8d54dc7f75948b9880059b5294c0e7e7f871b3 +SIZE (thunderbird-68.0.source.tar.xz) = 332745736 Modified: head/mail/thunderbird/files/patch-addon-search ============================================================================== --- head/mail/thunderbird/files/patch-addon-search Sun Aug 11 00:46:40 2019 (r508580) +++ head/mail/thunderbird/files/patch-addon-search Sun Aug 11 00:49:33 2019 (r508581) @@ -5,9 +5,9 @@ diff --git mail/app/profile/all-thunderbird.js mail/ap index 75c2c5e435e35..4d8c09c02759b 100644 --- comm/mail/app/profile/all-thunderbird.js +++ comm/mail/app/profile/all-thunderbird.js -@@ -166,10 +166,10 @@ pref("extensions.getAddons.maxResults", 15); - pref("extensions.getAddons.get.url", "https://live.thunderbird.net/services.addons/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); - pref("extensions.getAddons.compatOverides.url", "https://live.thunderbird.net/services.addons/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%"); +@@ -153,10 +153,10 @@ pref("extensions.getAddons.maxResults", 15); + pref("extensions.getAddons.get.url", "https://services.addons.thunderbird.net/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); + pref("extensions.getAddons.compatOverides.url", "https://services.addons.thunderbird.net/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%"); pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/"); -pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); +pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/Linux/%VERSION%?src=thunderbird"); @@ -16,10 +16,10 @@ index 75c2c5e435e35..4d8c09c02759b 100644 -pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); +pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/Linux/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); +pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/Linux"); - pref("extensions.getAddons.themes.browseURL", "https://addons.thunderbird.net/%LOCALE%/thunderbird/themes/?src=thunderbird"); pref("extensions.getAddons.siteRegExp", "^https://.*addons\\.thunderbird\\.net"); + pref("extensions.getAddons.langpacks.url", "https://services.addons.thunderbird.net/api/v3/addons/language-tools/?app=thunderbird&type=language&appversion=%VERSION%"); -@@ -190,9 +190,9 @@ pref("security.cert_pinning.enforcement_level", 1); +@@ -180,9 +180,9 @@ pref("security.cert_pinning.enforcement_level", 1); // .. etc .. // pref("extensions.update.enabled", true); @@ -44,11 +44,11 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 if (file.url) { addon.sourceURI = NetUtil.newURI(file.url); } -diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm index f70fd8d7e3bd8..81e8cd7764fdf 100644 ---- toolkit/mozapps/extensions/internal/XPIProvider.jsm -+++ toolkit/mozapps/extensions/internal/XPIProvider.jsm -@@ -4974,7 +4974,7 @@ AddonInternal.prototype = { +--- toolkit/mozapps/extensions/internal/XPIDatabase.jsm ++++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm +@@ -355,7 +355,7 @@ class AddonInternal { // Something is causing errors in here try { for (let platform of this.targetPlatforms) { Modified: head/mail/thunderbird/files/patch-bug1288587 ============================================================================== --- head/mail/thunderbird/files/patch-bug1288587 Sun Aug 11 00:46:40 2019 (r508580) +++ head/mail/thunderbird/files/patch-bug1288587 Sun Aug 11 00:49:33 2019 (r508581) @@ -43,13 +43,13 @@ index 855214a..1e91d51 100644 topobjdir = topobjdir[:-7] with LineIO(lambda l: log.info(l)) as out: -@@ -219,17 +226,20 @@ def virtualenv_python(env_python, build_env, mozconfig, help): +@@ -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 python != normsep(sys.executable): + if not normsep(sys.executable).startswith(normsep(virtualenvs_root)): log.info('Reexecuting in the virtualenv') if env_python: - del os.environ['PYTHON'] Added: head/mail/thunderbird/files/patch-bug1507655 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1507655 Sun Aug 11 00:49:33 2019 (r508581) @@ -0,0 +1,29 @@ +Revert bug 1497976 as close_fds on Python 2 is too slow + +diff --git build/moz.configure/util.configure build/moz.configure/util.configure +index 25862fee7c32..3fc725a5124e 100644 +--- build/moz.configure/util.configure ++++ build/moz.configure/util.configure +@@ -22,7 +22,6 @@ + + # A wrapper to obtain a process' output and return code. + # Returns a tuple (retcode, stdout, stderr). +-@imports('os') + @imports(_from='__builtin__', _import='unicode') + @imports('subprocess') + @imports(_from='mozbuild.shellutil', _import='quote') +@@ -45,13 +44,7 @@ + + log.debug('Executing: `%s`', quote(*args)) + proc = subprocess.Popen(args, stdout=subprocess.PIPE, +- stderr=subprocess.PIPE, +- # On Python 2 on Windows, close_fds prevents the +- # process from inheriting stdout/stderr. +- # Elsewhere, it simply prevents it from inheriting +- # extra file descriptors, which is what we want. +- close_fds=os.name != 'nt', +- **kwargs) ++ stderr=subprocess.PIPE, **kwargs) + stdout, stderr = proc.communicate() + return proc.wait(), stdout, stderr + Added: head/mail/thunderbird/files/patch-bug1559213 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1559213 Sun Aug 11 00:49:33 2019 (r508581) @@ -0,0 +1,100 @@ +commit 717bba28411c +Author: Jory A. Pratt <anarchy@gentoo.org> +Date: Thu Jun 13 11:53:00 2019 -0700 + + Bug 1559213 - Allow to use system av1 libs instead of bundled. +--- + config/external/moz.build | 5 +++-- + config/system-headers.mozbuild | 8 ++++++++ + dom/media/platforms/moz.build | 5 +++++ + toolkit/moz.configure | 19 ++++++++++++++++++- + 4 files changed, 34 insertions(+), 3 deletions(-) + +diff --git config/external/moz.build config/external/moz.build +index 03e4fa143bd1..a67d10b11fe6 100644 +--- config/external/moz.build ++++ config/external/moz.build +@@ -37,8 +37,9 @@ if not CONFIG['MOZ_SYSTEM_LIBVPX']: + external_dirs += ['media/libvpx'] + + if CONFIG['MOZ_AV1']: +- external_dirs += ['media/libaom'] +- external_dirs += ['media/libdav1d'] ++ if not CONFIG['MOZ_SYSTEM_AV1']: ++ external_dirs += ['media/libaom'] ++ external_dirs += ['media/libdav1d'] + + if not CONFIG['MOZ_SYSTEM_PNG']: + external_dirs += ['media/libpng'] +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index bcf5c4925564..48964a999a9b 100644 +--- config/system-headers.mozbuild ++++ config/system-headers.mozbuild +@@ -1304,6 +1304,14 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']: + 'SelectSingleContentItemPage.h', + ] + ++if CONFIG['MOZ_SYSTEM_AV1']: ++ system_headers += [ ++ 'aom/aom_decoder.h', ++ 'aom/aomdx.h', ++ 'aom/aom_image.h', ++ 'dav1d/dav1d.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', +diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build +index 092cee0c9b66..38e45de5b5f0 100644 +--- dom/media/platforms/moz.build ++++ dom/media/platforms/moz.build +@@ -80,6 +80,11 @@ if CONFIG['MOZ_AV1']: + 'agnostic/AOMDecoder.cpp', + 'agnostic/DAV1DDecoder.cpp', + ] ++ if CONFIG['MOZ_SYSTEM_AV1']: ++ CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS'] ++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS'] ++ CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS'] ++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS'] + + if CONFIG['MOZ_OMX']: + EXPORTS += [ +diff --git toolkit/moz.configure toolkit/moz.configure +index 82b5a59acf42..e2329560b42b 100644 +--- toolkit/moz.configure ++++ toolkit/moz.configure +@@ -441,7 +441,23 @@ def av1(value): + if value: + return True + +-@depends(target, nasm_version, when=av1 & compile_environment) ++option('--with-system-av1', ++ help="Use system av1 (located with pkgconfig)") ++ ++system_libaom_info = pkg_check_modules('MOZ_SYSTEM_LIBAOM', 'aom >= 1.0.0', ++ when='--with-system-av1') ++ ++system_libdav1d_info = pkg_check_modules('MOZ_SYSTEM_LIBDAV1D', 'dav1d >= 0.1.1', ++ when='--with-system-av1') ++ ++@depends(system_libaom_info, system_libdav1d_info) ++def system_av1(system_libaom_info, system_libdav1d_info): ++ has_av1_libs = False ++ if system_libaom_info and system_libdav1d_info: ++ has_av1_libs = True ++ return has_av1_libs ++ ++@depends(target, nasm_version, when=av1 & depends(system_av1)(lambda v: not v) & compile_environment) + def dav1d_asm(target, nasm_version): + if target.os != 'Android': + if target.cpu == 'aarch64': +@@ -457,6 +473,7 @@ set_config('MOZ_DAV1D_ASM', dav1d_asm) + set_define('MOZ_DAV1D_ASM', dav1d_asm) + set_config('MOZ_AV1', av1) + set_define('MOZ_AV1', av1) ++set_config('MOZ_SYSTEM_AV1', depends_if(system_av1)(lambda _: True)) + + # Built-in fragmented MP4 support. + # ============================================================== Modified: head/mail/thunderbird/files/patch-bug847568 ============================================================================== --- head/mail/thunderbird/files/patch-bug847568 Sun Aug 11 00:46:40 2019 (r508580) +++ head/mail/thunderbird/files/patch-bug847568 Sun Aug 11 00:49:33 2019 (r508581) @@ -4,8 +4,8 @@ diff --git config/system-headers.mozbuild config/syste index 7620b4d00623..09d3db5ca8c0 100644 --- config/system-headers.mozbuild +++ config/system-headers.mozbuild -@@ -1312,6 +1312,19 @@ if not CONFIG['MOZ_TREE_PIXMAN']: - 'pixman.h', +@@ -1300,6 +1300,19 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']: + 'SelectSingleContentItemPage.h', ] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: @@ -28,7 +28,7 @@ diff --git dom/base/moz.build dom/base/moz.build index 8e19020315ae..2fcdbb6f7b42 100644 --- dom/base/moz.build +++ dom/base/moz.build -@@ -470,6 +470,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +@@ -495,6 +495,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: if CONFIG['MOZ_X11']: CXXFLAGS += CONFIG['TK_CFLAGS'] @@ -72,10 +72,10 @@ diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/RE index 22c76a7df020..a01490bd49ee 100644 --- gfx/harfbuzz/README-mozilla +++ gfx/harfbuzz/README-mozilla -@@ -19,3 +19,8 @@ the mozilla tree. +@@ -15,3 +15,8 @@ from within the gfx/harfbuzz directory. If the collection of source files changes, manual updates to moz.build may be - needed, as we don't use the upstream makefiles. + needed as we don't use the upstream makefiles. + +The in-tree copy may be omitted during build by --with-system-harfbuzz. +Make sure to keep pkg-config version check within toolkit/moz.configure in sync @@ -111,7 +111,7 @@ diff --git gfx/skia/generate_mozbuild.py gfx/skia/gene index e06ae3457a47..93faa61594a3 100755 --- gfx/skia/generate_mozbuild.py +++ gfx/skia/generate_mozbuild.py -@@ -135,6 +135,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -148,6 +148,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] @@ -125,7 +125,7 @@ diff --git gfx/skia/moz.build gfx/skia/moz.build index 2118677ca3a8..e4978b413784 100644 --- gfx/skia/moz.build +++ gfx/skia/moz.build -@@ -780,6 +780,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -822,6 +822,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] @@ -139,7 +139,7 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build index 56f1b9fe3f4b..0ac1100b0df3 100644 --- gfx/thebes/moz.build +++ gfx/thebes/moz.build -@@ -267,7 +267,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): +@@ -288,7 +288,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3': LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] @@ -170,7 +170,7 @@ diff --git netwerk/dns/moz.build netwerk/dns/moz.build index 79c26e3e7001..c4d93bc5f7dc 100644 --- netwerk/dns/moz.build +++ netwerk/dns/moz.build -@@ -73,3 +73,6 @@ USE_LIBS += ['icu'] +@@ -76,3 +76,6 @@ USE_LIBS += ['icu'] if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] @@ -181,7 +181,7 @@ diff --git old-configure.in old-configure.in index 95a58b634593..b614eef85c89 100644 --- old-configure.in +++ old-configure.in -@@ -4333,6 +4333,27 @@ dnl ======================================================== +@@ -3951,6 +3951,27 @@ dnl ======================================================== AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) @@ -198,7 +198,7 @@ index 95a58b634593..b614eef85c89 100644 + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,10) ++ #if !GR2_VERSION_REQUIRE(1,3,12) + #error "Insufficient graphite2 version." + #endif + ], [], @@ -213,9 +213,9 @@ diff --git toolkit/library/moz.build toolkit/library/m index 24f940e1ed7e..079a575adec3 100644 --- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] +@@ -226,6 +226,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: + if CONFIG['MOZ_SYSTEM_WEBP']: + OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] @@ -223,14 +223,14 @@ index 24f940e1ed7e..079a575adec3 100644 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + if CONFIG['MOZ_SYSTEM_LIBEVENT']: + OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] diff --git toolkit/moz.configure toolkit/moz.configure index 9297e4d6f501..d8e273887e4b 100644 --- toolkit/moz.configure +++ toolkit/moz.configure -@@ -1065,6 +1065,26 @@ add_old_configure_assignment('FT2_LIBS', +@@ -894,6 +894,26 @@ add_old_configure_assignment('FT2_LIBS', add_old_configure_assignment('FT2_CFLAGS', ft2_info.cflags) @@ -249,11 +249,11 @@ index 9297e4d6f501..d8e273887e4b 100644 +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.4', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.4.0', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) + - # Mortar + # Marionette remote protocol # ============================================================== - option('--enable-mortar', help='Enable mortar extension') + # Modified: head/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp ============================================================================== --- head/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp Sun Aug 11 00:46:40 2019 (r508580) +++ head/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp Sun Aug 11 00:49:33 2019 (r508581) @@ -7,7 +7,7 @@ index 53fc3c9937f7..b23771ab80fa 100644 @@ -7,6 +7,7 @@ #include "FlacDecoder.h" #include "MediaContainerType.h" - #include "MediaPrefs.h" + #include "mozilla/StaticPrefs.h" +#include "PDMFactory.h" namespace mozilla { @@ -15,10 +15,10 @@ index 53fc3c9937f7..b23771ab80fa 100644 @@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { #ifdef MOZ_FFVPX - return MediaPrefs::FlacEnabled(); + return StaticPrefs::MediaFlacEnabled(); +#elif defined(MOZ_FFMPEG) + RefPtr<PDMFactory> platform = new PDMFactory(); -+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ return StaticPrefs::MediaFlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), + /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908110049.x7B0nXht051708>