Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix gala-x11.service timeout #1265

Merged
merged 2 commits into from
Oct 4, 2021
Merged

Fix gala-x11.service timeout #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a5ebb
Fix gala-x11.service timeout
bobby285271 Oct 4, 2021
22b5a32
Merge branch 'master' into systemd
Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ m_dep = cc.find_library('m', required: false)
posix_dep = vala.find_library('posix', required: false)
gexiv2_dep = dependency('gexiv2')
if get_option('systemd')
systemd_dep = cc.find_library('libsystemd', required: false)
systemd_dep = dependency('libsystemd')
endif

mutter_dep = []
Expand Down Expand Up @@ -163,14 +163,17 @@ endif

mutter_typelib_dir = libmutter_dep.get_pkgconfig_variable('typelibdir')

if get_option('systemd')
vala_flags += ['--define', 'WITH_SYSTEMD']
endif

add_project_arguments(vala_flags, language: 'vala')
add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c')

gala_base_dep = [canberra_dep, glib_dep, gobject_dep, gio_dep, gmodule_dep, gee_dep, gtk_dep, plank_dep, mutter_dep, granite_dep, gnome_desktop_dep, m_dep, posix_dep, gexiv2_dep, config_dep]

if get_option('systemd')
gala_base_dep += systemd_dep
vala_flags += ['--define', 'WITH_SYSTEMD']
endif

subdir('data')
Expand Down
0 vapi/systemd.vapi → vapi/libsystemd.vapi
View file
Open in desktop
File renamed without changes.