Skip to content

Commit

Permalink
thunderbird: update to 102.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
pascal-huber committed Apr 25, 2023
1 parent 5045773 commit 5dabfd2
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 276 deletions.
3 changes: 1 addition & 2 deletions srcpkgs/thunderbird/patches/flac-no-ffvpx.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ index 53fc3c9937f7..b23771ab80fa 100644

namespace mozilla {

@@ -14,6 +15,10 @@ namespace mozilla {
@@ -14,5 +15,9 @@ namespace mozilla {
bool FlacDecoder::IsEnabled() {
#ifdef MOZ_FFVPX
return StaticPrefs::media_flac_enabled();
Expand All @@ -21,5 +21,4 @@ index 53fc3c9937f7..b23771ab80fa 100644
+ return StaticPrefs::media_flac_enabled() &&
+ platform->SupportsMimeType("audio/flac"_ns);
#else
// Until bug 1295886 is fixed.
return false;
21 changes: 12 additions & 9 deletions srcpkgs/thunderbird/patches/lto-thin.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
This patch is a modified version of the OpenBSD patch

use lto=thin to reduce memory pressure when building gkrust
try to consume less memory when linking gkrust with debug symbols ?

openbsd patch: https://github.com/openbsd/ports/blob/master/mail/mozilla-thunderbird/patches/patch-config_makefiles_rust_mk
https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
https://bugzilla.mozilla.org/show_bug.cgi?id=1640982

Index: config/makefiles/rust.mk
--- a/config/makefiles/rust.mk.orig
+++ a/config/makefiles/rust.mk
@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
# gkrust_gtest. And not when doing cross-language LTO.
ifndef MOZ_LTO_RUST_CROSS
---
diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
index a243ee5f7f..89593f1fe1 100644
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
@@ -90,7 +90,8 @@ ifndef rustflags_sancov
# Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045.
ifndef MOZ_CODE_COVERAGE
ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
-cargo_rustc_flags += -Clto
+cargo_rustc_flags += -Clto=thin
Expand Down
24 changes: 13 additions & 11 deletions srcpkgs/thunderbird/patches/mallinfo.patch
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
--- a/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:12:20.844810044 +0100
+++ b/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100
@@ -123,6 +123,7 @@
return GetProcSelfSmapsPrivate(aN);
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 30bc60e01a..caf9f740d2 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -127,6 +127,7 @@ using namespace dom;
return GetProcSelfSmapsPrivate(aN, aPid);
}

+#ifdef __GLIBC__
# ifdef HAVE_MALLINFO
# define HAVE_SYSTEM_HEAP_REPORTER 1
static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
@@ -142,6 +143,7 @@
[[nodiscard]] static nsresult SystemHeapSize(int64_t* aSizeOut) {
@@ -146,6 +147,7 @@ using namespace dom;
return NS_OK;
}
# endif
+#endif // __GLIBC__

#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
@@ -642,6 +644,7 @@
@@ -653,6 +655,7 @@ static bool InSharedRegion(mach_vm_address_t aAddr, cpu_type_t aType) {
return NS_OK;
}

+#ifdef __GLIBC__
# define HAVE_SYSTEM_HEAP_REPORTER 1
// Windows can have multiple separate heaps. During testing there were multiple
// heaps present but the non-default ones had sizes no more than a few 10s of
@@ -698,6 +701,7 @@
*aSizeOut = heapsSize;
// Windows can have multiple separate heaps, but we should not touch non-default
// heaps because they may be destroyed at anytime while we hold a handle. So we
@@ -685,6 +688,7 @@ static bool InSharedRegion(mach_vm_address_t aAddr, cpu_type_t aType) {
*aSizeOut = heapSize;
return NS_OK;
}
+#endif // __GLIBC__
Expand Down
238 changes: 0 additions & 238 deletions srcpkgs/thunderbird/patches/python3.11.patch

This file was deleted.

20 changes: 12 additions & 8 deletions srcpkgs/thunderbird/patches/rust-configure.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ instead use what is set in RUST_TARGET

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 @@
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
index e64dc5d5ec..c4778f8cc8 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -91,9 +91,6 @@ def unwrap_rustup(prog, name):
return unwrap


Expand All @@ -18,7 +20,7 @@ Skip extra checks on cross builds (broken for arm*)

set_config("CARGO", cargo)
set_config("RUSTC", rustc)
@@ -260,7 +257,9 @@
@@ -274,7 +271,9 @@ def rust_supported_targets(rustc):
data.setdefault(key, []).append(namespace(rust_target=t, target=info))
return data

Expand All @@ -29,24 +31,26 @@ Skip extra checks on cross builds (broken for arm*)
def detect_rustc_target(
host_or_target, compiler_info, arm_target, rust_supported_targets
):
@@ -382,12 +381,12 @@
@@ -396,12 +395,14 @@ def detect_rustc_target(

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 @@
@@ -423,35 +424,6 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):

os.write(in_fd, ensure_binary(source))
os.write(in_fd, source)
os.close(in_fd)
-
- cmd = [
Expand Down Expand Up @@ -80,7 +84,7 @@ Skip extra checks on cross builds (broken for arm*)
finally:
os.remove(in_path)
os.remove(out_path)
@@ -462,28 +432,7 @@
@@ -475,28 +447,7 @@ def rust_host_triple(
host, compiler_info, arm_target, rust_supported_targets
)
if rustc_target != rustc_host:
Expand Down
Loading

0 comments on commit 5dabfd2

Please sign in to comment.