[geary] build: Use JSON Flatpak manifest

[Cédric Bellegarde <cbellegarde src gnome org>]

commit adca034818ba2ed8b31e1bc7ae2fcbae1264724b
Author: Cédric Bellegarde <cedric bellegarde adishatz org>
Date:   Thu Jun 30 10:02:39 2022 +0200

    build: Use JSON Flatpak manifest
    
    Generating JSON from meson does not work as flatpak-builder needs it
    earlier

 build-aux/yaml/__init__.py    |  402 ------------
 build-aux/yaml/composer.py    |  139 ----
 build-aux/yaml/constructor.py |  720 ---------------------
 build-aux/yaml/cyaml.py       |  101 ---
 build-aux/yaml/dumper.py      |   62 --
 build-aux/yaml/emitter.py     | 1137 --------------------------------
 build-aux/yaml/error.py       |   75 ---
 build-aux/yaml/events.py      |   86 ---
 build-aux/yaml/loader.py      |   63 --
 build-aux/yaml/nodes.py       |   49 --
 build-aux/yaml/parser.py      |  589 -----------------
 build-aux/yaml/reader.py      |  185 ------
 build-aux/yaml/representer.py |  389 -----------
 build-aux/yaml/resolver.py    |  227 -------
 build-aux/yaml/scanner.py     | 1435 -----------------------------------------
 build-aux/yaml/serializer.py  |  111 ----
 build-aux/yaml/tokens.py      |  104 ---
 build-aux/yaml_to_json.py     |   25 -
 meson.build                   |   11 -
 org.gnome.Geary.json          |    3 +-
 org.gnome.Geary.yaml          |  264 --------
 21 files changed, 1 insertion(+), 6176 deletions(-)
---
diff --git a/meson.build b/meson.build
index 8641d6cc3..cabe44e4b 100644
--- a/meson.build
+++ b/meson.build
@@ -224,17 +224,6 @@ files(iso_639_xml, iso_3166_xml) # Check to make sure these exist
 # Post-install scripts
 meson.add_install_script('build-aux' / 'post_install.py')
 
-# GNOME Builder doesn't support YAML manifests, so generate a JSON
-# version from the YAML and commit it. :( GNOME/gnome-builder#520
-yaml_to_json = find_program('build-aux' / 'yaml_to_json.py')
-custom_target(
-  'org.gnome.Geary.json',
-  build_by_default: true,
-  command: [yaml_to_json, '@INPUT@', meson.source_root(), '@OUTPUT@'],
-  input: files('org.gnome.Geary.yaml'),
-  output: 'org.gnome.Geary.json'
-)
-
 # Subfolders
 subdir('desktop')
 subdir('help')
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 6ca90c914..848a64325 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -1,4 +1,3 @@
-/* Automatically generated from org.gnome.Geary.yaml, do not modify. */
 {
     "app-id": "org.gnome.Geary.Devel",
     "branch": "master",
@@ -282,4 +281,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}