ci: Refresh generated files

Notable differences:

  * meson is now installed from the distro repositories
    instead of PyPI on CentOS 8 and CentOS Stream 8. We
    can finally do this because the version they ship
    has been updated.

  * intltool and itstool (which are used to build osinfo-db
    as part of the CI pipeline) are no longer included in the
    container images. osinfo-db-tools moved away from the
    former and never adopted the latter.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

12 files changed, 14 insertions, 48 deletions

diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile
index 9b241c9..6d95529 100644
--- a/ci/containers/centos-8.Dockerfile
+++ b/ci/containers/centos-8.Dockerfile
@@ -23,23 +23,19 @@ RUN dnf update -y && \
         gobject-introspection-devel \
         gtk-doc \
         hwdata \
-        intltool \
-        itstool \
         libsoup-devel \
         libxml2 \
         libxml2-devel \
         libxslt-devel \
         make \
+        meson \
         ninja-build \
         osinfo-db-tools \
         pkgconfig \
         python3 \
         python3-lxml \
-        python3-pip \
         python3-pytest \
         python3-requests \
-        python3-setuptools \
-        python3-wheel \
         rpm-build \
         vala \
         wget \
@@ -51,9 +47,6 @@ RUN dnf update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
-         meson==0.56.0
-
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
index f37dbdd..436c846 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -23,23 +23,19 @@ RUN dnf update -y && \
         gobject-introspection-devel \
         gtk-doc \
         hwdata \
-        intltool \
-        itstool \
         libsoup-devel \
         libxml2 \
         libxml2-devel \
         libxslt-devel \
         make \
+        meson \
         ninja-build \
         osinfo-db-tools \
         pkgconfig \
         python3 \
         python3-lxml \
-        python3-pip \
         python3-pytest \
         python3-requests \
-        python3-setuptools \
-        python3-wheel \
         rpm-build \
         vala \
         wget \
@@ -51,9 +47,6 @@ RUN dnf update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
-         meson==0.56.0
-
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
index 0ec761d..192456c 100644
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@@ -19,8 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             git \
             gtk-doc-tools \
             hwdata \
-            intltool \
-            itstool \
             libgirepository1.0-dev \
             libglib2.0-dev \
             libsoup2.4-dev \
diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index 72be2be..8ca0d33 100644
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -19,8 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             git \
             gtk-doc-tools \
             hwdata \
-            intltool \
-            itstool \
             libgirepository1.0-dev \
             libglib2.0-dev \
             libsoup2.4-dev \
diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile
index 4f5ebdb..5d97b3e 100644
--- a/ci/containers/fedora-34.Dockerfile
+++ b/ci/containers/fedora-34.Dockerfile
@@ -29,8 +29,6 @@ exec "$@"' > /usr/bin/nosync && \
         gobject-introspection-devel \
         gtk-doc \
         hwdata \
-        intltool \
-        itstool \
         libsoup-devel \
         libxml2 \
         libxml2-devel \
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index c552b3b..9b1db4d 100644
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@@ -26,8 +26,6 @@ exec "$@"' > /usr/bin/nosync && \
         glibc-langpack-en \
         gtk-doc \
         hwdata \
-        intltool \
-        itstool \
         libxml2 \
         make \
         meson \
@@ -42,11 +40,7 @@ exec "$@"' > /usr/bin/nosync && \
         wget \
         xz && \
     nosync dnf autoremove -y && \
-    nosync dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
+    nosync dnf clean all -y
 
 RUN nosync dnf install -y \
         mingw32-gcc \
@@ -56,7 +50,11 @@ RUN nosync dnf install -y \
         mingw32-libxml2 \
         mingw32-libxslt \
         mingw32-pkg-config && \
-    nosync dnf clean all -y
+    nosync dnf clean all -y && \
+    rpm -qa | sort > /packages.txt && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index ab07260..bf32a56 100644
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@@ -26,8 +26,6 @@ exec "$@"' > /usr/bin/nosync && \
         glibc-langpack-en \
         gtk-doc \
         hwdata \
-        intltool \
-        itstool \
         libxml2 \
         make \
         meson \
@@ -42,11 +40,7 @@ exec "$@"' > /usr/bin/nosync && \
         wget \
         xz && \
     nosync dnf autoremove -y && \
-    nosync dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
+    nosync dnf clean all -y
 
 RUN nosync dnf install -y \
         mingw64-gcc \
@@ -56,7 +50,11 @@ RUN nosync dnf install -y \
         mingw64-libxml2 \
         mingw64-libxslt \
         mingw64-pkg-config && \
-    nosync dnf clean all -y
+    nosync dnf clean all -y && \
+    rpm -qa | sort > /packages.txt && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index 298b866..3cab96e 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -30,8 +30,6 @@ exec "$@"' > /usr/bin/nosync && \
         gobject-introspection-devel \
         gtk-doc \
         hwdata \
-        intltool \
-        itstool \
         libsoup-devel \
         libxml2 \
         libxml2-devel \
diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile
index d5a7529..a72c2e1 100644
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -19,8 +19,6 @@ RUN zypper update -y && \
            gobject-introspection-devel \
            gtk-doc \
            hwdata \
-           intltool \
-           itstool \
            libsoup-devel \
            libxml2 \
            libxml2-devel \
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile
index 8e3b2a8..ad67dad 100644
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -19,8 +19,6 @@ RUN zypper update -y && \
            gobject-introspection-devel \
            gtk-doc \
            hwdata \
-           intltool \
-           itstool \
            libsoup-devel \
            libxml2 \
            libxml2-devel \
diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
index 9b35858..923e959 100644
--- a/ci/containers/ubuntu-1804.Dockerfile
+++ b/ci/containers/ubuntu-1804.Dockerfile
@@ -19,8 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             git \
             gtk-doc-tools \
             hwdata \
-            intltool \
-            itstool \
             libgirepository1.0-dev \
             libglib2.0-dev \
             libsoup2.4-dev \
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 9e989bf..2414e3e 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -19,8 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             git \
             gtk-doc-tools \
             hwdata \
-            intltool \
-            itstool \
             libgirepository1.0-dev \
             libglib2.0-dev \
             libsoup2.4-dev \