diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 417daefe..5fa36235 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,8 +63,10 @@ jobs: - name: Install GTK4 (Windows) run: | - # TODO: Remove constraint once https://github.com/wingtk/gvsbuild/issues/1436 is fixed - pipx install gvsbuild==2024.8.1 + # TODO: Next 3 lines should have been `pipx install gvsbuild`, but https://github.com/wingtk/gvsbuild/issues/1436 + py -m venv .venv + .\.venv\Scripts\activate.ps1 + py -m pip install gvsbuild gvsbuild build gtk4 librsvg if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6f0b7455..c100ae8d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -81,8 +81,10 @@ jobs: - name: Install GTK4 (Windows) run: | - # TODO: Remove constraint once https://github.com/wingtk/gvsbuild/issues/1436 is fixed - pipx install gvsbuild==2024.8.1 + # TODO: Next 3 lines should have been `pipx install gvsbuild`, but https://github.com/wingtk/gvsbuild/issues/1436 + py -m venv .venv + .\.venv\Scripts\activate.ps1 + py -m pip install gvsbuild gvsbuild build gtk4 librsvg if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true' @@ -207,8 +209,10 @@ jobs: - name: Install GTK4 (Windows) run: | - # TODO: Remove constraint once https://github.com/wingtk/gvsbuild/issues/1436 is fixed - pipx install gvsbuild==2024.8.1 + # TODO: Next 3 lines should have been `pipx install gvsbuild`, but https://github.com/wingtk/gvsbuild/issues/1436 + py -m venv .venv + .\.venv\Scripts\activate.ps1 + py -m pip install gvsbuild gvsbuild build gtk4 librsvg if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true' diff --git a/res/windows/wix/expected-dlls.log b/res/windows/wix/expected-dlls.log index 7851b004..a2820fe7 100644 --- a/res/windows/wix/expected-dlls.log +++ b/res/windows/wix/expected-dlls.log @@ -4,6 +4,7 @@ cairo-gobject-2.dll cairo-script-interpreter-2.dll epoxy-0.dll ffi-8.dll +fontconfig-1.dll freetype-6.dll fribidi-0.dll gdk_pixbuf-2.0-0.dll @@ -25,6 +26,7 @@ harfbuzz.dll iconv.dll intl.dll jpeg62.dll +libexpat.dll libpng16.dll libxml2.dll pango-1.0-0.dll diff --git a/res/windows/wix/space-acres.wxs b/res/windows/wix/space-acres.wxs index 53879176..c0042819 100644 --- a/res/windows/wix/space-acres.wxs +++ b/res/windows/wix/space-acres.wxs @@ -173,6 +173,9 @@ + + + @@ -236,6 +239,9 @@ + + + @@ -388,6 +394,7 @@ + @@ -409,6 +416,7 @@ +