Skip to content

Commit

Permalink
Increase likelihood that budgie-desktop is being shipped with require…
Browse files Browse the repository at this point in the history
…d component.

budgie-screensaver, our fork of gnome-screensaver, is required for locker functionality as of Budgie 10.5.3 due to changes in GNOME Settings Daemon and GNOME Shell (which affects the use of gdm + future locking as gnome-shell will register and keep the ScreenSaver bus, only killable via our budgie-screensaver v4 changes).

This patch introduces org.gnome.desktop.screensaver Budgie session override per suggestion from #2124 as well.
  • Loading branch information
JoshStrobl committed Apr 26, 2021
1 parent 4b95422 commit da7787b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
11 changes: 11 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ project(
],
)

budgie_screensaver = find_program('budgie-screensaver', required: false)
assert(budgie_screensaver.found(), 'Budgie Screensaver is a required separate component of Budgie Desktop. Please ensure budgie-screensaver is available at configure and run time. You can find this at https://github.com/getsolus/budgie-screensaver')

if budgie_screensaver.found()
budgie_screensaver_version_cmd = run_command('budgie-screensaver', ['--version'])
cmd_out = budgie_screensaver_version_cmd.stdout()
split_cmd = cmd_out.split(' ')
budgie_screensaver_version = split_cmd.get(1)
assert(budgie_screensaver_version.version_compare('>=4.0'), 'Budgie Screensaver must be 4.0 or higher. Found @0@'.format(budgie_screensaver_version))
endif

git = find_program('git', required: false)

am_cflags = [
Expand Down
2 changes: 2 additions & 0 deletions src/wm/20_solus-project.budgie.wm.gschema.override
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ picture-uri = 'file:///usr/share/backgrounds/budgie/default.jpg'
[org.gnome.desktop.wm.preferences:Budgie]
button-layout = 'appmenu:minimize,maximize,close'

[org.gnome.desktop.screensaver:Budgie]
picture-uri = 'file:///usr/share/backgrounds/budgie/default.jpg'

0 comments on commit da7787b

Please sign in to comment.