From owner-dev-commits-ports-main@freebsd.org Sat Apr 10 07:15:29 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 A462E5C6029; Sat, 10 Apr 2021 07:15:29 +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 4FHR9F2rVpz4bZl; Sat, 10 Apr 2021 07:15:29 +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 4A77A4F50; Sat, 10 Apr 2021 07:15:29 +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 13A7FTLE009587; Sat, 10 Apr 2021 07:15:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13A7FTPD009586; Sat, 10 Apr 2021 07:15:29 GMT (envelope-from git) Date: Sat, 10 Apr 2021 07:15:29 GMT Message-Id: <202104100715.13A7FTPD009586@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: 20bc3c521ab4 - main - deskutils/bijiben: Add generated biji-marshalers.h to libbiji dependency sources (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: 20bc3c521ab47cb3435c108a41113e98f8a3d805 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: Sat, 10 Apr 2021 07:15:29 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=20bc3c521ab47cb3435c108a41113e98f8a3d805 commit 20bc3c521ab47cb3435c108a41113e98f8a3d805 Author: Michael Forney AuthorDate: 2021-04-10 07:15:00 +0000 Commit: Tobias Kortkamp CommitDate: 2021-04-10 07:15:00 +0000 deskutils/bijiben: Add generated biji-marshalers.h to libbiji dependency sources (D29353) The meson manual states that > Each target that depends on a generated header should add that > header to it's sources, as seen above with libfoo and myexe. This > is because there is no way for Meson or the backend to know that > myexe depends on foo.h just because libfoo does, it could be a > private header. Since biji-marshalers.h is included by the libbiji public header libbiji.h, it must be added as a source to all targets that depend on libbiji. This can be done by adding it to the sources of libbiji_dep. This should unbreak the build with samurai. https://github.com/michaelforney/samurai/issues/70 PR: 254678 --- .../bijiben/files/patch-src_libbiji_meson.build | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/deskutils/bijiben/files/patch-src_libbiji_meson.build b/deskutils/bijiben/files/patch-src_libbiji_meson.build new file mode 100644 index 000000000000..0365e6ee7ac1 --- /dev/null +++ b/deskutils/bijiben/files/patch-src_libbiji_meson.build @@ -0,0 +1,56 @@ +From 6dd31c362b264a7d7e5441310ee5baebb3769ac5 Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Fri, 9 Apr 2021 21:45:13 -0700 +Subject: [PATCH] Add generated biji-marshalers.h to libbiji dependency sources + +The meson manual states that + +> Each target that depends on a generated header should add that +> header to it's sources, as seen above with libfoo and myexe. This +> is because there is no way for Meson or the backend to know that +> myexe depends on foo.h just because libfoo does, it could be a +> private header. + +Since biji-marshalers.h is included by the libbiji public header +libbiji.h, it must be added as a source to all targets that depend +on libbiji. This can be done by adding it to the sources of +libbiji_dep. + +Fixes #157. + +https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/116 + +--- src/libbiji/meson.build.orig 2020-09-20 21:32:11 UTC ++++ src/libbiji/meson.build +@@ -27,11 +27,9 @@ sources = files( + '../bjb-utils.c', + ) + +-marshalers = 'biji-marshalers' +- +-sources += gnome.genmarshal( +- marshalers, +- sources: marshalers + '.list', ++marshalers = gnome.genmarshal( ++ 'biji-marshalers', ++ sources: 'biji-marshalers.list', + prefix: '_biji_marshal' + ) + +@@ -48,7 +46,7 @@ endif + + libbiji = static_library( + 'biji', +- sources: sources, ++ sources: sources + marshalers, + include_directories: top_inc, + dependencies: deps, + c_args: cflags +@@ -57,5 +55,6 @@ libbiji = static_library( + libbiji_dep = declare_dependency( + link_with: libbiji, + include_directories: include_directories('.'), +- dependencies: deps ++ dependencies: deps, ++ sources: marshalers[1], + )