[gedit/tchaik/meson-0.49.0: 3/3] build: Ensure of meson 0.49.0 support
- From: Martin Blanchard <mablanch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/tchaik/meson-0.49.0: 3/3] build: Ensure of meson 0.49.0 support
- Date: Tue, 5 Nov 2019 08:31:53 +0000 (UTC)
commit e25005907bab539877b790d36f93fa931d497d4b
Author: Martin Blanchard <tchaik gmx com>
Date: Tue Sep 17 21:08:20 2019 +0200
build: Ensure of meson 0.49.0 support
Meson scripts are currently using 0.50.0 features but are only
requesting meson >= 0.46.0: fix dependency to 0.49.0 (like main
dependencies libpeas and gtksourceview).
data/meson.build | 5 ++---
meson.build | 2 +-
plugins/checkupdate/meson.build | 1 -
plugins/externaltools/meson.build | 1 -
plugins/filebrowser/meson.build | 1 -
plugins/pythonconsole/meson.build | 1 -
plugins/spell/meson.build | 1 -
plugins/time/meson.build | 1 -
8 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 1eb35223e..ecf473a29 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -20,6 +20,7 @@ appdata_file = i18n.merge_file(
'metainfo',
)
)
+
appstream_util = find_program('appstream-util', required: false)
if appstream_util.found()
test(
@@ -39,7 +40,6 @@ desktop_file_configured = configure_file(
input: 'org.gnome.gedit.desktop.in.in',
output: 'org.gnome.gedit.desktop.in',
configuration: desktop_in,
- install: false,
)
desktop_file = i18n.merge_file(
@@ -54,6 +54,7 @@ desktop_file = i18n.merge_file(
'applications',
)
)
+
desktop_file_validate = find_program('desktop-file-validate', required: false)
if desktop_file_validate.found()
test(
@@ -80,7 +81,6 @@ configure_file(
input: 'org.gnome.gedit.gschema.xml.in',
output: 'org.gnome.gedit.gschema.xml',
configuration: gschema_xml,
- install: true,
install_dir: join_paths(
glibdir,
'schemas',
@@ -94,7 +94,6 @@ configure_file(
input: 'org.gnome.gedit.service.in',
output: 'org.gnome.gedit.service',
configuration: service_in,
- install: true,
install_dir: join_paths(
dbusdir,
'services',
diff --git a/meson.build b/meson.build
index 142ce79d0..ddb591e60 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project(
'gedit', 'c',
version: '3.34.0',
- meson_version: '>=0.46.0',
+ meson_version: '>=0.49.0',
license: 'GPL2'
)
diff --git a/plugins/checkupdate/meson.build b/plugins/checkupdate/meson.build
index d527ddb2c..94b4e8b0d 100644
--- a/plugins/checkupdate/meson.build
+++ b/plugins/checkupdate/meson.build
@@ -29,7 +29,6 @@ configure_file(
input: 'org.gnome.gedit.plugins.checkupdate.gschema.xml.in',
output: 'org.gnome.gedit.plugins.checkupdate.gschema.xml',
configuration: gschema_xml,
- install: true,
install_dir: join_paths(
glibdir,
'schemas',
diff --git a/plugins/externaltools/meson.build b/plugins/externaltools/meson.build
index cc05c1267..75a23a144 100644
--- a/plugins/externaltools/meson.build
+++ b/plugins/externaltools/meson.build
@@ -6,7 +6,6 @@ configure_file(
input: 'org.gnome.gedit.plugins.externaltools.gschema.xml.in',
output: 'org.gnome.gedit.plugins.externaltools.gschema.xml',
configuration: gschema_xml,
- install: true,
install_dir: join_paths(
glibdir,
'schemas',
diff --git a/plugins/filebrowser/meson.build b/plugins/filebrowser/meson.build
index 94a4ab0a6..7bae8f4ac 100644
--- a/plugins/filebrowser/meson.build
+++ b/plugins/filebrowser/meson.build
@@ -105,7 +105,6 @@ configure_file(
input: 'org.gnome.gedit.plugins.filebrowser.gschema.xml.in',
output: 'org.gnome.gedit.plugins.filebrowser.gschema.xml',
configuration: gschema_xml,
- install: true,
install_dir: join_paths(
glibdir,
'schemas',
diff --git a/plugins/pythonconsole/meson.build b/plugins/pythonconsole/meson.build
index 0e4b1a5cb..55b0af282 100644
--- a/plugins/pythonconsole/meson.build
+++ b/plugins/pythonconsole/meson.build
@@ -4,7 +4,6 @@ configure_file(
input: 'org.gnome.gedit.plugins.pythonconsole.gschema.xml.in',
output: 'org.gnome.gedit.plugins.pythonconsole.gschema.xml',
configuration: gschema_xml,
- install: true,
install_dir: join_paths(
glibdir,
'schemas',
diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
index f89cef785..4832da8e0 100644
--- a/plugins/spell/meson.build
+++ b/plugins/spell/meson.build
@@ -32,7 +32,6 @@ configure_file(
input: 'org.gnome.gedit.plugins.spell.gschema.xml.in',
output: 'org.gnome.gedit.plugins.spell.gschema.xml',
configuration: gschema_xml,
- install: true,
install_dir: join_paths(
glibdir,
'schemas',
diff --git a/plugins/time/meson.build b/plugins/time/meson.build
index 4294abc61..25e80e580 100644
--- a/plugins/time/meson.build
+++ b/plugins/time/meson.build
@@ -46,7 +46,6 @@ configure_file(
input: 'org.gnome.gedit.plugins.time.gschema.xml.in',
output: 'org.gnome.gedit.plugins.time.gschema.xml',
configuration: gschema_xml,
- install: true,
install_dir: join_paths(
glibdir,
'schemas',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]