Date: Wed, 7 Apr 2021 11:54:16 GMT From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5f925921c7fb - main - x11-themes/gtk-arc-themes: Try to fix build order bug (D29353) Message-ID: <202104071154.137BsGH9027800@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f925921c7fb2282b2673b38a4fafd4545fcbe1d commit 5f925921c7fb2282b2673b38a4fafd4545fcbe1d Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2021-04-07 11:46:27 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2021-04-07 11:49:50 +0000 x11-themes/gtk-arc-themes: Try to fix build order bug (D29353) Uncovered while building with devel/samurai but can probably also happen with ninja eventually. 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 http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-05_21h03m50s/logs/errors/gtk-arc-themes-20210127.log PR: 254678 --- .../files/patch-common_gtk-3.0_meson.build | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/x11-themes/gtk-arc-themes/files/patch-common_gtk-3.0_meson.build b/x11-themes/gtk-arc-themes/files/patch-common_gtk-3.0_meson.build new file mode 100644 index 000000000000..0adc3b379d42 --- /dev/null +++ b/x11-themes/gtk-arc-themes/files/patch-common_gtk-3.0_meson.build @@ -0,0 +1,28 @@ +Try to fix build order bug + +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 + +--- common/gtk-3.0/meson.build.orig 2021-04-07 08:43:47 UTC ++++ common/gtk-3.0/meson.build +@@ -42,8 +42,10 @@ gtk3_asset_names = run_command( + + assets_svg = gtk3_ver / 'assets.svg' + ++gtk3_assets = [] ++gtk3_hidpi_assets = [] + foreach asset : gtk3_asset_names +- gtk3_assets = custom_target( ++ gtk3_assets += custom_target( + 'gtk3-' + asset, + input : assets_svg, + output : asset + '.png', +@@ -58,7 +60,7 @@ foreach asset : gtk3_asset_names + build_by_default : true + ) + +- gtk3_hidpi_assets = custom_target( ++ gtk3_hidpi_assets += custom_target( + 'gtk3-' + asset + '-hidpi', + input : assets_svg, + output : asset + '@2.png',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104071154.137BsGH9027800>