Bug 1623627 - Updated to use the gnome-3-34 snapcraft extension r=rail

Differential Revision: https://phabricator.services.mozilla.com/D68252

taskcluster/docker/firefox-snap/Dockerfile

@@ -14,6 +14,7 @@ RUN apt-get update && \
       locales \
       bzip2 \
       curl \
+      gcc \
       git \
       python3 \
       locales \
@@ -42,11 +43,17 @@ RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/sna
 RUN mkdir -p /snap/core18
 RUN unsquashfs -d /snap/core18/current core18.snap
 
-# Grab the gnome-3-28-1804 snap from the stable channel
+# Grab the gnome-3-34-1804 snap from the stable channel
 # and unpack it in the proper place.
-RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/gnome-3-28-1804' | jq '.download_url' -r) --output gnome-3-28-1804.snap
-RUN mkdir -p /snap/gnome-3-28-1804
-RUN unsquashfs -d /snap/gnome-3-28-1804/current gnome-3-28-1804.snap
+RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/gnome-3-34-1804?channel=stable' | jq '.download_url' -r) --output gnome-3-34-1804.snap
+RUN mkdir -p /snap/gnome-3-34-1804
+RUN unsquashfs -d /snap/gnome-3-34-1804/current gnome-3-34-1804.snap
+
+# Grab the gnome-3-34-1804-sdk snap from the stable channel
+# and unpack it in the proper place.
+RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/gnome-3-34-1804-sdk?channel=stable' | jq '.download_url' -r) --output gnome-3-34-1804-sdk.snap
+RUN mkdir -p /snap/gnome-3-34-1804-sdk
+RUN unsquashfs -d /snap/gnome-3-34-1804-sdk/current gnome-3-34-1804-sdk.snap
 
 # Grab the snapcraft snap from the stable channel and unpack it in the proper
 # place.

taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in

@@ -10,7 +10,7 @@ apps:
   firefox:
     command: firefox
     desktop: distribution/firefox.desktop
-    extensions: [gnome-3-28]
+    extensions: [gnome-3-34]
     environment:
       DISABLE_WAYLAND: 1
       HOME: "$SNAP_USER_COMMON"
@@ -56,6 +56,9 @@ parts:
       - libc-bin
       - locales-all
       - libcurl3-gnutls
+    prime:
+      - -usr/lib/*/libharfbuzz*
+      - -usr/lib/*/*pango*
 
   xdg-open:
     after: [firefox]
@@ -93,6 +96,18 @@ parts:
         cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
       done
 
+  # Find files provided by the base and platform snap and ensure they aren't
+  # duplicated in this snap
+  cleanup:
+    after: [shared-mime-info]
+    plugin: nil
+    build-snaps: [core18, gnome-3-34-1804]
+    override-prime: |
+      set -eux
+      for snap in "core18" "gnome-3-34-1804"; do
+        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+      done
+
 slots:
   dbus-daemon:
     interface: dbus