Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save Tireg/840230b3e1b16c740945ef64109a2629 to your computer and use it in GitHub Desktop.
Save Tireg/840230b3e1b16c740945ef64109a2629 to your computer and use it in GitHub Desktop.
Fix Gala building with mutter 3.30 (See https://github.com/elementary/gala/issues/303 for instructions)
diff --git a/lib/meson.build b/lib/meson.build
index 3c2a0c4..d100a50 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -25,7 +25,6 @@ gala_lib = shared_library(
version : '0.0.0',
vala_args: [
'--pkg', 'config',
- '--pkg', 'compat',
],
)
diff --git a/meson.build b/meson.build
index 5d2236b..2b681bd 100644
--- a/meson.build
+++ b/meson.build
@@ -67,7 +67,6 @@ add_project_arguments([
'--vapidir=' + join_paths(meson.source_root(), 'vapi'),
'--pkg', 'config',
'--pkg', 'cogl-fixes',
- '--pkg', 'compat',
],
language: 'vala',
)
@@ -226,21 +225,21 @@ if mutter328_dep.found()
'-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c')
endif
-mutter330_dep = dependency('libmutter-2', version: ['>= 3.29.2', '< 3.31'], required: false)
+mutter330_dep = dependency('libmutter-3', version: ['>= 3.29.2', '< 3.31'], required: false)
if mutter330_dep.found()
mutter_packages_command = [
- '--pkg', 'libmutter-2',
- '--pkg', 'mutter-cogl-2',
- '--pkg', 'mutter-cogl-pango-2',
- '--pkg', 'mutter-cogl-path-2',
- '--pkg', 'mutter-clutter-2'
+ '--pkg', 'libmutter-3',
+ '--pkg', 'mutter-cogl-3',
+ '--pkg', 'mutter-cogl-pango-3',
+ '--pkg', 'mutter-cogl-path-3',
+ '--pkg', 'mutter-clutter-3'
]
- libmutter_dep = dependency('libmutter-2', version: '>= 3.29.2')
- pkgconf.set('MUTTER_PKGS', 'libmutter-2 >= 3.29.2')
+ libmutter_dep = dependency('libmutter-3', version: '>= 3.29.2')
+ pkgconf.set('MUTTER_PKGS', 'libmutter-3 >= 3.29.2')
mutter_dep = [
libmutter_dep,
- dependency('mutter-cogl-2'), dependency('mutter-cogl-pango-2'),
- dependency('mutter-cogl-path-2'), dependency('mutter-clutter-2')
+ dependency('mutter-cogl-3'), dependency('mutter-cogl-pango-3'),
+ dependency('mutter-cogl-path-3'), dependency('mutter-clutter-3')
]
vala_flags += ['--define', 'HAS_MUTTER320', '--define', 'HAS_MUTTER322', '--define', 'HAS_MUTTER324', '--define', 'HAS_MUTTER326', '--define', 'HAS_MUTTER328', '--define', 'HAS_MUTTER330']
add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API',
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment