brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Specify systemd version requirement

Browse Source 
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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2800>
This commit is contained in:
Joan Torres 2023-06-16 16:23:30 +02:00 committed by Marge Bot
parent 95f923f21a
commit 51dc50144e
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/org.gnome.Shell@wayland.service.in
View File

@ -13,7 +13,6 @@ Requisite=gnome-session-initialized.target
PartOf=gnome-session-initialized.target PartOf=gnome-session-initialized.target
Before=gnome-session-initialized.target Before=gnome-session-initialized.target
#NOTE: ConditionEnvironment works with systemd >= 246
ConditionEnvironment=XDG_SESSION_TYPE=%I ConditionEnvironment=XDG_SESSION_TYPE=%I
[Service] [Service]

1
data/org.gnome.Shell@x11.service.in
View File

@ -13,7 +13,6 @@ Requisite=gnome-session-initialized.target
PartOf=gnome-session-initialized.target PartOf=gnome-session-initialized.target
Before=gnome-session-initialized.target Before=gnome-session-initialized.target
#NOTE: ConditionEnvironment works with systemd >= 246
ConditionEnvironment=XDG_SESSION_TYPE=%I ConditionEnvironment=XDG_SESSION_TYPE=%I
# Limit startup frequency more than the default # Limit startup frequency more than the default

5
meson.build
View File

@ -29,6 +29,7 @@ mutter_req = '>= 44.0'
polkit_req = '>= 0.100' polkit_req = '>= 0.100'
schemas_req = '>= 42.beta' schemas_req = '>= 42.beta'
startup_req = '>= 0.11' startup_req = '>= 0.11'
systemd_req = '>= 246'
ibus_req = '>= 1.5.19' ibus_req = '>= 1.5.19'
gnome_desktop_req = '>= 40' gnome_desktop_req = '>= 40'
@ -102,8 +103,8 @@ else
endif endif
if get_option('systemd') if get_option('systemd')
libsystemd_dep = dependency('libsystemd') libsystemd_dep = dependency('libsystemd', version: systemd_req)
systemd_dep = dependency('systemd') systemd_dep = dependency('systemd', version: systemd_req)
systemduserunitdir = systemd_dep.get_variable('systemduserunitdir', systemduserunitdir = systemd_dep.get_variable('systemduserunitdir',
pkgconfig_define: ['prefix', prefix]) pkgconfig_define: ['prefix', prefix])
have_systemd = true have_systemd = true