Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] thunderbird: update to 68.12.0
@ 2020-08-27 15:27 mmnmnnmnmm
  2020-08-27 23:04 ` sgn
                   ` (26 more replies)
  0 siblings, 27 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-08-27 15:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 444 bytes --]

There is a new pull request by mmnmnnmnmm against master on the void-packages repository

https://github.com/mmnmnnmnmm/void-packages thunderbird
https://github.com/void-linux/void-packages/pull/24509

thunderbird: update to 68.12.0
Final release in the 68 branch, next release is 78, which contains big OpenPGP changes and supports only webextensions.

A patch file from https://github.com/void-linux/void-packages/pull/24509.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-thunderbird-24509.patch --]
[-- Type: text/x-diff, Size: 9339 bytes --]

From 721c89207bfa77fa9344252ad645eec9805c3abd Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Thu, 27 Aug 2020 11:24:40 +0100
Subject: [PATCH 1/2] thunderbird: update to 68.12.0

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index fd9c9580559..f0be0d9388c 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=68.11.0
+version=68.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="29ebac8c1596b508a1a19977524bcb9b9d357b8b422274c03f085bc2a1e5d11b
- b36fc2bc7ee070202ec3caa6ffe3bc24f527d8c076e33f0f3ac7c2bb34678264
- c425d737792ab8a4793e4c9ac094027c9ecfabe5bdc56c205e1b57b999626fd2
- 344962eb54d66b925d1e9d2139e92bec9d3f7c273d2735ab4933004efb2cc300
- ff8f1460b1c3dec628985fb047c62d75847a8ab1fdef553324dcd1b1c7a058e5
- bd531fa67ef6b4406e778cb5b0e09dc38e6de2f08d48c2fe87bfb13ba62eebac
- 9690c8600e36c138954bc2848d71872346c1e747b97a2bc180783779af589c15
- 52afdc19898b244a0a751ec5e89f223922554931c6a5cfb46289b3f71e7e4700
- 47c6881a303ade66dca9618b5127557be7511e1d44a64892efecefd451b7f7e0
- 77d63f3133a1978d139098af5d2e2cc19675c1bf380a7f2dac2d59ce876c29ee
- 046e46ecee6430a190f0f8cfdcc4723f5d69f617d1167788ebcd410fd6c206e5
- afa61ad764739ea2f171e8c3338883b2b076e354a40c39d73709d5592f3ad577
- 7cfabfb6454de77116b7ca806ca43cf1c93b21b126708e787f7e0d2e3b1907af
- 7d38732aef00b03c54f353cd81f5b22fb43437f0b0960ae269c0af58832e7044
- 9690287d26cd6d3fd8301f762a40d4304ef7dbf0f73da913a793eb5f171295af
- c9eafbbdf6a267804dbfb2f5f8d6f1a1b53aa0fa9426f9af05138655a49d61f6
- c5d249574dc53a8425bef3469d2bf6aa3e1735a9cef1cfe5339a7c4b674294a1
- 6a6bcdddbf4cf6edae30b7d5eba330232d88fc2722085409ecbac0861f661d05
- ac2abdbd3cad39a5d52626ffe00e7f59ab52c669b3da6f43268d62e2f01345d7
- 566718f0068fccedacf3cee3ab56a36e849bc3d4acadf508962c81981f29e7e9
- bb94fb6835400bfe0b70276fc45e941b4a5dd809f946865dfca841373beb42f7
- 9b36cc8688ab7871ef90f7778b3747fc6503a56ed42f8faafa0b6568e9a906d0
- b99159527690293830cf167affa9a604c26a10e268d0617a3d06e7319ff8572a
- 22695eda8f34c749e95a310752461d48f45eafb428dbf6a1d324e223577fae0d
- f35d72064fd5a7246020e5958d8d43b0f0e1f439aee7095e306318400bd4b298
- e015951a49b812ae1889e24dd67f67cc26c38242a0c20708ef845277559b131d
- 343acef6937334a0a525fd181f88c7f68f75e93cdeacffef05df4a8211e288b7
- c9e3739e55834d7512e5817498c358498a3cb0f652f21c213c06287204ebed01
- 2381df9b757dd2aac778001a09f36d88e98f2620dd05813425f53b9e35f26040
- a6f21d925b9334d5f46e054ae6db492f7c3c8c62b043a292e45a984a37ef6087
- ced2a3d7a590e538ca6d817efda47478ca198246640835733c5d579205fd9059
- c2bff27ecd581fffb156cb9fdfc26cdfa2a2fd8dab3ad478c80ca53d22c59ef6
- efc4f0b1781463bdf0561e25e9c31dc5878949cbd34684393f168b7b69f88e15
- c4fac0f3281e59de3a1a43767ac497689605d6e35673e3606b5a43fb835cd47a
- fc034024f5a960d3ac82b5b5b99dc481b8d6508496bd6264dd873c4883a9440e
- c3c5fe21cb5bb84af9b6428ff6f62ba8b669dc931ea3bd66225bd3d88aec07f8
- bb5955b070dd509f4a8f170162826ec497d0a09e56eaa641e8223328b67408a3
- a0d018d37b19fa4e82d89411c9e297df12fa56b003f6631cfbc12355dd8cac94
- d8a5eac605c4288f1946de393dd52b9c16f8f618335c1e609806b5ec806d697a
- 867cd73998fca97eeb29a08ae3b492329741bcfcd157c275e2f7c3d75dd2da7f
- a56814cbc21b8415645c655ae20836935c3fba31d66c0b33de33ace295a294e3
- 0dbbca82f751b0fe80ca7f3b161350d982e966499e0835c415cd7ed32861b3a7
- 238f218891c28e1505bddbd08a183896b93d383d56e5a429a8ac731d30b54624
- 2d7f404c97d377275a4e9be9fcf5712ba2b85c161042d80f992c4c1d794890f5
- 3093d3e5de225238bb15c459c0b317c5ebf05302389d03cbd0b69768ca9c011d
- 313247a18560313e0d39895713c793488e98c705659fc5b6aaba59fd25fbeb5c
- 06542ba7fad18017e52b135ab68266a0c791a1446b36b55f4476e9e6720c33d0
- abfeca306d10dcaba73becffa90bf830707983f341b8abfec90203297c2f676e
- cb1e4c67fad60b0080ce304a78728174f463093a2a6d730b5bd6739b5a15c370
- 93da2ce9ffa2aec8aa56fd88c97ee5bead6b8ba46b4df3bd98a4376402669183
- d6144c43d24bff108ae787092bbbefe91c135345a923f7f8b951ac7cd46fa807
- c2c24bfe1522a36181b6c6d03acf98a0df3921c0493cc8c818df70ebf2760c53
- d68229f3b05b80ad807cd2a750b916e460665574c96b5b8e5258e2f689a4a971
- 4ca52ff75e0358feb4a535617076d2aede70b0d7ab29524a4b4bfe4f1b7ab0da
- ff20a2ac005ee398f2aec1897f578ed38072b7b21e3e962abc67ecb66d01d3fe"
+checksum="e9456d69ebf490d2b2dd0a9732e21b77508a6d86888f539ac435440dc0d73b1f
+ 107c073b5ff0af969a7886523ed8447bee97c12ba8752beb68084a38538d2659
+ 0f5461c5c9f138fd6d321dbce76ea8880df76c6051b2e34222a8709fc5824891
+ 4219193972f22db5287bbc9b3de2edd25e25d3fb39400ddd674e655ced8d131b
+ 13357a031aea34ee5f3d93f8da819ac8d0ebafca34331cb515cdf3dc8c3ebaf1
+ 65aa6f338fc8f0e7e9b2a4c8ef21da3b4ddcf2ecbf0752c735c905d62b5ca0cf
+ 326bd58eaa320449b472aabb9b5cd92fb6f681f1a739b372aefc1f49136c76b5
+ 099ef087a81436ce10c7525ce6795af4737b0329775b0504483a8bb67ec118fa
+ b1c30da0a1eda837bb09ec35063c764e473e285f58ba70d1d41e4520e34010ff
+ 23beb45709ddbdba152fdc671d2150f7808ca5ea52e2ef3bf1ee1e1cc6ffe16d
+ 3f6edcbffc303c5099e26fc385079c57ad9487bcc523c0a4980c5416690fbe34
+ e2a4b15b8d47b0de7942fc77e7a0f6ac0a8edc4c647207383befd32750dbb0d3
+ dba8caaa04e7114091dbf1c31ecd47fd3e6c3204e61e8fa451f7919213577106
+ 54faedc63d017d95d53353b0d2456b41e70d68da8e99a1612f2766962c3a08b6
+ f16858cbb758a737f138735e9c3f78ac0d61ebdac4b9b7e1e181bd6bbc4daa27
+ 980c1776f6fcc7a47be48e47b8b34ce7886340e794f2b61220d584a3887687c9
+ 2d39afb4d0b7f3309ac07b45f7e7a8ff753b4d4852ec588f19380b0cfdf0a8fe
+ 8c6e0d287c5dc25751a74c7a5662d5e4eb18a10f96f8aca5bd6a14453cb4385c
+ 11111cfa0c149c58fa7c7591e427a3d6437ca3ad49b00f267af189ff12dfa00c
+ 1208bb9bfa4bc19a3de3af7bee7120fe36bc1412e61a7f197a2305842b42b448
+ c8e056a8200114c216dbff50105f8e6cd16e4fbe75dd6d982270df04001d1173
+ 49fd83485aa15d8563ba582d06d82ab59a3a88f8a0bfddc517878877943e91fe
+ f80ab30e66d91925cf2f5ba880d95272e0948d1a815655f1eaf62530a0862f27
+ 46544f2a179ce9550e1099a9914aa8521fd2a22f73540e1de5b32beae49a62c4
+ 984ee44c0bc6b3ad421bc27d591b09dc92d70bafcc6dc28f07a22f74d4812aaf
+ 246b42acae78ac7334e968b9209917f2975b5a6e4de7deefb103af51df7b6893
+ 498344b40ad9d4da13fa06401715cf2a32aef44c6116192f194663bfc518f2ed
+ 226840deb3dc0ddfa80cd311fff3eea9cc2b51daa371e3080299e4827cf3c577
+ f22f041b598e0be5489d60f215202c4f5754467a116066a75481e9f9e3eb29a2
+ bfefd69189801d4fff3335dd9312f496d7c058346fd74c8b7e0780406e80ee1b
+ d921aa36bb04a16b7b7d9f8f5e9cad4016ffb920fbb84343c463ddd593e16e97
+ fa56c22c7b9ed9ce53544618c9777dbabb236ee77b5d9b5889cae264283655dc
+ f02f2f4506758f4c101bb7ae6b43a79d75888c0ed0f9038a52f3fd3d23c20587
+ 3a5eceffd620820eb2218771f239bc3cce5689c32f8828e0bda34d7642b7ddb5
+ 24e2f2922635336b3108c031259fe83fbe2f77cc976428967e424421ad190f7b
+ e5afed49a6faa52d50bd8341d7b0c8a6d84e5754f8e7d2ee4fde2be4caea7245
+ d98360bea6f3dba644232acf196670dab8ef436244d82327a2734fe774ed10eb
+ ba18f7ccee9f4cad7c192504cf46108e9f1ae0364d4ab64027ba4ee8f21bf19b
+ 82bc066b34447f0138e242062ec02703a41c52fcd27ee9c34cfb9139175b11b3
+ 26b733b4ea0007d994fbfff47d807ab6901cfa815388aa8f6c7fd470e87a771a
+ efb16bd7e9a38a179d3ed46043ebfde56841ba78b659664b5f8315b9a4b8f834
+ cf2b0b016526c7a3a7462806bbde0b36dee21b75a46f92b53d3f52d933e87c2a
+ f54ffa00147a0cca0d39852d25517b9fe1b2979b307e112d083e18e07926ddfe
+ 027731d6af14e49e3615dc432ca90f2969adfbf4f1414830d9c73d12fdee355d
+ 7421901c3e6c59a21991f22c88e9032af43fde2f039893f2fc3d8a431f020a93
+ 5b5dad1ca6a2f540c460e2da76041f307fb339edfc31d813c05cf023aa244bed
+ 6fe7c0f1ace7e3860b05324f112778d5296902d01caa56cd23a80475ee7fa51f
+ 5e082b576a7c2c8d8889d7f8b00f3547b6125d953126fdc06a02e9db119dd30d
+ 30621d0c41258db623fee7f116cafabc9f9ee4dc9143f7d1cee38fc42da2ebfd
+ e4d7052ff94f8c4afd86d4a3f332640d1ee08f54c1044f7ad02cbe2271be5ed2
+ 9aac3abe19602d612248a525e1483c805984523eb428929aa7bd4c2163e35e02
+ 8caf97578f8655c746bff8d0d0cd353c6d47f5b3346bc0a416f94e94cb7c3aa5
+ 171d2b79d6f47c298053b27b188a02dd75f4e5dede4d7ef246e0c1685e2cc102
+ c9c3758fdc564448c049efb5b4b12818bb0249c8f06760f561b6b447b6bfa9fe
+ d2aef33f392f91502c21878d71f67088c60d69555aff4a4d2a55e009cdf5fac8"

From 7753a7f1261602fceca4cd2df145ff0b10e86439 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Thu, 27 Aug 2020 11:24:56 +0100
Subject: [PATCH 2/2] thunderbird: update to 68.12.0 [ci skip]

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 7d57aec6929..1d1f32d196b 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=68.11.0
+version=68.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=0d2f403c7aca55ab130b7262ff8afc0254e5c0471db01f1631976df68a6af5f2
+checksum=8cf582d03125df86044626072c0d924d4b7c3e984d9228d62acdf4e9918eec02
 
 lib32disabled=yes
 

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 68.12.0
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
@ 2020-08-27 23:04 ` sgn
  2020-08-28 13:04 ` mmnmnnmnmm
                   ` (25 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sgn @ 2020-08-27 23:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-682234584

Comment:
On 2020-08-27 08:27:53-0700, mmnmnnmnmm <notifications@github.com> wrote:
> Final release in the 68 branch, next release is 78, which contains
> big OpenPGP changes and supports only webextensions.

I don't use Thunder Bird, but I think we should switch to 78.2 now.

-- 
Danh


^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 68.12.0
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
  2020-08-27 23:04 ` sgn
@ 2020-08-28 13:04 ` mmnmnnmnmm
  2020-08-28 13:04 ` mmnmnnmnmm
                   ` (24 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-08-28 13:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New comment by mmnmnnmnmm on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-682538132

Comment:
Sure, I barely use thunderbird anymore so I can't reliably test the new changes but I'll update this pr once I get it to build.

I could also update firefox-esr to 78 now as I've been running it for over a month now.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 68.12.0
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
  2020-08-27 23:04 ` sgn
  2020-08-28 13:04 ` mmnmnnmnmm
@ 2020-08-28 13:04 ` mmnmnnmnmm
  2020-08-28 13:04 ` mmnmnnmnmm
                   ` (23 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-08-28 13:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New comment by mmnmnnmnmm on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-682538243

Comment:
Sure, I barely use thunderbird anymore so I can't reliably test the new changes but I'll update this pr once I get it to build.

I could also update firefox-esr to 78 now as I've been running it for over a month now.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 68.12.0
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (2 preceding siblings ...)
  2020-08-28 13:04 ` mmnmnnmnmm
@ 2020-08-28 13:04 ` mmnmnnmnmm
  2020-08-28 19:51 ` [PR PATCH] [Updated] " mmnmnnmnmm
                   ` (22 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-08-28 13:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New comment by mmnmnnmnmm on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-682538243

Comment:
Sure, I barely use thunderbird anymore so I can't reliably test the new changes but I'll update this pr once I get it to build.

I could also update firefox-esr to 78 now as I've been running it for over a month now.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] thunderbird: update to 68.12.0
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (3 preceding siblings ...)
  2020-08-28 13:04 ` mmnmnnmnmm
@ 2020-08-28 19:51 ` mmnmnnmnmm
  2020-08-28 19:57 ` mmnmnnmnmm
                   ` (21 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-08-28 19:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is an updated pull request by mmnmnnmnmm against master on the void-packages repository

https://github.com/mmnmnnmnmm/void-packages thunderbird
https://github.com/void-linux/void-packages/pull/24509

thunderbird: update to 68.12.0
Final release in the 68 branch, next release is 78, which contains big OpenPGP changes and supports only webextensions.

A patch file from https://github.com/void-linux/void-packages/pull/24509.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-thunderbird-24509.patch --]
[-- Type: text/x-diff, Size: 35738 bytes --]

From 68e44b0b80c328973fcb1da709be86bf5ec7ed6d Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:46:09 +0100
Subject: [PATCH 1/2] thunderbird-i18n: update to 78.2.0

---
 srcpkgs/thunderbird-i18n/template | 167 ++++++++++++++++++++----------
 1 file changed, 110 insertions(+), 57 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index fd9c9580559..83c331247ec 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=68.11.0
+version=78.2.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -79,7 +79,7 @@ for _lang in "${_languages[@]}"; do
 	_pkgname=thunderbird-i18n-${_locale}
 
 	depends+=" ${_pkgname}>=${version}"
-	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-i686/xpi/${_locale}.xpi"
+	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-x86_64/xpi/${_locale}.xpi"
 
 	eval "${_pkgname}_package() {
 		_pkgtmpl $_lang
@@ -96,58 +96,111 @@ _pkgtmpl() {
 	}
 }
 
-checksum="29ebac8c1596b508a1a19977524bcb9b9d357b8b422274c03f085bc2a1e5d11b
- b36fc2bc7ee070202ec3caa6ffe3bc24f527d8c076e33f0f3ac7c2bb34678264
- c425d737792ab8a4793e4c9ac094027c9ecfabe5bdc56c205e1b57b999626fd2
- 344962eb54d66b925d1e9d2139e92bec9d3f7c273d2735ab4933004efb2cc300
- ff8f1460b1c3dec628985fb047c62d75847a8ab1fdef553324dcd1b1c7a058e5
- bd531fa67ef6b4406e778cb5b0e09dc38e6de2f08d48c2fe87bfb13ba62eebac
- 9690c8600e36c138954bc2848d71872346c1e747b97a2bc180783779af589c15
- 52afdc19898b244a0a751ec5e89f223922554931c6a5cfb46289b3f71e7e4700
- 47c6881a303ade66dca9618b5127557be7511e1d44a64892efecefd451b7f7e0
- 77d63f3133a1978d139098af5d2e2cc19675c1bf380a7f2dac2d59ce876c29ee
- 046e46ecee6430a190f0f8cfdcc4723f5d69f617d1167788ebcd410fd6c206e5
- afa61ad764739ea2f171e8c3338883b2b076e354a40c39d73709d5592f3ad577
- 7cfabfb6454de77116b7ca806ca43cf1c93b21b126708e787f7e0d2e3b1907af
- 7d38732aef00b03c54f353cd81f5b22fb43437f0b0960ae269c0af58832e7044
- 9690287d26cd6d3fd8301f762a40d4304ef7dbf0f73da913a793eb5f171295af
- c9eafbbdf6a267804dbfb2f5f8d6f1a1b53aa0fa9426f9af05138655a49d61f6
- c5d249574dc53a8425bef3469d2bf6aa3e1735a9cef1cfe5339a7c4b674294a1
- 6a6bcdddbf4cf6edae30b7d5eba330232d88fc2722085409ecbac0861f661d05
- ac2abdbd3cad39a5d52626ffe00e7f59ab52c669b3da6f43268d62e2f01345d7
- 566718f0068fccedacf3cee3ab56a36e849bc3d4acadf508962c81981f29e7e9
- bb94fb6835400bfe0b70276fc45e941b4a5dd809f946865dfca841373beb42f7
- 9b36cc8688ab7871ef90f7778b3747fc6503a56ed42f8faafa0b6568e9a906d0
- b99159527690293830cf167affa9a604c26a10e268d0617a3d06e7319ff8572a
- 22695eda8f34c749e95a310752461d48f45eafb428dbf6a1d324e223577fae0d
- f35d72064fd5a7246020e5958d8d43b0f0e1f439aee7095e306318400bd4b298
- e015951a49b812ae1889e24dd67f67cc26c38242a0c20708ef845277559b131d
- 343acef6937334a0a525fd181f88c7f68f75e93cdeacffef05df4a8211e288b7
- c9e3739e55834d7512e5817498c358498a3cb0f652f21c213c06287204ebed01
- 2381df9b757dd2aac778001a09f36d88e98f2620dd05813425f53b9e35f26040
- a6f21d925b9334d5f46e054ae6db492f7c3c8c62b043a292e45a984a37ef6087
- ced2a3d7a590e538ca6d817efda47478ca198246640835733c5d579205fd9059
- c2bff27ecd581fffb156cb9fdfc26cdfa2a2fd8dab3ad478c80ca53d22c59ef6
- efc4f0b1781463bdf0561e25e9c31dc5878949cbd34684393f168b7b69f88e15
- c4fac0f3281e59de3a1a43767ac497689605d6e35673e3606b5a43fb835cd47a
- fc034024f5a960d3ac82b5b5b99dc481b8d6508496bd6264dd873c4883a9440e
- c3c5fe21cb5bb84af9b6428ff6f62ba8b669dc931ea3bd66225bd3d88aec07f8
- bb5955b070dd509f4a8f170162826ec497d0a09e56eaa641e8223328b67408a3
- a0d018d37b19fa4e82d89411c9e297df12fa56b003f6631cfbc12355dd8cac94
- d8a5eac605c4288f1946de393dd52b9c16f8f618335c1e609806b5ec806d697a
- 867cd73998fca97eeb29a08ae3b492329741bcfcd157c275e2f7c3d75dd2da7f
- a56814cbc21b8415645c655ae20836935c3fba31d66c0b33de33ace295a294e3
- 0dbbca82f751b0fe80ca7f3b161350d982e966499e0835c415cd7ed32861b3a7
- 238f218891c28e1505bddbd08a183896b93d383d56e5a429a8ac731d30b54624
- 2d7f404c97d377275a4e9be9fcf5712ba2b85c161042d80f992c4c1d794890f5
- 3093d3e5de225238bb15c459c0b317c5ebf05302389d03cbd0b69768ca9c011d
- 313247a18560313e0d39895713c793488e98c705659fc5b6aaba59fd25fbeb5c
- 06542ba7fad18017e52b135ab68266a0c791a1446b36b55f4476e9e6720c33d0
- abfeca306d10dcaba73becffa90bf830707983f341b8abfec90203297c2f676e
- cb1e4c67fad60b0080ce304a78728174f463093a2a6d730b5bd6739b5a15c370
- 93da2ce9ffa2aec8aa56fd88c97ee5bead6b8ba46b4df3bd98a4376402669183
- d6144c43d24bff108ae787092bbbefe91c135345a923f7f8b951ac7cd46fa807
- c2c24bfe1522a36181b6c6d03acf98a0df3921c0493cc8c818df70ebf2760c53
- d68229f3b05b80ad807cd2a750b916e460665574c96b5b8e5258e2f689a4a971
- 4ca52ff75e0358feb4a535617076d2aede70b0d7ab29524a4b4bfe4f1b7ab0da
- ff20a2ac005ee398f2aec1897f578ed38072b7b21e3e962abc67ecb66d01d3fe"
+checksum="1951d1412b6e3de153bec871ac75b182529c40d703b0e6faa3aacdac35744498
+ c90fb72b96a8c4ac3c1efd045962242d98a2f803955df3e88888736478d63602
+ 8e82fa53f8237eb0d2afa1c8c4ce9da209bce4554483e151dba43da93262d1f3
+ 286565e0de10090182497bf540b5b29676fa0faffc40f63bbf1bc9666cee37f0
+ d27c97c11dec8d7948e9e959c75a52b1d0aaf86ad8ef8148a73a2de4b20fc1f6
+ 2eaf51fdf94935bbf91c4414afd54ad04fe685abe5a6ac8628d72e71ecd07e35
+ fe80c229e70619d5d6ce9f55de4bca1c61d4053e3d32aa5cbd51e2a05ae2b83b
+ c0f77657ed1841edea389f76d20313a9b433c2b6b0173ae9393be241b26ddc71
+ d1a74be7f40e1c1ab72c8a1b5dbe49f9a5edd23b9e99b99fc9a9265dcf7c637c
+ 215a7134b6980c9bd76662d331aa27170361a7e3382bb66de778be31e8d8be78
+ 9722f33259e2f097b246e4f6b560ba50c2cbed0e9b85525e84c84d46a4997c82
+ 3bec3846afec50553d57e3e9e066244dc0f05e2a2bdb3ae8b4f9f02e3c8ca35d
+ 1b53f351976e964f0384f018042c2f5e4b50db9a491f75dfadc09bf765d18e73
+ 6bb04c7748f451e9df011fc54c875dea56e536402c04d0cba27dcee8efa4f0fd
+ 05f7c731b095838c754c3fc4c5614e1a596c69f9538aa975effd86c787117e49
+ 0d33d4f160822887d087dfe9174ccdc2ea1e2cc8878607ddadff0d34968a0a13
+ 9f3d13e3f24dd61073d6c738d0249119283c1e3f89734b409c48e44c8472730a
+ 24f4f814051c8324b41867fd855b1fc78c768201e153bfb8640db440de58c853
+ 45948336e9def651199d548df702459d4fb7667c11c057984efe932039df0312
+ 74c32583b012c8daa0f6d5c844b502ebe76eaac2d61cc3a0331f265c3b8cdad1
+ fc63430d1c60b2c1ae66076e502616fa440d35cf2c6b09acbf3e4ca34d2519f7
+ 81ee3a9c75dc85c466917fe33a66cafca363b87d7b1bf0cb5b7b464253b5f5aa
+ a6bcddab931c266658ddfc4c668429cc5342cd8a232df10f8ceaa590bc49a840
+ e86b82a50d69c88e3dac4f4f5d3a4ac2a27ac1b6db5388384c0e79aa21f77caf
+ ba3774750117a480ca7d18a7830f27eb5e2f493e25b3f22cf805186e3925563e
+ 714446124f4caa4fbe8411c15d6041f2c5e0080c154e5befac4e557a8a74dd8f
+ 5c8bf7f727f6ea7370a39cd013107e3b24a21b56ae335a71dffbfa243c13b742
+ fb1420d63515857657a92ef38371b1b9a0aa897b7aadc9e451bf2d9da4ffef17
+ 696b62a8043b3486a059fe8487bf0749065d9e878311eeec0730304647862d85
+ b5649b00e2fc530b8f63d5f963511c6ef7cae4deadf70fb83d4e70972c7c313b
+ a6ecba0825dbc2f3bec693577b850ca52acd100d0df3af544784c23fb6d1f4f0
+ d36dc9011d464bc027bb0b3c91ccd73baa879d8c814d790f802a9ddaf2b805e2
+ 410ca6c4a58e2d0d6057dd9203b9d7eb4b93baf1ec4a8e5ebb8651bf80138d8f
+ 49702c62a0156218a9e3b405da1629f38e519f4880a873040df1948c36408396
+ ac3312e70ca69310620582a23abcb18b7e8e7486cc6f2753ee77f3f52ecb3d0b
+ f7ab49c53fd9aad793c6efd95fae234af85fdfb83c6ed27e7be158a1aa7e738e
+ 40ad4638619e3ba1a10a3e4435576d9d56033cd04575cb839072070d4e71a844
+ 7bcf1a1e811df56a16cfbd1ed9aaaec4be87ceeeb627b637453c7bef8af926b6
+ abedc83798c5a8d1254f6f0cf2a938f702854749a70cbb1eae667674b6929c71
+ 283678aa2856fc587b881350c951416aa76086ad1175d9174eafbc6c9b9e4e33
+ 31909339d708f4d039ad2b155cdce0b556f5070e727557f07be3d890debb9608
+ fc0c86ca18e652438a38fef65f1302405953d88bd187d18c3e71cc2adabfa63d
+ 62215faec6e80fff004957f544b94cb80615894741be6be265ef7701d0ddb871
+ 8ff77a6f9b18aa28dc969415b4113840c647409d55a8e2c97800095f6f1f2dee
+ f1cc4f47b187a09f16929f531b44e6a7d26473a175a44dca33a13a59ee79b88c
+ 1e73ff8f4f5b0290a84810b1a7ba60abcf0ab3a5d40a3eb9a179c94af79c2f69
+ 0be99f9215e5f96f6e2590a3fab30e739d5aa237578de23d9147fc10a9734cac
+ 4b164ee6f3d4d82a751b6be64d7b8a90c31f5669ceede3ff98355b3381ffceaf
+ 6936cc84a1f76519ab915d0c91fb66024556afa9af686ced76daa2f326b7ed77
+ c278a4c70b3f90ba6d499be3828d999d63ce6eed13b126c3611e812558aeb0d5
+ 7e33b56d19a8ec633ce2223d0caf7d8cfe999c3259a2377b07f345ad3827658d
+ aecc84bab9abecf1f8090450ade2f7eac172865b5b7422407cfa04b2e5e17fd9
+ 1b8878eeef01f2961a1d6beb302e68fd895cdd4f5b0da87f70393b20ccd81767
+ 93e7cf622a273c4169226af136b798d5e363b765e00ec788aab510d4eab846a0
+ dd6030769be34a901ce1af8753f45ec67ee893057fa9a7c37aca41117f3ac2a9"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

From 7fd00c6ac78d4fa297066e9dc7ce1e88a7625b51 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:49:23 +0100
Subject: [PATCH 2/2] thunderbird: update to 78.2.0 [ci skip]

---
 srcpkgs/thunderbird/files/mozconfig           | 10 +--
 srcpkgs/thunderbird/files/thunderbird-wayland |  2 +
 .../patches/fix-i686-ppc-musl.patch           |  8 +-
 srcpkgs/thunderbird/patches/fix-musl.patch    | 11 ---
 .../patches/fix-sandbox-membarrier.patch      | 52 ------------
 .../thunderbird/patches/fix-seccomp-bpf.patch | 14 ----
 srcpkgs/thunderbird/patches/fix-toolkit.patch | 78 ------------------
 srcpkgs/thunderbird/patches/fix-tools.patch   | 17 ----
 .../thunderbird/patches/ppc32-fix-build.patch | 36 +++++++++
 .../patches/ppc32-skia-portable.patch         | 14 ----
 .../thunderbird/patches/rust-configure.patch  | 15 ++--
 .../thunderbird/patches/rust-glslopt.patch    | 13 +++
 .../thunderbird/patches/rust-has-i128.patch   | 21 +++++
 .../thunderbird/patches/sandbox-fork.patch    | 13 +++
 srcpkgs/thunderbird/patches/sndio.patch       | 81 +++++--------------
 srcpkgs/thunderbird/template                  | 61 +++++++-------
 16 files changed, 147 insertions(+), 299 deletions(-)
 create mode 100644 srcpkgs/thunderbird/files/thunderbird-wayland
 delete mode 100644 srcpkgs/thunderbird/patches/fix-musl.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-toolkit.patch
 create mode 100644 srcpkgs/thunderbird/patches/ppc32-fix-build.patch
 delete mode 100644 srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-glslopt.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-has-i128.patch
 create mode 100644 srcpkgs/thunderbird/patches/sandbox-fork.patch

diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig
index 334846e9a64..ed6cfb244cb 100644
--- a/srcpkgs/thunderbird/files/mozconfig
+++ b/srcpkgs/thunderbird/files/mozconfig
@@ -3,7 +3,6 @@ ac_add_options --libdir=/usr/lib
 
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-libevent
@@ -12,12 +11,8 @@ ac_add_options --with-system-icu
 # XXX: the system's libpng doesn't have APNG support
 ac_add_options --without-system-png
 ac_add_options --enable-system-pixman
-ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 
-ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr
-ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr
-
 nspr_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nspr"
@@ -26,16 +21,15 @@ nss_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nss"
 
-ac_add_options --disable-gconf
 ac_add_options --disable-tests
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-install-strip
 ac_add_options --disable-strip
 ac_add_options --disable-profiling
-ac_add_options --disable-gold
+ac_add_options --enable-release
 ac_add_options --enable-optimize="$CFLAGS"
 
 ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
 ac_add_options --enable-application=comm/mail
+ac_add_options --enable-calendar
diff --git a/srcpkgs/thunderbird/files/thunderbird-wayland b/srcpkgs/thunderbird/files/thunderbird-wayland
new file mode 100644
index 00000000000..cd7f9ab7394
--- /dev/null
+++ b/srcpkgs/thunderbird/files/thunderbird-wayland
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec env MOZ_ENABLE_WAYLAND= /usr/lib/thunderbird/thunderbird "$@"
diff --git a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
index 40aab43ae86..6df609bbf16 100644
--- a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
 --- mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
 +++ mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -33,7 +33,7 @@ using namespace mozilla;
- #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+@@ -41,7 +41,7 @@
+ #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
  
--#if (defined(linux) &&                                            \
+-#if (defined(linux) && \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #define MOZ_STACKWALK_SUPPORTS_LINUX 1
diff --git a/srcpkgs/thunderbird/patches/fix-musl.patch b/srcpkgs/thunderbird/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/thunderbird/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch b/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
deleted file mode 100644
index caffd83cf67..00000000000
--- a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-allow usage of SYS_membarrier, needed since musl-1.1.22
-
---- security/sandbox/linux/SandboxFilter.cpp
-+++ security/sandbox/linux/SandboxFilter.cpp
-@@ -283,6 +283,8 @@
-       case __NR_set_tid_address:
-         return Allow();
- #endif
-+      case __NR_membarrier:
-+        return Allow();
- 
-         // prctl
-       case __NR_prctl: {
-
---- security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-
---- security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
- 
---- security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1490,5 +1490,9 @@
- #define __NR_shutdown 373
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
- 
diff --git a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch b/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
deleted file mode 100644
index ed94fc39ed0..00000000000
--- a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig	2015-09-23 09:10:08.812740571 +0200
-+++ security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc	2015-09-23 09:11:38.404746155 +0200
-@@ -23,6 +23,11 @@
- #include "sandbox/linux/services/android_ucontext.h"
- #endif
- 
-+// musl libc defines siginfo_t __si_fields instead of _sifields
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#define _sifields __si_fields
-+#endif
-+
- namespace {
- 
- struct arch_sigsys {
diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch
deleted file mode 100644
index 86e8ef47855..00000000000
--- a/srcpkgs/thunderbird/patches/fix-toolkit.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig    2016-07-05 21:00:03.672000517 +0200
-+++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200
-@@ -1134,6 +1134,12 @@
- #ifndef __NR_fallocate
- #define __NR_fallocate          285
- #endif
-+
-+#undef __NR_pread
-+#define __NR_pread __NR_pread64
-+#undef __NR_pwrite
-+#define __NR_pwrite __NR_pwrite64
-+
- /* End of x86-64 definitions                                                 */
- #elif defined(__mips__)
- #if _MIPS_SIM == _MIPS_SIM_ABI32
---- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-04-17 10:24:33.793431933 +0000
-@@ -45,6 +45,7 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <libgen.h>
- 
- #include <iostream>
- #include <set>
---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-04-17 10:24:33.793431933 +0000
-@@ -41,6 +41,10 @@
- 
- #include "common/using_std_string.h"
- 
-+#ifndef N_UNDF
-+#define N_UNDF 0
-+#endif
-+
- using std::vector;
- 
- namespace google_breakpad {
---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-04-17 10:24:33.793431933 +0000
-@@ -55,7 +55,7 @@
-
- #ifdef HAVE_MACH_O_NLIST_H
- #include <mach-o/nlist.h>
--#elif defined(HAVE_A_OUT_H)
-+#elif 0
- #include <a.out.h>
- #endif
-
---- toolkit.orig/mozapps/update/common/updatedefines.h	2019-01-29 11:34:36.416804577 +0100
-+++ toolkit/mozapps/update/common/updatedefines.h	2019-01-29 11:34:59.193583777 +0100
-@@ -102,7 +102,7 @@
-
- #  ifdef SOLARIS
- #    include <sys/stat.h>
--#  else
-+#  elif !(defined(__linux__)) || defined(__GLIBC__)
- #    include <fts.h>
- #  endif
- #  include <dirent.h>
---- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
-+++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
-@@ -3978,6 +3978,7 @@
- 
- int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
-   int rv = OK;
-+#if !defined(__linux__) || defined(__GLIBC__)
-   FTS* ftsdir;
-   FTSENT* ftsdirEntry;
-   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
-@@ -4085,6 +4086,7 @@
-   }
- 
-   fts_close(ftsdir);
-+#endif
- 
-   return rv;
- }
diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch
index 0ed043fb5b5..d29da8bb54b 100644
--- a/srcpkgs/thunderbird/patches/fix-tools.patch
+++ b/srcpkgs/thunderbird/patches/fix-tools.patch
@@ -1,20 +1,3 @@
---- tools/profiler/lul/LulElf.cpp.orig	2019-01-29 12:05:34.223834130 +0100
-+++ tools/profiler/lul/LulElf.cpp	2019-01-29 12:08:02.480400845 +0100
-@@ -469,10 +469,10 @@
- // Return the non-directory portion of FILENAME: the portion after the
- // last slash, or the whole filename if there are no slashes.
- string BaseFileName(const string& filename) {
--  // Lots of copies!  basename's behavior is less than ideal.
--  char* c_filename = strdup(filename.c_str());
--  string base = basename(c_filename);
--  free(c_filename);
-+  // basename's behavior is less than ideal so avoid it
-+  const char *c_filename = filename.c_str();
-+  const char *p = strrchr(c_filename, '/');
-+  string base = p ? p+1 : c_filename;
-   return base;
- }
- 
 --- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
 +++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
 @@ -253,7 +253,11 @@
diff --git a/srcpkgs/thunderbird/patches/ppc32-fix-build.patch b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch
new file mode 100644
index 00000000000..c1a8f422d0a
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch
@@ -0,0 +1,36 @@
+This is not a complete/correct patch, but it makes firefox build. For now
+mostly for tracking, so a real fix can be made, but right now it still
+segfaults on start.
+
+Ref: https://hg.mozilla.org/mozilla-central/rev/08339a56f3ae
+Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60
+Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e
+Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp
+
+--- xpcom/reflect/xptcall/xptcall.h
++++ xpcom/reflect/xptcall/xptcall.h
+@@ -71,6 +71,11 @@ struct nsXPTCVariant {
+     ExtendedVal ext;
+   };
+ 
++#if defined(__powerpc__) && !defined(__powerpc64__)
++  // this field is still necessary on ppc32, as an address
++  // to it is taken certain places in xptcall
++  void *ptr;
++#endif
+   nsXPTType type;
+   uint8_t flags;
+ 
+@@ -91,7 +96,12 @@ struct nsXPTCVariant {
+   };
+ 
+   void ClearFlags() { flags = 0; }
++#if defined(__powerpc__) && !defined(__powerpc64__)
++  void SetIndirect() { ptr = &val; flags |= IS_INDIRECT; }
++  bool IsPtrData() const { return IsIndirect(); }
++#else
+   void SetIndirect() { flags |= IS_INDIRECT; }
++#endif
+ 
+   bool IsIndirect() const { return 0 != (flags & IS_INDIRECT); }
+ 
diff --git a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch b/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
deleted file mode 100644
index 93c625a861e..00000000000
--- a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gfx/skia/skia/third_party/skcms/skcms.cc
-+++ gfx/skia/skia/third_party/skcms/skcms.cc
-@@ -1806,6 +1806,11 @@ typedef enum {
-     Op_store_ffff,
- } Op;
- 
-+// work around ICE on 32-bit ppc
-+#if defined(__powerpc__) && !defined(__powerpc64__)
-+#  define SKCMS_PORTABLE
-+#endif
-+
- #if defined(__clang__)
-     template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));
- #elif defined(__GNUC__)
diff --git a/srcpkgs/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch
index 09191782b35..887c102bc55 100644
--- a/srcpkgs/thunderbird/patches/rust-configure.patch
+++ b/srcpkgs/thunderbird/patches/rust-configure.patch
@@ -1,20 +1,23 @@
---- build/moz.configure/rust.configure	2020-06-06 10:05:25.819337924 +0200
-+++ build/moz.configure/rust.configure	2020-06-06 10:07:11.346031015 +0200
-@@ -79,10 +79,6 @@
+Mozilla rustc check does not support crossbuild: let's remove it
+Remove calls to unwrap_rustup, they fail if rustup isn't present
+
+--- build/moz.configure/rust.configure.orig	2019-10-17 04:19:59.000000000 +0700
++++ build/moz.configure/rust.configure	2019-10-22 11:48:55.616022140 +0700
+@@ -78,9 +78,6 @@
  
      return unwrap
  
 -rustc = unwrap_rustup(rustc, 'rustc')
 -cargo = unwrap_rustup(cargo, 'cargo')
 -
--
+ 
  set_config('CARGO', cargo)
  set_config('RUSTC', rustc)
+@@ -348,26 +345,6 @@
  
-@@ -366,25 +362,6 @@
              os.write(in_fd, source)
              os.close(in_fd)
- 
+-
 -            cmd = [
 -                rustc,
 -                '--crate-type', 'staticlib',
diff --git a/srcpkgs/thunderbird/patches/rust-glslopt.patch b/srcpkgs/thunderbird/patches/rust-glslopt.patch
new file mode 100644
index 00000000000..3717caa2290
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-glslopt.patch
@@ -0,0 +1,13 @@
+overwrite HOST_* flags to get rid of -MF
+
+--- third_party/rust/glslopt/build.rs	2020-06-03 01:37:31.000000000 +0200
++++ third_party/rust/glslopt/build.rs	2020-06-04 10:57:16.418469546 +0200
+@@ -28,6 +28,8 @@
+     env::remove_var(format!("CXXFLAGS_{}", &target));
+     env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
+     env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_")));
++    env::set_var("HOST_CFLAGS", "-O2");
++    env::set_var("HOST_CXXFLAGS", "-O2");
+ 
+     configure(&mut cc::Build::new())
+         .warnings(false)
diff --git a/srcpkgs/thunderbird/patches/rust-has-i128.patch b/srcpkgs/thunderbird/patches/rust-has-i128.patch
new file mode 100644
index 00000000000..4c90cd3d106
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-has-i128.patch
@@ -0,0 +1,21 @@
+The configure check fails for cross builds.
+i128 is supported since rust-1.26, so it is safe for us to assume it is always present
+
+--- third_party/rust/num-traits/build.rs.orig	2020-02-14 23:57:25.985355610 +0100
++++ third_party/rust/num-traits/build.rs	2020-02-14 23:58:36.255710188 +0100
+@@ -1,14 +1,5 @@
+-extern crate autocfg;
+-
+-use std::env;
+-
+ fn main() {
+-    let ac = autocfg::new();
+-    if ac.probe_type("i128") {
+-        println!("cargo:rustc-cfg=has_i128");
+-    } else if env::var_os("CARGO_FEATURE_I128").is_some() {
+-        panic!("i128 support was not detected!");
+-    }
++    println!("cargo:rustc-cfg=has_i128");
+ 
+     autocfg::rerun_path("build.rs");
+ }
diff --git a/srcpkgs/thunderbird/patches/sandbox-fork.patch b/srcpkgs/thunderbird/patches/sandbox-fork.patch
new file mode 100644
index 00000000000..72640cb7f70
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/sandbox-fork.patch
@@ -0,0 +1,13 @@
+make SYS_fork non-fatal, musl uses it for fork(2)
+
+--- security/sandbox/linux/SandboxFilter.cpp
++++ security/sandbox/linux/SandboxFilter.cpp
+@@ -1253,6 +1253,8 @@
+         // usually do something reasonable on error.
+       case __NR_clone:
+         return ClonePolicy(Error(EPERM));
++      case __NR_fork:
++        return Error(ENOSYS);
+ 
+ #  ifdef __NR_fadvise64
+       case __NR_fadvise64:
diff --git a/srcpkgs/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch
index 6c72284c19b..c5e5c486dd1 100644
--- a/srcpkgs/thunderbird/patches/sndio.patch
+++ b/srcpkgs/thunderbird/patches/sndio.patch
@@ -1,8 +1,8 @@
 --- old-configure.in.orig
 +++ old-configure.in
-@@ -2839,6 +2839,22 @@
- 
- AC_SUBST(MOZ_ALSA)
+@@ -2818,6 +2818,22 @@
+     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
+ fi
  
 +dnl ==================================
 +dnl = Check sndio availability
@@ -21,26 +21,11 @@
 +AC_SUBST(MOZ_SNDIO)
 +
  dnl ========================================================
- dnl = Disable PulseAudio
- dnl ========================================================
---- toolkit/library/moz.build.orig
-+++ toolkit/library/moz.build
-@@ -235,10 +235,8 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
-     OS_LIBS += CONFIG['TK_LIBS']
- 
--if CONFIG['OS_ARCH'] == 'OpenBSD':
--    OS_LIBS += [
--        'sndio',
--    ]
-+if CONFIG['MOZ_SNDIO']:
-+    OS_LIBS += CONFIG['MOZ_SNDIO_LIBS']
- 
- if CONFIG['MOZ_ENABLE_DBUS']:
-     OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']
+ dnl =
+ dnl = Maintainer debug option (no --enable equivalent)
 --- media/libcubeb/src/moz.build.orig
 +++ media/libcubeb/src/moz.build
-@@ -43,7 +43,7 @@
+@@ -44,11 +44,13 @@
      ]
      DEFINES['USE_JACK'] = True
  
@@ -49,49 +34,19 @@
      SOURCES += [
          'cubeb_sndio.c',
      ]
---- build/moz.configure/old.configure.orig
-+++ build/moz.configure/old.configure
-@@ -169,6 +169,7 @@
+     DEFINES['USE_SNDIO'] = True
++
++if CONFIG['OS_ARCH'] == 'OpenBSD':
+     DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
+ 
+ if CONFIG['OS_TARGET'] == 'Darwin':
+--- build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
++++ -	2020-06-30 12:18:26.027756310 +0200
+@@ -210,6 +210,7 @@
  @old_configure_options(
      '--cache-file',
      '--datadir',
 +    '--enable-sndio',
-     '--enable-content-sandbox',
-     '--enable-cookies',
-     '--enable-cpp-rtti',
---- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig
-+++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
-@@ -349,6 +349,21 @@
-         }
-       }
-     }
-+
-+#ifdef MOZ_SNDIO
-+    // ~/.aucat_cookie (sndio)
-+    rv = homeDir->Clone(getter_AddRefs(confDir));
-+    if (NS_SUCCEEDED(rv)) {
-+      rv = confDir->AppendNative(NS_LITERAL_CSTRING(".aucat_cookie"));
-+      if (NS_SUCCEEDED(rv)) {
-+        nsAutoCString tmpPath;
-+        rv = confDir->GetNativePath(tmpPath);
-+        if (NS_SUCCEEDED(rv)) {
-+          policy->AddPath(rdwrcr, tmpPath.get());
-+        }
-+      }
-+    }
-+#endif
-   }
- 
-   // Firefox binary dir.
---- security/sandbox/linux/moz.build.orig
-+++ security/sandbox/linux/moz.build
-@@ -81,6 +81,9 @@
- if CONFIG['MOZ_ALSA']:
-     DEFINES['MOZ_ALSA'] = True
- 
-+if CONFIG['MOZ_SNDIO']:
-+    DEFINES['MOZ_SNDIO'] = True
-+
- # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
- # dependency like the one in libxul does, but this way the behavior is
- # consistent.  See also the comment in SandboxLogging.h.
+     '--enable-crashreporter',
+     '--enable-dbus',
+     '--enable-debug-js-modules',
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 7d57aec6929..bb680f2a9c0 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=68.11.0
+version=78.2.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,27 +11,26 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=0d2f403c7aca55ab130b7262ff8afc0254e5c0471db01f1631976df68a6af5f2
+checksum=273804d2199dde45f1857053575fe7c7fbb823f7547621400a5595ff5ae3ec14
 
 lib32disabled=yes
 
-hostmakedepends="autoconf213 unzip zip pkg-config perl python python3 yasm rust cargo
- llvm clang nodejs cbindgen nasm which tar"
+hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
+ llvm clang nodejs-lts-10 cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
- pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel
+ pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
  libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if startup_notification startup-notification-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel)
- $(vopt_if sndio sndio-devel)"
-depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme"
+ $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
+depends="nss>=3.47.1 desktop-file-utils hicolor-icon-theme"
 
-build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
-build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
+build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
+build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
-	armv6*) broken="required NEON extensions are not supported on armv6" ;;
+	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac
@@ -64,7 +63,9 @@ post_extract() {
 }
 
 post_patch() {
-	_clear_vendor_checksums cssparser
+	_clear_vendor_checksums audio_thread_priority
+	_clear_vendor_checksums num-traits
+	_clear_vendor_checksums glslopt
 }
 
 do_build() {
@@ -73,7 +74,7 @@ do_build() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig
-		echo "ac_add_options --enable-release" >>.mozconfig
+		echo "ac_add_options --disable-gold" >>.mozconfig
 		;;
 	esac
 
@@ -93,13 +94,6 @@ do_build() {
 		export LDFLAGS+=" -latomic"
 	fi
 
-	case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl|i686-musl)
-		echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig
-		echo "ac_add_options --target=${XBPS_TRIPLET}" >>.mozconfig
-		;;
-	esac
-
 	if [ "$CROSS_BUILD" ]; then
 		BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
 			sed -n '/#include <...> search starts here:/,/End of search list./p' | \
@@ -128,10 +122,6 @@ do_build() {
 	mkdir -p third_party/rust/libloading/.deps
 
 	case "$XBPS_TARGET_MACHINE" in
-	i686*)
-		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		;;
 	armv7*)
 		export CFLAGS+=" -mfpu=neon -Wno-psabi"
 		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
@@ -145,9 +135,14 @@ do_build() {
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
 		sed -i "s/debug_info = '2'/debug_info = '1'/" \
-		 build/moz.configure/toolchain.configure
+		build/moz.configure/toolchain.configure
 	fi
 
+	case "$XBPS_TARGET_MACHINE" in
+	aarch64*|i686*|x86_64*)
+		echo "ac_add_options --enable-rust-simd" >>.mozconfig ;;
+	esac
+
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird"
 
 	if [ "$SOURCE_DATE_EPOCH" ]; then
@@ -157,20 +152,20 @@ do_build() {
 	export MOZ_MAKE_FLAGS="${makejobs}"
 	export MOZ_NOSPAM=1
 	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
-	# avoid error: /usr/bin/as: invalid option -- 'N'
-	unset AS
+
+	export AS=$CC
 
 	cat <<! >>.mozconfig
 ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-google-safebrowsing-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key"
 ac_add_options $(vopt_enable alsa)
+ac_add_options $(vopt_enable jack)
 ac_add_options $(vopt_enable sndio)
 ac_add_options $(vopt_enable dbus)
 ac_add_options $(vopt_enable dbus necko-wifi)
 ac_add_options $(vopt_enable pulseaudio)
-ac_add_options $(vopt_enable startup_notification startup-notification)
-ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk')
+ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3')
 !
 
 	rm -f old-configure
@@ -182,9 +177,9 @@ do_install() {
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/preferences
 	vinstall ${FILESDIR}/thunderbird.desktop 644 usr/share/applications
 
-	for i in 16 22 24 32 48 256; do
-		vinstall ./comm/mail/branding/thunderbird/default$i.png 644 \
-			usr/share/icons/hicolor/${i}x${i}/apps thunderbird.png
+	for i in 16x16 22x22 24x24 32x32 48x48 128x128 256x256; do
+		vinstall ${wrksrc}/comm/mail/branding/thunderbird/default${i%x*}.png 644 \
+			usr/share/icons/hicolor/${i}/apps thunderbird.png
 	done
 
 	# Use system-provided dictionaries
@@ -197,4 +192,6 @@ do_install() {
 
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
 	ln -sf thunderbird ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin
+
+	vbin ${FILESDIR}/thunderbird-wayland
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] thunderbird: update to 68.12.0
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (4 preceding siblings ...)
  2020-08-28 19:51 ` [PR PATCH] [Updated] " mmnmnnmnmm
@ 2020-08-28 19:57 ` mmnmnnmnmm
  2020-08-28 20:01 ` [wip] thunderbird: update to 78.2.0 mmnmnnmnmm
                   ` (20 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-08-28 19:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is an updated pull request by mmnmnnmnmm against master on the void-packages repository

https://github.com/mmnmnnmnmm/void-packages thunderbird
https://github.com/void-linux/void-packages/pull/24509

thunderbird: update to 68.12.0
Final release in the 68 branch, next release is 78, which contains big OpenPGP changes and supports only webextensions.

A patch file from https://github.com/void-linux/void-packages/pull/24509.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-thunderbird-24509.patch --]
[-- Type: text/x-diff, Size: 35630 bytes --]

From c9a8538517b114857a9392c7d421b1c4708a9777 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:46:09 +0100
Subject: [PATCH 1/2] thunderbird-i18n: update to 78.2.0

---
 srcpkgs/thunderbird-i18n/template | 114 +++++++++++++++---------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index fd9c9580559..a739b08e539 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=68.11.0
+version=78.2.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -79,7 +79,7 @@ for _lang in "${_languages[@]}"; do
 	_pkgname=thunderbird-i18n-${_locale}
 
 	depends+=" ${_pkgname}>=${version}"
-	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-i686/xpi/${_locale}.xpi"
+	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-x86_64/xpi/${_locale}.xpi"
 
 	eval "${_pkgname}_package() {
 		_pkgtmpl $_lang
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="29ebac8c1596b508a1a19977524bcb9b9d357b8b422274c03f085bc2a1e5d11b
- b36fc2bc7ee070202ec3caa6ffe3bc24f527d8c076e33f0f3ac7c2bb34678264
- c425d737792ab8a4793e4c9ac094027c9ecfabe5bdc56c205e1b57b999626fd2
- 344962eb54d66b925d1e9d2139e92bec9d3f7c273d2735ab4933004efb2cc300
- ff8f1460b1c3dec628985fb047c62d75847a8ab1fdef553324dcd1b1c7a058e5
- bd531fa67ef6b4406e778cb5b0e09dc38e6de2f08d48c2fe87bfb13ba62eebac
- 9690c8600e36c138954bc2848d71872346c1e747b97a2bc180783779af589c15
- 52afdc19898b244a0a751ec5e89f223922554931c6a5cfb46289b3f71e7e4700
- 47c6881a303ade66dca9618b5127557be7511e1d44a64892efecefd451b7f7e0
- 77d63f3133a1978d139098af5d2e2cc19675c1bf380a7f2dac2d59ce876c29ee
- 046e46ecee6430a190f0f8cfdcc4723f5d69f617d1167788ebcd410fd6c206e5
- afa61ad764739ea2f171e8c3338883b2b076e354a40c39d73709d5592f3ad577
- 7cfabfb6454de77116b7ca806ca43cf1c93b21b126708e787f7e0d2e3b1907af
- 7d38732aef00b03c54f353cd81f5b22fb43437f0b0960ae269c0af58832e7044
- 9690287d26cd6d3fd8301f762a40d4304ef7dbf0f73da913a793eb5f171295af
- c9eafbbdf6a267804dbfb2f5f8d6f1a1b53aa0fa9426f9af05138655a49d61f6
- c5d249574dc53a8425bef3469d2bf6aa3e1735a9cef1cfe5339a7c4b674294a1
- 6a6bcdddbf4cf6edae30b7d5eba330232d88fc2722085409ecbac0861f661d05
- ac2abdbd3cad39a5d52626ffe00e7f59ab52c669b3da6f43268d62e2f01345d7
- 566718f0068fccedacf3cee3ab56a36e849bc3d4acadf508962c81981f29e7e9
- bb94fb6835400bfe0b70276fc45e941b4a5dd809f946865dfca841373beb42f7
- 9b36cc8688ab7871ef90f7778b3747fc6503a56ed42f8faafa0b6568e9a906d0
- b99159527690293830cf167affa9a604c26a10e268d0617a3d06e7319ff8572a
- 22695eda8f34c749e95a310752461d48f45eafb428dbf6a1d324e223577fae0d
- f35d72064fd5a7246020e5958d8d43b0f0e1f439aee7095e306318400bd4b298
- e015951a49b812ae1889e24dd67f67cc26c38242a0c20708ef845277559b131d
- 343acef6937334a0a525fd181f88c7f68f75e93cdeacffef05df4a8211e288b7
- c9e3739e55834d7512e5817498c358498a3cb0f652f21c213c06287204ebed01
- 2381df9b757dd2aac778001a09f36d88e98f2620dd05813425f53b9e35f26040
- a6f21d925b9334d5f46e054ae6db492f7c3c8c62b043a292e45a984a37ef6087
- ced2a3d7a590e538ca6d817efda47478ca198246640835733c5d579205fd9059
- c2bff27ecd581fffb156cb9fdfc26cdfa2a2fd8dab3ad478c80ca53d22c59ef6
- efc4f0b1781463bdf0561e25e9c31dc5878949cbd34684393f168b7b69f88e15
- c4fac0f3281e59de3a1a43767ac497689605d6e35673e3606b5a43fb835cd47a
- fc034024f5a960d3ac82b5b5b99dc481b8d6508496bd6264dd873c4883a9440e
- c3c5fe21cb5bb84af9b6428ff6f62ba8b669dc931ea3bd66225bd3d88aec07f8
- bb5955b070dd509f4a8f170162826ec497d0a09e56eaa641e8223328b67408a3
- a0d018d37b19fa4e82d89411c9e297df12fa56b003f6631cfbc12355dd8cac94
- d8a5eac605c4288f1946de393dd52b9c16f8f618335c1e609806b5ec806d697a
- 867cd73998fca97eeb29a08ae3b492329741bcfcd157c275e2f7c3d75dd2da7f
- a56814cbc21b8415645c655ae20836935c3fba31d66c0b33de33ace295a294e3
- 0dbbca82f751b0fe80ca7f3b161350d982e966499e0835c415cd7ed32861b3a7
- 238f218891c28e1505bddbd08a183896b93d383d56e5a429a8ac731d30b54624
- 2d7f404c97d377275a4e9be9fcf5712ba2b85c161042d80f992c4c1d794890f5
- 3093d3e5de225238bb15c459c0b317c5ebf05302389d03cbd0b69768ca9c011d
- 313247a18560313e0d39895713c793488e98c705659fc5b6aaba59fd25fbeb5c
- 06542ba7fad18017e52b135ab68266a0c791a1446b36b55f4476e9e6720c33d0
- abfeca306d10dcaba73becffa90bf830707983f341b8abfec90203297c2f676e
- cb1e4c67fad60b0080ce304a78728174f463093a2a6d730b5bd6739b5a15c370
- 93da2ce9ffa2aec8aa56fd88c97ee5bead6b8ba46b4df3bd98a4376402669183
- d6144c43d24bff108ae787092bbbefe91c135345a923f7f8b951ac7cd46fa807
- c2c24bfe1522a36181b6c6d03acf98a0df3921c0493cc8c818df70ebf2760c53
- d68229f3b05b80ad807cd2a750b916e460665574c96b5b8e5258e2f689a4a971
- 4ca52ff75e0358feb4a535617076d2aede70b0d7ab29524a4b4bfe4f1b7ab0da
- ff20a2ac005ee398f2aec1897f578ed38072b7b21e3e962abc67ecb66d01d3fe"
+checksum="1951d1412b6e3de153bec871ac75b182529c40d703b0e6faa3aacdac35744498
+ c90fb72b96a8c4ac3c1efd045962242d98a2f803955df3e88888736478d63602
+ 8e82fa53f8237eb0d2afa1c8c4ce9da209bce4554483e151dba43da93262d1f3
+ 286565e0de10090182497bf540b5b29676fa0faffc40f63bbf1bc9666cee37f0
+ d27c97c11dec8d7948e9e959c75a52b1d0aaf86ad8ef8148a73a2de4b20fc1f6
+ 2eaf51fdf94935bbf91c4414afd54ad04fe685abe5a6ac8628d72e71ecd07e35
+ fe80c229e70619d5d6ce9f55de4bca1c61d4053e3d32aa5cbd51e2a05ae2b83b
+ c0f77657ed1841edea389f76d20313a9b433c2b6b0173ae9393be241b26ddc71
+ d1a74be7f40e1c1ab72c8a1b5dbe49f9a5edd23b9e99b99fc9a9265dcf7c637c
+ 215a7134b6980c9bd76662d331aa27170361a7e3382bb66de778be31e8d8be78
+ 9722f33259e2f097b246e4f6b560ba50c2cbed0e9b85525e84c84d46a4997c82
+ 3bec3846afec50553d57e3e9e066244dc0f05e2a2bdb3ae8b4f9f02e3c8ca35d
+ 1b53f351976e964f0384f018042c2f5e4b50db9a491f75dfadc09bf765d18e73
+ 6bb04c7748f451e9df011fc54c875dea56e536402c04d0cba27dcee8efa4f0fd
+ 05f7c731b095838c754c3fc4c5614e1a596c69f9538aa975effd86c787117e49
+ 0d33d4f160822887d087dfe9174ccdc2ea1e2cc8878607ddadff0d34968a0a13
+ 9f3d13e3f24dd61073d6c738d0249119283c1e3f89734b409c48e44c8472730a
+ 24f4f814051c8324b41867fd855b1fc78c768201e153bfb8640db440de58c853
+ 45948336e9def651199d548df702459d4fb7667c11c057984efe932039df0312
+ 74c32583b012c8daa0f6d5c844b502ebe76eaac2d61cc3a0331f265c3b8cdad1
+ fc63430d1c60b2c1ae66076e502616fa440d35cf2c6b09acbf3e4ca34d2519f7
+ 81ee3a9c75dc85c466917fe33a66cafca363b87d7b1bf0cb5b7b464253b5f5aa
+ a6bcddab931c266658ddfc4c668429cc5342cd8a232df10f8ceaa590bc49a840
+ e86b82a50d69c88e3dac4f4f5d3a4ac2a27ac1b6db5388384c0e79aa21f77caf
+ ba3774750117a480ca7d18a7830f27eb5e2f493e25b3f22cf805186e3925563e
+ 714446124f4caa4fbe8411c15d6041f2c5e0080c154e5befac4e557a8a74dd8f
+ 5c8bf7f727f6ea7370a39cd013107e3b24a21b56ae335a71dffbfa243c13b742
+ fb1420d63515857657a92ef38371b1b9a0aa897b7aadc9e451bf2d9da4ffef17
+ 696b62a8043b3486a059fe8487bf0749065d9e878311eeec0730304647862d85
+ b5649b00e2fc530b8f63d5f963511c6ef7cae4deadf70fb83d4e70972c7c313b
+ a6ecba0825dbc2f3bec693577b850ca52acd100d0df3af544784c23fb6d1f4f0
+ d36dc9011d464bc027bb0b3c91ccd73baa879d8c814d790f802a9ddaf2b805e2
+ 410ca6c4a58e2d0d6057dd9203b9d7eb4b93baf1ec4a8e5ebb8651bf80138d8f
+ 49702c62a0156218a9e3b405da1629f38e519f4880a873040df1948c36408396
+ ac3312e70ca69310620582a23abcb18b7e8e7486cc6f2753ee77f3f52ecb3d0b
+ f7ab49c53fd9aad793c6efd95fae234af85fdfb83c6ed27e7be158a1aa7e738e
+ 40ad4638619e3ba1a10a3e4435576d9d56033cd04575cb839072070d4e71a844
+ 7bcf1a1e811df56a16cfbd1ed9aaaec4be87ceeeb627b637453c7bef8af926b6
+ abedc83798c5a8d1254f6f0cf2a938f702854749a70cbb1eae667674b6929c71
+ 283678aa2856fc587b881350c951416aa76086ad1175d9174eafbc6c9b9e4e33
+ 31909339d708f4d039ad2b155cdce0b556f5070e727557f07be3d890debb9608
+ fc0c86ca18e652438a38fef65f1302405953d88bd187d18c3e71cc2adabfa63d
+ 62215faec6e80fff004957f544b94cb80615894741be6be265ef7701d0ddb871
+ 8ff77a6f9b18aa28dc969415b4113840c647409d55a8e2c97800095f6f1f2dee
+ f1cc4f47b187a09f16929f531b44e6a7d26473a175a44dca33a13a59ee79b88c
+ 1e73ff8f4f5b0290a84810b1a7ba60abcf0ab3a5d40a3eb9a179c94af79c2f69
+ 0be99f9215e5f96f6e2590a3fab30e739d5aa237578de23d9147fc10a9734cac
+ 4b164ee6f3d4d82a751b6be64d7b8a90c31f5669ceede3ff98355b3381ffceaf
+ 6936cc84a1f76519ab915d0c91fb66024556afa9af686ced76daa2f326b7ed77
+ c278a4c70b3f90ba6d499be3828d999d63ce6eed13b126c3611e812558aeb0d5
+ 7e33b56d19a8ec633ce2223d0caf7d8cfe999c3259a2377b07f345ad3827658d
+ aecc84bab9abecf1f8090450ade2f7eac172865b5b7422407cfa04b2e5e17fd9
+ 1b8878eeef01f2961a1d6beb302e68fd895cdd4f5b0da87f70393b20ccd81767
+ 93e7cf622a273c4169226af136b798d5e363b765e00ec788aab510d4eab846a0
+ dd6030769be34a901ce1af8753f45ec67ee893057fa9a7c37aca41117f3ac2a9"

From b6034a9b97ef0ced8ad039965399c3c92e30d206 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:49:23 +0100
Subject: [PATCH 2/2] thunderbird: update to 78.2.0 [ci skip]

---
 srcpkgs/thunderbird/files/mozconfig           | 10 +--
 srcpkgs/thunderbird/files/thunderbird-wayland |  2 +
 .../patches/fix-i686-ppc-musl.patch           |  8 +-
 srcpkgs/thunderbird/patches/fix-musl.patch    | 11 ---
 .../patches/fix-sandbox-membarrier.patch      | 52 ------------
 .../thunderbird/patches/fix-seccomp-bpf.patch | 14 ----
 srcpkgs/thunderbird/patches/fix-toolkit.patch | 78 ------------------
 srcpkgs/thunderbird/patches/fix-tools.patch   | 17 ----
 .../thunderbird/patches/ppc32-fix-build.patch | 36 +++++++++
 .../patches/ppc32-skia-portable.patch         | 14 ----
 .../thunderbird/patches/rust-configure.patch  | 15 ++--
 .../thunderbird/patches/rust-glslopt.patch    | 13 +++
 .../thunderbird/patches/rust-has-i128.patch   | 21 +++++
 .../thunderbird/patches/sandbox-fork.patch    | 13 +++
 srcpkgs/thunderbird/patches/sndio.patch       | 81 +++++--------------
 srcpkgs/thunderbird/template                  | 61 +++++++-------
 16 files changed, 147 insertions(+), 299 deletions(-)
 create mode 100644 srcpkgs/thunderbird/files/thunderbird-wayland
 delete mode 100644 srcpkgs/thunderbird/patches/fix-musl.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-toolkit.patch
 create mode 100644 srcpkgs/thunderbird/patches/ppc32-fix-build.patch
 delete mode 100644 srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-glslopt.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-has-i128.patch
 create mode 100644 srcpkgs/thunderbird/patches/sandbox-fork.patch

diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig
index 334846e9a64..ed6cfb244cb 100644
--- a/srcpkgs/thunderbird/files/mozconfig
+++ b/srcpkgs/thunderbird/files/mozconfig
@@ -3,7 +3,6 @@ ac_add_options --libdir=/usr/lib
 
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-libevent
@@ -12,12 +11,8 @@ ac_add_options --with-system-icu
 # XXX: the system's libpng doesn't have APNG support
 ac_add_options --without-system-png
 ac_add_options --enable-system-pixman
-ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 
-ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr
-ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr
-
 nspr_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nspr"
@@ -26,16 +21,15 @@ nss_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nss"
 
-ac_add_options --disable-gconf
 ac_add_options --disable-tests
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-install-strip
 ac_add_options --disable-strip
 ac_add_options --disable-profiling
-ac_add_options --disable-gold
+ac_add_options --enable-release
 ac_add_options --enable-optimize="$CFLAGS"
 
 ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
 ac_add_options --enable-application=comm/mail
+ac_add_options --enable-calendar
diff --git a/srcpkgs/thunderbird/files/thunderbird-wayland b/srcpkgs/thunderbird/files/thunderbird-wayland
new file mode 100644
index 00000000000..cd7f9ab7394
--- /dev/null
+++ b/srcpkgs/thunderbird/files/thunderbird-wayland
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec env MOZ_ENABLE_WAYLAND= /usr/lib/thunderbird/thunderbird "$@"
diff --git a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
index 40aab43ae86..6df609bbf16 100644
--- a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
 --- mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
 +++ mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -33,7 +33,7 @@ using namespace mozilla;
- #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+@@ -41,7 +41,7 @@
+ #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
  
--#if (defined(linux) &&                                            \
+-#if (defined(linux) && \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #define MOZ_STACKWALK_SUPPORTS_LINUX 1
diff --git a/srcpkgs/thunderbird/patches/fix-musl.patch b/srcpkgs/thunderbird/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/thunderbird/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch b/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
deleted file mode 100644
index caffd83cf67..00000000000
--- a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-allow usage of SYS_membarrier, needed since musl-1.1.22
-
---- security/sandbox/linux/SandboxFilter.cpp
-+++ security/sandbox/linux/SandboxFilter.cpp
-@@ -283,6 +283,8 @@
-       case __NR_set_tid_address:
-         return Allow();
- #endif
-+      case __NR_membarrier:
-+        return Allow();
- 
-         // prctl
-       case __NR_prctl: {
-
---- security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-
---- security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
- 
---- security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1490,5 +1490,9 @@
- #define __NR_shutdown 373
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
- 
diff --git a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch b/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
deleted file mode 100644
index ed94fc39ed0..00000000000
--- a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig	2015-09-23 09:10:08.812740571 +0200
-+++ security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc	2015-09-23 09:11:38.404746155 +0200
-@@ -23,6 +23,11 @@
- #include "sandbox/linux/services/android_ucontext.h"
- #endif
- 
-+// musl libc defines siginfo_t __si_fields instead of _sifields
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#define _sifields __si_fields
-+#endif
-+
- namespace {
- 
- struct arch_sigsys {
diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch
deleted file mode 100644
index 86e8ef47855..00000000000
--- a/srcpkgs/thunderbird/patches/fix-toolkit.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig    2016-07-05 21:00:03.672000517 +0200
-+++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200
-@@ -1134,6 +1134,12 @@
- #ifndef __NR_fallocate
- #define __NR_fallocate          285
- #endif
-+
-+#undef __NR_pread
-+#define __NR_pread __NR_pread64
-+#undef __NR_pwrite
-+#define __NR_pwrite __NR_pwrite64
-+
- /* End of x86-64 definitions                                                 */
- #elif defined(__mips__)
- #if _MIPS_SIM == _MIPS_SIM_ABI32
---- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-04-17 10:24:33.793431933 +0000
-@@ -45,6 +45,7 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <libgen.h>
- 
- #include <iostream>
- #include <set>
---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-04-17 10:24:33.793431933 +0000
-@@ -41,6 +41,10 @@
- 
- #include "common/using_std_string.h"
- 
-+#ifndef N_UNDF
-+#define N_UNDF 0
-+#endif
-+
- using std::vector;
- 
- namespace google_breakpad {
---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-04-17 10:24:33.793431933 +0000
-@@ -55,7 +55,7 @@
-
- #ifdef HAVE_MACH_O_NLIST_H
- #include <mach-o/nlist.h>
--#elif defined(HAVE_A_OUT_H)
-+#elif 0
- #include <a.out.h>
- #endif
-
---- toolkit.orig/mozapps/update/common/updatedefines.h	2019-01-29 11:34:36.416804577 +0100
-+++ toolkit/mozapps/update/common/updatedefines.h	2019-01-29 11:34:59.193583777 +0100
-@@ -102,7 +102,7 @@
-
- #  ifdef SOLARIS
- #    include <sys/stat.h>
--#  else
-+#  elif !(defined(__linux__)) || defined(__GLIBC__)
- #    include <fts.h>
- #  endif
- #  include <dirent.h>
---- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
-+++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
-@@ -3978,6 +3978,7 @@
- 
- int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
-   int rv = OK;
-+#if !defined(__linux__) || defined(__GLIBC__)
-   FTS* ftsdir;
-   FTSENT* ftsdirEntry;
-   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
-@@ -4085,6 +4086,7 @@
-   }
- 
-   fts_close(ftsdir);
-+#endif
- 
-   return rv;
- }
diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch
index 0ed043fb5b5..d29da8bb54b 100644
--- a/srcpkgs/thunderbird/patches/fix-tools.patch
+++ b/srcpkgs/thunderbird/patches/fix-tools.patch
@@ -1,20 +1,3 @@
---- tools/profiler/lul/LulElf.cpp.orig	2019-01-29 12:05:34.223834130 +0100
-+++ tools/profiler/lul/LulElf.cpp	2019-01-29 12:08:02.480400845 +0100
-@@ -469,10 +469,10 @@
- // Return the non-directory portion of FILENAME: the portion after the
- // last slash, or the whole filename if there are no slashes.
- string BaseFileName(const string& filename) {
--  // Lots of copies!  basename's behavior is less than ideal.
--  char* c_filename = strdup(filename.c_str());
--  string base = basename(c_filename);
--  free(c_filename);
-+  // basename's behavior is less than ideal so avoid it
-+  const char *c_filename = filename.c_str();
-+  const char *p = strrchr(c_filename, '/');
-+  string base = p ? p+1 : c_filename;
-   return base;
- }
- 
 --- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
 +++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
 @@ -253,7 +253,11 @@
diff --git a/srcpkgs/thunderbird/patches/ppc32-fix-build.patch b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch
new file mode 100644
index 00000000000..c1a8f422d0a
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch
@@ -0,0 +1,36 @@
+This is not a complete/correct patch, but it makes firefox build. For now
+mostly for tracking, so a real fix can be made, but right now it still
+segfaults on start.
+
+Ref: https://hg.mozilla.org/mozilla-central/rev/08339a56f3ae
+Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60
+Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e
+Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp
+
+--- xpcom/reflect/xptcall/xptcall.h
++++ xpcom/reflect/xptcall/xptcall.h
+@@ -71,6 +71,11 @@ struct nsXPTCVariant {
+     ExtendedVal ext;
+   };
+ 
++#if defined(__powerpc__) && !defined(__powerpc64__)
++  // this field is still necessary on ppc32, as an address
++  // to it is taken certain places in xptcall
++  void *ptr;
++#endif
+   nsXPTType type;
+   uint8_t flags;
+ 
+@@ -91,7 +96,12 @@ struct nsXPTCVariant {
+   };
+ 
+   void ClearFlags() { flags = 0; }
++#if defined(__powerpc__) && !defined(__powerpc64__)
++  void SetIndirect() { ptr = &val; flags |= IS_INDIRECT; }
++  bool IsPtrData() const { return IsIndirect(); }
++#else
+   void SetIndirect() { flags |= IS_INDIRECT; }
++#endif
+ 
+   bool IsIndirect() const { return 0 != (flags & IS_INDIRECT); }
+ 
diff --git a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch b/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
deleted file mode 100644
index 93c625a861e..00000000000
--- a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gfx/skia/skia/third_party/skcms/skcms.cc
-+++ gfx/skia/skia/third_party/skcms/skcms.cc
-@@ -1806,6 +1806,11 @@ typedef enum {
-     Op_store_ffff,
- } Op;
- 
-+// work around ICE on 32-bit ppc
-+#if defined(__powerpc__) && !defined(__powerpc64__)
-+#  define SKCMS_PORTABLE
-+#endif
-+
- #if defined(__clang__)
-     template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));
- #elif defined(__GNUC__)
diff --git a/srcpkgs/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch
index 09191782b35..887c102bc55 100644
--- a/srcpkgs/thunderbird/patches/rust-configure.patch
+++ b/srcpkgs/thunderbird/patches/rust-configure.patch
@@ -1,20 +1,23 @@
---- build/moz.configure/rust.configure	2020-06-06 10:05:25.819337924 +0200
-+++ build/moz.configure/rust.configure	2020-06-06 10:07:11.346031015 +0200
-@@ -79,10 +79,6 @@
+Mozilla rustc check does not support crossbuild: let's remove it
+Remove calls to unwrap_rustup, they fail if rustup isn't present
+
+--- build/moz.configure/rust.configure.orig	2019-10-17 04:19:59.000000000 +0700
++++ build/moz.configure/rust.configure	2019-10-22 11:48:55.616022140 +0700
+@@ -78,9 +78,6 @@
  
      return unwrap
  
 -rustc = unwrap_rustup(rustc, 'rustc')
 -cargo = unwrap_rustup(cargo, 'cargo')
 -
--
+ 
  set_config('CARGO', cargo)
  set_config('RUSTC', rustc)
+@@ -348,26 +345,6 @@
  
-@@ -366,25 +362,6 @@
              os.write(in_fd, source)
              os.close(in_fd)
- 
+-
 -            cmd = [
 -                rustc,
 -                '--crate-type', 'staticlib',
diff --git a/srcpkgs/thunderbird/patches/rust-glslopt.patch b/srcpkgs/thunderbird/patches/rust-glslopt.patch
new file mode 100644
index 00000000000..3717caa2290
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-glslopt.patch
@@ -0,0 +1,13 @@
+overwrite HOST_* flags to get rid of -MF
+
+--- third_party/rust/glslopt/build.rs	2020-06-03 01:37:31.000000000 +0200
++++ third_party/rust/glslopt/build.rs	2020-06-04 10:57:16.418469546 +0200
+@@ -28,6 +28,8 @@
+     env::remove_var(format!("CXXFLAGS_{}", &target));
+     env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
+     env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_")));
++    env::set_var("HOST_CFLAGS", "-O2");
++    env::set_var("HOST_CXXFLAGS", "-O2");
+ 
+     configure(&mut cc::Build::new())
+         .warnings(false)
diff --git a/srcpkgs/thunderbird/patches/rust-has-i128.patch b/srcpkgs/thunderbird/patches/rust-has-i128.patch
new file mode 100644
index 00000000000..4c90cd3d106
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-has-i128.patch
@@ -0,0 +1,21 @@
+The configure check fails for cross builds.
+i128 is supported since rust-1.26, so it is safe for us to assume it is always present
+
+--- third_party/rust/num-traits/build.rs.orig	2020-02-14 23:57:25.985355610 +0100
++++ third_party/rust/num-traits/build.rs	2020-02-14 23:58:36.255710188 +0100
+@@ -1,14 +1,5 @@
+-extern crate autocfg;
+-
+-use std::env;
+-
+ fn main() {
+-    let ac = autocfg::new();
+-    if ac.probe_type("i128") {
+-        println!("cargo:rustc-cfg=has_i128");
+-    } else if env::var_os("CARGO_FEATURE_I128").is_some() {
+-        panic!("i128 support was not detected!");
+-    }
++    println!("cargo:rustc-cfg=has_i128");
+ 
+     autocfg::rerun_path("build.rs");
+ }
diff --git a/srcpkgs/thunderbird/patches/sandbox-fork.patch b/srcpkgs/thunderbird/patches/sandbox-fork.patch
new file mode 100644
index 00000000000..72640cb7f70
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/sandbox-fork.patch
@@ -0,0 +1,13 @@
+make SYS_fork non-fatal, musl uses it for fork(2)
+
+--- security/sandbox/linux/SandboxFilter.cpp
++++ security/sandbox/linux/SandboxFilter.cpp
+@@ -1253,6 +1253,8 @@
+         // usually do something reasonable on error.
+       case __NR_clone:
+         return ClonePolicy(Error(EPERM));
++      case __NR_fork:
++        return Error(ENOSYS);
+ 
+ #  ifdef __NR_fadvise64
+       case __NR_fadvise64:
diff --git a/srcpkgs/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch
index 6c72284c19b..c5e5c486dd1 100644
--- a/srcpkgs/thunderbird/patches/sndio.patch
+++ b/srcpkgs/thunderbird/patches/sndio.patch
@@ -1,8 +1,8 @@
 --- old-configure.in.orig
 +++ old-configure.in
-@@ -2839,6 +2839,22 @@
- 
- AC_SUBST(MOZ_ALSA)
+@@ -2818,6 +2818,22 @@
+     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
+ fi
  
 +dnl ==================================
 +dnl = Check sndio availability
@@ -21,26 +21,11 @@
 +AC_SUBST(MOZ_SNDIO)
 +
  dnl ========================================================
- dnl = Disable PulseAudio
- dnl ========================================================
---- toolkit/library/moz.build.orig
-+++ toolkit/library/moz.build
-@@ -235,10 +235,8 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
-     OS_LIBS += CONFIG['TK_LIBS']
- 
--if CONFIG['OS_ARCH'] == 'OpenBSD':
--    OS_LIBS += [
--        'sndio',
--    ]
-+if CONFIG['MOZ_SNDIO']:
-+    OS_LIBS += CONFIG['MOZ_SNDIO_LIBS']
- 
- if CONFIG['MOZ_ENABLE_DBUS']:
-     OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']
+ dnl =
+ dnl = Maintainer debug option (no --enable equivalent)
 --- media/libcubeb/src/moz.build.orig
 +++ media/libcubeb/src/moz.build
-@@ -43,7 +43,7 @@
+@@ -44,11 +44,13 @@
      ]
      DEFINES['USE_JACK'] = True
  
@@ -49,49 +34,19 @@
      SOURCES += [
          'cubeb_sndio.c',
      ]
---- build/moz.configure/old.configure.orig
-+++ build/moz.configure/old.configure
-@@ -169,6 +169,7 @@
+     DEFINES['USE_SNDIO'] = True
++
++if CONFIG['OS_ARCH'] == 'OpenBSD':
+     DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
+ 
+ if CONFIG['OS_TARGET'] == 'Darwin':
+--- build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
++++ -	2020-06-30 12:18:26.027756310 +0200
+@@ -210,6 +210,7 @@
  @old_configure_options(
      '--cache-file',
      '--datadir',
 +    '--enable-sndio',
-     '--enable-content-sandbox',
-     '--enable-cookies',
-     '--enable-cpp-rtti',
---- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig
-+++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
-@@ -349,6 +349,21 @@
-         }
-       }
-     }
-+
-+#ifdef MOZ_SNDIO
-+    // ~/.aucat_cookie (sndio)
-+    rv = homeDir->Clone(getter_AddRefs(confDir));
-+    if (NS_SUCCEEDED(rv)) {
-+      rv = confDir->AppendNative(NS_LITERAL_CSTRING(".aucat_cookie"));
-+      if (NS_SUCCEEDED(rv)) {
-+        nsAutoCString tmpPath;
-+        rv = confDir->GetNativePath(tmpPath);
-+        if (NS_SUCCEEDED(rv)) {
-+          policy->AddPath(rdwrcr, tmpPath.get());
-+        }
-+      }
-+    }
-+#endif
-   }
- 
-   // Firefox binary dir.
---- security/sandbox/linux/moz.build.orig
-+++ security/sandbox/linux/moz.build
-@@ -81,6 +81,9 @@
- if CONFIG['MOZ_ALSA']:
-     DEFINES['MOZ_ALSA'] = True
- 
-+if CONFIG['MOZ_SNDIO']:
-+    DEFINES['MOZ_SNDIO'] = True
-+
- # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
- # dependency like the one in libxul does, but this way the behavior is
- # consistent.  See also the comment in SandboxLogging.h.
+     '--enable-crashreporter',
+     '--enable-dbus',
+     '--enable-debug-js-modules',
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 7d57aec6929..bb680f2a9c0 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=68.11.0
+version=78.2.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,27 +11,26 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=0d2f403c7aca55ab130b7262ff8afc0254e5c0471db01f1631976df68a6af5f2
+checksum=273804d2199dde45f1857053575fe7c7fbb823f7547621400a5595ff5ae3ec14
 
 lib32disabled=yes
 
-hostmakedepends="autoconf213 unzip zip pkg-config perl python python3 yasm rust cargo
- llvm clang nodejs cbindgen nasm which tar"
+hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
+ llvm clang nodejs-lts-10 cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
- pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel
+ pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
  libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if startup_notification startup-notification-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel)
- $(vopt_if sndio sndio-devel)"
-depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme"
+ $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
+depends="nss>=3.47.1 desktop-file-utils hicolor-icon-theme"
 
-build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
-build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
+build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
+build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
-	armv6*) broken="required NEON extensions are not supported on armv6" ;;
+	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac
@@ -64,7 +63,9 @@ post_extract() {
 }
 
 post_patch() {
-	_clear_vendor_checksums cssparser
+	_clear_vendor_checksums audio_thread_priority
+	_clear_vendor_checksums num-traits
+	_clear_vendor_checksums glslopt
 }
 
 do_build() {
@@ -73,7 +74,7 @@ do_build() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig
-		echo "ac_add_options --enable-release" >>.mozconfig
+		echo "ac_add_options --disable-gold" >>.mozconfig
 		;;
 	esac
 
@@ -93,13 +94,6 @@ do_build() {
 		export LDFLAGS+=" -latomic"
 	fi
 
-	case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl|i686-musl)
-		echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig
-		echo "ac_add_options --target=${XBPS_TRIPLET}" >>.mozconfig
-		;;
-	esac
-
 	if [ "$CROSS_BUILD" ]; then
 		BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
 			sed -n '/#include <...> search starts here:/,/End of search list./p' | \
@@ -128,10 +122,6 @@ do_build() {
 	mkdir -p third_party/rust/libloading/.deps
 
 	case "$XBPS_TARGET_MACHINE" in
-	i686*)
-		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		;;
 	armv7*)
 		export CFLAGS+=" -mfpu=neon -Wno-psabi"
 		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
@@ -145,9 +135,14 @@ do_build() {
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
 		sed -i "s/debug_info = '2'/debug_info = '1'/" \
-		 build/moz.configure/toolchain.configure
+		build/moz.configure/toolchain.configure
 	fi
 
+	case "$XBPS_TARGET_MACHINE" in
+	aarch64*|i686*|x86_64*)
+		echo "ac_add_options --enable-rust-simd" >>.mozconfig ;;
+	esac
+
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird"
 
 	if [ "$SOURCE_DATE_EPOCH" ]; then
@@ -157,20 +152,20 @@ do_build() {
 	export MOZ_MAKE_FLAGS="${makejobs}"
 	export MOZ_NOSPAM=1
 	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
-	# avoid error: /usr/bin/as: invalid option -- 'N'
-	unset AS
+
+	export AS=$CC
 
 	cat <<! >>.mozconfig
 ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-google-safebrowsing-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key"
 ac_add_options $(vopt_enable alsa)
+ac_add_options $(vopt_enable jack)
 ac_add_options $(vopt_enable sndio)
 ac_add_options $(vopt_enable dbus)
 ac_add_options $(vopt_enable dbus necko-wifi)
 ac_add_options $(vopt_enable pulseaudio)
-ac_add_options $(vopt_enable startup_notification startup-notification)
-ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk')
+ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3')
 !
 
 	rm -f old-configure
@@ -182,9 +177,9 @@ do_install() {
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/preferences
 	vinstall ${FILESDIR}/thunderbird.desktop 644 usr/share/applications
 
-	for i in 16 22 24 32 48 256; do
-		vinstall ./comm/mail/branding/thunderbird/default$i.png 644 \
-			usr/share/icons/hicolor/${i}x${i}/apps thunderbird.png
+	for i in 16x16 22x22 24x24 32x32 48x48 128x128 256x256; do
+		vinstall ${wrksrc}/comm/mail/branding/thunderbird/default${i%x*}.png 644 \
+			usr/share/icons/hicolor/${i}/apps thunderbird.png
 	done
 
 	# Use system-provided dictionaries
@@ -197,4 +192,6 @@ do_install() {
 
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
 	ln -sf thunderbird ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin
+
+	vbin ${FILESDIR}/thunderbird-wayland
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [wip] thunderbird: update to 78.2.0
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (5 preceding siblings ...)
  2020-08-28 19:57 ` mmnmnnmnmm
@ 2020-08-28 20:01 ` mmnmnnmnmm
  2020-09-02  5:34 ` archfan
                   ` (19 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-08-28 20:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

New comment by mmnmnnmnmm on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-683122584

Comment:
The files and template have been taken from firefox78 and modified.

I don't know what I'm doing with regards to browsers so some of the patches
may not be needed.

This works on x86_64-glibc, but if anyone uses OpenPGP please test!


^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [wip] thunderbird: update to 78.2.0
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (6 preceding siblings ...)
  2020-08-28 20:01 ` [wip] thunderbird: update to 78.2.0 mmnmnnmnmm
@ 2020-09-02  5:34 ` archfan
  2020-09-03 15:36 ` [PR PATCH] [Updated] " mmnmnnmnmm
                   ` (18 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: archfan @ 2020-09-02  5:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

New comment by archfan on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-685311051

Comment:
I've successfully compiled from your template. Runs fine and the included pgp works also.

Could you please update your template to the latest minor version? 78.2.1 is already out.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] [wip] thunderbird: update to 78.2.0
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (7 preceding siblings ...)
  2020-09-02  5:34 ` archfan
@ 2020-09-03 15:36 ` mmnmnnmnmm
  2020-09-03 15:42 ` thunderbird: update to 78.2.1 mmnmnnmnmm
                   ` (17 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-09-03 15:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

There is an updated pull request by mmnmnnmnmm against master on the void-packages repository

https://github.com/mmnmnnmnmm/void-packages thunderbird
https://github.com/void-linux/void-packages/pull/24509

[wip] thunderbird: update to 78.2.0
Updated to the 78 branch, this contains big OpenPGP changes and supports only webextensions.

A patch file from https://github.com/void-linux/void-packages/pull/24509.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-thunderbird-24509.patch --]
[-- Type: text/x-diff, Size: 35630 bytes --]

From 900fd0777df472bf7f9d7be42e4121763983272f Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:46:09 +0100
Subject: [PATCH 1/2] thunderbird-i18n: update to 78.2.1

---
 srcpkgs/thunderbird-i18n/template | 114 +++++++++++++++---------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index fd9c9580559..b917876db93 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=68.11.0
+version=78.2.1
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -79,7 +79,7 @@ for _lang in "${_languages[@]}"; do
 	_pkgname=thunderbird-i18n-${_locale}
 
 	depends+=" ${_pkgname}>=${version}"
-	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-i686/xpi/${_locale}.xpi"
+	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-x86_64/xpi/${_locale}.xpi"
 
 	eval "${_pkgname}_package() {
 		_pkgtmpl $_lang
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="29ebac8c1596b508a1a19977524bcb9b9d357b8b422274c03f085bc2a1e5d11b
- b36fc2bc7ee070202ec3caa6ffe3bc24f527d8c076e33f0f3ac7c2bb34678264
- c425d737792ab8a4793e4c9ac094027c9ecfabe5bdc56c205e1b57b999626fd2
- 344962eb54d66b925d1e9d2139e92bec9d3f7c273d2735ab4933004efb2cc300
- ff8f1460b1c3dec628985fb047c62d75847a8ab1fdef553324dcd1b1c7a058e5
- bd531fa67ef6b4406e778cb5b0e09dc38e6de2f08d48c2fe87bfb13ba62eebac
- 9690c8600e36c138954bc2848d71872346c1e747b97a2bc180783779af589c15
- 52afdc19898b244a0a751ec5e89f223922554931c6a5cfb46289b3f71e7e4700
- 47c6881a303ade66dca9618b5127557be7511e1d44a64892efecefd451b7f7e0
- 77d63f3133a1978d139098af5d2e2cc19675c1bf380a7f2dac2d59ce876c29ee
- 046e46ecee6430a190f0f8cfdcc4723f5d69f617d1167788ebcd410fd6c206e5
- afa61ad764739ea2f171e8c3338883b2b076e354a40c39d73709d5592f3ad577
- 7cfabfb6454de77116b7ca806ca43cf1c93b21b126708e787f7e0d2e3b1907af
- 7d38732aef00b03c54f353cd81f5b22fb43437f0b0960ae269c0af58832e7044
- 9690287d26cd6d3fd8301f762a40d4304ef7dbf0f73da913a793eb5f171295af
- c9eafbbdf6a267804dbfb2f5f8d6f1a1b53aa0fa9426f9af05138655a49d61f6
- c5d249574dc53a8425bef3469d2bf6aa3e1735a9cef1cfe5339a7c4b674294a1
- 6a6bcdddbf4cf6edae30b7d5eba330232d88fc2722085409ecbac0861f661d05
- ac2abdbd3cad39a5d52626ffe00e7f59ab52c669b3da6f43268d62e2f01345d7
- 566718f0068fccedacf3cee3ab56a36e849bc3d4acadf508962c81981f29e7e9
- bb94fb6835400bfe0b70276fc45e941b4a5dd809f946865dfca841373beb42f7
- 9b36cc8688ab7871ef90f7778b3747fc6503a56ed42f8faafa0b6568e9a906d0
- b99159527690293830cf167affa9a604c26a10e268d0617a3d06e7319ff8572a
- 22695eda8f34c749e95a310752461d48f45eafb428dbf6a1d324e223577fae0d
- f35d72064fd5a7246020e5958d8d43b0f0e1f439aee7095e306318400bd4b298
- e015951a49b812ae1889e24dd67f67cc26c38242a0c20708ef845277559b131d
- 343acef6937334a0a525fd181f88c7f68f75e93cdeacffef05df4a8211e288b7
- c9e3739e55834d7512e5817498c358498a3cb0f652f21c213c06287204ebed01
- 2381df9b757dd2aac778001a09f36d88e98f2620dd05813425f53b9e35f26040
- a6f21d925b9334d5f46e054ae6db492f7c3c8c62b043a292e45a984a37ef6087
- ced2a3d7a590e538ca6d817efda47478ca198246640835733c5d579205fd9059
- c2bff27ecd581fffb156cb9fdfc26cdfa2a2fd8dab3ad478c80ca53d22c59ef6
- efc4f0b1781463bdf0561e25e9c31dc5878949cbd34684393f168b7b69f88e15
- c4fac0f3281e59de3a1a43767ac497689605d6e35673e3606b5a43fb835cd47a
- fc034024f5a960d3ac82b5b5b99dc481b8d6508496bd6264dd873c4883a9440e
- c3c5fe21cb5bb84af9b6428ff6f62ba8b669dc931ea3bd66225bd3d88aec07f8
- bb5955b070dd509f4a8f170162826ec497d0a09e56eaa641e8223328b67408a3
- a0d018d37b19fa4e82d89411c9e297df12fa56b003f6631cfbc12355dd8cac94
- d8a5eac605c4288f1946de393dd52b9c16f8f618335c1e609806b5ec806d697a
- 867cd73998fca97eeb29a08ae3b492329741bcfcd157c275e2f7c3d75dd2da7f
- a56814cbc21b8415645c655ae20836935c3fba31d66c0b33de33ace295a294e3
- 0dbbca82f751b0fe80ca7f3b161350d982e966499e0835c415cd7ed32861b3a7
- 238f218891c28e1505bddbd08a183896b93d383d56e5a429a8ac731d30b54624
- 2d7f404c97d377275a4e9be9fcf5712ba2b85c161042d80f992c4c1d794890f5
- 3093d3e5de225238bb15c459c0b317c5ebf05302389d03cbd0b69768ca9c011d
- 313247a18560313e0d39895713c793488e98c705659fc5b6aaba59fd25fbeb5c
- 06542ba7fad18017e52b135ab68266a0c791a1446b36b55f4476e9e6720c33d0
- abfeca306d10dcaba73becffa90bf830707983f341b8abfec90203297c2f676e
- cb1e4c67fad60b0080ce304a78728174f463093a2a6d730b5bd6739b5a15c370
- 93da2ce9ffa2aec8aa56fd88c97ee5bead6b8ba46b4df3bd98a4376402669183
- d6144c43d24bff108ae787092bbbefe91c135345a923f7f8b951ac7cd46fa807
- c2c24bfe1522a36181b6c6d03acf98a0df3921c0493cc8c818df70ebf2760c53
- d68229f3b05b80ad807cd2a750b916e460665574c96b5b8e5258e2f689a4a971
- 4ca52ff75e0358feb4a535617076d2aede70b0d7ab29524a4b4bfe4f1b7ab0da
- ff20a2ac005ee398f2aec1897f578ed38072b7b21e3e962abc67ecb66d01d3fe"
+checksum="471cdd194ba3b0699f1c438afb6ed280e334f1f82485e21734cd07d8868d5d42
+ 122f27297042dc53d7d191d207e3e0d2065a125c6c6d8e3a45c98cc78de4a48f
+ 58332bc408b8aeba54099c2cbfba6ad4c512ab87cac39e22f18534373e6ff76f
+ 8f46d61f10edcdc073def4bd260b3d280a48e0d8622c00d72fda27d058f94a6e
+ 71408b75023e48a0ff7a1f7649b7fd002ba427c5d9bb33e969b0232f0e7694fd
+ 3c03270fd64c28c27f7d7d35edcdd04fe4a5b075447d6af7bdc2aa5f4474c1a1
+ ade79acb86be0f722c0769f0dc1bccfb18fefdc427c12108dd669dd9f6dec05e
+ bf6ff9a132749fb755a5447a1feba6fe0566d1df17be8e64e9243553a07fbbc6
+ a2d7e7c80d7211a83be452231e6b2e7fa4ad0d3a60206dd0170f16dff7d14cad
+ d95b6a75ee77bcaee58450b48c7c287a9acfc6bf739e2017baeae8d5742c1591
+ 10beb0ee5a8e6c38776d3851491f7d5af7225a6d2601caaa72c2c8b1693d7eed
+ aaaf7d44c4a43f431bb52a4269d0e33e5c13039b86de6e774438f810436dce39
+ 731b77a9662c1e48d77b85685d778cc74ae9b7ebc056b3465aa5d5db118f58b3
+ a9464eb2dbf4237e42dcabcb84b2025e176b045316b0a562414b40cc2d09e5e8
+ 492175fff38f291f1f384a41e6353d6be88905be98521e1688aa4448ab52e1cc
+ 0c4e3ef0310fe084ad5ff40ea485955617821af71c2039a5d2585d69c23b17f4
+ 30ae8aba6cd1b72870f5462df7d31372c7ee38d74e7c549f277e220f3aa4f36f
+ 33c849af02ebb45010565dcd819bebe16a1e994e24a1f6ba0778a142f1629a37
+ a881fc4550431dc6a69cbe56a4c92e22faa23c7d73b3c4ecb1a6e582ea2d3b2f
+ f41cba98537942f34e91a8121384fc10c8352feee05c98bcac17f19b0f17345b
+ c02bff8e019af61758b3766684165c93ee70d17eefc0cec98265bbca21d9ff90
+ 02a2ab88c2ad24d6d6a5562c201b2b5ac3c64d98e22ea7afedf6df7a65e296c3
+ 23e3906b35fd5e50642fc7308948777f76821744b240061828f498ed4e101c90
+ c3c11861b9d9136540175345f4daecfacdc0409a8ed6d1a8f783bd0ea9cef36b
+ 308d3cadee1e620674008055dcf7c380e82e7e5e30102ede1ccfdec34aee62f7
+ cb69fbab6acff47b83ffe244c3c10ebefb046779468df04ef51c2c0b31307181
+ 9a785bbc6db76c3a3317833f77914f775c3a1baf62877038463da0b6fa7fcac5
+ 00c495a32ba8e5e3b4aacd4495886f7e9725d582364b5d7d6f9f49d2e50829b3
+ 5ecee2745774c329923d9f660a9a954e78449058c761dda084679b98159564f0
+ 9284d88a3fd871903989dfaef9e5873492e2da38f5c4faff17003344b2c40451
+ 021fe9c1b19170979efba6dc9d7424f46bbcee629d8c0e13c6c00a0d3da9870b
+ ae96a0f8fee54e7ed063bb9af6853dfa553d454316c02386b64044b32b488d02
+ 55bf9118a0487fd66949cb6fa5987810facdf421683db58a6f7b01bca836ad60
+ 2bda14dcc6aab42811ceeebc03208d2fec00e978ebf70b5722465b1456d4d48a
+ 0002a047039a2badd5bef730c3776241eb25094f713dc0a3fd6b6b9145020542
+ a508030c3b3128b71a46a84dc2c34265072db2e9f3de49f83ab8935d8ed384f1
+ 7df1d1c45ecaabe8e96f5c3f06aace8607930aa4910afcfdc85736ec57918dec
+ 8e827c1f30b39e70a91b8906ff21f1bac71d8a4b8387d549bcd0a3d646c9b403
+ 670ac5c72928a5f2c821bac2abed2173c5a196b0656daac3a357982917dca86d
+ 1c57337a4e5479ee27875fb2e45d8120ff6d7c45d0fc4c9604068861ece58e5a
+ bf7f8449ae8c82dd1d664cd247ed3dd0a5d73637369816bd9f280996c3c4fedb
+ fead4a1bbc8b76f5edece11ed435e5739e0fc5c49e48252d35fa68543d7ca4b1
+ 33d015fa49ed65b539e5a3e85d34da248e30a9342669d9e815eb874fda2d3dc5
+ 215cc5c573de47aa69e06f6950b753fc8291e4000ed1a2dea6700bb4ed876a63
+ 10491bfb9f3f6a0053f9e7fa7247b6660447649b9dad979fc1a1e1988a10586f
+ 3eabbd7e94a5fd848cf75f3c8cd565a9c17ba4063dcf142f5044e1e9c2e494e8
+ 7b6a3c987bd329f4aeb089cf52e4836fcd07cff57f9516bd9cad861ef7c5775d
+ f211909009fd8de1cc6f746bc3d48ce342d99c0cd0a3e47111d22cf0b7be4421
+ d7553766b6c0faad5325b1b6b296d176df1fdd64e1bdfc9d00c4dc93373e73d8
+ 3f591b99ce4e43230c51a38462bd9cb5793abe6e36eac3ea1409bd3f5906fda8
+ 653e33ebc1a11c98c070dd957e317657f3ed6393a30b4c38848c2be952623b66
+ ea794e662cf4d50523f1151759b2ffa2126a3b84aae1193ca9879030a04ba8ee
+ 14762e32f9fc852a9bb6571fdeae006bb66b47737bee99a1754d2cbb5a7949d0
+ b4e5089dc98168d2c2e084a7182efd31cdd137210ef8ed4224155d50496407e1
+ c3da94d88aa44518953afcbf9d73a14ddfd6f88727339ce8c7c25dd78e4276f8"

From f0fc730152437ab168300a281e7dd6eeb7e9be32 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:49:23 +0100
Subject: [PATCH 2/2] thunderbird: update to 78.2.1 [ci skip]

---
 srcpkgs/thunderbird/files/mozconfig           | 10 +--
 srcpkgs/thunderbird/files/thunderbird-wayland |  2 +
 .../patches/fix-i686-ppc-musl.patch           |  8 +-
 srcpkgs/thunderbird/patches/fix-musl.patch    | 11 ---
 .../patches/fix-sandbox-membarrier.patch      | 52 ------------
 .../thunderbird/patches/fix-seccomp-bpf.patch | 14 ----
 srcpkgs/thunderbird/patches/fix-toolkit.patch | 78 ------------------
 srcpkgs/thunderbird/patches/fix-tools.patch   | 17 ----
 .../thunderbird/patches/ppc32-fix-build.patch | 36 +++++++++
 .../patches/ppc32-skia-portable.patch         | 14 ----
 .../thunderbird/patches/rust-configure.patch  | 15 ++--
 .../thunderbird/patches/rust-glslopt.patch    | 13 +++
 .../thunderbird/patches/rust-has-i128.patch   | 21 +++++
 .../thunderbird/patches/sandbox-fork.patch    | 13 +++
 srcpkgs/thunderbird/patches/sndio.patch       | 81 +++++--------------
 srcpkgs/thunderbird/template                  | 61 +++++++-------
 16 files changed, 147 insertions(+), 299 deletions(-)
 create mode 100644 srcpkgs/thunderbird/files/thunderbird-wayland
 delete mode 100644 srcpkgs/thunderbird/patches/fix-musl.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-toolkit.patch
 create mode 100644 srcpkgs/thunderbird/patches/ppc32-fix-build.patch
 delete mode 100644 srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-glslopt.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-has-i128.patch
 create mode 100644 srcpkgs/thunderbird/patches/sandbox-fork.patch

diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig
index 334846e9a64..ed6cfb244cb 100644
--- a/srcpkgs/thunderbird/files/mozconfig
+++ b/srcpkgs/thunderbird/files/mozconfig
@@ -3,7 +3,6 @@ ac_add_options --libdir=/usr/lib
 
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-libevent
@@ -12,12 +11,8 @@ ac_add_options --with-system-icu
 # XXX: the system's libpng doesn't have APNG support
 ac_add_options --without-system-png
 ac_add_options --enable-system-pixman
-ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 
-ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr
-ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr
-
 nspr_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nspr"
@@ -26,16 +21,15 @@ nss_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nss"
 
-ac_add_options --disable-gconf
 ac_add_options --disable-tests
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-install-strip
 ac_add_options --disable-strip
 ac_add_options --disable-profiling
-ac_add_options --disable-gold
+ac_add_options --enable-release
 ac_add_options --enable-optimize="$CFLAGS"
 
 ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
 ac_add_options --enable-application=comm/mail
+ac_add_options --enable-calendar
diff --git a/srcpkgs/thunderbird/files/thunderbird-wayland b/srcpkgs/thunderbird/files/thunderbird-wayland
new file mode 100644
index 00000000000..cd7f9ab7394
--- /dev/null
+++ b/srcpkgs/thunderbird/files/thunderbird-wayland
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec env MOZ_ENABLE_WAYLAND= /usr/lib/thunderbird/thunderbird "$@"
diff --git a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
index 40aab43ae86..6df609bbf16 100644
--- a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
 --- mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
 +++ mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -33,7 +33,7 @@ using namespace mozilla;
- #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+@@ -41,7 +41,7 @@
+ #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
  
--#if (defined(linux) &&                                            \
+-#if (defined(linux) && \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #define MOZ_STACKWALK_SUPPORTS_LINUX 1
diff --git a/srcpkgs/thunderbird/patches/fix-musl.patch b/srcpkgs/thunderbird/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/thunderbird/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch b/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
deleted file mode 100644
index caffd83cf67..00000000000
--- a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-allow usage of SYS_membarrier, needed since musl-1.1.22
-
---- security/sandbox/linux/SandboxFilter.cpp
-+++ security/sandbox/linux/SandboxFilter.cpp
-@@ -283,6 +283,8 @@
-       case __NR_set_tid_address:
-         return Allow();
- #endif
-+      case __NR_membarrier:
-+        return Allow();
- 
-         // prctl
-       case __NR_prctl: {
-
---- security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-
---- security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
- 
---- security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1490,5 +1490,9 @@
- #define __NR_shutdown 373
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
- 
diff --git a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch b/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
deleted file mode 100644
index ed94fc39ed0..00000000000
--- a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig	2015-09-23 09:10:08.812740571 +0200
-+++ security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc	2015-09-23 09:11:38.404746155 +0200
-@@ -23,6 +23,11 @@
- #include "sandbox/linux/services/android_ucontext.h"
- #endif
- 
-+// musl libc defines siginfo_t __si_fields instead of _sifields
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#define _sifields __si_fields
-+#endif
-+
- namespace {
- 
- struct arch_sigsys {
diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch
deleted file mode 100644
index 86e8ef47855..00000000000
--- a/srcpkgs/thunderbird/patches/fix-toolkit.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig    2016-07-05 21:00:03.672000517 +0200
-+++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200
-@@ -1134,6 +1134,12 @@
- #ifndef __NR_fallocate
- #define __NR_fallocate          285
- #endif
-+
-+#undef __NR_pread
-+#define __NR_pread __NR_pread64
-+#undef __NR_pwrite
-+#define __NR_pwrite __NR_pwrite64
-+
- /* End of x86-64 definitions                                                 */
- #elif defined(__mips__)
- #if _MIPS_SIM == _MIPS_SIM_ABI32
---- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-04-17 10:24:33.793431933 +0000
-@@ -45,6 +45,7 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <libgen.h>
- 
- #include <iostream>
- #include <set>
---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-04-17 10:24:33.793431933 +0000
-@@ -41,6 +41,10 @@
- 
- #include "common/using_std_string.h"
- 
-+#ifndef N_UNDF
-+#define N_UNDF 0
-+#endif
-+
- using std::vector;
- 
- namespace google_breakpad {
---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-04-17 10:24:33.793431933 +0000
-@@ -55,7 +55,7 @@
-
- #ifdef HAVE_MACH_O_NLIST_H
- #include <mach-o/nlist.h>
--#elif defined(HAVE_A_OUT_H)
-+#elif 0
- #include <a.out.h>
- #endif
-
---- toolkit.orig/mozapps/update/common/updatedefines.h	2019-01-29 11:34:36.416804577 +0100
-+++ toolkit/mozapps/update/common/updatedefines.h	2019-01-29 11:34:59.193583777 +0100
-@@ -102,7 +102,7 @@
-
- #  ifdef SOLARIS
- #    include <sys/stat.h>
--#  else
-+#  elif !(defined(__linux__)) || defined(__GLIBC__)
- #    include <fts.h>
- #  endif
- #  include <dirent.h>
---- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
-+++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
-@@ -3978,6 +3978,7 @@
- 
- int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
-   int rv = OK;
-+#if !defined(__linux__) || defined(__GLIBC__)
-   FTS* ftsdir;
-   FTSENT* ftsdirEntry;
-   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
-@@ -4085,6 +4086,7 @@
-   }
- 
-   fts_close(ftsdir);
-+#endif
- 
-   return rv;
- }
diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch
index 0ed043fb5b5..d29da8bb54b 100644
--- a/srcpkgs/thunderbird/patches/fix-tools.patch
+++ b/srcpkgs/thunderbird/patches/fix-tools.patch
@@ -1,20 +1,3 @@
---- tools/profiler/lul/LulElf.cpp.orig	2019-01-29 12:05:34.223834130 +0100
-+++ tools/profiler/lul/LulElf.cpp	2019-01-29 12:08:02.480400845 +0100
-@@ -469,10 +469,10 @@
- // Return the non-directory portion of FILENAME: the portion after the
- // last slash, or the whole filename if there are no slashes.
- string BaseFileName(const string& filename) {
--  // Lots of copies!  basename's behavior is less than ideal.
--  char* c_filename = strdup(filename.c_str());
--  string base = basename(c_filename);
--  free(c_filename);
-+  // basename's behavior is less than ideal so avoid it
-+  const char *c_filename = filename.c_str();
-+  const char *p = strrchr(c_filename, '/');
-+  string base = p ? p+1 : c_filename;
-   return base;
- }
- 
 --- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
 +++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
 @@ -253,7 +253,11 @@
diff --git a/srcpkgs/thunderbird/patches/ppc32-fix-build.patch b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch
new file mode 100644
index 00000000000..c1a8f422d0a
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch
@@ -0,0 +1,36 @@
+This is not a complete/correct patch, but it makes firefox build. For now
+mostly for tracking, so a real fix can be made, but right now it still
+segfaults on start.
+
+Ref: https://hg.mozilla.org/mozilla-central/rev/08339a56f3ae
+Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60
+Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e
+Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp
+
+--- xpcom/reflect/xptcall/xptcall.h
++++ xpcom/reflect/xptcall/xptcall.h
+@@ -71,6 +71,11 @@ struct nsXPTCVariant {
+     ExtendedVal ext;
+   };
+ 
++#if defined(__powerpc__) && !defined(__powerpc64__)
++  // this field is still necessary on ppc32, as an address
++  // to it is taken certain places in xptcall
++  void *ptr;
++#endif
+   nsXPTType type;
+   uint8_t flags;
+ 
+@@ -91,7 +96,12 @@ struct nsXPTCVariant {
+   };
+ 
+   void ClearFlags() { flags = 0; }
++#if defined(__powerpc__) && !defined(__powerpc64__)
++  void SetIndirect() { ptr = &val; flags |= IS_INDIRECT; }
++  bool IsPtrData() const { return IsIndirect(); }
++#else
+   void SetIndirect() { flags |= IS_INDIRECT; }
++#endif
+ 
+   bool IsIndirect() const { return 0 != (flags & IS_INDIRECT); }
+ 
diff --git a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch b/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
deleted file mode 100644
index 93c625a861e..00000000000
--- a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gfx/skia/skia/third_party/skcms/skcms.cc
-+++ gfx/skia/skia/third_party/skcms/skcms.cc
-@@ -1806,6 +1806,11 @@ typedef enum {
-     Op_store_ffff,
- } Op;
- 
-+// work around ICE on 32-bit ppc
-+#if defined(__powerpc__) && !defined(__powerpc64__)
-+#  define SKCMS_PORTABLE
-+#endif
-+
- #if defined(__clang__)
-     template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));
- #elif defined(__GNUC__)
diff --git a/srcpkgs/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch
index 09191782b35..887c102bc55 100644
--- a/srcpkgs/thunderbird/patches/rust-configure.patch
+++ b/srcpkgs/thunderbird/patches/rust-configure.patch
@@ -1,20 +1,23 @@
---- build/moz.configure/rust.configure	2020-06-06 10:05:25.819337924 +0200
-+++ build/moz.configure/rust.configure	2020-06-06 10:07:11.346031015 +0200
-@@ -79,10 +79,6 @@
+Mozilla rustc check does not support crossbuild: let's remove it
+Remove calls to unwrap_rustup, they fail if rustup isn't present
+
+--- build/moz.configure/rust.configure.orig	2019-10-17 04:19:59.000000000 +0700
++++ build/moz.configure/rust.configure	2019-10-22 11:48:55.616022140 +0700
+@@ -78,9 +78,6 @@
  
      return unwrap
  
 -rustc = unwrap_rustup(rustc, 'rustc')
 -cargo = unwrap_rustup(cargo, 'cargo')
 -
--
+ 
  set_config('CARGO', cargo)
  set_config('RUSTC', rustc)
+@@ -348,26 +345,6 @@
  
-@@ -366,25 +362,6 @@
              os.write(in_fd, source)
              os.close(in_fd)
- 
+-
 -            cmd = [
 -                rustc,
 -                '--crate-type', 'staticlib',
diff --git a/srcpkgs/thunderbird/patches/rust-glslopt.patch b/srcpkgs/thunderbird/patches/rust-glslopt.patch
new file mode 100644
index 00000000000..3717caa2290
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-glslopt.patch
@@ -0,0 +1,13 @@
+overwrite HOST_* flags to get rid of -MF
+
+--- third_party/rust/glslopt/build.rs	2020-06-03 01:37:31.000000000 +0200
++++ third_party/rust/glslopt/build.rs	2020-06-04 10:57:16.418469546 +0200
+@@ -28,6 +28,8 @@
+     env::remove_var(format!("CXXFLAGS_{}", &target));
+     env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
+     env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_")));
++    env::set_var("HOST_CFLAGS", "-O2");
++    env::set_var("HOST_CXXFLAGS", "-O2");
+ 
+     configure(&mut cc::Build::new())
+         .warnings(false)
diff --git a/srcpkgs/thunderbird/patches/rust-has-i128.patch b/srcpkgs/thunderbird/patches/rust-has-i128.patch
new file mode 100644
index 00000000000..4c90cd3d106
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-has-i128.patch
@@ -0,0 +1,21 @@
+The configure check fails for cross builds.
+i128 is supported since rust-1.26, so it is safe for us to assume it is always present
+
+--- third_party/rust/num-traits/build.rs.orig	2020-02-14 23:57:25.985355610 +0100
++++ third_party/rust/num-traits/build.rs	2020-02-14 23:58:36.255710188 +0100
+@@ -1,14 +1,5 @@
+-extern crate autocfg;
+-
+-use std::env;
+-
+ fn main() {
+-    let ac = autocfg::new();
+-    if ac.probe_type("i128") {
+-        println!("cargo:rustc-cfg=has_i128");
+-    } else if env::var_os("CARGO_FEATURE_I128").is_some() {
+-        panic!("i128 support was not detected!");
+-    }
++    println!("cargo:rustc-cfg=has_i128");
+ 
+     autocfg::rerun_path("build.rs");
+ }
diff --git a/srcpkgs/thunderbird/patches/sandbox-fork.patch b/srcpkgs/thunderbird/patches/sandbox-fork.patch
new file mode 100644
index 00000000000..72640cb7f70
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/sandbox-fork.patch
@@ -0,0 +1,13 @@
+make SYS_fork non-fatal, musl uses it for fork(2)
+
+--- security/sandbox/linux/SandboxFilter.cpp
++++ security/sandbox/linux/SandboxFilter.cpp
+@@ -1253,6 +1253,8 @@
+         // usually do something reasonable on error.
+       case __NR_clone:
+         return ClonePolicy(Error(EPERM));
++      case __NR_fork:
++        return Error(ENOSYS);
+ 
+ #  ifdef __NR_fadvise64
+       case __NR_fadvise64:
diff --git a/srcpkgs/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch
index 6c72284c19b..c5e5c486dd1 100644
--- a/srcpkgs/thunderbird/patches/sndio.patch
+++ b/srcpkgs/thunderbird/patches/sndio.patch
@@ -1,8 +1,8 @@
 --- old-configure.in.orig
 +++ old-configure.in
-@@ -2839,6 +2839,22 @@
- 
- AC_SUBST(MOZ_ALSA)
+@@ -2818,6 +2818,22 @@
+     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
+ fi
  
 +dnl ==================================
 +dnl = Check sndio availability
@@ -21,26 +21,11 @@
 +AC_SUBST(MOZ_SNDIO)
 +
  dnl ========================================================
- dnl = Disable PulseAudio
- dnl ========================================================
---- toolkit/library/moz.build.orig
-+++ toolkit/library/moz.build
-@@ -235,10 +235,8 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
-     OS_LIBS += CONFIG['TK_LIBS']
- 
--if CONFIG['OS_ARCH'] == 'OpenBSD':
--    OS_LIBS += [
--        'sndio',
--    ]
-+if CONFIG['MOZ_SNDIO']:
-+    OS_LIBS += CONFIG['MOZ_SNDIO_LIBS']
- 
- if CONFIG['MOZ_ENABLE_DBUS']:
-     OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']
+ dnl =
+ dnl = Maintainer debug option (no --enable equivalent)
 --- media/libcubeb/src/moz.build.orig
 +++ media/libcubeb/src/moz.build
-@@ -43,7 +43,7 @@
+@@ -44,11 +44,13 @@
      ]
      DEFINES['USE_JACK'] = True
  
@@ -49,49 +34,19 @@
      SOURCES += [
          'cubeb_sndio.c',
      ]
---- build/moz.configure/old.configure.orig
-+++ build/moz.configure/old.configure
-@@ -169,6 +169,7 @@
+     DEFINES['USE_SNDIO'] = True
++
++if CONFIG['OS_ARCH'] == 'OpenBSD':
+     DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
+ 
+ if CONFIG['OS_TARGET'] == 'Darwin':
+--- build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
++++ -	2020-06-30 12:18:26.027756310 +0200
+@@ -210,6 +210,7 @@
  @old_configure_options(
      '--cache-file',
      '--datadir',
 +    '--enable-sndio',
-     '--enable-content-sandbox',
-     '--enable-cookies',
-     '--enable-cpp-rtti',
---- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig
-+++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
-@@ -349,6 +349,21 @@
-         }
-       }
-     }
-+
-+#ifdef MOZ_SNDIO
-+    // ~/.aucat_cookie (sndio)
-+    rv = homeDir->Clone(getter_AddRefs(confDir));
-+    if (NS_SUCCEEDED(rv)) {
-+      rv = confDir->AppendNative(NS_LITERAL_CSTRING(".aucat_cookie"));
-+      if (NS_SUCCEEDED(rv)) {
-+        nsAutoCString tmpPath;
-+        rv = confDir->GetNativePath(tmpPath);
-+        if (NS_SUCCEEDED(rv)) {
-+          policy->AddPath(rdwrcr, tmpPath.get());
-+        }
-+      }
-+    }
-+#endif
-   }
- 
-   // Firefox binary dir.
---- security/sandbox/linux/moz.build.orig
-+++ security/sandbox/linux/moz.build
-@@ -81,6 +81,9 @@
- if CONFIG['MOZ_ALSA']:
-     DEFINES['MOZ_ALSA'] = True
- 
-+if CONFIG['MOZ_SNDIO']:
-+    DEFINES['MOZ_SNDIO'] = True
-+
- # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
- # dependency like the one in libxul does, but this way the behavior is
- # consistent.  See also the comment in SandboxLogging.h.
+     '--enable-crashreporter',
+     '--enable-dbus',
+     '--enable-debug-js-modules',
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 7d57aec6929..c906a821487 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=68.11.0
+version=78.2.1
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,27 +11,26 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=0d2f403c7aca55ab130b7262ff8afc0254e5c0471db01f1631976df68a6af5f2
+checksum=1a231291cbad76b505ba1451efc543ce2651bcb481fdf26e6300b918c7ee903d
 
 lib32disabled=yes
 
-hostmakedepends="autoconf213 unzip zip pkg-config perl python python3 yasm rust cargo
- llvm clang nodejs cbindgen nasm which tar"
+hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
+ llvm clang nodejs-lts-10 cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
- pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel
+ pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
  libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if startup_notification startup-notification-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel)
- $(vopt_if sndio sndio-devel)"
-depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme"
+ $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
+depends="nss>=3.47.1 desktop-file-utils hicolor-icon-theme"
 
-build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
-build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
+build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
+build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
-	armv6*) broken="required NEON extensions are not supported on armv6" ;;
+	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac
@@ -64,7 +63,9 @@ post_extract() {
 }
 
 post_patch() {
-	_clear_vendor_checksums cssparser
+	_clear_vendor_checksums audio_thread_priority
+	_clear_vendor_checksums num-traits
+	_clear_vendor_checksums glslopt
 }
 
 do_build() {
@@ -73,7 +74,7 @@ do_build() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig
-		echo "ac_add_options --enable-release" >>.mozconfig
+		echo "ac_add_options --disable-gold" >>.mozconfig
 		;;
 	esac
 
@@ -93,13 +94,6 @@ do_build() {
 		export LDFLAGS+=" -latomic"
 	fi
 
-	case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl|i686-musl)
-		echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig
-		echo "ac_add_options --target=${XBPS_TRIPLET}" >>.mozconfig
-		;;
-	esac
-
 	if [ "$CROSS_BUILD" ]; then
 		BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
 			sed -n '/#include <...> search starts here:/,/End of search list./p' | \
@@ -128,10 +122,6 @@ do_build() {
 	mkdir -p third_party/rust/libloading/.deps
 
 	case "$XBPS_TARGET_MACHINE" in
-	i686*)
-		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		;;
 	armv7*)
 		export CFLAGS+=" -mfpu=neon -Wno-psabi"
 		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
@@ -145,9 +135,14 @@ do_build() {
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
 		sed -i "s/debug_info = '2'/debug_info = '1'/" \
-		 build/moz.configure/toolchain.configure
+		build/moz.configure/toolchain.configure
 	fi
 
+	case "$XBPS_TARGET_MACHINE" in
+	aarch64*|i686*|x86_64*)
+		echo "ac_add_options --enable-rust-simd" >>.mozconfig ;;
+	esac
+
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird"
 
 	if [ "$SOURCE_DATE_EPOCH" ]; then
@@ -157,20 +152,20 @@ do_build() {
 	export MOZ_MAKE_FLAGS="${makejobs}"
 	export MOZ_NOSPAM=1
 	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
-	# avoid error: /usr/bin/as: invalid option -- 'N'
-	unset AS
+
+	export AS=$CC
 
 	cat <<! >>.mozconfig
 ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-google-safebrowsing-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key"
 ac_add_options $(vopt_enable alsa)
+ac_add_options $(vopt_enable jack)
 ac_add_options $(vopt_enable sndio)
 ac_add_options $(vopt_enable dbus)
 ac_add_options $(vopt_enable dbus necko-wifi)
 ac_add_options $(vopt_enable pulseaudio)
-ac_add_options $(vopt_enable startup_notification startup-notification)
-ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk')
+ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3')
 !
 
 	rm -f old-configure
@@ -182,9 +177,9 @@ do_install() {
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/preferences
 	vinstall ${FILESDIR}/thunderbird.desktop 644 usr/share/applications
 
-	for i in 16 22 24 32 48 256; do
-		vinstall ./comm/mail/branding/thunderbird/default$i.png 644 \
-			usr/share/icons/hicolor/${i}x${i}/apps thunderbird.png
+	for i in 16x16 22x22 24x24 32x32 48x48 128x128 256x256; do
+		vinstall ${wrksrc}/comm/mail/branding/thunderbird/default${i%x*}.png 644 \
+			usr/share/icons/hicolor/${i}/apps thunderbird.png
 	done
 
 	# Use system-provided dictionaries
@@ -197,4 +192,6 @@ do_install() {
 
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
 	ln -sf thunderbird ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin
+
+	vbin ${FILESDIR}/thunderbird-wayland
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (8 preceding siblings ...)
  2020-09-03 15:36 ` [PR PATCH] [Updated] " mmnmnnmnmm
@ 2020-09-03 15:42 ` mmnmnnmnmm
  2020-09-03 17:13 ` q66
                   ` (16 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-09-03 15:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by mmnmnnmnmm on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-686579719

Comment:
Thanks for testing and for reminding me about the release.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (9 preceding siblings ...)
  2020-09-03 15:42 ` thunderbird: update to 78.2.1 mmnmnnmnmm
@ 2020-09-03 17:13 ` q66
  2020-09-03 18:10 ` mmnmnnmnmm
                   ` (15 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: q66 @ 2020-09-03 17:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-686632672

Comment:
this update will mess up image colors on big endian systems (there have been changes in image loading code which results in things not being properly swizzled on BE, there is no patchset yet), not yet sure how important that is for email client (probably far less than for firefox itself)

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (10 preceding siblings ...)
  2020-09-03 17:13 ` q66
@ 2020-09-03 18:10 ` mmnmnnmnmm
  2020-09-22  6:10 ` dkwo
                   ` (14 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-09-03 18:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 715 bytes --]

New comment by mmnmnnmnmm on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-686662040

Comment:
> this update will mess up image colors on big endian systems (there have
> been changes in image loading code which results in things not being
> properly swizzled on BE, there is no patchset yet)

Eh, that's annoying, is there a bug tracking this anywhere?

> not yet sure how important that is for email client (probably far less
> than for firefox itself)

I personally would take the security fixes with the caveat of broken
images, though I know a lot of people use html emails full of images.
But it's not my place to say, I don't even use void on BE.


^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (11 preceding siblings ...)
  2020-09-03 18:10 ` mmnmnnmnmm
@ 2020-09-22  6:10 ` dkwo
  2020-09-22 13:56 ` sgn
                   ` (13 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: dkwo @ 2020-09-22  6:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-696527279

Comment:
Thanks, I also built it on x86_64-musl and it works fine.
Would it be possible to update to 78.2.2?
My compile time on Intel i5-6300U (4) @ 3.000GHz with `XBPS_MAKEJOBS=4` in `etc/defaults.conf` was aournd 6h: is this normal or did I miss something?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (12 preceding siblings ...)
  2020-09-22  6:10 ` dkwo
@ 2020-09-22 13:56 ` sgn
  2020-10-01  3:28 ` ericonr
                   ` (12 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sgn @ 2020-09-22 13:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-696738557

Comment:
> My compile time on Intel i5-6300U (4) @ 3.000GHz with `XBPS_MAKEJOBS=4` in `etc/defaults.conf` was aournd 6h: is this normal or did I miss something?

That's normal.



^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (13 preceding siblings ...)
  2020-09-22 13:56 ` sgn
@ 2020-10-01  3:28 ` ericonr
  2020-10-02  7:02 ` pullmoll
                   ` (11 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-10-01  3:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-701843236

Comment:
78.3.1 seems to be available.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (14 preceding siblings ...)
  2020-10-01  3:28 ` ericonr
@ 2020-10-02  7:02 ` pullmoll
  2020-10-02  7:02 ` pullmoll
                   ` (10 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: pullmoll @ 2020-10-02  7:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-702564070

Comment:
FWIW I already tried moving Icecat, which is basically firefox-esr + patches, but have trouble to get it to cross build.
The patches from 80.x can for the most part be used for 78.3.x as well.


^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (15 preceding siblings ...)
  2020-10-02  7:02 ` pullmoll
@ 2020-10-02  7:02 ` pullmoll
  2020-11-12 22:00 ` dkwo
                   ` (9 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: pullmoll @ 2020-10-02  7:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-702564070

Comment:
FWIW I already tried moving Icecat to 78.3.0, which is basically firefox-esr + patches, but have trouble to get it to cross build.
The patches from 80.x can for the most part be used for 78.3.x as well.


^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (16 preceding siblings ...)
  2020-10-02  7:02 ` pullmoll
@ 2020-11-12 22:00 ` dkwo
  2020-12-02 19:46 ` ericonr
                   ` (8 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: dkwo @ 2020-11-12 22:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-726365816

Comment:
78.4.3 seems to be  available.
What are the conflicts that must be resolved?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (17 preceding siblings ...)
  2020-11-12 22:00 ` dkwo
@ 2020-12-02 19:46 ` ericonr
  2020-12-02 21:09 ` ericonr
                   ` (7 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-12-02 19:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-737454896

Comment:
I'm working on 78.5.1, which might unfortunately depend on #26609 

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (18 preceding siblings ...)
  2020-12-02 19:46 ` ericonr
@ 2020-12-02 21:09 ` ericonr
  2020-12-02 21:19 ` ericonr
                   ` (6 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-12-02 21:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-737496891

Comment:
I managed to build 78.5.1, will try cross now.

I believe the patches I posted in #26609 are necessary only when updating to 1.48, and the build might work just fine with 1.47, which is what we currently have.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (19 preceding siblings ...)
  2020-12-02 21:09 ` ericonr
@ 2020-12-02 21:19 ` ericonr
  2020-12-03 21:57 ` ericonr
                   ` (5 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-12-02 21:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 406 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-737496891

Comment:
I managed to build 78.5.1, will try cross now.

I believe the patches I posted in #26609 are necessary only when updating to 1.48, and the build might work just fine with 1.47, which is what we currently have.

Btw, thanks @mmnmnnmnmm , patches applied cleanly.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (20 preceding siblings ...)
  2020-12-02 21:19 ` ericonr
@ 2020-12-03 21:57 ` ericonr
  2020-12-03 21:58 ` ericonr
                   ` (4 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-12-03 21:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-738343604

Comment:
@mmnmnnmnmm do you remember why you removed system sqlite and bz2?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (21 preceding siblings ...)
  2020-12-03 21:57 ` ericonr
@ 2020-12-03 21:58 ` ericonr
  2020-12-05 12:51 ` mmnmnnmnmm
                   ` (3 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-12-03 21:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-738343604

Comment:
@mmnmnnmnmm do you remember why you removed system sqlite and bz2?

EDIT: firefox-esr did the same

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (22 preceding siblings ...)
  2020-12-03 21:58 ` ericonr
@ 2020-12-05 12:51 ` mmnmnnmnmm
  2020-12-16 21:26 ` Piraty
                   ` (2 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: mmnmnnmnmm @ 2020-12-05 12:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

New comment by mmnmnnmnmm on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-739247059

Comment:
On Thu, 03 Dec 2020 13:57:14 -0800
Érico Nogueira Rolim <notifications@github.com> wrote:

> @mmnmnnmnmm do you remember why you removed system sqlite and bz2?
> 

Mozilla removed support for using the system sqlite (https://bugzilla.mozilla.org/show_bug.cgi?id=1611386).

I don't remember why bz2 was disabled but I think it was broken as
well and you have to rely on the builtin one now too.


Also, thank you for picking this up Érico, I have been busy with work
lately and completely forgot about these pull requests!


^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (23 preceding siblings ...)
  2020-12-05 12:51 ` mmnmnnmnmm
@ 2020-12-16 21:26 ` Piraty
  2020-12-20  5:28 ` ahesford
  2020-12-20  5:28 ` [PR PATCH] [Closed]: " ahesford
  26 siblings, 0 replies; 28+ messages in thread
From: Piraty @ 2020-12-16 21:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-747048671

Comment:
https://github.com/void-linux/void-packages/pull/26896

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (24 preceding siblings ...)
  2020-12-16 21:26 ` Piraty
@ 2020-12-20  5:28 ` ahesford
  2020-12-20  5:28 ` [PR PATCH] [Closed]: " ahesford
  26 siblings, 0 replies; 28+ messages in thread
From: ahesford @ 2020-12-20  5:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24509#issuecomment-748565848

Comment:
Superseded by #26896

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Closed]: thunderbird: update to 78.2.1
  2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
                   ` (25 preceding siblings ...)
  2020-12-20  5:28 ` ahesford
@ 2020-12-20  5:28 ` ahesford
  26 siblings, 0 replies; 28+ messages in thread
From: ahesford @ 2020-12-20  5:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 255 bytes --]

There's a closed pull request on the void-packages repository

thunderbird: update to 78.2.1
https://github.com/void-linux/void-packages/pull/24509

Description:
Updated to the 78 branch, this contains big OpenPGP changes and supports only webextensions.

^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2020-12-20  5:28 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-27 15:27 [PR PATCH] thunderbird: update to 68.12.0 mmnmnnmnmm
2020-08-27 23:04 ` sgn
2020-08-28 13:04 ` mmnmnnmnmm
2020-08-28 13:04 ` mmnmnnmnmm
2020-08-28 13:04 ` mmnmnnmnmm
2020-08-28 19:51 ` [PR PATCH] [Updated] " mmnmnnmnmm
2020-08-28 19:57 ` mmnmnnmnmm
2020-08-28 20:01 ` [wip] thunderbird: update to 78.2.0 mmnmnnmnmm
2020-09-02  5:34 ` archfan
2020-09-03 15:36 ` [PR PATCH] [Updated] " mmnmnnmnmm
2020-09-03 15:42 ` thunderbird: update to 78.2.1 mmnmnnmnmm
2020-09-03 17:13 ` q66
2020-09-03 18:10 ` mmnmnnmnmm
2020-09-22  6:10 ` dkwo
2020-09-22 13:56 ` sgn
2020-10-01  3:28 ` ericonr
2020-10-02  7:02 ` pullmoll
2020-10-02  7:02 ` pullmoll
2020-11-12 22:00 ` dkwo
2020-12-02 19:46 ` ericonr
2020-12-02 21:09 ` ericonr
2020-12-02 21:19 ` ericonr
2020-12-03 21:57 ` ericonr
2020-12-03 21:58 ` ericonr
2020-12-05 12:51 ` mmnmnnmnmm
2020-12-16 21:26 ` Piraty
2020-12-20  5:28 ` ahesford
2020-12-20  5:28 ` [PR PATCH] [Closed]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).