Path: blob/main/deskutils/bijiben/files/patch-src_libbiji_meson.build
17397 views
From 6dd31c362b264a7d7e5441310ee5baebb3769ac5 Mon Sep 17 00:00:00 20011From: Michael Forney <mforney@mforney.org>2Date: Fri, 9 Apr 2021 21:45:13 -07003Subject: [PATCH] Add generated biji-marshalers.h to libbiji dependency sources45The meson manual states that67> Each target that depends on a generated header should add that8> header to it's sources, as seen above with libfoo and myexe. This9> is because there is no way for Meson or the backend to know that10> myexe depends on foo.h just because libfoo does, it could be a11> private header.1213Since biji-marshalers.h is included by the libbiji public header14libbiji.h, it must be added as a source to all targets that depend15on libbiji. This can be done by adding it to the sources of16libbiji_dep.1718Fixes #157.1920https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/1162122--- src/libbiji/meson.build.orig 2020-09-20 21:32:11 UTC23+++ src/libbiji/meson.build24@@ -27,11 +27,9 @@ sources = files(25'../bjb-utils.c',26)2728-marshalers = 'biji-marshalers'29-30-sources += gnome.genmarshal(31- marshalers,32- sources: marshalers + '.list',33+marshalers = gnome.genmarshal(34+ 'biji-marshalers',35+ sources: 'biji-marshalers.list',36prefix: '_biji_marshal'37)3839@@ -48,7 +46,7 @@ endif4041libbiji = static_library(42'biji',43- sources: sources,44+ sources: sources + marshalers,45include_directories: top_inc,46dependencies: deps,47c_args: cflags48@@ -57,5 +55,6 @@ libbiji = static_library(49libbiji_dep = declare_dependency(50link_with: libbiji,51include_directories: include_directories('.'),52- dependencies: deps53+ dependencies: deps,54+ sources: marshalers[1],55)565758