Merge pull request #311 from autonomys/update-gvsbuild

Update gvsbuild to latest version with a workaround
autonomys · Oct 19, 2024 · 674cfc3 · 674cfc3
2 parents 5b368ef + 3af732b
commit 674cfc3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -173,6 +173,9 @@
                         <Component Id='gtk4_ffi_8.dll' Guid='eb810a85-6565-42ac-a079-6015a21b3960'>
                             <File Id='ffi_8.dll' Name='ffi-8.dll' DiskId='1' Source='target\wix\gtk4\bin\ffi-8.dll' />
                         </Component>
+                        <Component Id='gtk4_fontconfig_1.dll' Guid='109f0657-261a-4a58-8315-e8642a1803f4'>
+                            <File Id='fontconfig_1.dll' Name='fontconfig-1.dll' DiskId='1' Source='target\wix\gtk4\bin\fontconfig-1.dll' />
+                        </Component>
                         <Component Id='gtk4_freetype_6.dll' Guid='0c9779a7-9283-4740-8ea8-16a8a29826af'>
                             <File Id='freetype_6.dll' Name='freetype-6.dll' DiskId='1' Source='target\wix\gtk4\bin\freetype-6.dll' />
                         </Component>
@@ -236,6 +239,9 @@
                         <Component Id='gtk4_jpeg62.dll' Guid='42892585-e55f-4816-9747-e3287b303281'>
                             <File Id='jpeg62.dll' Name='jpeg62.dll' DiskId='1' Source='target\wix\gtk4\bin\jpeg62.dll' />
                         </Component>
+                        <Component Id='gtk4_libexpat.dll' Guid='b651545a-c0d3-4f67-a311-c6a5100626ce'>
+                            <File Id='libexpat.dll' Name='libexpat.dll' DiskId='1' Source='target\wix\gtk4\bin\libexpat.dll' />
+                        </Component>
                         <Component Id='gtk4_libpng16.dll' Guid='f1eb894a-fd88-469d-81ea-640791560a1e'>
                             <File Id='libpng16.dll' Name='libpng16.dll' DiskId='1' Source='target\wix\gtk4\bin\libpng16.dll' />
                         </Component>
@@ -388,6 +394,7 @@
             <ComponentRef Id='gtk4_cairo_script_interpreter_2.dll'/>
             <ComponentRef Id='gtk4_epoxy_0.dll'/>
             <ComponentRef Id='gtk4_ffi_8.dll'/>
+            <ComponentRef Id='gtk4_fontconfig_1.dll'/>
             <ComponentRef Id='gtk4_freetype_6.dll'/>
             <ComponentRef Id='gtk4_fribidi_0.dll'/>
             <ComponentRef Id='gtk4_gdk_pixbuf_2.0_0.dll'/>
@@ -409,6 +416,7 @@
             <ComponentRef Id='gtk4_iconv.dll'/>
             <ComponentRef Id='gtk4_intl.dll'/>
             <ComponentRef Id='gtk4_jpeg62.dll'/>
+            <ComponentRef Id='gtk4_libexpat.dll'/>
             <ComponentRef Id='gtk4_libpng16.dll'/>
             <ComponentRef Id='gtk4_libxml2.dll'/>
             <ComponentRef Id='gtk4_pango_1.0_0.dll'/>