From 22a8ae46f46d0e151038aedbf936b50737cb9dde Mon Sep 17 00:00:00 2001
From: Tyson Smith <tysmith@users.noreply.github.com>
Date: Thu, 1 Dec 2022 10:18:19 -0800
Subject: [PATCH] [firefox] Add missing dep (#9083)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Attempting to fix broken build:
```
Step #3 - "compile-libfuzzer-address-x86_64":  1:59.04(B /work/obj-fuzz/dist/bin/firefox -unittest --gtest_death_test_style=threadsafe(B(B
Step #3 - "compile-libfuzzer-address-x86_64": XPCOMGlueLoad error for file /work/obj-fuzz/dist/bin/libmozgtk.so:
Step #3 - "compile-libfuzzer-address-x86_64": libgtk-3.so.0: cannot open shared object file: No such file or directory
Step #3 - "compile-libfuzzer-address-x86_64": Couldn't load XPCOM.
Step #3 - "compile-libfuzzer-address-x86_64": ********************************************************************************
Step #3 - "compile-libfuzzer-address-x86_64": Failed to build.
Step #3 - "compile-libfuzzer-address-x86_64": To reproduce, run:
Step #3 - "compile-libfuzzer-address-x86_64": python infra/helper.py build_image firefox
Step #3 - "compile-libfuzzer-address-x86_64": python infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture x86_64 firefox
Step #3 - "compile-libfuzzer-address-x86_64": ********************************************************************************
Finished Step #3 - "compile-libfuzzer-address-x86_64"
ERROR
ERROR: build step 3 "gcr.io/cloud-builders/docker" failed: step exited with non-zero status: 1
```
---
 projects/firefox/Dockerfile | 50 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/projects/firefox/Dockerfile b/projects/firefox/Dockerfile
index e5343c9ee..0c48ab1b1 100644
--- a/projects/firefox/Dockerfile
+++ b/projects/firefox/Dockerfile
@@ -21,10 +21,58 @@ RUN apt-get update && \
     apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y --no-install-recommends \
+      cmake \
       gawk \
+      git \
       libstdc++6 \
       m4 \
-      python python3-pip python3-setuptools python3-wheel cmake git nasm 
+      nasm \
+      python \
+      python3-pip \
+      python3-setuptools \
+      python3-wheel
+
+# install Firefox deps
+# built using https://packages.ubuntu.com/focal/firefox as a reference
+RUN apt-get install -y --no-install-recommends \
+    libasound2 \
+    libatk1.0-0 \
+    libc6 \
+    libcairo-gobject2 \
+    libcairo2 \
+    libdbus-1-3 \
+    libdbus-glib-1-2 \
+    libffi7 \
+    libfontconfig1 \
+    libfreetype6 \
+    libgcc-s1 \
+    libgdk-pixbuf2.0-0 \
+    libglib2.0-0 \
+    libgtk-3-0 \
+    libharfbuzz0b \
+    libpango-1.0-0 \
+    libpangocairo-1.0-0 \
+    libpangoft2-1.0-0 \
+    libstdc++6 \
+    libx11-6 \
+    libx11-xcb1 \
+    libxcb-shm0 \
+    libxcb1 \
+    libxcomposite1 \
+    libxcursor1 \
+    libxdamage1 \
+    libxext6 \
+    libxfixes3 \
+    libxi6 \
+    libxrandr2 \
+    libxrender1 \
+    libxt6 \
+    libxtst6 \
+    lsb-release \
+    libcanberra0 \
+    libdbusmenu-glib4 \
+    libdbusmenu-gtk3-4
+
 RUN pip3 install meson ninja
 
 # This wrapper of cargo seems to interfere with our build system.