From 9a5db673a83d67f2e56a5b7365057906ed478fba Mon Sep 17 00:00:00 2001 From: Tiberius Oros Date: Tue, 6 Mar 2018 15:25:37 +0200 Subject: [PATCH] Backed out changeset 32c3c20fd489 (bug 1443419) for shell failure on shell failure on /firefox-snap/runme.sh:53 on CLOSED TREE --HG-- extra : amend_source : cbc8b1f406e34c98ebb5e1ba570859a9b2d90988 --- taskcluster/docker/firefox-snap/runme.sh | 6 ------ taskcluster/docker/firefox-snap/snapcraft.yaml.in | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/taskcluster/docker/firefox-snap/runme.sh b/taskcluster/docker/firefox-snap/runme.sh index f1679bff5a00..fb9d10c79c8a 100755 --- a/taskcluster/docker/firefox-snap/runme.sh +++ b/taskcluster/docker/firefox-snap/runme.sh @@ -47,12 +47,6 @@ for locale in $locales; do "$CANDIDATES_DIR/${VERSION}-candidates/build${BUILD_NUMBER}/linux-x86_64/xpi/${locale}.xpi" done -# Extract gtk30.mo from Ubuntu language packs -apt download language-pack-gnome-*-base -for i in *.deb; do - dpkg-deb --fsys-tarfile $i |tar xv -C "$SOURCE_DEST" --wildcards "./usr/share/locale-langpack/*/LC_MESSAGES/gtk30.mo" || true -done - # Generate snapcraft manifest sed -e "s/@VERSION@/${VERSION}/g" -e "s/@BUILD_NUMBER@/${BUILD_NUMBER}/g" snapcraft.yaml.in > "${WORKSPACE}/snapcraft.yaml" cp -v "$SCRIPT_DIRECTORY/mime"{-handler.xml,apps.list} "$WORKSPACE" diff --git a/taskcluster/docker/firefox-snap/snapcraft.yaml.in b/taskcluster/docker/firefox-snap/snapcraft.yaml.in index f87da3362be9..b42ef66910ad 100644 --- a/taskcluster/docker/firefox-snap/snapcraft.yaml.in +++ b/taskcluster/docker/firefox-snap/snapcraft.yaml.in @@ -52,10 +52,8 @@ parts: - libgl1-mesa-glx - libmirclient9 - desktop-file-utils - - ffmpeg - xdg-utils - - libc-bin - - locales-all + - ffmpeg after: [desktop-gtk3] xdg-open: