wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 23:53:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

thunderbird: update to 91.2.0.

Browse source
This commit is contained in:
Érico Nogueira 2021-10-18 16:15:53 -03:00 • committed by Érico Nogueira Rolim
parent 4742b9eec2
commit 7d21c3cca8
12 changed files with 133 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/thunderbird/files/mozconfig
View file

@ -32,6 +32,5 @@ ac_add_options --enable-optimize="$CFLAGS"
ac_add_options --enable-official-branding ac_add_options --enable-official-branding
ac_add_options --enable-application=comm/mail ac_add_options --enable-application=comm/mail
ac_add_options --enable-calendar
ac_add_options --allow-addon-sideload ac_add_options --allow-addon-sideload

15
srcpkgs/thunderbird/patches/avoid-redefinition.patch Normal file
View file

@ -0,0 +1,15 @@
Author: Rasmus Thomsen <oss@cogitri.dev>
Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
(linux/if.h), leading to redefinitions. We need to include net/if.h before
linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
Upstream: No
--- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 2020-07-28 19:24:32.359751046 +0200
+++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 2020-07-28 19:24:37.856343751 +0200
@@ -31,6 +31,7 @@
*/
#if defined(LINUX)
+#include <net/if.h>
#include "addrs-netlink.h"
#include <csi_platform.h>
#include <assert.h>

16
srcpkgs/thunderbird/patches/fix-cross.patch
View file

@ -1,16 +0,0 @@
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
--- a/third_party/rust/glslopt/build.rs
+++ b/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
srcpkgs/thunderbird/patches/fix-fortify-inline.patch
View file

@ -1,11 +0,0 @@
--- a/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
@@ -27,8 +27,5 @@
typedef int16_t int16;
typedef unsigned short ushort;
typedef unsigned long ulong;
-#ifndef __GNUC_STDC_INLINE__
-#define inline
-#endif
#endif /* _SDP_OS_DEFS_H_ */

15
srcpkgs/thunderbird/patches/fix-wasm-arm.patch
View file

@ -1,15 +0,0 @@
--- a/js/src/wasm/WasmSignalHandlers.cpp
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -243,9 +243,9 @@
// If you run into compile problems on a tier-3 platform, you can disable the
// emulation here.
-#if defined(__linux__) && defined(__arm__)
-# define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-#endif
+// #if defined(__linux__) && defined(__arm__)
+// # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+// #endif
#ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
# include <sys/user.h>

4
srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
View file

@ -1,5 +1,5 @@
--- a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:20:52.298793223 +0100 --- a/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:20:52.298793223 +0100
+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100 +++ b/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
#ifndef __GLIBC_PREREQ #ifndef __GLIBC_PREREQ
#define __GLIBC_PREREQ(a, b) 0 #define __GLIBC_PREREQ(a, b) 0

26
srcpkgs/thunderbird/patches/musl-rust.configure.patch
View file

@ -1,26 +0,0 @@
--- a/build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
+++ b/build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
@@ -297,11 +297,20 @@
suffix = 'hf'
else:
suffix = ''
+
+ narrowed = []
for p in prefixes:
for c in candidates:
- if c.rust_target.startswith('{}-'.format(p)) and \
- c.rust_target.endswith(suffix):
- return c.rust_target
+ if c.rust_target.startswith('{}-'.format(p)):
+ narrowed.append(c.rust_target)
+
+ for target in narrowed:
+ if target.endswith(host_or_target.raw_os):
+ return target
+
+ for target in narrowed:
+ if target.endswith(suffix):
+ return target
# See if we can narrow down on the exact alias
narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]

96
srcpkgs/thunderbird/patches/rust-configure.patch
View file

@ -1,42 +1,112 @@
Mozilla rustc check does not support crossbuild: let's remove it Mozilla rustc check does not support crossbuild: let's remove it
Remove calls to unwrap_rustup, they fail if rustup isn't present Remove calls to unwrap_rustup, they fail if rustup isn't present
--- a/build/moz.configure/rust.configure 2019-10-17 04:19:59.000000000 +0700 Do not try to figure out the rust target as it is broken on musl
+++ b/build/moz.configure/rust.configure 2019-10-22 11:48:55.616022140 +0700 instead use what is set in RUST_TARGET
@@ -78,9 +78,6 @@
Skip extra checks on cross builds (broken for arm*)
--- a/build/moz.configure/rust.configure 2020-12-12 01:35:33.000000000 +0100
+++ b/build/moz.configure/rust.configure 2020-12-15 19:45:16.467750787 +0100
@@ -91,9 +91,6 @@
return unwrap return unwrap
-rustc = unwrap_rustup(rustc, 'rustc')
-cargo = unwrap_rustup(cargo, 'cargo') -rustc = unwrap_rustup(rustc, "rustc")
-cargo = unwrap_rustup(cargo, "cargo")
- -
set_config('CARGO', cargo) set_config("CARGO", cargo)
set_config('RUSTC', rustc) set_config("RUSTC", rustc)
@@ -348,26 +345,6 @@ @@ -260,7 +257,9 @@
data.setdefault(key, []).append(namespace(rust_target=t, target=info))
return data
os.write(in_fd, source) -
+@imports('os')
+@imports(_from='mozbuild.util', _import='ensure_unicode')
+@imports(_from='mozbuild.util', _import='system_encoding')
def detect_rustc_target(
host_or_target, compiler_info, arm_target, rust_supported_targets
):
@@ -382,12 +381,12 @@
return None
- rustc_target = find_candidate(candidates)
+ rustc_target = os.environ['RUST_TARGET']
if rustc_target is None:
die("Don't know how to translate {} for rustc".format(host_or_target.alias))
- return rustc_target
+ return ensure_unicode(rustc_target, system_encoding)
@imports("os")
@@ -410,35 +409,6 @@
os.write(in_fd, ensure_binary(source))
os.close(in_fd) os.close(in_fd)
- -
- cmd = [ - cmd = [
- rustc, - rustc,
- '--crate-type', 'staticlib', - "--crate-type",
- "staticlib",
- target_arg, - target_arg,
- '-o', out_path, - "-o",
- out_path,
- in_path, - in_path,
- ] - ]
- -
- def failed(): - def failed():
- die(dedent('''\ - die(
- dedent(
- """\
- Cannot compile for {} with {} - Cannot compile for {} with {}
- The target may be unsupported, or you may not have - The target may be unsupported, or you may not have
- a rust std library for that target installed. Try: - a rust std library for that target installed. Try:
- -
- rustup target add {} - rustup target add {}
- '''.format(host_or_target.alias, rustc, rustc_target))) - """.format(
- host_or_target.alias, rustc, rustc_target
- )
- )
- )
-
- check_cmd_output(*cmd, onerror=failed) - check_cmd_output(*cmd, onerror=failed)
- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0: - if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
- failed() - failed()
finally: finally:
os.remove(in_path) os.remove(in_path)
os.remove(out_path) os.remove(out_path)
@@ -462,28 +432,7 @@
host, compiler_info, arm_target, rust_supported_targets
)
if rustc_target != rustc_host:
- if host.alias == rustc_target:
- configure_host = host.alias
- else:
- configure_host = "{}/{}".format(host.alias, rustc_target)
- die(
- dedent(
- """\
- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
-
- You can solve this by:
- * Set your configure host to match the rust compiler host by editing your
- mozconfig and adding "ac_add_options --host={rustc}".
- * Or, install the rust toolchain for {configure}, if supported, by running
- "rustup default stable-{rustc_target}"
- """.format(
- rustc=rustc_host,
- configure=configure_host,
- rustc_target=rustc_target,
- )
- )
- )
- assert_rust_compile(host, rustc_target, rustc)
+ return rustc_host
return rustc_target

21
srcpkgs/thunderbird/patches/rust-has-i128.patch
View file

@ -1,21 +0,0 @@
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
--- a/third_party/rust/num-traits/build.rs 2020-02-14 23:57:25.985355610 +0100
+++ b/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");
}

4
srcpkgs/thunderbird/patches/sandbox-fork.patch
View file

@ -2,12 +2,14 @@ make SYS_fork non-fatal, musl uses it for fork(2)
--- a/security/sandbox/linux/SandboxFilter.cpp --- a/security/sandbox/linux/SandboxFilter.cpp
+++ b/security/sandbox/linux/SandboxFilter.cpp +++ b/security/sandbox/linux/SandboxFilter.cpp
@@ -1253,6 +1253,8 @@ @@ -1420,6 +1420,10 @@
// usually do something reasonable on error. // usually do something reasonable on error.
case __NR_clone: case __NR_clone:
return ClonePolicy(Error(EPERM)); return ClonePolicy(Error(EPERM));
+# ifdef __NR_fork
+ case __NR_fork: + case __NR_fork:
+ return Error(ENOSYS); + return Error(ENOSYS);
+# endif
# ifdef __NR_fadvise64 # ifdef __NR_fadvise64
case __NR_fadvise64: case __NR_fadvise64:

14
srcpkgs/thunderbird/patches/sndio.patch
View file

@ -42,11 +42,11 @@
if CONFIG['OS_TARGET'] == 'Darwin': if CONFIG['OS_TARGET'] == 'Darwin':
--- a/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 --- a/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200
+++ b/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 +++ b/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200
@@ -210,6 +210,7 @@ @@ -88,6 +88,7 @@
@old_configure_options( @old_configure_options(
'--cache-file', "--cache-file",
'--datadir', "--datadir",
+ '--enable-sndio', + "--enable-sndio",
'--enable-crashreporter', "--enable-crashreporter",
'--enable-dbus', "--enable-dbus",
'--enable-debug-js-modules', "--enable-debug-js-modules",

7
srcpkgs/thunderbird/template
View file

@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
# #
pkgname=thunderbird pkgname=thunderbird
version=78.13.0 version=91.2.0
revision=1 revision=1
build_helper="rust" build_helper="rust"
short_desc="Standalone Mail/News reader" short_desc="Standalone Mail/News reader"
@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.thunderbird.net/" homepage="https://www.thunderbird.net/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9 checksum=30476803f0bd4a46d2516ac5cbb831fc580b81d5d704af17c7df81e2bb6ee075
lib32disabled=yes lib32disabled=yes
@ -159,6 +159,7 @@ do_build() {
export MOZ_MAKE_FLAGS="${makejobs}" export MOZ_MAKE_FLAGS="${makejobs}"
export MOZ_NOSPAM=1 export MOZ_NOSPAM=1
export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild" export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
export MACH_USE_SYSTEM_PYTHON=1
export AS=$CC export AS=$CC
@ -179,6 +180,8 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' '
./mach build ./mach build
} }
do_install() { do_install() {
export MACH_USE_SYSTEM_PYTHON=1
export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
DESTDIR="$DESTDIR" ./mach install DESTDIR="$DESTDIR" ./mach install
vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/preferences vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/preferences