test building tarball with some very preliminary patches

5 files changed, 63 insertions, 3 deletions

diff --git a/deb_patches/python3-remove-fstrings.patch b/deb_patches/python3-remove-fstrings.patch
index abc5be8..75f20d9 100644
--- a/deb_patches/python3-remove-fstrings.patch
+++ b/deb_patches/python3-remove-fstrings.patch
@@ -427,6 +427,6 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
                  category_name = util.snake_case(category_name)
 -                full_path = f"{category_name}::{metric_name}"
 +                full_path = "{}::{}".format(category_name, metric_name)
-                 objs_by_type[key].append((get_metric_id(metric), full_path))
  
-     # Now for the modules for each category.
+                 if metric.type == "event":
+                     events_by_id[get_metric_id(metric)] = full_path
diff --git a/deb_patches/reduce-rust-debuginfo.patch b/deb_patches/reduce-rust-debuginfo.patch
new file mode 100644
index 0000000..e6a9148
--- /dev/null
+++ b/deb_patches/reduce-rust-debuginfo.patch
@@ -0,0 +1,21 @@
+Description: reduce the rust debuginfo level
+ because compiling with debuginfo=2 causes the OOM killer to interrupt the build
+ on launchpad builders. Initially this was only on 32 bit architectures, but
+ with firefox 63 it started happening frequently on arm64 and ppc64el too,
+ with newer versions it started happening very frequently on s390x too, and with
+ firefox 84 (built with rustc 1.47) it started happening on amd64 too.
+ This patch would initially decrease debug_info for selected architectures, but
+ with recent versions of rustc pretty much all supported architectures are
+ affected, so it is now unconditional.
+
+--- a/build/moz.configure/toolchain.configure
++++ b/build/moz.configure/toolchain.configure
+@@ -2167,7 +2167,7 @@ def rust_compile_flags(opt_level, debug_
+         debug_assertions = False
+ 
+     if debug_symbols:
+-        debug_info = "2"
++        debug_info = "1"
+ 
+     opts = []
+ 
diff --git a/deb_patches/relax-cargo-dep.patch b/deb_patches/relax-cargo-dep.patch
new file mode 100644
index 0000000..f83558c
--- /dev/null
+++ b/deb_patches/relax-cargo-dep.patch
@@ -0,0 +1,11 @@
+--- a/build/moz.configure/rust.configure
++++ b/build/moz.configure/rust.configure
+@@ -168,7 +168,7 @@
+         rustc_min_version = Version("1.47.0")
+     else:
+         rustc_min_version = Version(MINIMUM_RUST_VERSION)
+-    cargo_min_version = rustc_min_version
++    cargo_min_version = Version("1.46.0")
+ 
+     version = rustc_info.version
+     is_nightly = "nightly" in version.version
diff --git a/deb_patches/silence-gtk-style-assertions.patch b/deb_patches/silence-gtk-style-assertions.patch
index 36ec8e3..71cf2aa 100644
--- a/deb_patches/silence-gtk-style-assertions.patch
+++ b/deb_patches/silence-gtk-style-assertions.patch
@@ -13,8 +13,23 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
      if (mTextSelectedBackground == mTextSelectedText) {
        // Some old distros/themes don't properly use the .selection style, so
        // fall back to the regular text view style.
+@@ -13,6 +13,14 @@
+      if (mTextSelectedBackground == mTextSelectedText) {
+        // Some old distros/themes don't properly use the .selection style, so
+        // fall back to the regular text view style.
++@@ -1413,6 +1413,7 @@ bool nsLookAndFeel::WidgetUsesImage(Widg
++       GTK_STATE_FLAG_BACKDROP, GTK_STATE_FLAG_INSENSITIVE};
++ 
++   GtkStyleContext* style = GetStyleContext(aNodeType);
+++  if (!style) return false;
++ 
++   GValue value = G_VALUE_INIT;
++   for (GtkStateFlags state : sFlagsToCheck) {
+ --- a/widget/gtk/WidgetStyleCache.cpp
+ +++ b/widget/gtk/WidgetStyleCache.cpp
+ @@ -933,7 +933,7 @@ static GtkStyleContext* GetWidgetRootSty
 @@ -1413,6 +1413,7 @@ bool nsLookAndFeel::WidgetUsesImage(Widg
-       GTK_STATE_FLAG_BACKDROP, GTK_STATE_FLAG_INSENSITIVE};
+   };
  
    GtkStyleContext* style = GetStyleContext(aNodeType);
 +  if (!style) return false;
diff --git a/deb_patches/use-system-icupkg.patch b/deb_patches/use-system-icupkg.patch
new file mode 100644
index 0000000..99eb4b5
--- /dev/null
+++ b/deb_patches/use-system-icupkg.patch
@@ -0,0 +1,13 @@
+diff -r 08cd64cdbc3b config/external/icu/data/convert_icudata.py
+--- a/config/external/icu/data/convert_icudata.py	Fri Jul 17 11:18:09 2020 +0000
++++ b/config/external/icu/data/convert_icudata.py	Sat Jul 18 14:40:33 2020 +0200
+@@ -11,7 +11,7 @@
+     subprocess.run(
+         [
+-            os.path.join(buildconfig.topobjdir, "dist", "host", "bin", "icupkg"),
++            "icupkg",
+             "-tb",
+             data_file,
+             output.name,
+         ]
+