Add librsvg on Windows

autonomys · Jan 6, 2024 · 3d891b9 · 3d891b9
1 parent 83aace3
commit 3d891b9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -74,7 +74,7 @@ jobs:
       - name: Install GTK4 (Windows)
         run: |
           pipx install gvsbuild
-          gvsbuild build gtk4
+          gvsbuild build gtk4 librsvg
         if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true'
 
       # TODO: This is a workaround for https://github.com/wingtk/gvsbuild/issues/984, remove once fixed upstream

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Install GTK4 (Windows)
         run: |
           pipx install gvsbuild
-          gvsbuild build gtk4
+          gvsbuild build gtk4 librsvg
         if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true'
 
       # TODO: This is a workaround for https://github.com/wingtk/gvsbuild/issues/984, remove once fixed upstream
@@ -207,7 +207,7 @@ jobs:
       - name: Install GTK4 (Windows)
         run: |
           pipx install gvsbuild
-          gvsbuild build gtk4
+          gvsbuild build gtk4 librsvg
         if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true'
 
       # TODO: This is a workaround for https://github.com/wingtk/gvsbuild/issues/984, remove once fixed upstream

diff --git a/res/windows/wix/expected-dlls.log b/res/windows/wix/expected-dlls.log
@@ -27,6 +27,7 @@ intl.dll
 jpeg62.dll
 libexpat.dll
 libpng16.dll
+libxml2.dll
 pango-1.0-0.dll
 pangocairo-1.0-0.dll
 pangowin32-1.0-0.dll
@@ -36,6 +37,7 @@ pcre2-8.dll
 pcre2-posix.dll
 pixman-1-0.dll
 pkgconf-4.dll
+rsvg-2.0-vs17.dll
 textstyle.dll
 tiff.dll
 turbojpeg.dll

diff --git a/res/windows/wix/space-acres.wxs b/res/windows/wix/space-acres.wxs
@@ -160,6 +160,7 @@
                             <File Id='jpeg62.dll' Name='jpeg62.dll' DiskId='1' Source='target\wix\gtk4\bin\jpeg62.dll' />
                             <File Id='libexpat.dll' Name='libexpat.dll' DiskId='1' Source='target\wix\gtk4\bin\libexpat.dll' />
                             <File Id='libpng16.dll' Name='libpng16.dll' DiskId='1' Source='target\wix\gtk4\bin\libpng16.dll' />
+                            <File Id='libxml2.dll' Name='libxml2.dll' DiskId='1' Source='target\wix\gtk4\bin\libxml2.dll' />
                             <File Id='pango_1.0_0.dll' Name='pango-1.0-0.dll' DiskId='1' Source='target\wix\gtk4\bin\pango-1.0-0.dll' />
                             <File Id='pangocairo_1.0_0.dll' Name='pangocairo-1.0-0.dll' DiskId='1' Source='target\wix\gtk4\bin\pangocairo-1.0-0.dll' />
                             <File Id='pangowin32_1.0_0.dll' Name='pangowin32-1.0-0.dll' DiskId='1' Source='target\wix\gtk4\bin\pangowin32-1.0-0.dll' />
@@ -169,6 +170,7 @@
                             <File Id='pcre2_posix.dll' Name='pcre2-posix.dll' DiskId='1' Source='target\wix\gtk4\bin\pcre2-posix.dll' />
                             <File Id='pixman_1_0.dll' Name='pixman-1-0.dll' DiskId='1' Source='target\wix\gtk4\bin\pixman-1-0.dll' />
                             <File Id='pkgconf_4.dll' Name='pkgconf-4.dll' DiskId='1' Source='target\wix\gtk4\bin\pkgconf-4.dll' />
+                            <File Id='rsvg_2.0_vs17.dll' Name='rsvg-2.0-vs17.dll' DiskId='1' Source='target\wix\gtk4\bin\rsvg-2.0-vs17.dll' />
                             <File Id='textstyle.dll' Name='textstyle.dll' DiskId='1' Source='target\wix\gtk4\bin\textstyle.dll' />
                             <File Id='tiff.dll' Name='tiff.dll' DiskId='1' Source='target\wix\gtk4\bin\tiff.dll' />
                             <File Id='turbojpeg.dll' Name='turbojpeg.dll' DiskId='1' Source='target\wix\gtk4\bin\turbojpeg.dll' />