[gedit] Revert "build: Ensure of meson 0.49.0 support"



commit 47b0e1e1eab4ca3de533b2746176f2fcb779c993
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Nov 6 13:02:52 2019 -0600

    Revert "build: Ensure of meson 0.49.0 support"
    
    This reverts commit e25005907bab539877b790d36f93fa931d497d4b.

 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, 10 insertions(+), 3 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index ecf473a29..1eb35223e 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -20,7 +20,6 @@ appdata_file = i18n.merge_file(
     'metainfo',
   )
 )
-
 appstream_util = find_program('appstream-util', required: false)
 if appstream_util.found()
 test(
@@ -40,6 +39,7 @@ 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,7 +54,6 @@ desktop_file = i18n.merge_file(
     'applications',
   )
 )
-
 desktop_file_validate = find_program('desktop-file-validate', required: false)
 if desktop_file_validate.found()
 test(
@@ -81,6 +80,7 @@ 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,6 +94,7 @@ 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 ddb591e60..142ce79d0 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'gedit', 'c',
   version: '3.34.0',
-  meson_version: '>=0.49.0',
+  meson_version: '>=0.46.0',
   license: 'GPL2'
 )
 
diff --git a/plugins/checkupdate/meson.build b/plugins/checkupdate/meson.build
index 94b4e8b0d..d527ddb2c 100644
--- a/plugins/checkupdate/meson.build
+++ b/plugins/checkupdate/meson.build
@@ -29,6 +29,7 @@ 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 75a23a144..cc05c1267 100644
--- a/plugins/externaltools/meson.build
+++ b/plugins/externaltools/meson.build
@@ -6,6 +6,7 @@ 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 7bae8f4ac..94a4ab0a6 100644
--- a/plugins/filebrowser/meson.build
+++ b/plugins/filebrowser/meson.build
@@ -105,6 +105,7 @@ 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 55b0af282..0e4b1a5cb 100644
--- a/plugins/pythonconsole/meson.build
+++ b/plugins/pythonconsole/meson.build
@@ -4,6 +4,7 @@ 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 4832da8e0..f89cef785 100644
--- a/plugins/spell/meson.build
+++ b/plugins/spell/meson.build
@@ -32,6 +32,7 @@ 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 25e80e580..4294abc61 100644
--- a/plugins/time/meson.build
+++ b/plugins/time/meson.build
@@ -46,6 +46,7 @@ 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]