[gnome-taquin/meson: 5/5] various fixes to the meson build & flatpak manifest

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit eb51cdc13032feb333692260a5668f5636b04fff
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Sun Jan 20 14:52:11 2019 +0100

    various fixes to the meson build & flatpak manifest

 .gitignore                                                 |  1 +
 build-aux/{org.gnome.taquin.json => org.gnome.Taquin.json} | 10 +++-------
 data/meson.build                                           | 10 ++++++++--
 meson.build                                                |  4 ++--
 src/meson.build                                            | 12 ++++++------
 5 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c6a151b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+_build/
\ No newline at end of file
diff --git a/build-aux/org.gnome.taquin.json b/build-aux/org.gnome.Taquin.json
similarity index 78%
rename from build-aux/org.gnome.taquin.json
rename to build-aux/org.gnome.Taquin.json
index c3438a7..188c25d 100644
--- a/build-aux/org.gnome.taquin.json
+++ b/build-aux/org.gnome.Taquin.json
@@ -1,12 +1,10 @@
 {
-    "app-id": "org.gnome.taquin",
+    "app-id": "org.gnome.Taquin",
     "runtime": "org.gnome.Platform",
     "runtime-version": "master",
     "sdk": "org.gnome.Sdk",
     "command": "gnome-taquin",
     "tags": ["nightly"],
-    "copy-icon": true,
-    "rename-icon": "gnome-taquin",
     "desktop-file-name-prefix": "(Nightly) ",
     "finish-args": [
         /* X11 + XShm access */
@@ -19,17 +17,15 @@
         "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
         "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
-    "build-options": {
-        "cflags": "-O2 -g"
-    },
     "cleanup": ["/share/man"],
     "modules": [
         {
             "name": "gnome-taquin",
+            "buildsystem": "meson",
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gnome-taquin.git";
+                    "path": "https://gitlab.gnome.org/GNOME/gonme-taquin.git";
                 }
             ]
         }
diff --git a/data/meson.build b/data/meson.build
index 12233f6..c335613 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -30,8 +30,8 @@ endif
 
 # AppData file
 appdata_file = i18n.merge_file(
-    input: '@0  appdata xml in'.format(application_id),
-    output: '@0  appdata xml'.format(application_id),
+    input: '@0  appdata xml in'.format(project_id),
+    output: '@0  appdata xml'.format(project_id),
     po_dir: join_paths(meson.source_root(), 'po'),
     install: true,
     install_dir: join_paths(get_option('datadir'), 'metainfo')
@@ -47,6 +47,12 @@ if appstream_util.found()
   )
 endif
 
+install_data(
+  '@0  gschema xml'.format(project_id),
+  install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
+)
+
+
 install_man('@0@.6'.format(meson.project_name()))
 
 subdir('icons')
diff --git a/meson.build b/meson.build
index 7f1c09b..924dee5 100644
--- a/meson.build
+++ b/meson.build
@@ -12,9 +12,9 @@ gtk_dependency = dependency('gtk+-3.0', version: '>= 3.15.0')
 rsvg_dependency = dependency('librsvg-2.0', version: '>= 2.32.0')
 canberra_depenency = dependency('libcanberra')
 canberra_gtk3_depenency = dependency('libcanberra-gtk3', version: '>= 0.26')
-posix_dependency = 
+posix_dependency = meson.get_compiler('vala').find_library('posix')
 
-desktop_file_validate = find_program('desktop-file-valdiate', required: false)
+desktop_file_validate = find_program('desktop-file-validate', required: false)
 appstream_util = find_program('appstream-util', required: false)
 glib_compile_schema = find_program('glib-compile-schemas', required: true)
 
diff --git a/src/meson.build b/src/meson.build
index 6983a8c..5926e69 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,8 +1,8 @@
-resources = gnome.compile_resources (meson.project_name(), 'taquin.gresources.xml')
+resources = gnome.compile_resources (meson.project_name(), 'taquin.gresource.xml')
 
 executable(meson.project_name(),[
         'config.vapi',
-        'gnome-window.vala',
+        'game-window.vala',
         'taquin-game.vala',
         'taquin-main.vala',
         'taquin-view.vala'
@@ -15,11 +15,11 @@ executable(meson.project_name(),[
         '--vapidir', join_paths(meson.current_source_dir(), 'vapi')
     ],
     dependencies: [
-        gee_dependency,
         glib_dependency,
-        gnome_games_support_dependency,
         gtk_dependency,
-        posix_dependency,
-        rsvg_dependency
+        rsvg_dependency,
+        canberra_depenency,
+        canberra_gtk3_depenency,
+        posix_dependency
     ]
 )