diff options
| author | ryoon <ryoon@pkgsrc.org> | 2019-02-26 11:32:12 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2019-02-26 11:32:12 +0000 |
| commit | e3c5b38bcb8160455d2756c5fb3541af7c818e21 (patch) | |
| tree | 2b6813b7658f763a15dd0216976ffe85fb1672d5 /mail/thunderbird | |
| parent | 75e9a44cd8caa7ae861ac605557dda45c75b5f55 (diff) | |
| download | pkgsrc-e3c5b38bcb8160455d2756c5fb3541af7c818e21.tar.gz | |
Update to 60.5.1
Changelog:
60.5.1
Fixed
CalDav access to some servers not working
#CVE-2018-18500: Use-after-free parsing HTML5 stream
#CVE-2018-18505: Privilege escalation through IPC channel messages
#CVE-2016-5824: DoS (use-after-free) via a crafted ics file
#CVE-2018-18501: Memory safety bugs fixed in Firefox 65, Firefox ESR 60.5, and Thunderbird 60.5
60.5.0
New
FileLink provider WeTransfer to upload large attachments
Thunderbird now allows the addition of OpenSearch search engines from a local XML file using a minimal user inferface: [+] button to select a file an add, [-] to remove.
More search engines: Google and DuckDuckGo available by default in some locales
During account creation, Thunderbird will now detect servers using the Microsoft Exchange protocol. It will offer the installation of a 3rd party add-on (Owl) which supports that protocol.
Fixed
Thunderbird now compatible with other WebExtension-based FileLink add-ons like the Dropbox add-on
Crash when using custom sound for new email notification
WebExtension-based dictionaries from addons.mozilla.org not working in Thunderbird
Calendar: Printing of calendars not working
#CVE-2018-18356: Use-after-free in Skia
#CVE-2019-5785: Integer overflow in Skia
#CVE-2018-18335: Buffer overflow in Skia with accelerated Canvas 2D
#CVE-2018-18509: S/MIME signature spoofing
Diffstat (limited to 'mail/thunderbird')
17 files changed, 181 insertions, 566 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 530ed85da6b..ac510f0c457 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.220 2019/02/01 16:54:12 ryoon Exp $ +# $NetBSD: Makefile,v 1.221 2019/02/26 11:32:12 ryoon Exp $ DISTNAME= thunderbird-${TB_VER}.source PKGNAME= thunderbird-${TB_VER} -TB_VER= 60.4.0 +TB_VER= 60.5.1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} EXTRACT_SUFX= .tar.xz diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST index 3dbcdc6d793..b8a082d228a 100644 --- a/mail/thunderbird/PLIST +++ b/mail/thunderbird/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.66 2019/01/05 00:38:22 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.67 2019/02/26 11:32:12 ryoon Exp $ bin/thunderbird lib/thunderbird/application.ini lib/thunderbird/blocklist.xml @@ -358,6 +358,7 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/searchBox.css lib/thunderbird/chrome/classic/skin/classic/messenger/searchDialog.css lib/thunderbird/chrome/classic/skin/classic/messenger/section_collapsed.png lib/thunderbird/chrome/classic/skin/classic/messenger/section_expanded.png +lib/thunderbird/chrome/classic/skin/classic/messenger/shared/accountCreation.css lib/thunderbird/chrome/classic/skin/classic/messenger/shared/accountProvisioner.css lib/thunderbird/chrome/classic/skin/classic/messenger/shared/addressbook.css lib/thunderbird/chrome/classic/skin/classic/messenger/shared/compacttheme.css @@ -1963,9 +1964,9 @@ ${PLIST.nobranding}lib/thunderbird/chrome/en-US/locale/branding/brand.dtd ${PLIST.nobranding}lib/thunderbird/chrome/en-US/locale/branding/brand.properties lib/thunderbird/chrome/en-US/locale/en-US/alerts/alert.dtd lib/thunderbird/chrome/en-US/locale/en-US/alerts/alert.properties -lib/thunderbird/chrome/en-US/locale/en-US/autoconfig/autoconfig.properties ${PLIST.branding}lib/thunderbird/chrome/en-US/locale/en-US/branding/brand.dtd ${PLIST.branding}lib/thunderbird/chrome/en-US/locale/en-US/branding/brand.properties +lib/thunderbird/chrome/en-US/locale/en-US/autoconfig/autoconfig.properties lib/thunderbird/chrome/en-US/locale/en-US/chat/accounts.dtd lib/thunderbird/chrome/en-US/locale/en-US/chat/accounts.properties lib/thunderbird/chrome/en-US/locale/en-US/chat/commands.properties @@ -2361,8 +2362,9 @@ lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchIntegrationMac.dtd lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchIntegrationWin.dtd lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchTermOverlay.dtd lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchplugins/amazondotcom.xml -lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchplugins/aol-web-search.xml lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchplugins/bing.xml +lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchplugins/ddg.xml +lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchplugins/google.xml lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchplugins/list.json lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchplugins/twitter.xml lib/thunderbird/chrome/en-US/locale/en-US/messenger/searchplugins/wikipedia.xml @@ -2487,6 +2489,7 @@ lib/thunderbird/chrome/messenger/content/messenger/accountcreation/accountConfig lib/thunderbird/chrome/messenger/content/messenger/accountcreation/createInBackend.js lib/thunderbird/chrome/messenger/content/messenger/accountcreation/emailWizard.js lib/thunderbird/chrome/messenger/content/messenger/accountcreation/emailWizard.xul +lib/thunderbird/chrome/messenger/content/messenger/accountcreation/exchangeAutoDiscover.js lib/thunderbird/chrome/messenger/content/messenger/accountcreation/fetchConfig.js lib/thunderbird/chrome/messenger/content/messenger/accountcreation/fetchhttp.js lib/thunderbird/chrome/messenger/content/messenger/accountcreation/guessConfig.js @@ -3723,6 +3726,56 @@ lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifes lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon64.png lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/bootstrap.js +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/install.rdf +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/ar/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/br/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/ca/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/cs/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/cy/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/dsb/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/el/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/en/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/en_GB/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/es_AR/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/es_MX/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/et/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/eu/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/fi/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/fr/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/fy_NL/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/hr/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/hsb/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/hu/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/id/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/it/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/ja/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/ka/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/kab/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/kk/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/ko/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/nl/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/nn_NO/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/pl/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/pt_BR/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/pt_PT/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/rm/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/ro/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/ru/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/sk/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/sl/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/sq/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/sv_SE/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/th/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/tr/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/zh_CN/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/_locales/zh_TW/messages.json +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/background/background.js +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/content/moments.css +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/content/moments.html +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/content/moments.js +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/images/logo.svg +lib/thunderbird/features/wetransfer@extensions.thunderbird.net/webextension/manifest.json lib/thunderbird/greprefs.js lib/thunderbird/gtk2/libmozgtk.so lib/thunderbird/hyphenation/hyph_af.dic diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index ffc67e3f093..51a963a0779 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.204 2019/01/05 00:38:22 ryoon Exp $ +$NetBSD: distinfo,v 1.205 2019/02/26 11:32:12 ryoon Exp $ -SHA1 (thunderbird-60.4.0.source.tar.xz) = bcdd2096a0e6cdfb28a8bef384688a03625ce4c5 -RMD160 (thunderbird-60.4.0.source.tar.xz) = 825b6960f06f157dd81cbd0057d760d8e4eee956 -SHA512 (thunderbird-60.4.0.source.tar.xz) = 084becec870ad1449196110ecd2d2cc397c32d9d5a682f3cf45a170b7bdf5c2197299a72034965e838af62534df870de5a46d49fd0d05a9c4c7fdf5e408e471d -Size (thunderbird-60.4.0.source.tar.xz) = 284938284 bytes +SHA1 (thunderbird-60.5.1.source.tar.xz) = 6c4b6e550d553ac16298403f9de22354ed30bf5d +RMD160 (thunderbird-60.5.1.source.tar.xz) = 8ed8447ea1d7a9ca3f227f1050969a68c8ed9ef6 +SHA512 (thunderbird-60.5.1.source.tar.xz) = dafb7c81568b96285aa367fdac3db65aa0972a8224385714b14b67abdd5b17df963aec63608538a566f20c655cf0eb6784ba2b304151b2cc9b9dc3fdd9a48c7c +Size (thunderbird-60.5.1.source.tar.xz) = 285211052 bytes SHA1 (patch-browser_app_profile_firefox.js) = a939d5d4f0284f66a83bc0062f0fc173e6f75bd2 SHA1 (patch-build_moz.configure_old.configure) = 6cded37360c0609e780f4fdd19ed5e81d5de43f3 SHA1 (patch-build_moz.configure_rust.configure) = 98a009b91dc10b741d3fff3103c782d63373ad29 @@ -13,22 +13,20 @@ SHA1 (patch-comm_ldap_c-sdk_include_portable.h) = efddc22fead98c9109690fe593cf76 SHA1 (patch-comm_mail_app_nsMailApp.cpp) = 72cb57b9995fb180db3865136e3a53ffc7d5cec5 SHA1 (patch-comm_mail_components_shell_nsMailGNOMEIntegration.cpp) = e0ed20894e1343fc06816e78193a0cee39aeb4b7 SHA1 (patch-comm_mail_installer_package-manifest.in) = 14e8977f690e579a8caf73326248323615e04803 -SHA1 (patch-comm_mail_installer_removed-files.in) = 3a399921cbbdd9a23cfe9a10487b6b968f82cdae -SHA1 (patch-dom_fetch_FetchConsumer.cpp) = 7d8751c67b9f21601c34229daf722bf2000dd56a -SHA1 (patch-dom_media_CubebUtils.cpp) = a3b537d95b8a4605ea283a4b274f64142da92387 +SHA1 (patch-comm_mail_installer_removed-files.in) = bda8a8d12075fa5bf87d552035812f5cf485a393 +SHA1 (patch-dom_media_CubebUtils.cpp) = 76fc35167e603f96450f4bc17cd0d76157a22dd3 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 23c0f9d4677c1a87ebeb12a9a822fd7a15f51215 SHA1 (patch-gfx_webrender_src_query.rs) = 3e5fe60706a4b6daf14861aedf37ac86a8acad18 -SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = 5a571fd8383b243f8e8e57c4a9ee7a954d7001a3 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = a03d220132f86eed32117a1d0282064a8eff46ca -SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 0b7859b60c1d9d4ff5f124e95d38a19624aa35b3 -SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 004dbcbf091bdcb9ef3a1ca9d1c219734c741797 +SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = cdb159f0ede970b150eca4cc5e0d1b2cf4e414b2 +SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 0809f1b12d3627e36cd32dce46a332abd7a74e6b SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = bc05df1cee60b3ae45f111ac451dc098027d8add -SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 8362446284f2f1a0fb047c25e43ddfce8e859530 +SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 8775f39cdf91f61754474dde79f3895658348b02 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 007ec171c69059d503977bcef036a89b0f38dc5d -SHA1 (patch-js_src_gc_Memory.cpp) = 1b274cbbab4882fac09d5a98c46b892eb3888aa3 +SHA1 (patch-js_src_gc_Memory.cpp) = b27f68d31f584052dfb8a2d3132efc844c52c8e4 SHA1 (patch-js_src_threading_posix_Thread.cpp) = 5c0e0238208b0928ea2472f15bdbe55aa7bcbb44 -SHA1 (patch-js_src_util_NativeStack.cpp) = 2ae815897e6edcd413402880f2008a899a4ce4f4 -SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = 4917088a9383e1c9849e2f60be083bc8e12f7dd9 +SHA1 (patch-js_src_util_NativeStack.cpp) = 3af7d3c90ce9299f0a95b938ca903488e7809d0a +SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = 5442266a05721a9f4a3c9d12429bd1d59ecd936a SHA1 (patch-media_libcubeb_gtest_moz.build) = da3183625cd058fac97dbf675d6a44fb1ee288f9 SHA1 (patch-media_libcubeb_src_cubeb.c) = b4a07b1be8f65601a620b4527772842af0db46e3 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = fdf4e43d90c112f70b00c6a1ab0a0f64aebe7ea7 @@ -36,7 +34,6 @@ SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 9b70f53022c1bfdb5413dfd8258272a02 SHA1 (patch-media_libcubeb_src_moz.build) = 50848d22aac4824c8ae113e8b8799b7d083a2378 SHA1 (patch-media_libcubeb_update.sh) = 4796bb212f046ecc57e19abcf8962de35193c372 SHA1 (patch-media_libpng_pngpriv.h) = dfd4d345e10f6f74d3a3546732a868481c1d5818 -SHA1 (patch-media_libyuv_libyuv_source_mjpeg__decoder.cc) = 3081c6c3eadfd90fb5fb20130b17d8fca0a8038a SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc) = 959660c938753b96d2c2a96ba9488113bda99a61 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 1e0e83fa9df5cd5c4ae83bc2fbfd08ebaba05d6b SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = b950dc99c51af7aa51f485457a0653aa9d17f5a4 @@ -47,7 +44,7 @@ SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 11201c556ceb111ccf SHA1 (patch-toolkit_library_moz.build) = 429745ec028ce71d8ba2457679b715ac14b6e2d3 SHA1 (patch-toolkit_moz.configure) = 994c8ff526984482b0e5fa26176ed6c20380a97d SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 11fac6aa776a3567e38924b9b083f84b23596071 -SHA1 (patch-toolkit_xre_glxtest.cpp) = 00c88e14734e68bf521e30d87de3edf6feff46a5 -SHA1 (patch-xpcom_base_nscore.h) = f6c844ec44086a6f3887a4efd1a516dda7e392dc -SHA1 (patch-xpcom_build_BinaryPath.h) = 1cecba7419bdb10d0fbc0e20f09c9a2a67e20303 +SHA1 (patch-toolkit_xre_glxtest.cpp) = e02b1073fe1a6f36872b10883455c8be59ff81e9 +SHA1 (patch-xpcom_base_nscore.h) = 3f131370b9665a0af55cab7f8f54723ebbc389fa +SHA1 (patch-xpcom_build_BinaryPath.h) = fcaca939aca30a4ae07414cd5e6b1497ac3a1178 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = d1329a1206cb117898259a85414b3d9d868ad4eb diff --git a/mail/thunderbird/patches/patch-comm_mail_installer_removed-files.in b/mail/thunderbird/patches/patch-comm_mail_installer_removed-files.in index f3873e2bfd8..df41b1ab8e1 100644 --- a/mail/thunderbird/patches/patch-comm_mail_installer_removed-files.in +++ b/mail/thunderbird/patches/patch-comm_mail_installer_removed-files.in @@ -1,8 +1,8 @@ -$NetBSD: patch-comm_mail_installer_removed-files.in,v 1.1 2018/12/16 08:12:15 ryoon Exp $ +$NetBSD: patch-comm_mail_installer_removed-files.in,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- comm/mail/installer/removed-files.in.orig 2018-12-04 23:12:16.000000000 +0000 +--- comm/mail/installer/removed-files.in.orig 2019-02-13 14:19:59.000000000 +0000 +++ comm/mail/installer/removed-files.in -@@ -186,51 +186,15 @@ +@@ -75,7 +75,7 @@ @DIR_RESOURCES@extensions/ @DIR_RESOURCES@extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/* #else @@ -13,47 +13,3 @@ $NetBSD: patch-comm_mail_installer_removed-files.in,v 1.1 2018/12/16 08:12:15 ry +@DIR_RESOURCES@bin/distribution/extensions/ +@DIR_RESOURCES@bin/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/* #endif - - @DIR_MACOS@greprefs/all.js - @DIR_MACOS@greprefs/security-prefs.js - @DIR_MACOS@greprefs/xpinstall.js - @DIR_MACOS@greprefs/ --@DIR_MACOS@hyphenation/ --@DIR_MACOS@hyphenation/hyph_af.dic --@DIR_MACOS@hyphenation/hyph_bg.dic --@DIR_MACOS@hyphenation/hyph_ca.dic --@DIR_MACOS@hyphenation/hyph_cy.dic --@DIR_MACOS@hyphenation/hyph_da.dic --@DIR_MACOS@hyphenation/hyph_de-1901.dic --@DIR_MACOS@hyphenation/hyph_de-1996.dic --@DIR_MACOS@hyphenation/hyph_de-CH.dic --@DIR_MACOS@hyphenation/hyph_en_US.dic --@DIR_MACOS@hyphenation/hyph_eo.dic --@DIR_MACOS@hyphenation/hyph_es.dic --@DIR_MACOS@hyphenation/hyph_et.dic --@DIR_MACOS@hyphenation/hyph_fi.dic --@DIR_MACOS@hyphenation/hyph_fr.dic --@DIR_MACOS@hyphenation/hyph_gl.dic --@DIR_MACOS@hyphenation/hyph_hr.dic --@DIR_MACOS@hyphenation/hyph_hsb.dic --@DIR_MACOS@hyphenation/hyph_hu.dic --@DIR_MACOS@hyphenation/hyph_ia.dic --@DIR_MACOS@hyphenation/hyph_is.dic --@DIR_MACOS@hyphenation/hyph_it.dic --@DIR_MACOS@hyphenation/hyph_kmr.dic --@DIR_MACOS@hyphenation/hyph_la.dic --@DIR_MACOS@hyphenation/hyph_lt.dic --@DIR_MACOS@hyphenation/hyph_mn.dic --@DIR_MACOS@hyphenation/hyph_nb.dic --@DIR_MACOS@hyphenation/hyph_nl.dic --@DIR_MACOS@hyphenation/hyph_nn.dic --@DIR_MACOS@hyphenation/hyph_pt.dic --@DIR_MACOS@hyphenation/hyph_ru.dic --@DIR_MACOS@hyphenation/hyph_sh.dic --@DIR_MACOS@hyphenation/hyph_sl.dic --@DIR_MACOS@hyphenation/hyph_sv.dic --@DIR_MACOS@hyphenation/hyph_tr.dic --@DIR_MACOS@hyphenation/hyph_uk.dic - - #ifdef MOZ_WIDGET_GTK - icons/mozicon128.png diff --git a/mail/thunderbird/patches/patch-dom_fetch_FetchConsumer.cpp b/mail/thunderbird/patches/patch-dom_fetch_FetchConsumer.cpp deleted file mode 100644 index 33bb2f63dbb..00000000000 --- a/mail/thunderbird/patches/patch-dom_fetch_FetchConsumer.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dom_fetch_FetchConsumer.cpp,v 1.1 2018/12/16 08:12:15 ryoon Exp $ - ---- dom/fetch/FetchConsumer.cpp.orig 2018-12-04 23:11:45.000000000 +0000 -+++ dom/fetch/FetchConsumer.cpp -@@ -616,7 +616,7 @@ FetchBodyConsumer<Derived>::ContinueCons - RefPtr<Promise> localPromise = mConsumePromise.forget(); - - RefPtr<FetchBodyConsumer<Derived>> self = this; -- auto autoReleaseObject = mozilla::MakeScopeExit([&] { -+ auto autoReleaseObject = mozilla::MakeScopeExit([self] { - self->ReleaseObject(); - }); - diff --git a/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp b/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp index 7ef1535faea..4830a3088d4 100644 --- a/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp +++ b/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp @@ -1,14 +1,13 @@ -$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.1 2018/12/16 08:12:15 ryoon Exp $ +$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- dom/media/CubebUtils.cpp.orig 2018-12-04 23:11:46.000000000 +0000 +--- dom/media/CubebUtils.cpp.orig 2019-02-13 14:19:37.000000000 +0000 +++ dom/media/CubebUtils.cpp -@@ -152,7 +152,8 @@ const char* AUDIOSTREAM_BACKEND_ID_STR[] - "sndio", - "opensl", - "audiotrack", -- "kai" -+ "kai", -+ "oss", - }; +@@ -143,7 +143,7 @@ const char kBrandBundleURL[] = "chrome:/ + + const char* AUDIOSTREAM_BACKEND_ID_STR[] = { + "jack", "pulse", "alsa", "audiounit", "audioqueue", "wasapi", +- "winmm", "directsound", "sndio", "opensl", "audiotrack", "kai"}; ++ "winmm", "directsound", "sndio", "opensl", "audiotrack", "kai", "oss"}; /* Index for failures to create an audio stream the first time. */ const int CUBEB_BACKEND_INIT_FAILURE_FIRST = + ArrayLength(AUDIOSTREAM_BACKEND_ID_STR); diff --git a/mail/thunderbird/patches/patch-image_decoders_nsJPEGDecoder.cpp b/mail/thunderbird/patches/patch-image_decoders_nsJPEGDecoder.cpp deleted file mode 100644 index b3ebadfb583..00000000000 --- a/mail/thunderbird/patches/patch-image_decoders_nsJPEGDecoder.cpp +++ /dev/null @@ -1,364 +0,0 @@ -$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2018/12/16 08:12:15 ryoon Exp $ - ---- image/decoders/nsJPEGDecoder.cpp.orig 2018-12-04 23:11:48.000000000 +0000 -+++ image/decoders/nsJPEGDecoder.cpp -@@ -29,13 +29,28 @@ - - extern "C" { - #include "iccjpeg.h" --} - -+#ifdef JCS_EXTENSIONS - #if MOZ_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)); -+ JMETHOD(void, color_convert, (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows)); -+}; -+ -+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); - -@@ -354,6 +369,7 @@ nsJPEGDecoder::ReadJPEGData(const char* - 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) { -@@ -362,6 +378,9 @@ nsJPEGDecoder::ReadJPEGData(const char* - } else { - mInfo.out_color_space = JCS_RGB; - } -+#else -+ mInfo.out_color_space = JCS_RGB; -+#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -436,6 +455,16 @@ nsJPEGDecoder::ReadJPEGData(const char* - return Transition::ContinueUnbuffered(State::JPEG_DATA); // 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) { -+ /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ -+ 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; -@@ -633,7 +662,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus - - MOZ_ASSERT(imageRow, "Should have a row buffer here"); - -+#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 -@@ -965,6 +998,282 @@ term_source (j_decompress_ptr jd) - } // namespace image - } // namespace mozilla - -+#ifndef JCS_EXTENSIONS -+/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ -+ -+/* -+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are -+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5. -+ * The conversion equations to be implemented are therefore -+ * R = Y + 1.40200 * Cr -+ * G = Y - 0.34414 * Cb - 0.71414 * Cr -+ * B = Y + 1.77200 * Cb -+ * where Cb and Cr represent the incoming values less CENTERJSAMPLE. -+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.) -+ * -+ * To avoid floating-point arithmetic, we represent the fractional constants -+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide -+ * the products by 2^16, with appropriate rounding, to get the correct answer. -+ * Notice that Y, being an integral input, does not contribute any fraction -+ * so it need not participate in the rounding. -+ * -+ * For even more speed, we avoid doing any multiplications in the inner loop -+ * by precalculating the constants times Cb and Cr for all possible values. -+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table); -+ * for 12-bit samples it is still acceptable. It's not very reasonable for -+ * 16-bit samples, but if you want lossless storage you shouldn't be changing -+ * colorspace anyway. -+ * The Cr=>R and Cb=>B values can be rounded to integers in advance; the -+ * values for the G calculation are left scaled up, since we must add them -+ * together before rounding. -+ */ -+ -+#define SCALEBITS 16 /* speediest right-shift on some machines */ -+ -+/* Use static tables for color processing. */ -+/* Four tables, each 256 entries of 4 bytes totals 4K which is not bad... */ -+ -+const int Cr_r_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xb3, -0xb2, -0xb1, -0xaf, -0xae, -0xac, -+ -0xab, -0xaa, -0xa8, -0xa7, -0xa5, -0xa4, -+ -0xa3, -0xa1, -0xa0, -0x9e, -0x9d, -0x9c, -+ -0x9a, -0x99, -0x97, -0x96, -0x95, -0x93, -+ -0x92, -0x90, -0x8f, -0x8e, -0x8c, -0x8b, -+ -0x89, -0x88, -0x87, -0x85, -0x84, -0x82, -+ -0x81, -0x80, -0x7e, -0x7d, -0x7b, -0x7a, -+ -0x79, -0x77, -0x76, -0x74, -0x73, -0x72, -+ -0x70, -0x6f, -0x6d, -0x6c, -0x6b, -0x69, -+ -0x68, -0x66, -0x65, -0x64, -0x62, -0x61, -+ -0x5f, -0x5e, -0x5d, -0x5b, -0x5a, -0x58, -+ -0x57, -0x56, -0x54, -0x53, -0x51, -0x50, -+ -0x4f, -0x4d, -0x4c, -0x4a, -0x49, -0x48, -+ -0x46, -0x45, -0x43, -0x42, -0x40, -0x3f, -+ -0x3e, -0x3c, -0x3b, -0x39, -0x38, -0x37, -+ -0x35, -0x34, -0x32, -0x31, -0x30, -0x2e, -+ -0x2d, -0x2b, -0x2a, -0x29, -0x27, -0x26, -+ -0x24, -0x23, -0x22, -0x20, -0x1f, -0x1d, -+ -0x1c, -0x1b, -0x19, -0x18, -0x16, -0x15, -+ -0x14, -0x12, -0x11, -0x0f, -0x0e, -0x0d, -+ -0x0b, -0x0a, -0x08, -0x07, -0x06, -0x04, -+ -0x03, -0x01, 0x00, 0x01, 0x03, 0x04, -+ 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0d, -+ 0x0e, 0x0f, 0x11, 0x12, 0x14, 0x15, -+ 0x16, 0x18, 0x19, 0x1b, 0x1c, 0x1d, -+ 0x1f, 0x20, 0x22, 0x23, 0x24, 0x26, -+ 0x27, 0x29, 0x2a, 0x2b, 0x2d, 0x2e, -+ 0x30, 0x31, 0x32, 0x34, 0x35, 0x37, -+ 0x38, 0x39, 0x3b, 0x3c, 0x3e, 0x3f, -+ 0x40, 0x42, 0x43, 0x45, 0x46, 0x48, -+ 0x49, 0x4a, 0x4c, 0x4d, 0x4f, 0x50, -+ 0x51, 0x53, 0x54, 0x56, 0x57, 0x58, -+ 0x5a, 0x5b, 0x5d, 0x5e, 0x5f, 0x61, -+ 0x62, 0x64, 0x65, 0x66, 0x68, 0x69, -+ 0x6b, 0x6c, 0x6d, 0x6f, 0x70, 0x72, -+ 0x73, 0x74, 0x76, 0x77, 0x79, 0x7a, -+ 0x7b, 0x7d, 0x7e, 0x80, 0x81, 0x82, -+ 0x84, 0x85, 0x87, 0x88, 0x89, 0x8b, -+ 0x8c, 0x8e, 0x8f, 0x90, 0x92, 0x93, -+ 0x95, 0x96, 0x97, 0x99, 0x9a, 0x9c, -+ 0x9d, 0x9e, 0xa0, 0xa1, 0xa3, 0xa4, -+ 0xa5, 0xa7, 0xa8, 0xaa, 0xab, 0xac, -+ 0xae, 0xaf, 0xb1, 0xb2, -+ }; -+ -+const int Cb_b_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xe3, -0xe1, -0xdf, -0xde, -0xdc, -0xda, -+ -0xd8, -0xd6, -0xd5, -0xd3, -0xd1, -0xcf, -+ -0xce, -0xcc, -0xca, -0xc8, -0xc6, -0xc5, -+ -0xc3, -0xc1, -0xbf, -0xbe, -0xbc, -0xba, -+ -0xb8, -0xb7, -0xb5, -0xb3, -0xb1, -0xaf, -+ -0xae, -0xac, -0xaa, -0xa8, -0xa7, -0xa5, -+ -0xa3, -0xa1, -0x9f, -0x9e, -0x9c, -0x9a, -+ -0x98, -0x97, -0x95, -0x93, -0x91, -0x90, -+ -0x8e, -0x8c, -0x8a, -0x88, -0x87, -0x85, -+ -0x83, -0x81, -0x80, -0x7e, -0x7c, -0x7a, -+ -0x78, -0x77, -0x75, -0x73, -0x71, -0x70, -+ -0x6e, -0x6c, -0x6a, -0x69, -0x67, -0x65, -+ -0x63, -0x61, -0x60, -0x5e, -0x5c, -0x5a, -+ -0x59, -0x57, -0x55, -0x53, -0x52, -0x50, -+ -0x4e, -0x4c, -0x4a, -0x49, -0x47, -0x45, -+ -0x43, -0x42, -0x40, -0x3e, -0x3c, -0x3a, -+ -0x39, -0x37, -0x35, -0x33, -0x32, -0x30, -+ -0x2e, -0x2c, -0x2b, -0x29, -0x27, -0x25, -+ -0x23, -0x22, -0x20, -0x1e, -0x1c, -0x1b, -+ -0x19, -0x17, -0x15, -0x13, -0x12, -0x10, -+ -0x0e, -0x0c, -0x0b, -0x09, -0x07, -0x05, -+ -0x04, -0x02, 0x00, 0x02, 0x04, 0x05, -+ 0x07, 0x09, 0x0b, 0x0c, 0x0e, 0x10, -+ 0x12, 0x13, 0x15, 0x17, 0x19, 0x1b, -+ 0x1c, 0x1e, 0x20, 0x22, 0x23, 0x25, -+ 0x27, 0x29, 0x2b, 0x2c, 0x2e, 0x30, -+ 0x32, 0x33, 0x35, 0x37, 0x39, 0x3a, -+ 0x3c, 0x3e, 0x40, 0x42, 0x43, 0x45, -+ 0x47, 0x49, 0x4a, 0x4c, 0x4e, 0x50, -+ 0x52, 0x53, 0x55, 0x57, 0x59, 0x5a, -+ 0x5c, 0x5e, 0x60, 0x61, 0x63, 0x65, -+ 0x67, 0x69, 0x6a, 0x6c, 0x6e, 0x70, -+ 0x71, 0x73, 0x75, 0x77, 0x78, 0x7a, -+ 0x7c, 0x7e, 0x80, 0x81, 0x83, 0x85, -+ 0x87, 0x88, 0x8a, 0x8c, 0x8e, 0x90, -+ 0x91, 0x93, 0x95, 0x97, 0x98, 0x9a, -+ 0x9c, 0x9e, 0x9f, 0xa1, 0xa3, 0xa5, -+ 0xa7, 0xa8, 0xaa, 0xac, 0xae, 0xaf, -+ 0xb1, 0xb3, 0xb5, 0xb7, 0xb8, 0xba, -+ 0xbc, 0xbe, 0xbf, 0xc1, 0xc3, 0xc5, -+ 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xcf, -+ 0xd1, 0xd3, 0xd5, 0xd6, 0xd8, 0xda, -+ 0xdc, 0xde, 0xdf, 0xe1, -+ }; -+ -+const int Cr_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x5b6900, 0x5ab22e, 0x59fb5c, 0x59448a, 0x588db8, 0x57d6e6, -+ 0x572014, 0x566942, 0x55b270, 0x54fb9e, 0x5444cc, 0x538dfa, -+ 0x52d728, 0x522056, 0x516984, 0x50b2b2, 0x4ffbe0, 0x4f450e, -+ 0x4e8e3c, 0x4dd76a, 0x4d2098, 0x4c69c6, 0x4bb2f4, 0x4afc22, -+ 0x4a4550, 0x498e7e, 0x48d7ac, 0x4820da, 0x476a08, 0x46b336, -+ 0x45fc64, 0x454592, 0x448ec0, 0x43d7ee, 0x43211c, 0x426a4a, -+ 0x41b378, 0x40fca6, 0x4045d4, 0x3f8f02, 0x3ed830, 0x3e215e, -+ 0x3d6a8c, 0x3cb3ba, 0x3bfce8, 0x3b4616, 0x3a8f44, 0x39d872, -+ 0x3921a0, 0x386ace, 0x37b3fc, 0x36fd2a, 0x364658, 0x358f86, -+ 0x34d8b4, 0x3421e2, 0x336b10, 0x32b43e, 0x31fd6c, 0x31469a, -+ 0x308fc8, 0x2fd8f6, 0x2f2224, 0x2e6b52, 0x2db480, 0x2cfdae, -+ 0x2c46dc, 0x2b900a, 0x2ad938, 0x2a2266, 0x296b94, 0x28b4c2, -+ 0x27fdf0, 0x27471e, 0x26904c, 0x25d97a, 0x2522a8, 0x246bd6, -+ 0x23b504, 0x22fe32, 0x224760, 0x21908e, 0x20d9bc, 0x2022ea, -+ 0x1f6c18, 0x1eb546, 0x1dfe74, 0x1d47a2, 0x1c90d0, 0x1bd9fe, -+ 0x1b232c, 0x1a6c5a, 0x19b588, 0x18feb6, 0x1847e4, 0x179112, -+ 0x16da40, 0x16236e, 0x156c9c, 0x14b5ca, 0x13fef8, 0x134826, -+ 0x129154, 0x11da82, 0x1123b0, 0x106cde, 0x0fb60c, 0x0eff3a, -+ 0x0e4868, 0x0d9196, 0x0cdac4, 0x0c23f2, 0x0b6d20, 0x0ab64e, -+ 0x09ff7c, 0x0948aa, 0x0891d8, 0x07db06, 0x072434, 0x066d62, -+ 0x05b690, 0x04ffbe, 0x0448ec, 0x03921a, 0x02db48, 0x022476, -+ 0x016da4, 0x00b6d2, 0x000000, -0x00b6d2, -0x016da4, -0x022476, -+ -0x02db48, -0x03921a, -0x0448ec, -0x04ffbe, -0x05b690, -0x066d62, -+ -0x072434, -0x07db06, -0x0891d8, -0x0948aa, -0x09ff7c, -0x0ab64e, -+ -0x0b6d20, -0x0c23f2, -0x0cdac4, -0x0d9196, -0x0e4868, -0x0eff3a, -+ -0x0fb60c, -0x106cde, -0x1123b0, -0x11da82, -0x129154, -0x134826, -+ -0x13fef8, -0x14b5ca, -0x156c9c, -0x16236e, -0x16da40, -0x179112, -+ -0x1847e4, -0x18feb6, -0x19b588, -0x1a6c5a, -0x1b232c, -0x1bd9fe, -+ -0x1c90d0, -0x1d47a2, -0x1dfe74, -0x1eb546, -0x1f6c18, -0x2022ea, -+ -0x20d9bc, -0x21908e, -0x224760, -0x22fe32, -0x23b504, -0x246bd6, -+ -0x2522a8, -0x25d97a, -0x26904c, -0x27471e, -0x27fdf0, -0x28b4c2, -+ -0x296b94, -0x2a2266, -0x2ad938, -0x2b900a, -0x2c46dc, -0x2cfdae, -+ -0x2db480, -0x2e6b52, -0x2f2224, -0x2fd8f6, -0x308fc8, -0x31469a, -+ -0x31fd6c, -0x32b43e, -0x336b10, -0x3421e2, -0x34d8b4, -0x358f86, -+ -0x364658, -0x36fd2a, -0x37b3fc, -0x386ace, -0x3921a0, -0x39d872, -+ -0x3a8f44, -0x3b4616, -0x3bfce8, -0x3cb3ba, -0x3d6a8c, -0x3e215e, -+ -0x3ed830, -0x3f8f02, -0x4045d4, -0x40fca6, -0x41b378, -0x426a4a, -+ -0x43211c, -0x43d7ee, -0x448ec0, -0x454592, -0x45fc64, -0x46b336, -+ -0x476a08, -0x4820da, -0x48d7ac, -0x498e7e, -0x4a4550, -0x4afc22, -+ -0x4bb2f4, -0x4c69c6, -0x4d2098, -0x4dd76a, -0x4e8e3c, -0x4f450e, -+ -0x4ffbe0, -0x50b2b2, -0x516984, -0x522056, -0x52d728, -0x538dfa, -+ -0x5444cc, -0x54fb9e, -0x55b270, -0x566942, -0x572014, -0x57d6e6, -+ -0x588db8, -0x59448a, -0x59fb5c, -0x5ab22e, -+ }; -+ -+const int Cb_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x2c8d00, 0x2c34e6, 0x2bdccc, 0x2b84b2, 0x2b2c98, 0x2ad47e, -+ 0x2a7c64, 0x2a244a, 0x29cc30, 0x297416, 0x291bfc, 0x28c3e2, -+ 0x286bc8, 0x2813ae, 0x27bb94, 0x27637a, 0x270b60, 0x26b346, -+ 0x265b2c, 0x260312, 0x25aaf8, 0x2552de, 0x24fac4, 0x24a2aa, -+ 0x244a90, 0x23f276, 0x239a5c, 0x234242, 0x22ea28, 0x22920e, -+ 0x2239f4, 0x21e1da, 0x2189c0, 0x2131a6, 0x20d98c, 0x208172, -+ 0x202958, 0x1fd13e, 0x1f7924, 0x1f210a, 0x1ec8f0, 0x1e70d6, -+ 0x1e18bc, 0x1dc0a2, 0x1d6888, 0x1d106e, 0x1cb854, 0x1c603a, -+ 0x1c0820, 0x1bb006, 0x1b57ec, 0x1affd2, 0x1aa7b8, 0x1a4f9e, -+ 0x19f784, 0x199f6a, 0x194750, 0x18ef36, 0x18971c, 0x183f02, -+ 0x17e6e8, 0x178ece, 0x1736b4, 0x16de9a, 0x168680, 0x162e66, -+ 0x15d64c, 0x157e32, 0x152618, 0x14cdfe, 0x1475e4, 0x141dca, -+ 0x13c5b0, 0x136d96, 0x13157c, 0x12bd62, 0x126548, 0x120d2e, -+ 0x11b514, 0x115cfa, 0x1104e0, 0x10acc6, 0x1054ac, 0x0ffc92, -+ 0x0fa478, 0x0f4c5e, 0x0ef444, 0x0e9c2a, 0x0e4410, 0x0debf6, -+ 0x0d93dc, 0x0d3bc2, 0x0ce3a8, 0x0c8b8e, 0x0c3374, 0x0bdb5a, -+ 0x0b8340, 0x0b2b26, 0x0ad30c, 0x0a7af2, 0x0a22d8, 0x09cabe, -+ 0x0972a4, 0x091a8a, 0x08c270, 0x086a56, 0x08123c, 0x07ba22, -+ 0x076208, 0x0709ee, 0x06b1d4, 0x0659ba, 0x0601a0, 0x05a986, -+ 0x05516c, 0x04f952, 0x04a138, 0x04491e, 0x03f104, 0x0398ea, -+ 0x0340d0, 0x02e8b6, 0x02909c, 0x023882, 0x01e068, 0x01884e, -+ 0x013034, 0x00d81a, 0x008000, 0x0027e6, -0x003034, -0x00884e, -+ -0x00e068, -0x013882, -0x01909c, -0x01e8b6, -0x0240d0, -0x0298ea, -+ -0x02f104, -0x03491e, -0x03a138, -0x03f952, -0x04516c, -0x04a986, -+ -0x0501a0, -0x0559ba, -0x05b1d4, -0x0609ee, -0x066208, -0x06ba22, -+ -0x07123c, -0x076a56, -0x07c270, -0x081a8a, -0x0872a4, -0x08cabe, -+ -0x0922d8, -0x097af2, -0x09d30c, -0x0a2b26, -0x0a8340, -0x0adb5a, -+ -0x0b3374, -0x0b8b8e, -0x0be3a8, -0x0c3bc2, -0x0c93dc, -0x0cebf6, -+ -0x0d4410, -0x0d9c2a, -0x0df444, -0x0e4c5e, -0x0ea478, -0x0efc92, -+ -0x0f54ac, -0x0facc6, -0x1004e0, -0x105cfa, -0x10b514, -0x110d2e, -+ -0x116548, -0x11bd62, -0x12157c, -0x126d96, -0x12c5b0, -0x131dca, -+ -0x1375e4, -0x13cdfe, -0x142618, -0x147e32, -0x14d64c, -0x152e66, -+ -0x158680, -0x15de9a, -0x1636b4, -0x168ece, -0x16e6e8, -0x173f02, -+ -0x17971c, -0x17ef36, -0x184750, -0x189f6a, -0x18f784, -0x194f9e, -+ -0x19a7b8, -0x19ffd2, -0x1a57ec, -0x1ab006, -0x1b0820, -0x1b603a, -+ -0x1bb854, -0x1c106e, -0x1c6888, -0x1cc0a2, -0x1d18bc, -0x1d70d6, -+ -0x1dc8f0, -0x1e210a, -0x1e7924, -0x1ed13e, -0x1f2958, -0x1f8172, -+ -0x1fd98c, -0x2031a6, -0x2089c0, -0x20e1da, -0x2139f4, -0x21920e, -+ -0x21ea28, -0x224242, -0x229a5c, -0x22f276, -0x234a90, -0x23a2aa, -+ -0x23fac4, -0x2452de, -0x24aaf8, -0x250312, -0x255b2c, -0x25b346, -+ -0x260b60, -0x26637a, -0x26bb94, -0x2713ae, -0x276bc8, -0x27c3e2, -+ -0x281bfc, -0x287416, -0x28cc30, -0x29244a, -0x297c64, -0x29d47e, -+ -0x2a2c98, -0x2a84b2, -0x2adccc, -0x2b34e6, -+ }; -+ -+ -+/* We assume that right shift corresponds to signed division by 2 with -+ * rounding towards minus infinity. This is correct for typical "arithmetic -+ * shift" instructions that shift in copies of the sign bit. But some -+ * C compilers implement >> with an unsigned shift. For these machines you -+ * must define RIGHT_SHIFT_IS_UNSIGNED. -+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity. -+ * It is only applied with constant shift counts. SHIFT_TEMPS must be -+ * included in the variables of any routine using RIGHT_SHIFT. -+ */ -+ -+#ifdef RIGHT_SHIFT_IS_UNSIGNED -+#define SHIFT_TEMPS INT32 shift_temp; -+#define RIGHT_SHIFT(x,shft) \ -+ ((shift_temp = (x)) < 0 ? \ -+ (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \ -+ (shift_temp >> (shft))) -+#else -+#define SHIFT_TEMPS -+#define RIGHT_SHIFT(x,shft) ((x) >> (shft)) -+#endif -+ -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows) -+{ -+ JDIMENSION num_cols = cinfo->output_width; -+ JSAMPLE * range_limit = cinfo->sample_range_limit; -+ -+ SHIFT_TEMPS -+ -+ /* This is used if we don't have SSE2 */ -+ -+ while (--num_rows >= 0) { -+ JSAMPROW inptr0 = input_buf[0][input_row]; -+ JSAMPROW inptr1 = input_buf[1][input_row]; -+ JSAMPROW inptr2 = input_buf[2][input_row]; -+ input_row++; -+ uint32_t *outptr = (uint32_t *) *output_buf++; -+ for (JDIMENSION col = 0; col < num_cols; col++) { -+ int y = GETJSAMPLE(inptr0[col]); -+ int cb = GETJSAMPLE(inptr1[col]); -+ int cr = GETJSAMPLE(inptr2[col]); -+ JSAMPLE * range_limit_y = range_limit + y; -+ /* Range-limiting is essential due to noise introduced by DCT losses. */ -+ outptr[col] = 0xFF000000 | -+ ( range_limit_y[Cr_r_tab[cr]] << 16 ) | -+ ( range_limit_y[((int) RIGHT_SHIFT(Cb_g_tab[cb] + Cr_g_tab[cr], SCALEBITS))] << 8 ) | -+ ( range_limit_y[Cb_b_tab[cb]] ); -+ } -+ } -+} -+#endif -+ -+ - ///*************** Inverted CMYK -> RGB conversion ************************* - /// Input is (Inverted) CMYK stored as 4 bytes per pixel. - /// Output is RGB stored as 3 bytes per pixel. diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc index 485cd367366..def41151e11 100644 --- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc +++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.1 2018/12/16 08:12:15 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- ipc/chromium/src/base/message_pump_libevent.cc.orig 2018-12-04 23:11:48.000000000 +0000 +--- ipc/chromium/src/base/message_pump_libevent.cc.orig 2019-02-13 14:19:38.000000000 +0000 +++ ipc/chromium/src/base/message_pump_libevent.cc @@ -22,6 +22,7 @@ @@ -8,12 +8,12 @@ $NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.1 2018/12/16 // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct. +#if 0 #if defined(_EVENT_SIZEOF_SHORT) - #define CHECK_EVENT_SIZEOF(TYPE, type) \ - static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \ + #define CHECK_EVENT_SIZEOF(TYPE, type) \ + static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \ @@ -41,6 +42,7 @@ CHECK_EVENT_SIZEOF(PTHREAD_T, pthread_t) - CHECK_EVENT_SIZEOF(SHORT, short); - CHECK_EVENT_SIZEOF(SIZE_T, size_t); - CHECK_EVENT_SIZEOF(VOID_P, void*); + CHECK_EVENT_SIZEOF(SHORT, short); + CHECK_EVENT_SIZEOF(SIZE_T, size_t); + CHECK_EVENT_SIZEOF(VOID_P, void*); +#endif // Lifecycle of struct event diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc index 5a8046fd312..8bb43ace792 100644 --- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc +++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.10 2018/12/16 08:12:15 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.11 2019/02/26 11:32:13 ryoon Exp $ ---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2018-12-04 23:11:48.000000000 +0000 +--- ipc/chromium/src/base/platform_thread_posix.cc.orig 2019-02-13 14:19:38.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc @@ -12,7 +12,9 @@ #if defined(OS_MACOSX) @@ -12,8 +12,8 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.10 2018/12/1 #elif defined(OS_LINUX) #include <sys/syscall.h> #include <sys/prctl.h> -@@ -103,7 +105,7 @@ void PlatformThread::SetName(const char* - pthread_setname_np(pthread_self(), "%s", (void *)name); +@@ -100,7 +102,7 @@ void PlatformThread::SetName(const char* + pthread_setname_np(pthread_self(), "%s", (void*)name); #elif defined(OS_BSD) && !defined(__GLIBC__) pthread_set_name_np(pthread_self(), name); -#elif defined(OS_SOLARIS) diff --git a/mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp b/mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp index 03452349435..6a95c9f8d68 100644 --- a/mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp +++ b/mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/12/16 08:12:15 ryoon Exp $ +$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- ipc/glue/CrossProcessSemaphore_posix.cpp.orig 2018-12-04 23:11:48.000000000 +0000 +--- ipc/glue/CrossProcessSemaphore_posix.cpp.orig 2019-02-13 14:19:38.000000000 +0000 +++ ipc/glue/CrossProcessSemaphore_posix.cpp @@ -9,6 +9,11 @@ #include "nsDebug.h" @@ -14,8 +14,8 @@ $NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/12/16 08:12: static const uint64_t kNsPerMs = 1000000; static const uint64_t kNsPerSec = 1000000000; -@@ -17,7 +22,13 @@ namespace { - +@@ -16,7 +21,13 @@ static const uint64_t kNsPerSec = 100000 + namespace { struct SemaphoreData { +#if defined(__NetBSD__) @@ -28,7 +28,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/12/16 08:12: mozilla::Atomic<int32_t> mRefCount; uint32_t mInitialValue; }; -@@ -44,13 +55,27 @@ CrossProcessSemaphore::Create(const char +@@ -42,13 +53,27 @@ namespace mozilla { return nullptr; } @@ -56,7 +56,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/12/16 08:12: sem->mRefCount = &data->mRefCount; *sem->mRefCount = 1; -@@ -86,24 +111,44 @@ CrossProcessSemaphore::Create(CrossProce +@@ -83,23 +108,44 @@ namespace mozilla { int32_t oldCount = data->mRefCount++; if (oldCount == 0) { @@ -89,19 +89,20 @@ $NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/12/16 08:12: return sem; } - CrossProcessSemaphore::CrossProcessSemaphore() +- : mSemaphore(nullptr), mRefCount(nullptr) { +#if defined(__NetBSD__) -+ : mMutex (nullptr) -+ , mNotZero (nullptr) -+ , mValue (nullptr) ++ : mMutex (nullptr) ++ , mNotZero (nullptr) ++ , mValue (nullptr) +#else - : mSemaphore(nullptr) ++ : mSemaphore(nullptr) +#endif - , mRefCount(nullptr) - { ++ , mRefCount(nullptr) { MOZ_COUNT_CTOR(CrossProcessSemaphore); -@@ -115,17 +160,58 @@ CrossProcessSemaphore::~CrossProcessSema + } + +@@ -108,16 +154,57 @@ CrossProcessSemaphore::~CrossProcessSema if (oldCount == 0) { // Nothing can be done if the destroy fails so ignore return code. @@ -134,10 +135,9 @@ $NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/12/16 08:12: +} +#endif + - bool - CrossProcessSemaphore::Wait(const Maybe<TimeDuration>& aWaitTime) - { - MOZ_ASSERT(*mRefCount > 0, "Attempting to wait on a semaphore with zero ref count"); + bool CrossProcessSemaphore::Wait(const Maybe<TimeDuration>& aWaitTime) { + MOZ_ASSERT(*mRefCount > 0, + "Attempting to wait on a semaphore with zero ref count"); int ret; +#if defined(__NetBSD__) + struct timespec ts = makeAbsTime(aWaitTime); @@ -160,7 +160,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/12/16 08:12: if (aWaitTime.isSome()) { struct timespec ts; if (clock_gettime(CLOCK_REALTIME, &ts) == -1) { -@@ -142,6 +228,7 @@ CrossProcessSemaphore::Wait(const Maybe< +@@ -134,13 +221,24 @@ bool CrossProcessSemaphore::Wait(const M while ((ret = sem_wait(mSemaphore)) == -1 && errno == EINTR) { } } @@ -168,10 +168,9 @@ $NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/12/16 08:12: return ret == 0; } -@@ -149,7 +236,17 @@ void - CrossProcessSemaphore::Signal() - { - MOZ_ASSERT(*mRefCount > 0, "Attempting to signal a semaphore with zero ref count"); + void CrossProcessSemaphore::Signal() { + MOZ_ASSERT(*mRefCount > 0, + "Attempting to signal a semaphore with zero ref count"); +#if defined(__NetBSD__) + int ret; + ret = pthread_mutex_lock(mMutex); @@ -185,4 +184,4 @@ $NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/12/16 08:12: +#endif } - CrossProcessSemaphoreHandle + CrossProcessSemaphoreHandle CrossProcessSemaphore::ShareToProcess( diff --git a/mail/thunderbird/patches/patch-js_src_gc_Memory.cpp b/mail/thunderbird/patches/patch-js_src_gc_Memory.cpp index ad3a1e44a0b..adaee0179d8 100644 --- a/mail/thunderbird/patches/patch-js_src_gc_Memory.cpp +++ b/mail/thunderbird/patches/patch-js_src_gc_Memory.cpp @@ -1,21 +1,22 @@ -$NetBSD: patch-js_src_gc_Memory.cpp,v 1.1 2018/12/16 08:12:16 ryoon Exp $ +$NetBSD: patch-js_src_gc_Memory.cpp,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- js/src/gc/Memory.cpp.orig 2018-12-04 23:11:48.000000000 +0000 +--- js/src/gc/Memory.cpp.orig 2019-02-13 14:19:38.000000000 +0000 +++ js/src/gc/Memory.cpp -@@ -504,6 +504,7 @@ MapMemoryAt(void* desired, size_t length - { +@@ -419,6 +419,7 @@ static inline void* MapMemoryAt(void* de + off_t offset = 0) { - #if defined(__ia64__) || defined(__aarch64__) || \ + #if defined(__ia64__) || defined(__aarch64__) || \ + (defined(__sun) && defined(__x86_64__)) || \ - (defined(__sparc__) && defined(__arch64__) && (defined(__NetBSD__) || defined(__linux__))) - MOZ_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0); - #endif -@@ -554,7 +555,7 @@ MapMemory(size_t length, int prot = PROT - return nullptr; - } - return region; --#elif defined(__aarch64__) || (defined(__sparc__) && defined(__arch64__) && defined(__linux__)) -+#elif defined(__aarch64__) || (defined(__sparc__) && defined(__arch64__) && defined(__linux__)) || (defined(__sun) && defined(__x86_64__)) - /* - * There might be similar virtual address issue on arm64 which depends on - * hardware and kernel configurations. But the work around is slightly + (defined(__sparc__) && defined(__arch64__) && \ + (defined(__NetBSD__) || defined(__linux__))) + MOZ_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0); +@@ -468,7 +469,8 @@ static inline void* MapMemory(size_t len + } + return region; + #elif defined(__aarch64__) || \ +- (defined(__sparc__) && defined(__arch64__) && defined(__linux__)) ++ (defined(__sparc__) && defined(__arch64__) && defined(__linux__)) || \ ++ (defined(__sun) && defined(__x86_64__)) + /* + * There might be similar virtual address issue on arm64 which depends on + * hardware and kernel configurations. But the work around is slightly diff --git a/mail/thunderbird/patches/patch-js_src_util_NativeStack.cpp b/mail/thunderbird/patches/patch-js_src_util_NativeStack.cpp index d5be43bdbd7..90cda69b05a 100644 --- a/mail/thunderbird/patches/patch-js_src_util_NativeStack.cpp +++ b/mail/thunderbird/patches/patch-js_src_util_NativeStack.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-js_src_util_NativeStack.cpp,v 1.1 2018/12/16 08:12:16 ryoon Exp $ +$NetBSD: patch-js_src_util_NativeStack.cpp,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- js/src/util/NativeStack.cpp.orig 2018-12-04 23:11:52.000000000 +0000 +--- js/src/util/NativeStack.cpp.orig 2019-02-13 14:19:39.000000000 +0000 +++ js/src/util/NativeStack.cpp -@@ -32,7 +32,7 @@ js::GetNativeStackBaseImpl() - return static_cast<void*>(pTib->StackBase); +@@ -30,7 +30,7 @@ void* js::GetNativeStackBaseImpl() { + return static_cast<void*>(pTib->StackBase); } -#elif defined(SOLARIS) @@ -11,11 +11,11 @@ $NetBSD: patch-js_src_util_NativeStack.cpp,v 1.1 2018/12/16 08:12:16 ryoon Exp $ #include <ucontext.h> -@@ -78,6 +78,7 @@ js::GetNativeStackBaseImpl() - # elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) - /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */ - pthread_attr_get_np(thread, &sattr); -+# elif defined(__sun) - # else - /* - * FIXME: this function is non-portable; +@@ -69,6 +69,7 @@ void* js::GetNativeStackBaseImpl() { + #elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) + /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */ + pthread_attr_get_np(thread, &sattr); ++#elif defined(__sun) + #else + /* + * FIXME: this function is non-portable; diff --git a/mail/thunderbird/patches/patch-js_src_wasm_WasmSignalHandlers.cpp b/mail/thunderbird/patches/patch-js_src_wasm_WasmSignalHandlers.cpp index 5f0cd42062b..ba8ba0bbbf9 100644 --- a/mail/thunderbird/patches/patch-js_src_wasm_WasmSignalHandlers.cpp +++ b/mail/thunderbird/patches/patch-js_src_wasm_WasmSignalHandlers.cpp @@ -1,12 +1,12 @@ -$NetBSD: patch-js_src_wasm_WasmSignalHandlers.cpp,v 1.1 2018/12/16 08:12:16 ryoon Exp $ +$NetBSD: patch-js_src_wasm_WasmSignalHandlers.cpp,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- js/src/wasm/WasmSignalHandlers.cpp.orig 2018-12-04 23:11:52.000000000 +0000 +--- js/src/wasm/WasmSignalHandlers.cpp.orig 2019-02-13 14:19:40.000000000 +0000 +++ js/src/wasm/WasmSignalHandlers.cpp -@@ -135,6 +135,7 @@ struct AutoSignalHandler - # define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP]) - # define ESP_sig(p) ((p)->uc_mcontext.gregs[REG_ESP]) - # else -+# include <sys/regset.h> - # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i]) - # define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC]) - # define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP]) +@@ -133,6 +133,7 @@ struct AutoSignalHandler { + #define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP]) + #define ESP_sig(p) ((p)->uc_mcontext.gregs[REG_ESP]) + #else ++#include <sys/regset.h> + #define XMM_sig(p, i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i]) + #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC]) + #define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP]) diff --git a/mail/thunderbird/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc b/mail/thunderbird/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc deleted file mode 100644 index 0b047aad334..00000000000 --- a/mail/thunderbird/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-media_libyuv_libyuv_source_mjpeg__decoder.cc,v 1.1 2018/12/16 08:12:16 ryoon Exp $ - ---- media/libyuv/libyuv/source/mjpeg_decoder.cc.orig 2018-12-04 23:11:54.000000000 +0000 -+++ media/libyuv/libyuv/source/mjpeg_decoder.cc -@@ -25,7 +25,7 @@ - #endif - - #endif --struct FILE; // For jpeglib.h. -+//struct FILE; // For jpeglib.h. - - // C++ build requires extern C for jpeg internals. - #ifdef __cplusplus diff --git a/mail/thunderbird/patches/patch-toolkit_xre_glxtest.cpp b/mail/thunderbird/patches/patch-toolkit_xre_glxtest.cpp index 9f3f6e29921..4cf678f0ba8 100644 --- a/mail/thunderbird/patches/patch-toolkit_xre_glxtest.cpp +++ b/mail/thunderbird/patches/patch-toolkit_xre_glxtest.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.1 2018/12/16 08:12:16 ryoon Exp $ +$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- toolkit/xre/glxtest.cpp.orig 2018-12-04 23:12:02.000000000 +0000 +--- toolkit/xre/glxtest.cpp.orig 2019-02-13 14:19:45.000000000 +0000 +++ toolkit/xre/glxtest.cpp -@@ -124,7 +124,7 @@ void glxtest() - fatal_error("The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined"); +@@ -116,7 +116,7 @@ void glxtest() { + "The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined"); - ///// Open libGL and load needed symbols ///// + ///// Open libGL and load needed symbols ///// -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) - #define LIBGL_FILENAME "libGL.so" + #define LIBGL_FILENAME "libGL.so" #else - #define LIBGL_FILENAME "libGL.so.1" + #define LIBGL_FILENAME "libGL.so.1" diff --git a/mail/thunderbird/patches/patch-xpcom_base_nscore.h b/mail/thunderbird/patches/patch-xpcom_base_nscore.h index 23a86c84387..25a7e513da4 100644 --- a/mail/thunderbird/patches/patch-xpcom_base_nscore.h +++ b/mail/thunderbird/patches/patch-xpcom_base_nscore.h @@ -1,6 +1,6 @@ -$NetBSD: patch-xpcom_base_nscore.h,v 1.1 2018/12/16 08:12:16 ryoon Exp $ +$NetBSD: patch-xpcom_base_nscore.h,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- xpcom/base/nscore.h.orig 2018-12-04 23:12:03.000000000 +0000 +--- xpcom/base/nscore.h.orig 2019-02-13 14:19:45.000000000 +0000 +++ xpcom/base/nscore.h @@ -76,7 +76,7 @@ * NS_HIDDEN_(int) NS_FASTCALL func2(char *foo); @@ -8,6 +8,6 @@ $NetBSD: patch-xpcom_base_nscore.h,v 1.1 2018/12/16 08:12:16 ryoon Exp $ -#if defined(__i386__) && defined(__GNUC__) +#if defined(__i386__) && defined(__GNUC__) && !(defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ == 0) - #define NS_FASTCALL __attribute__ ((regparm (3), stdcall)) - #define NS_CONSTRUCTOR_FASTCALL __attribute__ ((regparm (3), stdcall)) + #define NS_FASTCALL __attribute__((regparm(3), stdcall)) + #define NS_CONSTRUCTOR_FASTCALL __attribute__((regparm(3), stdcall)) #elif defined(XP_WIN) && !defined(_WIN64) diff --git a/mail/thunderbird/patches/patch-xpcom_build_BinaryPath.h b/mail/thunderbird/patches/patch-xpcom_build_BinaryPath.h index 28981f3748b..71d52aef70f 100644 --- a/mail/thunderbird/patches/patch-xpcom_build_BinaryPath.h +++ b/mail/thunderbird/patches/patch-xpcom_build_BinaryPath.h @@ -1,9 +1,9 @@ -$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.1 2018/12/16 08:12:16 ryoon Exp $ +$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.2 2019/02/26 11:32:13 ryoon Exp $ ---- xpcom/build/BinaryPath.h.orig 2018-12-04 23:12:03.000000000 +0000 +--- xpcom/build/BinaryPath.h.orig 2019-02-13 14:19:45.000000000 +0000 +++ xpcom/build/BinaryPath.h -@@ -22,7 +22,8 @@ - defined(__OpenBSD__) +@@ -21,7 +21,8 @@ + defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) #include <sys/sysctl.h> #endif -#if defined(__OpenBSD__) @@ -12,21 +12,21 @@ $NetBSD: patch-xpcom_build_BinaryPath.h,v 1.1 2018/12/16 08:12:16 ryoon Exp $ #include <sys/stat.h> #endif #include "mozilla/UniquePtr.h" -@@ -172,7 +173,8 @@ private: +@@ -164,7 +165,8 @@ class BinaryPath { } #elif defined(__FreeBSD__) || defined(__DragonFly__) || \ -- defined(__FreeBSD_kernel__) || defined(__NetBSD__) +- defined(__FreeBSD_kernel__) || defined(__NetBSD__) + defined(__FreeBSD_kernel__) || \ + (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) - static nsresult Get(char aResult[MAXPATHLEN]) - { + static nsresult Get(char aResult[MAXPATHLEN]) { int mib[4]; -@@ -257,6 +259,13 @@ private: + mib[0] = CTL_KERN; +@@ -246,6 +248,13 @@ class BinaryPath { return NS_ERROR_FAILURE; } -+#elif (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME)) +++#elif (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME)) + static nsresult Get(char aResult[MAXPATHLEN]) + { + char path[] = "@PREFIX@/lib/firefox60/firefox60"; |