diff options
| author | Nelson Benítez León <nbenitezl@gmail.com> | 2023-04-24 23:52:33 -0400 |
|---|---|---|
| committer | Felipe Borges <felipeborges@gnome.org> | 2023-05-02 11:33:31 +0000 |
| commit | 6fb6ba1dc99da6a9713de98f3aca6fd45997ead8 (patch) | |
| tree | bc4bedefde10ce68c8291b68c8edc978131e5c42 | |
| parent | b1850b5c8abdeaf12b68ebc88b96ca047f7f1a98 (diff) | |
| download | gnome-control-center-6fb6ba1dc99da6a9713de98f3aca6fd45997ead8.tar.gz | |
meson: improve comment and fix deprecated functions
- Clarify that 'mm-glib' dep is for ModemManager (not Network
Manager which is below). The comment also helps people
which may confuse it with glibmm library.
- Fix following Meson warning about two deprecated functions:
WARNING: Deprecated features used:
* 0.56.0: {'dependency.get_pkgconfig_variable', 'meson.source_root'}
| -rw-r--r-- | meson.build | 7 | ||||
| -rw-r--r-- | panels/background/meson.build | 2 | ||||
| -rw-r--r-- | panels/datetime/meson.build | 2 | ||||
| -rw-r--r-- | tests/datetime/meson.build | 2 | ||||
| -rw-r--r-- | tests/network/meson.build | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/meson.build b/meson.build index 0514e7d42..1d41d237d 100644 --- a/meson.build +++ b/meson.build @@ -238,8 +238,9 @@ config_h.set('HAVE_MALCONTENT', enable_malcontent, description: 'Define to 1 if malcontent support is enabled') if host_is_linux - # network manager + # ModemManager mm_dep = dependency('mm-glib', version: '>= 0.7') + # NetworkManager network_manager_deps = [ dependency('libnm', version: '>= 1.24.0'), dependency('libnma-gtk4', version: '>= 1.10.2'), @@ -285,8 +286,8 @@ gnome = import('gnome') i18n = import('i18n') pkg = import('pkgconfig') -po_dir = join_paths(meson.source_root(), 'po') -its_dir = join_paths(meson.source_root(), 'gettext') +po_dir = join_paths(meson.project_source_root(), 'po') +its_dir = join_paths(meson.project_source_root(), 'gettext') install_subdir( 'gettext', diff --git a/panels/background/meson.build b/panels/background/meson.build index 69af0cfea..bffacfb3a 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build @@ -19,7 +19,7 @@ common_sources = [] enums = 'gdesktop-enums-types' enums_header = files( - gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', 'cc-background-item.h' ) diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build index 3b6f5e197..f827f5c8f 100644 --- a/panels/datetime/meson.build +++ b/panels/datetime/meson.build @@ -45,7 +45,7 @@ sources = files( enums = 'gdesktop-enums-types' enums_header = files( - gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', 'cc-datetime-panel.h' ) diff --git a/tests/datetime/meson.build b/tests/datetime/meson.build index c9f07877c..021036881 100644 --- a/tests/datetime/meson.build +++ b/tests/datetime/meson.build @@ -14,7 +14,7 @@ env = [ ] cflags = [ '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir()), - '-DSRCDIR="@0@"'.format(meson.source_root() + '/panels/datetime') + '-DSRCDIR="@0@"'.format(meson.project_source_root() + '/panels/datetime') ] foreach unit: test_units diff --git a/tests/network/meson.build b/tests/network/meson.build index e09ec5cab..a81e64753 100644 --- a/tests/network/meson.build +++ b/tests/network/meson.build @@ -5,7 +5,7 @@ cflags = [ '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir()), '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_WITH_GLIB', '-DNETWORKMANAGER_COMPILATION_TEST', - '-DTEST_NM_SERVICE="@0@"'.format(join_paths(meson.source_root(), 'tests', 'network', 'nm-utils', 'test-networkmanager-service.py')), + '-DTEST_NM_SERVICE="@0@"'.format(join_paths(meson.project_source_root(), 'tests', 'network', 'nm-utils', 'test-networkmanager-service.py')), ] exe = executable( |