Skip to content

Commit

Permalink
Install the budgie-wm schema since panel code still requires it
Browse files Browse the repository at this point in the history
  • Loading branch information
fossfreedom committed Nov 20, 2024
1 parent ff0e602 commit 34125db
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 94 deletions.
2 changes: 1 addition & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ subdir('daemon')

subdir('dialogs')

#subdir('wm')
subdir('wm')
subdir('panel')

# Finish up by doing the session
Expand Down
93 changes: 0 additions & 93 deletions src/wm/meson.build
Original file line number Diff line number Diff line change
@@ -1,96 +1,3 @@
custom_target('desktop-file-wm',
input : 'budgie-wm.desktop.in',
output : 'org.buddiesofbudgie.BudgieWm.desktop',
command : [intltool, '--desktop-style', podir, '@INPUT@', '@OUTPUT@'],
install : true,
install_dir : join_paths(datadir, 'applications'))


budgie_wm_sources = [
'background.vala',
'ibus.vala',
'keyboard.vala',
'main.vala',
'shim.vala',
'wm.vala',
'screenshot.vala',
]

budgie_wm_status_vala_args = []

zenity = find_program('zenity', required: false)
assert(zenity.found(), 'Zenity is a required program at build and run-time for dialog support in budgie-wm. Please include it in both build and run deps, as well as check if you need to set use-old-zenity.')

use_old_zenity = get_option('use-old-zenity')

if use_old_zenity == false
message('Using new zenity flags')
budgie_wm_status_vala_args += ['-D', 'HAVE_NEW_ZENITY']
else
message('Using old zenity flags')
endif

dep_graphene = dependency('graphene-gobject-1.0', version: '>= 1.10')
dep_wm = dependency('libmagpie-0', version: '>= 0.9', required: false)

if dep_wm.found()
message('Using libmagpie-0 ABI')
vapi_wm = 'libmagpie-0'
else
dep_wm = dependency('libmutter-12', version: '>= 44', required: false)
if dep_wm.found()
message('Using libmutter-12 ABI from GNOME 44')
vapi_wm = 'libmutter-12'
else
dep_wm = dependency('libmutter-11', version: '>= 43', required: false)
if dep_wm.found()
message('Using libmutter-11 ABI from GNOME 43')
vapi_wm = 'libmutter-11'
else
dep_wm = dependency('libmutter-10', version: gnome_minimum_version)
if dep_wm.found()
message('Using libmutter-10 ABI from GNOME 42')
vapi_wm = 'libmutter-10'
endif
endif
endif
endif

budgie_wm_deps = [
link_libconfig,
dep_giounix,
dep_wm,
dep_xfce4windowing,
dep_gnomedesktop,
dep_ibus,
]

budgie_wm_vala_args = [
'--pkg', 'gio-unix-2.0',
'--pkg', 'ibus-1.0',
'--pkg', 'gnome-desktop-3.0',
'--pkg', vapi_wm,
'--pkg', 'budgie-config',
'--vapidir', join_paths(meson.source_root(), 'vapi'),
'--vapidir', dir_libconfig,
budgie_wm_status_vala_args,
]

rpath = dep_wm.get_pkgconfig_variable('typelibdir')
budgie_wm_vala_args += ['--girdir', rpath]

executable(
'budgie-wm', budgie_wm_sources,
dependencies: budgie_wm_deps,
include_directories: extra_includes,
install: true,
vala_args: budgie_wm_vala_args,
c_args: [
'-DGNOME_DESKTOP_USE_UNSTABLE_API',
],
install_rpath: rpath,
)

# gschemas
install_data(
files('com.solus-project.budgie.wm.gschema.xml',
Expand Down

0 comments on commit 34125db

Please sign in to comment.