temporarily add patch for bug 1762050

2 files changed, 79 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d52bae3fb4cd..77fdf99db952 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=firefox-wayland-hg
 _pkgname=firefox
-pkgver=r635306.b898442a9527
+pkgver=r684798.b77de0b524d8
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org (mozilla-unified hg, release branding, targeting wayland)"
 arch=(x86_64)
@@ -31,10 +31,11 @@ _repo=https://hg.mozilla.org/mozilla-unified
 conflicts=('firefox')
 provides=('firefox')
 source=("hg+$_repo#revision=autoland"
-        $_pkgname.desktop $_pkgname-symbolic.svg)
+        $_pkgname.desktop $_pkgname-symbolic.svg bug1762050.diff)
 sha256sums=('SKIP'
             'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33'
-            '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797')
+            '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
+            'c5f8e7dd7197f3f505875a256d80aefa632f8cfb1f38e6b7748db89eaf3eabd7')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -128,6 +129,8 @@ END
 build() {
   cd mozilla-unified
 
+  patch -Np1 -i "$srcdir/bug1762050.diff"
+
   export MOZ_SOURCE_REPO="$_repo"
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
diff --git a/bug1762050.diff b/bug1762050.diff
new file mode 100644
index 000000000000..91c45c5d1b8a
--- /dev/null
+++ b/bug1762050.diff
@@ -0,0 +1,73 @@
+diff --git a/python/mozbuild/mozbuild/build_commands.py b/python/mozbuild/mozbuild/build_commands.py
+--- a/python/mozbuild/mozbuild/build_commands.py
++++ b/python/mozbuild/mozbuild/build_commands.py
+@@ -183,10 +183,11 @@
+             directory=directory,
+             verbose=verbose,
+             keep_going=keep_going,
+             mach_context=command_context._mach_context,
+             append_env=append_env,
++            virtualenv_topobjdir=orig_topobjdir,
+         )
+         if status != 0:
+             return status
+ 
+         # Packaging the instrumented build is required to get the jarlog
+diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
+--- a/python/mozbuild/mozbuild/controller/building.py
++++ b/python/mozbuild/mozbuild/controller/building.py
+@@ -1219,10 +1219,11 @@
+         directory=None,
+         verbose=False,
+         keep_going=False,
+         mach_context=None,
+         append_env=None,
++        virtualenv_topobjdir=None,
+     ):
+         """Invoke the build backend.
+ 
+         ``what`` defines the thing to build. If not defined, the default
+         target is used.
+@@ -1296,10 +1297,11 @@
+                 config_rc = self.configure(
+                     metrics,
+                     buildstatus_messages=True,
+                     line_handler=output.on_line,
+                     append_env=append_env,
++                    virtualenv_topobjdir=virtualenv_topobjdir,
+                 )
+ 
+                 if config_rc != 0:
+                     return config_rc
+ 
+@@ -1634,10 +1636,11 @@
+         metrics,
+         options=None,
+         buildstatus_messages=False,
+         line_handler=None,
+         append_env=None,
++        virtualenv_topobjdir=None,
+     ):
+         # Disable indexing in objdir because it is not necessary and can slow
+         # down builds.
+         self.metrics = metrics
+         mkdir(self.topobjdir, not_indexed=True)
+@@ -1657,15 +1660,16 @@
+             if line.startswith("export "):
+                 k, eq, v = line[len("export ") :].partition("=")
+                 if eq == "=":
+                     append_env[k] = v
+ 
++        virtualenv_topobjdir = virtualenv_topobjdir or self.topobjdir
+         build_site = CommandSiteManager.from_environment(
+             self.topsrcdir,
+             lambda: get_state_dir(specific_to_topsrcdir=True, topsrcdir=self.topsrcdir),
+             "build",
+-            os.path.join(self.topobjdir, "_virtualenvs"),
++            os.path.join(virtualenv_topobjdir, "_virtualenvs"),
+         )
+         build_site.ensure()
+ 
+         command = [build_site.python_path, os.path.join(self.topsrcdir, "configure.py")]
+         if options:
+