From fb1a2e5df63006d2bf675aaee4e57e83d3e4e7ec Mon Sep 17 00:00:00 2001 From: ChaseKnowlden Date: Tue, 31 Oct 2023 18:34:17 +0000 Subject: [PATCH] Bug 1858889 - [Linux] Remove dbus-glib from docs and CI. r=stransky Differential Revision: https://phabricator.services.mozilla.com/D192088 --- docs/contributing/debugging/debugging_firefox_with_gdb.rst | 2 +- docs/setup/linux_32bit_build_on_64bit_OS.rst | 2 +- python/mozboot/mozboot/freebsd.py | 1 - python/mozboot/mozboot/openbsd.py | 1 - taskcluster/docker/debian-build/Dockerfile | 3 +-- taskcluster/docker/debian-repackage/Dockerfile | 2 +- taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in | 1 - taskcluster/docker/periodic-updates/setup.sh | 1 - taskcluster/docker/recipes/debian-test-system-setup.sh | 1 - .../docker/recipes/ubuntu1804-test-system-setup-base.sh | 2 -- taskcluster/docker/static-analysis-build/Dockerfile | 1 - taskcluster/docker/valgrind-build/Dockerfile | 1 - taskcluster/scripts/misc/build-sysroot.sh | 1 - 13 files changed, 4 insertions(+), 15 deletions(-) diff --git a/docs/contributing/debugging/debugging_firefox_with_gdb.rst b/docs/contributing/debugging/debugging_firefox_with_gdb.rst index ad506f42ed196..50cfb75aa54c1 100644 --- a/docs/contributing/debugging/debugging_firefox_with_gdb.rst +++ b/docs/contributing/debugging/debugging_firefox_with_gdb.rst @@ -237,7 +237,7 @@ This can be done manually using: .. code:: bash $ yum install GConf2-debuginfo ORBit2-debuginfo atk-debuginfo \ - cairo-debuginfo dbus-debuginfo dbus-glib-debuginfo expat-debuginfo \ + cairo-debuginfo dbus-debuginfo expat-debuginfo \ fontconfig-debuginfo freetype-debuginfo gcc-debuginfo glib2-debuginfo \ glibc-debuginfo gnome-vfs2-debuginfo gtk2-debuginfo gtk2-engines-debuginfo \ hal-debuginfo libX11-debuginfo libXcursor-debuginfo libXext-debuginfo \ diff --git a/docs/setup/linux_32bit_build_on_64bit_OS.rst b/docs/setup/linux_32bit_build_on_64bit_OS.rst index 6e8656fc4a252..f2022031b3ca9 100644 --- a/docs/setup/linux_32bit_build_on_64bit_OS.rst +++ b/docs/setup/linux_32bit_build_on_64bit_OS.rst @@ -23,7 +23,7 @@ These steps were verified to work as of June 2020. .. code:: - sudo apt install gcc-multilib g++-multilib libdbus-glib-1-dev:i386 \ + sudo apt install gcc-multilib g++-multilib \ libgtk2.0-dev:i386 libgtk-3-dev:i386 libpango1.0-dev:i386 libxt-dev:i386 \ libx11-xcb-dev:i386 libpulse-dev:i386 libdrm-dev:i386 diff --git a/python/mozboot/mozboot/freebsd.py b/python/mozboot/mozboot/freebsd.py index f4d6d1847ba49..281af60c04e4e 100644 --- a/python/mozboot/mozboot/freebsd.py +++ b/python/mozboot/mozboot/freebsd.py @@ -27,7 +27,6 @@ def __init__(self, version, flavor, **kwargs): ] self.browser_packages = [ - "dbus-glib", "libXt", "nasm", "pulseaudio", diff --git a/python/mozboot/mozboot/openbsd.py b/python/mozboot/mozboot/openbsd.py index a862525ece4fd..b1432410c4797 100644 --- a/python/mozboot/mozboot/openbsd.py +++ b/python/mozboot/mozboot/openbsd.py @@ -17,7 +17,6 @@ def __init__(self, version, **kwargs): "nasm", "node", "gtk+3", - "dbus-glib", "pulseaudio", ] diff --git a/taskcluster/docker/debian-build/Dockerfile b/taskcluster/docker/debian-build/Dockerfile index 4e0e04c15064a..bd890ac46c990 100644 --- a/taskcluster/docker/debian-build/Dockerfile +++ b/taskcluster/docker/debian-build/Dockerfile @@ -13,7 +13,7 @@ RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAG # binutils is needed for base toolchain builds. Ideally, it wouldn't be needed. # libc6-i386 and lib32gcc1 are needed for wine. -# libdbus-glib-1-2 and libgtk-3-0 are needed to run xpcshell during the build. +# libgtk-3-0 are needed to run xpcshell during the build. # lib32atomic1, lib32stdc++6 and lib32z1 are needed to run some 32-bits # cpio is needed by xar (mac repackaging on linux) # spidermonkey tests. libasound2 is needed to run xpcshell after we introduced @@ -35,7 +35,6 @@ RUN apt-get update && \ lib32z1 \ libasound2 \ libc6-i386 \ - libdbus-glib-1-2 \ libgtk-3-0 \ libucl1 \ p7zip-full \ diff --git a/taskcluster/docker/debian-repackage/Dockerfile b/taskcluster/docker/debian-repackage/Dockerfile index 2ca035be0b252..c65bb17823153 100644 --- a/taskcluster/docker/debian-repackage/Dockerfile +++ b/taskcluster/docker/debian-repackage/Dockerfile @@ -25,7 +25,7 @@ RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAG debootstrap \ --arch=$arch \ --variant=buildd \ - --include=debhelper,libasound2,libdbus-glib-1-2,libgtk-3-0,libx11-xcb1,libxtst6 \ + --include=debhelper,libasound2,libgtk-3-0,libx11-xcb1,libxtst6 \ --keyring=/usr/share/keyrings/debian-archive-removed-keys.gpg \ --verbose \ jessie \ diff --git a/taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in b/taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in index 18dfc640892ad..82a65af2a8b8c 100644 --- a/taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in +++ b/taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in @@ -57,7 +57,6 @@ parts: source: source stage-packages: - libxt6 - - libdbus-glib-1-2 - libasound2 - libpci3 - libpulse0 diff --git a/taskcluster/docker/periodic-updates/setup.sh b/taskcluster/docker/periodic-updates/setup.sh index d05c60883cb01..dd4faf5fc2ac0 100755 --- a/taskcluster/docker/periodic-updates/setup.sh +++ b/taskcluster/docker/periodic-updates/setup.sh @@ -11,7 +11,6 @@ apt-get install \ curl \ jq \ libasound2 \ - libdbus-glib-1-2 \ libgtk-3-0 \ libx11-xcb1 \ libxml2-utils \ diff --git a/taskcluster/docker/recipes/debian-test-system-setup.sh b/taskcluster/docker/recipes/debian-test-system-setup.sh index a0023220a97a1..80cc47116f4b8 100644 --- a/taskcluster/docker/recipes/debian-test-system-setup.sh +++ b/taskcluster/docker/recipes/debian-test-system-setup.sh @@ -29,7 +29,6 @@ apt_packages+=('libasound2-dev') apt_packages+=('libcanberra-pulse') apt_packages+=('libcurl4-openssl-dev') apt_packages+=('libdbus-1-dev') -apt_packages+=('libdbus-glib-1-dev') apt_packages+=('libgconf2-dev') apt_packages+=('libiw-dev') apt_packages+=('libnotify-dev') diff --git a/taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh b/taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh index cb934529bf191..d72183cad4a0b 100644 --- a/taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh +++ b/taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh @@ -44,7 +44,6 @@ apt_packages+=('libcanberra-gtk3-module') apt_packages+=('libcanberra-pulse') apt_packages+=('libcurl4-openssl-dev') apt_packages+=('libdbus-1-dev') -apt_packages+=('libdbus-glib-1-dev') apt_packages+=('libfreetype6') apt_packages+=('libgconf2-dev') apt_packages+=('libgl1-mesa-dri') @@ -115,7 +114,6 @@ apt-get update # Make sure we have libraries for 32-bit tests apt_packages=() apt_packages+=('libavcodec-extra57:i386') -apt_packages+=('libdbus-glib-1-2:i386') apt_packages+=('libpulse0:i386') apt_packages+=('libxt6:i386') apt_packages+=('libxtst6:i386') diff --git a/taskcluster/docker/static-analysis-build/Dockerfile b/taskcluster/docker/static-analysis-build/Dockerfile index e53ff4fa2eb88..7959cd09c0269 100644 --- a/taskcluster/docker/static-analysis-build/Dockerfile +++ b/taskcluster/docker/static-analysis-build/Dockerfile @@ -47,7 +47,6 @@ RUN apt-get update && \ x11-utils \ xvfb \ linux-libc-dev \ - libdbus-glib-1-dev \ libfontconfig1-dev \ libfreetype6-dev \ libgconf2-dev \ diff --git a/taskcluster/docker/valgrind-build/Dockerfile b/taskcluster/docker/valgrind-build/Dockerfile index c87c4f4adad3c..3229a70368731 100644 --- a/taskcluster/docker/valgrind-build/Dockerfile +++ b/taskcluster/docker/valgrind-build/Dockerfile @@ -21,7 +21,6 @@ RUN apt-get update && apt-get install \ libatk-bridge2.0-0-dbgsym \ libatk1.0-0-dbgsym \ libcairo2-dbgsym \ - libdbus-glib-1-2-dbgsym \ libdrm2-dbgsym \ libffi8-dbgsym \ libfontconfig1-dbgsym \ diff --git a/taskcluster/scripts/misc/build-sysroot.sh b/taskcluster/scripts/misc/build-sysroot.sh index 9da118132146c..f8a1054f15ecd 100755 --- a/taskcluster/scripts/misc/build-sysroot.sh +++ b/taskcluster/scripts/misc/build-sysroot.sh @@ -51,7 +51,6 @@ packages=" linux-libc-dev libasound2-dev libstdc++-${gcc_version}-dev - libdbus-glib-1-dev libfontconfig1-dev libfreetype6-dev libgconf2-dev