fix: Added fixes for the wheels builds to pass all of them

Author: jakub-kocka

os_dependencies/linux_arm.sh

@@ -7,21 +7,29 @@ sudo apt-get update
 # AWS
 sudo apt-get install -y -q --no-install-recommends awscli
 
+sudo apt-get install cmake build-essential -y
+
 # PyGObject needs build dependecies https://pygobject.readthedocs.io/en/latest/getting_started.html
-sudo apt-get install libgirepository1.0-dev libgirepository-2.0-dev gcc libcairo2-dev pkg-config python3-dev -y
+sudo apt-get install libgirepository1.0-dev libgirepository-2.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-4.0 -y
+
+# dbus-python needs build dependecies
+sudo apt-get install dbus libdbus-1-dev libdbus-glib-1-dev libdbus-1-3 -y
+sudo apt-get install -y --no-install-recommends dbus-tests
+
+# Pillow needs libjpeg-dev
+sudo apt-get install libjpeg-dev libtiff5 libopenjp2-7 -y
 
-# dbus-python build dependecies
-sudo apt-get install libtiff5 libjpeg-dev libopenjp2-7 cmake libdbus-1-dev -y
-sudo apt-get install -y --no-install-recommends python3-dev libdbus-glib-1-dev libgirepository1.0-dev libcairo2-dev -y
-sudo apt-get install -y --no-install-recommends dbus-tests -y
 
 #Only ARMv7
 if [ "$arch" == "armv7l" ]; then
+    # ARMv7 Debian Bullseye container needs additional gobject-introspection packages for PyGObject
+    apt-get install -y gobject-introspection-dev libgirepository1.0-dev gir1.2-gtk-4.0
+
     # cryptography needs Rust
     # clean the container Rust installation to be sure right interpreter is used
     apt remove --auto-remove --purge rust-gdb rustc libstd-rust-dev libstd-rust-1.48
     # install Rust dependencies
-    apt-get install -y build-essential libssl-dev libffi-dev python3-dev pkg-config gcc musl-dev
+    apt-get install -y libssl-dev libffi-dev gcc musl-dev
     # install Rust
     curl --proto '=https' --tlsv1.3 -sSf https://sh.rustup.rs | bash -s -- -y
     . $HOME/.cargo/env

os_dependencies/windows.ps1

@@ -22,9 +22,23 @@ Write-Host "Updating MSYS2 and installing GTK4 dependencies..."
 & $msys2Exe -lc "pacman-key --init"
 & $msys2Exe -lc "pacman-key --populate msys2"
 & $msys2Exe -lc "pacman -Suy --noconfirm"
-& $msys2Exe -lc "pacman -S --noconfirm mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-python3 mingw-w64-ucrt-x86_64-python3-gobject"
+& $msys2Exe -lc "pacman -S --noconfirm mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-python3 mingw-w64-ucrt-x86_64-python3-gobject mingw-w64-ucrt-x86_64-gobject-introspection mingw-w64-ucrt-x86_64-pkg-config mingw-w64-ucrt-x86_64-cairo"
 
-# Add MSYS2 to PATH
+# Add MSYS2 to PATH and set up environment for PyGObject build
 $env:PATH = "$msys2InstallPath\ucrt64\bin;$env:PATH"
+$env:PKG_CONFIG_PATH = "$msys2InstallPath\ucrt64\lib\pkgconfig;$msys2InstallPath\ucrt64\share\pkgconfig"
+$env:INCLUDE = "$msys2InstallPath\ucrt64\include;$env:INCLUDE"
+$env:LIB = "$msys2InstallPath\ucrt64\lib;$env:LIB"
+
+# Ensure MSYS2 pkg-config is used instead of Strawberry Perl's broken one
+$env:PKG_CONFIG = "$msys2InstallPath\ucrt64\bin\pkg-config.exe"
+
+# Set environment variables for current GitHub Actions step
+Write-Output "PATH=$env:PATH" >> $env:GITHUB_ENV
+Write-Output "PKG_CONFIG_PATH=$env:PKG_CONFIG_PATH" >> $env:GITHUB_ENV
+Write-Output "PKG_CONFIG=$env:PKG_CONFIG" >> $env:GITHUB_ENV
+Write-Output "INCLUDE=$env:INCLUDE" >> $env:GITHUB_ENV
+Write-Output "LIB=$env:LIB" >> $env:GITHUB_ENV
 
 Write-Host "MSYS2 and GTK4 setup completed!"
+Write-Host "PKG_CONFIG_PATH set to: $env:PKG_CONFIG_PATH"