From owner-dev-commits-ports-main@freebsd.org Wed Apr 7 11:54:16 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE7875D3BFE; Wed, 7 Apr 2021 11:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFjVJ5Y99z3Bp5; Wed, 7 Apr 2021 11:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B12801E969; Wed, 7 Apr 2021 11:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 137BsGAb027801; Wed, 7 Apr 2021 11:54:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 137BsGH9027800; Wed, 7 Apr 2021 11:54:16 GMT (envelope-from git) Date: Wed, 7 Apr 2021 11:54:16 GMT Message-Id: <202104071154.137BsGH9027800@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 5f925921c7fb - main - x11-themes/gtk-arc-themes: Try to fix build order bug (D29353) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f925921c7fb2282b2673b38a4fafd4545fcbe1d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 11:54:16 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f925921c7fb2282b2673b38a4fafd4545fcbe1d commit 5f925921c7fb2282b2673b38a4fafd4545fcbe1d Author: Tobias Kortkamp AuthorDate: 2021-04-07 11:46:27 +0000 Commit: Tobias Kortkamp 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',