[mutter] build: ensure absolute path to sysprof dbus interface dir



commit 8a6673bb5589291859b1a5d3933a845f0658c09b
Author: worldofpeace <worldofpeace protonmail ch>
Date:   Wed Dec 4 17:25:41 2019 -0500

    build: ensure absolute path to sysprof dbus interface dir
    
    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

 meson.build     | 5 ++++-
 src/meson.build | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5463b1a9f..666ba68a7 100644
--- a/meson.build
+++ b/meson.build
@@ -52,6 +52,9 @@ gbm_req = '>= 10.3'
 # screen cast version requirements
 libpipewire_req = '>= 0.3.0'
 
+# profiler requirements
+sysprof_req = '>= 3.35.2'
+
 gnome = import('gnome')
 pkg = import('pkgconfig')
 i18n  = import('i18n')
@@ -276,7 +279,7 @@ endif
 
 have_profiler = get_option('profiler')
 if have_profiler
-  sysprof_dep = dependency('sysprof-capture-3')
+  sysprof_dep = dependency('sysprof-capture-3', version: sysprof_req)
 endif
 
 required_functions = [
diff --git a/src/meson.build b/src/meson.build
index 85f24e963..b882b5350 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -715,8 +715,8 @@ if have_profiler
     'backends/meta-profiler.h',
   ]
 
-  dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir')
-  sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
+  sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 
'interfaces')
+  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',
       sysprof3_dbus_file,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]