From owner-dev-commits-ports-main@freebsd.org Wed Apr 7 04:20:20 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 B6ABF5C93DD; Wed, 7 Apr 2021 04:20:20 +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 4FFWQX40Qvz3nTY; Wed, 7 Apr 2021 04:20:20 +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 C0AD418AAE; Wed, 7 Apr 2021 04:20:17 +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 1374KHhM023340; Wed, 7 Apr 2021 04:20:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1374KHHo023337; Wed, 7 Apr 2021 04:20:17 GMT (envelope-from git) Date: Wed, 7 Apr 2021 04:20:17 GMT Message-Id: <202104070420.1374KHHo023337@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: 6428be406482 - main - x11/brisk-menu: Attempt 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: 6428be4064828417c59ea99b98fa5ef404f70e25 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 04:20:20 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=6428be4064828417c59ea99b98fa5ef404f70e25 commit 6428be4064828417c59ea99b98fa5ef404f70e25 Author: Tobias Kortkamp AuthorDate: 2021-04-07 03:48:51 +0000 Commit: Tobias Kortkamp CommitDate: 2021-04-07 04:20:00 +0000 x11/brisk-menu: Attempt to fix build order bug (D29353) Uncovered while building with devel/samurai but can probably also happen with ninja eventually. In file included from ../src/mate-applet/applet.c:19: In file included from ../src/frontend/classic/classic-window.h:14: ../src/frontend/classic/../menu-private.h:18:10: fatal error: 'libsaver-glue.h' file not found #include "libsaver-glue.h" ^~~~~~~~~~~~~~~~~ 1 error generated. samu: subcommands failed http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/brisk-menu-0.6.2.log PR: 254678 --- x11/brisk-menu/files/patch-src_meson.build | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/x11/brisk-menu/files/patch-src_meson.build b/x11/brisk-menu/files/patch-src_meson.build new file mode 100644 index 000000000000..5b311b77f43b --- /dev/null +++ b/x11/brisk-menu/files/patch-src_meson.build @@ -0,0 +1,20 @@ +Attempt to unbreak parallel build + +--- src/meson.build.orig 2021-04-05 04:30:02 UTC ++++ src/meson.build +@@ -13,6 +13,7 @@ libresources = static_library( + + link_libresources = declare_dependency( + link_with: libresources, ++ sources: brisk_resources, + include_directories: [ + data_include, + ], +@@ -38,6 +39,7 @@ libsession_stub = static_library( + # Allow linking to the stub + link_libsession_stub = declare_dependency( + link_with: libsession_stub, ++ sources: [libsaver_glue, libsession_glue], + dependencies: [ + dep_gio_unix, + ],