From cca3d065d2c9f031c8c01af3fbd13366867bfb6e Mon Sep 17 00:00:00 2001
From: piegames <git@piegames.de>
Date: Mon, 26 Dec 2022 19:46:24 +0100
Subject: [PATCH] Update (#25)

* Update

* Fix help and launching commands
---
 .github/workflows/docker.yml   | 6 +++---
 README.md                      | 8 ++++----
 gtk4-cross-base-hub/Dockerfile | 9 ++++-----
 gtk4-cross-base-hub/package.sh | 2 ++
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7aa106b..44d3e6d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,12 +17,12 @@ jobs:
           - name: gtk-nightly
             gtktag: main
             adwtag: main
-          - name: gtk-4.4
-            gtktag: 4.4.1
-            adwtag: 1.0.0.alpha.4
           - name: gtk-4.6
             gtktag: 4.6.3
             adwtag: 1.1.1
+          - name: gtk-4.8
+            gtktag: 4.8.2
+            adwtag: 1.2.0
       fail-fast: false
 
     steps:
diff --git a/README.md b/README.md
index bb27b02..908638b 100644
--- a/README.md
+++ b/README.md
@@ -6,18 +6,18 @@ Images can be found on [DockerHub](https://hub.docker.com/r/mglolenstine/gtk4-cr
 
 ### To pull from DockerHub
 
-Example for GTK 4.6:
+Example for GTK 4.8:
 
 ```bash
-docker pull mglolenstine/gtk4-cross:rust-gtk-4.6 
+docker pull mglolenstine/gtk4-cross:rust-gtk-4.8
 ```
 
 ### To pull from GitHub container repository
 
-Example for GTK 4.6:
+Example for GTK 4.8:
 
 ```bash
-docker pull ghcr.io/mglolenstine/gtk4-cross:rust-gtk-4.6 
+docker pull ghcr.io/mglolenstine/gtk4-cross:rust-gtk-4.8
 ```
 
 ## Cross compilation
diff --git a/gtk4-cross-base-hub/Dockerfile b/gtk4-cross-base-hub/Dockerfile
index 72c2443..e339169 100644
--- a/gtk4-cross-base-hub/Dockerfile
+++ b/gtk4-cross-base-hub/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:37
 WORKDIR /root
 RUN dnf install -y git cmake gcc-c++ boost-devel
 RUN git clone https://github.com/gsauthof/pe-util
@@ -9,7 +9,7 @@ WORKDIR /root/pe-util/build
 RUN cmake .. -DCMAKE_BUILD_TYPE=Release
 RUN make
 
-FROM fedora:36
+FROM fedora:37
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 # RUN . ~/.cargo/env 
 # Set the rust linker to gcc
@@ -17,15 +17,14 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 RUN dnf install -y gcc
 RUN . ~/.cargo/env && cargo install --git https://github.com/MGlolenstine/peldd_dependency_scanner.git
 
-FROM fedora:36
+FROM fedora:37
 COPY --from=0 /root/pe-util/build/peldd /usr/bin/peldd
 COPY --from=1 /root/.cargo/bin/peldd_dependency_scanner /usr/bin/pds
-RUN dnf install git mingw64-binutils mingw64-gcc meson mingw64-pango mingw64-gdk-pixbuf mingw64-libepoxy mingw64-winpthreads-static glib2-devel gobject-introspection-devel mingw64-gstreamer1-plugins-bad-free vala wine-7.2-1.fc36 cmake gcc zip boost boost-system dos2unix sassc mingw64-librsvg2 intltool itstool gtk-update-icon-cache adwaita-icon-theme mingw64-adwaita-icon-theme mingw64-gettext -y && dnf clean all -y
+RUN dnf install git mingw64-binutils mingw64-gcc meson mingw64-pango mingw64-gdk-pixbuf mingw64-libepoxy mingw64-winpthreads-static glib2-devel gobject-introspection-devel mingw64-gstreamer1-plugins-bad-free vala wine cmake gcc zip boost boost-system dos2unix sassc mingw64-librsvg2 intltool itstool gtk-update-icon-cache adwaita-icon-theme mingw64-adwaita-icon-theme mingw64-gettext -y && dnf clean all -y
 
 # Clone the gtk4 repository (Move after the mingw setup for efficiency later)
 WORKDIR /tmp
 RUN git clone --branch %GTKTAG% https://gitlab.gnome.org/GNOME/gtk.git
-RUN git -C gtk cherry-pick -n dae892d8f6b7e5402360e7a66803814d86360fc5
 
 # Clone the libadwaita repository (Move after the mingw setup for efficiency later)
 WORKDIR /tmp
diff --git a/gtk4-cross-base-hub/package.sh b/gtk4-cross-base-hub/package.sh
index c4f26b0..bc207fe 100644
--- a/gtk4-cross-base-hub/package.sh
+++ b/gtk4-cross-base-hub/package.sh
@@ -12,6 +12,8 @@ mkdir -p $OUT
 
 # Add gdbus (https://discourse.gnome.org/t/gtk-warning-about-gdbus-exe-not-being-found-on-windows-msys2/2893/2)
 cp $MINGW_PREFIX/bin/gdbus.exe $OUT
+# Add gspawn binaries for launching external processes (https://gitlab.gnome.org/GNOME/glib/-/issues/2843#note_1625472)
+cp $MINGW_PREFIX/bin/gspawn-win64-helper-console.exe $MINGW_PREFIX/bin/gspawn-win64-helper.exe $OUT
 
 # Handle the glib schema compilation as well
 glib-compile-schemas $MINGW_PREFIX/share/glib-2.0/schemas/