flatpak: Use JSON instead of YAMLwip/cdavis/json-flatpak

This allows developers to use one-click builds in GNOME
Builder, which provides an easy workflow for newcomers,
established developers, and designers alike.

4 files changed, 105 insertions, 84 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 312efc2f7..afcb32cfa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
 flatpak:
     image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
     variables:
-        MANIFEST_PATH: "build-aux/flatpak/org.gnome.gedit.yml"
+        MANIFEST_PATH: "build-aux/flatpak/org.gnome.gedit.json"
         FLATPAK_MODULE: "gedit"
         RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
         APP_ID: "org.gnome.gedit"
diff --git a/build-aux/flatpak/1-build-and-install.sh b/build-aux/flatpak/1-build-and-install.sh
index cb96038cf..2e0d94c76 100755
--- a/build-aux/flatpak/1-build-and-install.sh
+++ b/build-aux/flatpak/1-build-and-install.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-flatpak-builder --force-clean --user --install build org.gnome.gedit.yml
+flatpak-builder --force-clean --user --install build org.gnome.gedit.json
diff --git a/build-aux/flatpak/org.gnome.gedit.json b/build-aux/flatpak/org.gnome.gedit.json
new file mode 100644
index 000000000..ec24bdb8e
--- /dev/null
+++ b/build-aux/flatpak/org.gnome.gedit.json
@@ -0,0 +1,103 @@
+{
+    "app-id": "org.gnome.gedit",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "gedit",
+    "tags": [
+        "nightly"
+    ],
+    "desktop-file-name-prefix": "(Nightly) ",
+    "finish-args": [
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=fallback-x11",
+        "--socket=wayland",
+        "--metadata=X-DConf=migrate-path=/org/gnome/gedit/",
+        "--filesystem=host",
+        "--talk-name=org.gtk.vfs.*"
+    ],
+    "build-options": {
+        "cflags": "-O2 -g",
+        "cxxflags": "-O2 -g",
+        "env": {
+            "V": "1"
+        }
+    },
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig",
+        "/share/pkgconfig",
+        "/share/aclocal",
+        "/man",
+        "/share/man",
+        "/share/gtk-doc",
+        "/share/vala",
+        "/share/gir-1.0",
+        "*.la",
+        "*.a"
+    ],
+    "modules": [
+        {
+            "name": "libpeas",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Dlua51=false",
+                "-Dvapi=true",
+                "-Ddemos=false",
+                "-Dglade_catalog=false"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/libpeas/1.28/libpeas-1.28.0.tar.xz",
+                    "sha256": "42d91993b46ed50f16add6d9577ecc22beb8e2dffa7101e2232c2b63733b8b15"
+                }
+            ]
+        },
+        {
+            "name": "gspell",
+            "cleanup": [
+                "/bin"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/gspell/1.9/gspell-1.9.1.tar.xz",
+                    "sha256": "dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd"
+                }
+            ]
+        },
+        {
+            "name": "uchardet",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz",
+                    "sha256": "8351328cdfbcb2432e63938721dd781eb8c11ebc56e3a89d0f84576b96002c61"
+                }
+            ]
+        },
+        {
+            "name": "gedit",
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gedit.git"
+                }
+            ]
+        },
+        {
+            "name": "gedit-plugins",
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gedit-plugins.git"
+                }
+            ]
+        }
+    ]
+}
diff --git a/build-aux/flatpak/org.gnome.gedit.yml b/build-aux/flatpak/org.gnome.gedit.yml
deleted file mode 100644
index d3b535176..000000000
--- a/build-aux/flatpak/org.gnome.gedit.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-app-id: org.gnome.gedit
-runtime: org.gnome.Platform
-runtime-version: master
-sdk: org.gnome.Sdk
-command: gedit
-tags:
-  - nightly
-desktop-file-name-prefix: "(Nightly) "
-
-finish-args:
-  - "--share=ipc"
-  - "--socket=x11"
-  - "--socket=fallback-x11"
-  - "--socket=wayland"
-  - "--metadata=X-DConf=migrate-path=/org/gnome/gedit/"
-  # Needed at least for the integrated file browser plugin:
-  - "--filesystem=host"
-  # For opening files from remote locations (with GVfs):
-  - "--talk-name=org.gtk.vfs.*"
-
-build-options:
-  cflags: "-O2 -g"
-  cxxflags: "-O2 -g"
-  env:
-    V: '1'
-
-cleanup:
-  - "/include"
-  - "/lib/pkgconfig"
-  - "/share/pkgconfig"
-  - "/share/aclocal"
-  - "/man"
-  - "/share/man"
-  - "/share/gtk-doc"
-  - "/share/vala"
-  - "/share/gir-1.0"
-  - "*.la"
-  - "*.a"
-
-modules:
-  - name: libpeas
-    buildsystem: meson
-    config-opts:
-      - "-Dlua51=false"
-      - "-Dvapi=true"
-      - "-Ddemos=false"
-      - "-Dglade_catalog=false"
-    sources:
-      - type: archive
-        url: https://download.gnome.org/sources/libpeas/1.28/libpeas-1.28.0.tar.xz
-        sha256: 42d91993b46ed50f16add6d9577ecc22beb8e2dffa7101e2232c2b63733b8b15
-
-  - name: gspell
-    cleanup:
-      - "/bin"
-    sources:
-      - type: archive
-        url: https://download.gnome.org/sources/gspell/1.9/gspell-1.9.1.tar.xz
-        sha256: dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd
-
-  - name: uchardet
-    buildsystem: cmake-ninja
-    sources:
-      - type: archive
-        url: https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz
-        sha256: 8351328cdfbcb2432e63938721dd781eb8c11ebc56e3a89d0f84576b96002c61
-
-  - name: gedit
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://gitlab.gnome.org/GNOME/gedit.git
-        # To build a local branch, comment out 'url' and uncomment:
-        # path: ../../
-        # branch: wip/misc
-
-  - name: gedit-plugins
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://gitlab.gnome.org/GNOME/gedit-plugins.git