applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common: Add a missing dependency on cc-common-resources.h

Browse source 
cc-common-resources.h is used by both libwidgets and liblanguage, and
so must be generated before they build. However, Meson wasn't aware
of this dependency which resulted in a race condition during build.

Conveniently, "generates_sources_dep" already contains other generated
sources used by these two libraries, so adding cc-common-resources.h
to this list is enough to declare the dependency.
This commit is contained in:
Dor Askayo 2022-02-20 01:26:12 +02:00 • committed by Georges Basile Stavracas Neto
parent 18b7f6f026
commit 9401881a38
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
panels/common/meson.build
View file

@ -24,6 +24,22 @@ common_sources += gnome.mkenums(
vtail: ' { 0, NULL, NULL }\n };\n etype = g_@type@_register_static ("@EnumName@", values);\n }\n return etype;\n}\n'
)
resource_data = files(
'cc-language-chooser.ui',
'cc-language-row.ui',
'cc-list-row.ui',
'cc-time-editor.ui',
'cc-permission-infobar.ui',
)
common_sources += gnome.compile_resources(
'cc-common-resources',
'common.gresource.xml',
c_name: 'cc_common',
dependencies: resource_data,
export: true
)
generates_sources_dep = declare_dependency(
sources: common_sources,
)
@ -55,22 +71,6 @@ sources = common_sources + files(
'cc-util.c'
)
resource_data = files(
'cc-language-chooser.ui',
'cc-language-row.ui',
'cc-list-row.ui',
'cc-time-editor.ui',
'cc-permission-infobar.ui',
)
sources += gnome.compile_resources(
'cc-common-resources',
'common.gresource.xml',
c_name: 'cc_common',
dependencies: resource_data,
export: true
)
deps = common_deps + [
generates_sources_dep,
gnome_desktop_dep,