From 64eb16425b6c0fa73f4bbb7d0fb384cb50426c5f Mon Sep 17 00:00:00 2001 From: Julian Hofer Date: Mon, 30 Oct 2023 19:27:50 +0100 Subject: [PATCH 1/5] docker: Move to libadwaita 1.4 This should unblock https://github.com/gtk-rs/gtk4-rs/pull/1529 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8399912f69c6..f67679733f7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN git clone https://gitlab.gnome.org/gnome/gtk.git --depth=1 && \ (cd /gtk && \ meson setup builddir --prefix=/usr --buildtype release -Dgtk_doc=false -Dintrospection=enabled -Dbuild-examples=false -Dbuild-tests=false -Ddemos=false -Dmedia-gstreamer=disabled -Dlibepoxy:tests=false && \ meson install -C builddir) && \ - git clone https://gitlab.gnome.org/GNOME/libadwaita.git --depth=1 -b libadwaita-1-2 && \ + git clone https://gitlab.gnome.org/GNOME/libadwaita.git --depth=1 -b libadwaita-1-4 && \ (cd /libadwaita && \ meson setup builddir --prefix=/usr --buildtype release -Dintrospection=disabled -Dvapi=false -Dexamples=false -Dtests=false && \ meson install -C builddir) && \ From 17a3f8970e8f91b29e18933a984263912fa6208f Mon Sep 17 00:00:00 2001 From: Julian Hofer Date: Mon, 30 Oct 2023 21:38:28 +0100 Subject: [PATCH 2/5] Add libdrm-devel --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f67679733f7b..9956454bc842 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,14 +3,14 @@ FROM ghcr.io/gtk-rs/gtk-rs-core/core:latest RUN dnf update -y && \ dnf install xorg-x11-server-Xvfb procps-ng clang-devel \ libxkbcommon-devel wayland-devel mesa-libEGL-devel blueprint-compiler \ - libXi-devel libXrandr-devel libXcursor-devel libXdamage-devel libXinerama-devel -y && \ + libXi-devel libXrandr-devel libXcursor-devel libXdamage-devel libXinerama-devel libdrm-devel -y && \ dnf clean all -y RUN git clone https://gitlab.gnome.org/gnome/gtk.git --depth=1 && \ (cd /gtk && \ meson setup builddir --prefix=/usr --buildtype release -Dgtk_doc=false -Dintrospection=enabled -Dbuild-examples=false -Dbuild-tests=false -Ddemos=false -Dmedia-gstreamer=disabled -Dlibepoxy:tests=false && \ meson install -C builddir) && \ - git clone https://gitlab.gnome.org/GNOME/libadwaita.git --depth=1 -b libadwaita-1-4 && \ + git clone https://gitlab.gnome.org/GNOME/libadwaita.git --depth=1 --branch libadwaita-1-4 && \ (cd /libadwaita && \ meson setup builddir --prefix=/usr --buildtype release -Dintrospection=disabled -Dvapi=false -Dexamples=false -Dtests=false && \ meson install -C builddir) && \ From 9af3d782b46f0c46e5bd31fe18c62a3eaf66f3bc Mon Sep 17 00:00:00 2001 From: Julian Hofer Date: Mon, 30 Oct 2023 21:39:44 +0100 Subject: [PATCH 3/5] Add libappstream-glib --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9956454bc842..895d2244dd53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/gtk-rs/gtk-rs-core/core:latest RUN dnf update -y && \ dnf install xorg-x11-server-Xvfb procps-ng clang-devel \ - libxkbcommon-devel wayland-devel mesa-libEGL-devel blueprint-compiler \ + libxkbcommon-devel wayland-devel mesa-libEGL-devel blueprint-compiler libappstream-glib \ libXi-devel libXrandr-devel libXcursor-devel libXdamage-devel libXinerama-devel libdrm-devel -y && \ dnf clean all -y From 554fcfa405d128e18a081c213dbc7334e20d6de4 Mon Sep 17 00:00:00 2001 From: Julian Hofer Date: Mon, 30 Oct 2023 22:26:44 +0100 Subject: [PATCH 4/5] Add appstream-devel dependency --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 895d2244dd53..b5efe0c19491 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ FROM ghcr.io/gtk-rs/gtk-rs-core/core:latest -RUN dnf update -y && \ - dnf install xorg-x11-server-Xvfb procps-ng clang-devel \ - libxkbcommon-devel wayland-devel mesa-libEGL-devel blueprint-compiler libappstream-glib \ - libXi-devel libXrandr-devel libXcursor-devel libXdamage-devel libXinerama-devel libdrm-devel -y && \ - dnf clean all -y +RUN dnf update --assumeyes && \ + dnf --assumeyes install xorg-x11-server-Xvfb procps-ng clang-devel \ + libxkbcommon-devel wayland-devel mesa-libEGL-devel blueprint-compiler \ + libXi-devel libXrandr-devel libXcursor-devel libXdamage-devel libXinerama-devel \ + appstream-devel libdrm-devel libappstream-glib && \ + dnf clean all --assumeyes RUN git clone https://gitlab.gnome.org/gnome/gtk.git --depth=1 && \ (cd /gtk && \ From 10eb28851ff17512553ea8d46d296553f739d0cb Mon Sep 17 00:00:00 2001 From: Julian Hofer Date: Mon, 30 Oct 2023 23:26:44 +0100 Subject: [PATCH 5/5] Remove libappstream --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b5efe0c19491..4397d0b05b30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN dnf update --assumeyes && \ dnf --assumeyes install xorg-x11-server-Xvfb procps-ng clang-devel \ libxkbcommon-devel wayland-devel mesa-libEGL-devel blueprint-compiler \ libXi-devel libXrandr-devel libXcursor-devel libXdamage-devel libXinerama-devel \ - appstream-devel libdrm-devel libappstream-glib && \ + appstream-devel libdrm-devel && \ dnf clean all --assumeyes RUN git clone https://gitlab.gnome.org/gnome/gtk.git --depth=1 && \