From 3cfadc7891c7fcbf9b2067d1445ed1b20cef2275 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Fri, 22 Dec 2023 20:02:51 +0400 Subject: [PATCH 1/3] Add meson support --- data/meson.build | 3 +++ meson.build | 12 ++++++++++++ session/meson.build | 9 +++++++++ 3 files changed, 24 insertions(+) create mode 100644 data/meson.build create mode 100644 meson.build create mode 100644 session/meson.build diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..e884c4e --- /dev/null +++ b/data/meson.build @@ -0,0 +1,3 @@ +install_data('10_mate-wayland.gschema.override', + install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas'), +) diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..3ad97e4 --- /dev/null +++ b/meson.build @@ -0,0 +1,12 @@ +project('mate-wayland-session', + version: '1.27.0', + meson_version: '>=0.50.0', + license: 'GPLv2+', +) + +prefix = get_option('prefix') +bindir = join_paths(prefix, get_option('bindir')) +datadir = join_paths(prefix, get_option('datadir')) + +subdir('data') +subdir('session') diff --git a/session/meson.build b/session/meson.build new file mode 100644 index 0000000..46f346c --- /dev/null +++ b/session/meson.build @@ -0,0 +1,9 @@ +install_data('mate-wayland-components.sh', + install_dir: get_option('bindir')) + +install_data('mate-wayland.sh', + install_dir: get_option('bindir')) + +install_data('MATE.desktop', + install_dir: join_paths(get_option('datadir'), 'wayland-sessions'), +) From 041e9011575f41d3b36af4e59aacfd4a44bf22d8 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Fri, 22 Dec 2023 20:09:38 +0400 Subject: [PATCH 2/3] Remove unused vars --- meson.build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meson.build b/meson.build index 3ad97e4..d854d5a 100644 --- a/meson.build +++ b/meson.build @@ -4,9 +4,5 @@ project('mate-wayland-session', license: 'GPLv2+', ) -prefix = get_option('prefix') -bindir = join_paths(prefix, get_option('bindir')) -datadir = join_paths(prefix, get_option('datadir')) - subdir('data') subdir('session') From 9bc03ecd9cfdb7ba16a76fa6a569982222d3d422 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Fri, 22 Dec 2023 22:51:30 +0400 Subject: [PATCH 3/3] Add meson-postinstall script --- meson-postinstall.sh | 6 ++++++ meson.build | 2 ++ 2 files changed, 8 insertions(+) create mode 100755 meson-postinstall.sh diff --git a/meson-postinstall.sh b/meson-postinstall.sh new file mode 100755 index 0000000..36b2677 --- /dev/null +++ b/meson-postinstall.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -z "$DESTDIR" ]; then + echo Compiling GSettings schemas... + glib-compile-schemas ${MESON_INSTALL_PREFIX}/share/glib-2.0/schemas +fi diff --git a/meson.build b/meson.build index d854d5a..d5d5f12 100644 --- a/meson.build +++ b/meson.build @@ -6,3 +6,5 @@ project('mate-wayland-session', subdir('data') subdir('session') + +meson.add_install_script('meson-postinstall.sh')