From d9245d341ed1f258a3dd1073cdfa656115c5b26d Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Mon, 23 Mar 2026 20:52:55 +0100 Subject: Adapt rest of packaging to use meson --- build-containers/fedora-rawhide/Containerfile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'build-containers/fedora-rawhide') diff --git a/build-containers/fedora-rawhide/Containerfile b/build-containers/fedora-rawhide/Containerfile index 6869330..3db886c 100644 --- a/build-containers/fedora-rawhide/Containerfile +++ b/build-containers/fedora-rawhide/Containerfile @@ -1,23 +1,15 @@ FROM docker.io/library/fedora:rawhide RUN dnf install -y \ - make \ - clang \ - lld \ - curl \ - tar \ - gzip \ + meson \ + rpm-build \ + cargo \ + rust \ + desktop-file-utils \ + libappstream-glib \ gettext \ gtk4-devel \ libadwaita-devel \ gtksourceview5-devel \ pkg-config \ && dnf clean all - -# Install rust toolchain -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -ENV PATH="/root/.cargo/bin:${PATH}" - -# Install cargo-generate-rpm -RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \ - && cargo binstall cargo-generate-rpm --no-confirm -- cgit