brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: ensure absolute path to sysprof dbus interface dir

Browse Source 
We want sysprof's exact datadir for compatability with
platforms where software is installed into their own
individual immutable prefix's. Such that, mutter's prefix will
never equate to sysprof's. This depends on a MR in sysprof [0]
which adds datadir to its pkgconfig files, as these files will always
have the proper path we want.

This adds version a constraint on sysprof_dep, as datadir was added to
the .pc in this version.

[0]: https://gitlab.gnome.org/GNOME/sysprof/merge_requests/19

https://gitlab.gnome.org/GNOME/mutter/merge_requests/957
This commit is contained in:
worldofpeace 2019-12-04 17:25:41 -05:00 committed by Jonas Ådahl
parent 35c16a9f4b
commit 8a6673bb55
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -52,6 +52,9 @@ gbm_req = '>= 10.3'
# screen cast version requirements # screen cast version requirements
libpipewire_req = '>= 0.3.0' libpipewire_req = '>= 0.3.0'
# profiler requirements
sysprof_req = '>= 3.35.2'
gnome = import('gnome') gnome = import('gnome')
pkg = import('pkgconfig') pkg = import('pkgconfig')
i18n = import('i18n') i18n = import('i18n')
@ -276,7 +279,7 @@ endif
have_profiler = get_option('profiler') have_profiler = get_option('profiler')
if have_profiler if have_profiler
sysprof_dep = dependency('sysprof-capture-3') sysprof_dep = dependency('sysprof-capture-3', version: sysprof_req)
endif endif
required_functions = [ required_functions = [

4
src/meson.build
View File

@ -715,8 +715,8 @@ if have_profiler
'backends/meta-profiler.h', 'backends/meta-profiler.h',
] ]
dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir') sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces')
sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler', dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
sysprof3_dbus_file, sysprof3_dbus_file,