Skip to content

Commit 4cc5e4a

Browse files
Tobias Kortkampjnsh
authored andcommitted
build/gtk3: Add missing dependencies to gresource target
gtk3_assets and gtk3_hidpi_assets were overwritten instead of added to an array, so the gresource target only had dependencies on the last custom_targets. This fixes the build with samurai which fails with samu: job failed: /usr/local/bin/glib-compile-resources --sourcedir=common/gtk-3.0 --target=common/gtk-3.0/gtk-lighter.gresource common/gtk-3.0/gtk-lighter.gresource.xml common/gtk-3.0/gtk-lighter.gresource.xml: Failed to locate checkbox-checked.png Samurai is a Ninja-compatible build tool [0]. The above failure can probably also happen with Ninja given a sufficient number of build jobs. [0] https://github.com/michaelforney/samurai #123
1 parent b99b13b commit 4cc5e4a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

common/gtk-3.0/meson.build

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ gtk3_asset_names = run_command(
4242

4343
assets_svg = gtk3_ver / 'assets.svg'
4444

45+
gtk3_assets = []
46+
gtk3_hidpi_assets = []
47+
4548
foreach asset : gtk3_asset_names
46-
gtk3_assets = custom_target(
49+
gtk3_assets += custom_target(
4750
'gtk3-' + asset,
4851
input : assets_svg,
4952
output : asset + '.png',
@@ -58,7 +61,7 @@ foreach asset : gtk3_asset_names
5861
build_by_default : true
5962
)
6063

61-
gtk3_hidpi_assets = custom_target(
64+
gtk3_hidpi_assets += custom_target(
6265
'gtk3-' + asset + '-hidpi',
6366
input : assets_svg,
6467
output : asset + '@2.png',

0 commit comments

Comments
 (0)