This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/8/head
in repository efl.
View the commit online.
commit 65f312e46736e8498d5dddb36a3f9318e1e5cfcd
Author: Dmitri Chudinov <dimmus@noreply.localhost>
AuthorDate: Fri Jul 22 06:17:50 2022 -0700
revert e08edfc068b57fb75cf871c27d6ed11aef7f585d
revert meson: changed deprecated since 0.56 (0.58) method get_pkgconfig_variable() to get_variable()
---
dbus-services/meson.build | 2 +-
meson.build | 4 ++--
src/wayland_protocol/meson.build | 4 ++--
systemd-services/meson.build | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dbus-services/meson.build b/dbus-services/meson.build
index 203c432264..29fe392411 100644
--- a/dbus-services/meson.build
+++ b/dbus-services/meson.build
@@ -15,4 +15,4 @@ configure_file(
input: 'org.enlightenment.Ethumb.service.in',
output: 'org.enlightenment.Ethumb.service',
configuration: org_enlightenment_ethumb_service_config,
- install_dir: dep.get_variable('session_bus_services_dir'))
+ install_dir: dep.get_pkgconfig_variable('session_bus_services_dir'))
diff --git a/meson.build b/meson.build
index 534ec1ee61..5c5ee7cacb 100644
--- a/meson.build
+++ b/meson.build
@@ -298,8 +298,8 @@ if sys_osx and get_option('lua-interpreter') == 'luajit'
# dependency with our arguments, a library later still needs to link to
# luajit for the pagesize argument thingy
lua = declare_dependency(
- include_directories: include_directories(lua.get_variable('includedir')),
- link_args: ['-L' + lua.get_variable('libdir'), '-l' + lua.get_variable('libname')]
+ include_directories: include_directories(lua.get_pkgconfig_variable('includedir')),
+ link_args: ['-L' + lua.get_pkgconfig_variable('libdir'), '-l' + lua.get_pkgconfig_variable('libname')]
)
endif
diff --git a/src/wayland_protocol/meson.build b/src/wayland_protocol/meson.build
index 43a8abbd9d..a61f8c8de3 100644
--- a/src/wayland_protocol/meson.build
+++ b/src/wayland_protocol/meson.build
@@ -22,13 +22,13 @@ wl_stable_protocol_sys = [
foreach sys_protocol : wl_unstable_protocol_sys
wl_protocol_local += [
- join_paths(_wayland_protocols.get_variable('pkgdatadir'), 'unstable',
+ join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable',
sys_protocol)]
endforeach
foreach sys_protocol : wl_stable_protocol_sys
wl_protocol_local += [
- join_paths(_wayland_protocols.get_variable('pkgdatadir'), 'stable',
+ join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'stable',
sys_protocol)]
endforeach
diff --git a/systemd-services/meson.build b/systemd-services/meson.build
index 373147e548..a17790e857 100644
--- a/systemd-services/meson.build
+++ b/systemd-services/meson.build
@@ -1,7 +1,7 @@
if get_option('systemd') == true
sys_dep = dependency('systemd', required: false)
if sys_dep.found()
- sys_dir = sys_dep.get_variable('systemduserunitdir')
+ sys_dir = sys_dep.get_pkgconfig_variable('systemduserunitdir')
else
sys_dir = join_paths(dir_lib, 'systemd', 'user')
endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
