Bug 1377445 - Remove gtk+2 from docker images. r=firefox-build-system-reviewers,andi,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D111998
This commit is contained in:
Mike Hommey 2021-04-20 01:57:03 +00:00
parent 79e8df83dd
commit cabbb4a97a
6 changed files with 2 additions and 8 deletions

View File

@ -17,7 +17,6 @@ apt_packages+=('autoconf-archive')
apt_packages+=('automake')
apt_packages+=('fluxbox')
apt_packages+=('libcairo2-dev')
apt_packages+=('libgtk2.0-dev')
apt_packages+=('libicu-dev')
apt_packages+=('libjpeg62-turbo-dev')
apt_packages+=('libopencv-contrib-dev')

View File

@ -33,7 +33,6 @@ apt_packages+=('libcurl4-openssl-dev')
apt_packages+=('libdbus-1-dev')
apt_packages+=('libdbus-glib-1-dev')
apt_packages+=('libgconf2-dev')
apt_packages+=('libgtk2.0-dev')
apt_packages+=('libiw-dev')
apt_packages+=('libnotify-dev')
apt_packages+=('libpulse-dev')

View File

@ -48,7 +48,6 @@ apt_packages+=('libgl1-mesa-dri')
apt_packages+=('libgl1-mesa-glx')
apt_packages+=('libgstreamer-plugins-base1.0-dev')
apt_packages+=('libgstreamer1.0-dev')
apt_packages+=('libgtk2.0-dev')
apt_packages+=('libgtk-3-0')
apt_packages+=('libiw-dev')
apt_packages+=('libx11-xcb1')
@ -120,7 +119,6 @@ apt_packages+=('libpulse0:i386')
apt_packages+=('libxt6:i386')
apt_packages+=('libxtst6:i386')
apt_packages+=('libsecret-1-0:i386')
apt_packages+=('libgtk2.0-0:i386')
apt_packages+=('libgtk-3-0:i386')
apt_packages+=('libx11-xcb1:i386')
apt_packages+=('libxcb1:i386')

View File

@ -62,7 +62,6 @@ RUN apt-get update && \
libgconf2-dev \
libgmp-dev \
libgtk-3-dev \
libgtk2.0-dev \
libpango1.0-dev \
libpulse-dev \
libx11-xcb-dev \

View File

@ -7,8 +7,8 @@ MAINTAINER release@mozilla.com
RUN dpkg --add-architecture i386 && apt-get -q update \
# p7zip-full is for extracting Windows and OS X packages
# wget is for downloading update.xml, installers, and MARs
# libgtk-3-0 and libgtk2.0-0 are required to run the Firefox updater
&& apt-get -q --yes install p7zip-full wget libgtk-3-0 libgtk-3.0:i386 libgtk2.0-0 libgtk2.0-0:i386 \
# libgtk-3-0 is required to run the Firefox updater
&& apt-get -q --yes install p7zip-full wget libgtk-3-0 libgtk-3.0:i386 \
&& apt-get clean
RUN mkdir /builds

View File

@ -32,7 +32,6 @@ packages="
libgconf2-dev
libgcc-${gcc_version}-dev
libgtk-3-dev
libgtk2.0-dev
libpango1.0-dev
libpulse-dev
libx11-xcb-dev