Skip to content

Commit

Permalink
Bundle the webp pixbuf loader with the Windows build
Browse files Browse the repository at this point in the history
Bug: #770
  • Loading branch information
cameronwhite committed May 13, 2024
1 parent 6cad5c7 commit b930be3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
with:
path-type: inherit # Inherit the path so that dotnet can be found
update: true
install: mingw-w64-x86_64-libadwaita
install: mingw-w64-x86_64-libadwaita mingw-w64-x86_64-webp-pixbuf-loader
- name: Build
run: dotnet build Pinta.sln -c Release -p:MinGWFolder=${MINGW_PREFIX}
- name: Test
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Thanks to the following contributors who worked on this release:
- Added a nearest-neighbor resampling mode when resizing images (#596)
- Added support for customizable gradients in the fractal and clouds effects (#578, #678, #683)
- Added a new `Offset Selection` option to the `Edit` menu to expand or contract the current selection (#661, #740, #746)
- The Windows build of Pinta now supports loading `.webp` images (#770)

### Changed
- When building Pinta using the Makefile, 'dotnet publish' is now run during the build step rather than the install step.
Expand Down
5 changes: 5 additions & 0 deletions installer/windows/bundle_gtk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@
<GtkFile Include="$(MinGWBinFolder)\librsvg-2-2.dll" />
<GtkFile Include="$(MinGWBinFolder)\libxml2-2.dll" />

<!-- Additional dependencies for the webp pixbuf loader. -->
<GtkFile Include="$(MinGWBinFolder)\libwebp-7.dll" />
<GtkFile Include="$(MinGWBinFolder)\libwebpdemux-2.dll" />
<GtkFile Include="$(MinGWBinFolder)\libwebpmux-3.dll" />

<GtkFile Include="$(MinGWBinFolder)\gdbus.exe" />
<GtkFile Include="$(MinGWBinFolder)\gdk-pixbuf-query-loaders.exe" />
<GtkFile Include="$(MinGWBinFolder)\gspawn-win64-helper.exe" />
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Used under [Creative Commons Attribution 3.0 License](http://creativecommons.org

First, install the required GTK-related dependencies:
- Install MinGW64 via [MSYS2](https://www.msys2.org)
- From the MinGW64 terminal, run `pacman -S mingw-w64-x86_64-libadwaita` to install `libadwaita`.
- From the MinGW64 terminal, run `pacman -S mingw-w64-x86_64-libadwaita mingw-w64-x86_64-webp-pixbuf-loader`.

Pinta can then be built by opening `Pinta.sln` in [Visual Studio](https://visualstudio.microsoft.com/).
Ensure that .NET 8 is installed via the Visual Studio installer.
Expand Down

0 comments on commit b930be3

Please sign in to comment.