Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Thunderbird 78.6.0 #26896

Merged
merged 2 commits into from
Jan 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 57 additions & 57 deletions srcpkgs/thunderbird-i18n/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'thunderbird-i18n'
pkgname=thunderbird-i18n
version=68.12.1
version=78.6.0
revision=1
build_style=meta
short_desc="Thunderbird language packs"
Expand Down Expand Up @@ -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
Expand All @@ -96,58 +96,58 @@ _pkgtmpl() {
}
}

checksum="daaef9e7b8c55328def0f22cad60ca48ad774afc4190b5e5eaf8e3dd1a4e5f28
8ff401dac77853307572acc410fd9c60b27b9577e7cbeff798e09107ed423d9c
cd19b72064b00ad4ba4b4c851e8ec634b3c75e2102b38c44385c761ec9152a81
031c9f61077ab08e8b896668e61e09a01720ac5f22f1a97046e4ba1abff653c3
6e6b9f12dce243c15f0601f7a6743e8fb0c3a2d98475659ea778afa80382d826
574b0ffef6849443395533a638ad9931dc2226f619a13526ea16364f60865d79
62d43bab52e891d56b43696f80a4d7287c9e5b92e57645dcc0e2b800e49bfc73
546bcb01d473cdf3d114efc7546d7499997c49710e38a75c77875cc0141b8582
0a4a2238f2630b3d2aa244aafe2bc59b78192fe973e977b72e71bcd170b852d7
2e2e2d793f49c323d265205f75ab08c460591c400a28b9c11c71dd3080c4e111
4b54e6395e0cad7bf01a41aea26eaa0b8a238d83bbbef70a80cb5472408c3538
782c27adfcfa3d8bfbbb46eaf2442f738f63e623e5c3a9fe25e9ef06c54270f2
dc23f05f6df9c9c133c5c1102e02d3703a7d42d6cd3021ff9e1b44bc010d36fa
189307a002a0ee88dfb373ae7daef44f13d3d86d292404fe75b9282c6ec70d9d
ef8be85899e8690b56a82bfafcb2422e21aa688ca716cf88fad660e2413a4371
def5c5acbc82f1274c74d407e4ce9aeca05298d4d2ecff9ee6a4048c4f748bb9
de3289bc94be4a76777a56af95b04957fc8289ac0e28a0fe5b0f84716164f3b1
b87fce391136a20fb53690cbdfe96511d0f44a07c8f6850d46942d753506dafe
2ea16aaf34e59b91d079b238489b8e99f2ac5c051127d80c130606fbedc17e82
d67cbf27d266394ec2ffdd6f6d5925a1bc3b779e190b43e126fac869d32a9772
5f241e80aafee6bd7cb38708723d65d22d0cf599da8310afed43b571e654ad30
04b1aa4a9540672b27a318bf0e8b051ecd2fd8e0fac9688972a98d24dc395cdc
ce24a1f51ff480d87b575e68d3da088ab70390a6efdc86a373bcc625b0d4fe69
ea147f235edafa18144c76ca843716d5e4a3806f7096a2888c15e45a291b8bb2
061ba1d21aedcdcbcf8b8a9bab53b16ef34e4b4abda0d2e43e49d4263ffbffb7
819530775c72a822a581c76d090e0709133905293d3df769d2c85692d1c7a4d9
c2f22993f2fd735e4ba8a34e8857546c4b9792b9a93488dddba30a2527ae174a
a847a8f00321f20846c45907458ae76f842d3107ddfac2fcf71e641c6a080c51
bcc6e48b51c67571c5ec08361134fbc3e4982ed27f3dab1e5b1ccfd26b3e22b1
368d63db282c200f5caaf65837a470df64db5a513d0b5e7d639e353fa8987c51
084bf0bb5fc42f068ae099d845c121f5ec8a1bcb91a76d80b6e49394b9e85e9d
578c24c143dda65697dc1708597215d59e5f2cc68b1f52e00901e07b3cea0dd4
1c2769d19ee3d444c75c4133f540ecf6860a6272bbb69f13524ca928bac33721
a9f2683f18b29503ea38df815107e3753c0c3c37468cc0c23fea25080ba7392d
dd61640c8987cbc5b8a41465e89200e3cef635c6931ce3f586a683d992492409
c274dc81cab7b3b2ba3e0a4a55b4b94ed9ff02be48c808b0164aba386aae7cd9
76b850488e513e5181b4f460227fdb9f7a297aa95bca7778f407521be6355d23
1924933c175b04d088fc5764fedc6a317396234e591ef9f787cbd6d21bf43790
28006df283c06e44ef08901f9db21011350930bdf0d0cba132d2d8eadbefd314
a90bce2d48d0b2f2db0423a22aad05c129029fb1b38824d7bb7875e6ff7a1cf4
77fbb6ddc67edffbdb0d3f992ed54f5309da13dfa9216d5c4ee613be6c9cec37
19df7a1f9216a69098fdbe7629140e7f36f52dbdd4b15a4c78734e448be3cdb2
0768ddd6ffeec0b1354270ff8c9627bffe9ddbe907c9d35081d5d9b6bae04874
8de1bb65249f9b06a3f90c02c1c715c8e308bccbaae22cde2f784ccac9228573
eebe0e05bab4a0061d5d8eb1cbb5f2769ca4befd3276db769b83906adaa3ef34
c23110b70da779084bbac3d55e87482ebf9502f249e11d9ed8956aac767f5889
27b5911a4ffa6a2a3e9ec4fdb10420ba33f333d9ac11deda8115656c5bcefb0b
44954a28be58dc2de08f0586ec7d8591939f81f3bb05a4574d8f58ac00b55ce8
3ac0f4e9cfcbe5089dcfb36eb39d8e26b16f062dcc12b5b89e6f619ab3caf013
4be6d239fd175d1bef88da579c7c1e6b244ae698aa4302a8a00069e2c0119331
c705309c32c0d4af7b4f8e98095919f2942329b1cad75e8fff168f6c0ea71baf
e6b9247a733e918f5e49aa6d11563c52b33d5f4f2f2cd4fd542953602b090c68
ae1b27bba6d82606b55bffc0275e35bbf6da3b5d6c5e242ce5ac62d3bf81c630
ffb9e14f03454cdf2d180d3960a3bbd13ccb6e177e86a1918d524c6de203df28
cca092e8f86e4102de12461ab5c8ab0b601846113a837508ff8b8c9d5a10e588"
checksum="77c0da17d85872a3ceae3d5849655a0dd3d783b365d405d4c2f9b3a243b3e5aa
e92122dfd91a99e7c32b90c5055f7f0c1a5268e0c001da5fc142a9d63261f0de
62d1d6d4f34292549b6ada66ede177b1a26efaeaa2e4d9e0f5ea7aeb6a555c1a
7846462412da03936930afb548657bea5c0e73eb464affd54459332888b6c744
27534af1a57041a076261443347f183d80d757da14157ddba11ff393f248ed8b
c1541a2035e9ae4549c337686c9d8e9e995a32bc6173794d834bd83f404845dc
3791e46378d40f75016ff5d35e66a8cef8aaed45f87368ac07bcec7fa916472f
617f1c23b7210bf4ceccb22a3824a15074e2d9770ca66a26f6448d26beb72e81
e90862ea3b5a6653e9eea25613915392c438ae5ae42d860440d85ffa1d850e3d
59bbfca02bb2ac6853c845653dc2de5ba123b33b468595a356f419c1fc8b6527
ec3e37a0a4c4dde29ba4c538d1efc1e135ef950ce95aa928c617b9da2a3de783
27c42d0537c3e51c7b2289fd25ef201bcd62281b5d844b68c03474be2a1e54e6
b299d69c68a79e3709c1487ae87f8ebf5765ef38f483d148238c7c7bd54a047a
408fe2cc100ea42751baa138b98d62ed78b5bb69f44039f61eea8262d5e9cd2e
913446300c7b3e837309fb137e7f68f62da3c23939287feeb94a5d35425140ca
5ed478e15a65d6ff15683b64f2769e3f7ced421c424d59ea7dba644cb5b84759
2b7d9416fa15300c18b13a34ab709b307ded3705d0ccffc70423ecf9762dbff8
31628ff53e3e87cbce122908b537df030f3ec936def0eb0e50c9791e6103b042
d7233c9efe07e54ec29911a8b27b8bce2b09f59e027687218c300374abc80aea
6ed4dc7f605de1516f9ae175b2b12bcd9d0fce64a8f00acb9a675ac1258af6a9
16a31b73042ffaf8373a977cdb2a2c563a6b49d13bc504569865a305e3fae380
5328efe43bdf651f3ff72696f96e8ea2aa000a95233b6a406f612c6a076ac38c
802db39bd53707555bbd5202c2668c7be92598b75cd7364e6169218c9f1f001e
9f9a547d87133a468757baa38a600ad24a8479231766529c2612d6f7a63836a2
82cf87688f7594e9d882969efd5a5963f3fa3f8b91e026b271fe630b3fda777a
55c8f68d1702befe1782c7373893fac4d9e15fb77fcd9ee4d8345707969dcf97
3cdcf203980d08dd18f0b6a566dc2585140625807f839102f15f0b685312aef6
52ed8740582330ac3e2660f86b07676aa72533180d5a0df411569cda7e0d0ee2
2e2eaf97e024d908b4cbd837bd8d14e50fc30bc877958f458568f3d5ef03debf
44830607a1818da44721d6dfb7c60395c5557c4e84fcbf7936106f6d64c0b2df
1727d70e0a3a8c8c8c6dc049243cd7ffb6710226b0ab7e4e4d776e241c13eaf9
10cb0bdbc88f5718f7a7877d4ec2c5e7fc71e4dd13e0522ec10082f9846fb65c
77740587416416ca7401573e4ba820ad2a3adb32374cb83b8a56e48aa4411b28
7b63447a8ee28e635e7cb060a1df868c6a8c0d11448c30712fae971ba02e132e
a4aa893d47d6edb2e9f8ad6423abe17e39be8dded5f359ed933723b944c6a85b
327cdc48a35fdcae7daa3dac86005d15798fd8ad4ffd47a497923dcbdf9cf386
32a0a2dc3075db4645836dab1d6353d9466328c0e63e183290f345a04e285f87
e07cc90bcb41097ba19d886d2d1e38ef3b3ae2f6d36cf0133e018e40535357d6
669a76ddd841a6559cbfdd97c82961251030e01036831279210f94606d472f05
e6f698313d67ab9da38ff1ff8097264dabc87de85df0e1c363736f60ad0954e2
48ac6b9506b2cae19451845a6d633579ed341e367e4c22f525c5d147cea7bb85
45fbeacc161c4d3e9fa8ba12c7a06b6ddf56dc5aa3c49543f45c9e5ecc6f8533
8114465485f3740e2f38cd31e29e183a91cfe50c1b3bcdd2fac37f5254df38c5
26869522aa4a17cd3965dc35442e6687cec86274cc17d43d3eda36b71e293071
79ede7a6a4fdc587996a6717891a1931f63a07d468d3adf07b4df56402202fbd
76acb24a68cc77a9f28b31e7337c815b8fefa81df6a47d57ed81612dc69c9878
bace543f253d44df294a35bb9db6dd4fbef8d0196a5698e0a862c589519c07d5
8b6bd148954f415265dee893ca94024826c0f3a2ed0c308e3386637f158ed26b
887a93e80fa6b42832e04ebea6f5c1a3cdb76cb6d4b2b0c0c882ab3c80a2c2da
0e7b8d2f3c7b57751cc68aae7135976c9683eb14b703d23b90fe31ed4170b55c
82f17754a013e65ad962e88a709be83eae9a00f0ba62c94bfbdf53eeb099ed19
1aa191b1dd13e47e02e7167063afc89bb091d7a38708fc5d7e8e5c0a34f4dd43
cedb43a69a31e5c889f5dd485cc8036819248cfe8e49c4b519f4854c5dddb3a8
131e883c87b8f4af323007f112ae93bfa8e37701ff4c64237e4db2045bbefb74
f54718774782453f8dfce92e55177663dbc8f49d8da668b0f745b98f0ca854f2"
12 changes: 4 additions & 8 deletions srcpkgs/thunderbird/files/mozconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -26,16 +21,17 @@ 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

ac_add_options --allow-addon-sideload
88 changes: 88 additions & 0 deletions srcpkgs/thunderbird/patches/big-endian-image-decoders.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=1626236
https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096

# HG changeset patch
# User msirringhaus@suse.de
# Date 1582805876 -3600
# Thu Feb 27 13:17:56 2020 +0100
# Node ID cc3d09abea31068e57f1ab918782f9f86fc6a158
# Parent 9cd90914846f667f18babc491a74c164ae5d6e9f
imported patch decoder_workaround.patch

diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
--- image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100
+++ image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100
@@ -422,6 +422,9 @@
MOZ_ASSERT(mSwizzleFn);
uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
mSwizzleFn(data, data, aColors);
+#if MOZ_BIG_ENDIAN()
+ SwizzleRow(SurfaceFormat::A8R8G8B8, SurfaceFormat::B8G8R8A8)(data, data, aColors);
+#endif
}

LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
--- image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
+++ image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
@@ -263,6 +263,9 @@
case JCS_YCbCr:
// By default, we will output directly to BGRA. If we need to apply
// special color transforms, this may change.
+#if MOZ_BIG_ENDIAN()
+ mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
+#else
switch (SurfaceFormat::OS_RGBX) {
case SurfaceFormat::B8G8R8X8:
mInfo.out_color_space = JCS_EXT_BGRX;
@@ -277,6 +280,7 @@
mState = JPEG_ERROR;
return Transition::TerminateFailure();
}
+#endif
break;
case JCS_CMYK:
case JCS_YCCK:
diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
--- image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
+++ image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
@@ -361,7 +361,7 @@
IResumable* aOnResume) {
MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");

- return mLexer.Lex(aIterator, aOnResume,
+ LexerResult res = mLexer.Lex(aIterator, aOnResume,
[=](State aState, const char* aData, size_t aLength) {
switch (aState) {
case State::PNG_DATA:
@@ -371,6 +371,14 @@
}
MOZ_CRASH("Unknown State");
});
+
+#if MOZ_BIG_ENDIAN()
+ if(res.is<TerminalState>() && res.as<TerminalState>() == TerminalState::SUCCESS) {
+ NativeEndian::swapToLittleEndianInPlace<uint32_t>((uint32_t*)(mImageData), mImageDataLength / 4);
+ }
+#endif
+
+ return res;
}

LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
--- image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
+++ image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
@@ -237,7 +237,12 @@
// WebP doesn't guarantee that the alpha generated matches the hint in the
// header, so we always need to claim the input is BGRA. If the output is
// BGRX, swizzling will mask off the alpha channel.
+#if MOZ_BIG_ENDIAN()
+ mBuffer.colorspace = MODE_ARGB;
+ SurfaceFormat inFormat = mFormat;
+#else
SurfaceFormat inFormat = SurfaceFormat::OS_RGBA;
+#endif

SurfacePipeFlags pipeFlags = SurfacePipeFlags();
if (mFormat == SurfaceFormat::OS_RGBA &&
15 changes: 0 additions & 15 deletions srcpkgs/thunderbird/patches/disable-image-format-warning.patch

This file was deleted.

16 changes: 16 additions & 0 deletions srcpkgs/thunderbird/patches/fix-cross.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
terrible hack to fix cross builds
overwrite HOST_* flags to get rid of -MF

note: this patch was used from firefox-77 until 80, dropped with the update to 81

--- third_party/rust/glslopt/build.rs
+++ third_party/rust/glslopt/build.rs
@@ -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)
11 changes: 11 additions & 0 deletions srcpkgs/thunderbird/patches/fix-desktop-icon-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- taskcluster/docker/firefox-snap/firefox.desktop.orig 2019-01-18 19:31:39.428839442 +0100
+++ taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:32:20.689063456 +0100
@@ -154,7 +154,7 @@
Terminal=false
X-MultipleArgs=false
Type=Application
-Icon=/browser/chrome/icons/default/default128.png
+Icon=firefox
Categories=GNOME;GTK;Network;WebBrowser;
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
StartupNotify=true
8 changes: 4 additions & 4 deletions srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
Original file line number Diff line number Diff line change
@@ -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
39 changes: 39 additions & 0 deletions srcpkgs/thunderbird/patches/fix-image-format-warning.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# HG changeset patch
# User Lee Salzman <lsalzman@mozilla.com>
# Date 1462463631 14400
# Thu May 05 11:53:51 2016 -0400
# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
# Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
handle big-endian formats in Cairo format conversions

--- gfx/2d/HelpersCairo.h
+++ gfx/2d/HelpersCairo.h
@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
case SurfaceFormat::R5G6B5_UINT16:
return CAIRO_FORMAT_RGB16_565;
default:
- gfxCriticalError() << "Unknown image format " << (int)format;
+ // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
+ // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
+ // See bug 1269654
+ if (format == SurfaceFormat::B8G8R8X8) {
+ return CAIRO_FORMAT_RGB24;
+ } else if (format != SurfaceFormat::B8G8R8A8) {
+ gfxCriticalError() << "Unknown image format " << (int)format;
+ }
return CAIRO_FORMAT_ARGB32;
}
}
@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
case SurfaceFormat::A8:
return CAIRO_CONTENT_ALPHA;
default:
- gfxCriticalError() << "Unknown image content format " << (int)format;
+ if (format == SurfaceFormat::B8G8R8X8) {
+ return CAIRO_CONTENT_COLOR;
+ } else if (format != SurfaceFormat::B8G8R8A8) {
+ gfxCriticalError() << "Unknown image content format " << (int)format;
+ }
return CAIRO_CONTENT_COLOR_ALPHA;
}
}
11 changes: 0 additions & 11 deletions srcpkgs/thunderbird/patches/fix-musl.patch

This file was deleted.

Loading