Fix app ID and move Flatpak manifest

This MR does a few changes that fixes most issues related to Flatpak:

- Change the app ID entirely to `org.gnome.Meld`
- Move the Flatpak manifest to `build-aux` directory - everybody in GNOME does it
Add `.Devel` suffix, just like all the other GNOME apps
Add `git` module that builds git from source, instead of copying a file

.gitlab-ci.yml

@@ -16,10 +16,10 @@ flatpak:
     extends: .flatpak
     stage: build
     variables:
-        MANIFEST_PATH: "data/org.gnome.MeldDevel.json"
+        MANIFEST_PATH: "build-aux/org.gnome.Meld.Devel.json"
         FLATPAK_MODULE: "meld"
         RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
-        APP_ID: "org.gnome.MeldDevel"
+        APP_ID: "org.gnome.Meld.Devel"
         BUNDLE: "meld-dev.flatpak"
 
 nightly:

data/org.gnome.MeldDevel.json → build-aux/org.gnome.Meld.Devel.json

@@ -1,5 +1,5 @@
 {
-  "app-id": "org.gnome.MeldDevel",
+  "app-id": "org.gnome.Meld.Devel",
   "runtime": "org.gnome.Platform",
   "runtime-version": "master",
   "sdk": "org.gnome.Sdk",
@@ -48,6 +48,24 @@
         }
       ]
     },
+    {
+      "name": "git",
+      "make-args": [
+        "NO_TCLTK=1",
+        "INSTALL_SYMLINKS=1"
+      ],
+      "make-install-args": [
+        "NO_TCLTK=1",
+        "INSTALL_SYMLINKS=1"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.42.0.tar.xz",
+          "sha256": "3278210e9fd2994b8484dd7e3ddd9ea8b940ef52170cdb606daa94d887c93b0d"
+        }
+      ]
+    },
     {
       "name": "meld",
       "buildsystem": "meson",
@@ -61,13 +79,6 @@
       "config-opts": [
         "-Dprofile=Devel"
       ]
-    },
-    {
-      "name": "git",
-      "buildsystem": "simple",
-      "build-commands": [
-        "cp /usr/bin/git ${FLATPAK_DEST}/bin"
-      ]
     }
   ]
 }

data/meson.build

@@ -33,8 +33,8 @@ endif
 
 appdata_file = i18n.merge_file(
   input: configure_file(
-    input: files('org.gnome.meld.appdata.xml.in.in'),
-    output: 'org.gnome.meld.appdata.xml.in',
+    input: files('org.gnome.Meld.appdata.xml.in.in'),
+    output: 'org.gnome.Meld.appdata.xml.in',
     configuration: {'appid': application_id},
   ),
   output: '@[email protected]'.format(application_id),

meld/resources/meld.gresource.xml

@@ -2,7 +2,7 @@
 <gresources>
   <gresource prefix="/org/gnome/meld/icons">
     <file>scalable/apps/org.gnome.Meld.svg</file>
-    <file>scalable/apps/org.gnome.MeldDevel.svg</file>
+    <file>scalable/apps/org.gnome.Meld.Devel.svg</file>
     <file preprocess="xml-stripblanks" alias="scalable/actions/vc-pull-symbolic.svg">icons/vc-pull-symbolic.svg</file>
     <file preprocess="xml-stripblanks" alias="scalable/actions/vc-push-symbolic.svg">icons/vc-push-symbolic.svg</file>
   </gresource>

meson.build

@@ -25,9 +25,9 @@ dependency('py3cairo', version: '>= 1.15.0')
 profile = get_option('profile')
 name_suffix = (profile == 'Devel' ? ' (Development Snapshot)' : '')
 
-resource_base_id = 'org.gnome.meld'
+resource_base_id = 'org.gnome.Meld'
 application_id_no_profile = 'org.gnome.Meld'
-application_id = 'org.gnome.Meld@0@'.format(profile)
+application_id = (profile == 'Devel' ? application_id_no_profile + '.' + profile : application_id_no_profile)
 
 prefix = get_option('prefix')