From 51dc50144ecacc9ac1f807dcc6bdf4f1d49343ae Mon Sep 17 00:00:00 2001 From: Joan Torres Date: Fri, 16 Jun 2023 16:23:30 +0200 Subject: [PATCH] build: Specify systemd version requirement Since we are specifying in the unit files a comment of requiring systemd >= 246, set the req at buildtime and drop the comment. Part-of: --- data/org.gnome.Shell@wayland.service.in | 1 - data/org.gnome.Shell@x11.service.in | 1 - meson.build | 5 +++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/org.gnome.Shell@wayland.service.in b/data/org.gnome.Shell@wayland.service.in index a1980e8a5..813da0b70 100644 --- a/data/org.gnome.Shell@wayland.service.in +++ b/data/org.gnome.Shell@wayland.service.in @@ -13,7 +13,6 @@ Requisite=gnome-session-initialized.target PartOf=gnome-session-initialized.target Before=gnome-session-initialized.target -#NOTE: ConditionEnvironment works with systemd >= 246 ConditionEnvironment=XDG_SESSION_TYPE=%I [Service] diff --git a/data/org.gnome.Shell@x11.service.in b/data/org.gnome.Shell@x11.service.in index e5785b453..63a014f14 100644 --- a/data/org.gnome.Shell@x11.service.in +++ b/data/org.gnome.Shell@x11.service.in @@ -13,7 +13,6 @@ Requisite=gnome-session-initialized.target PartOf=gnome-session-initialized.target Before=gnome-session-initialized.target -#NOTE: ConditionEnvironment works with systemd >= 246 ConditionEnvironment=XDG_SESSION_TYPE=%I # Limit startup frequency more than the default diff --git a/meson.build b/meson.build index 04b0352e9..7bef43514 100644 --- a/meson.build +++ b/meson.build @@ -29,6 +29,7 @@ mutter_req = '>= 44.0' polkit_req = '>= 0.100' schemas_req = '>= 42.beta' startup_req = '>= 0.11' +systemd_req = '>= 246' ibus_req = '>= 1.5.19' gnome_desktop_req = '>= 40' @@ -102,8 +103,8 @@ else endif if get_option('systemd') - libsystemd_dep = dependency('libsystemd') - systemd_dep = dependency('systemd') + libsystemd_dep = dependency('libsystemd', version: systemd_req) + systemd_dep = dependency('systemd', version: systemd_req) systemduserunitdir = systemd_dep.get_variable('systemduserunitdir', pkgconfig_define: ['prefix', prefix]) have_systemd = true