[gnome-software: 1/2] Convert flatpak-builder manifest to JSON
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software: 1/2] Convert flatpak-builder manifest to JSON
- Date: Wed, 28 Apr 2021 13:17:07 +0000 (UTC)
commit 0ea65e799af662d6e7eab6cc810f0ba6375a5e06
Author: Will Thompson <wjt endlessos org>
Date: Tue Apr 20 17:59:43 2021 +0100
Convert flatpak-builder manifest to JSON
GNOME Builder knows how to build from a JSON manifest, but not a YAML
one. If a JSON manifest is present this makes for a very convenient
development workflow in GNOME Builder: clone repo, hit build, done.
.gitlab-ci.yml | 2 +-
contrib/org.gnome.SoftwareDevel.json | 210 +++++++++++++++++++++++++++++++++++
contrib/org.gnome.SoftwareDevel.yml | 145 ------------------------
3 files changed, 211 insertions(+), 146 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14e342120..93e3d1c81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ flatpak bundle:
stage: 'build'
dependencies: []
variables:
- MANIFEST_PATH: "contrib/org.gnome.SoftwareDevel.yml"
+ MANIFEST_PATH: "contrib/org.gnome.SoftwareDevel.json"
FLATPAK_MODULE: "gnome-software"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
APP_ID: "org.gnome.SoftwareDevel"
diff --git a/contrib/org.gnome.SoftwareDevel.json b/contrib/org.gnome.SoftwareDevel.json
new file mode 100644
index 000000000..b6a9bd313
--- /dev/null
+++ b/contrib/org.gnome.SoftwareDevel.json
@@ -0,0 +1,210 @@
+{
+ "app-id": "org.gnome.SoftwareDevel",
+ "runtime": "org.gnome.Platform",
+ "runtime-version": "master",
+ "sdk": "org.gnome.Sdk",
+ "command": "gnome-software",
+ "tags": [
+ "devel",
+ "development",
+ "nightly"
+ ],
+ "finish-args": [
+ "--share=ipc",
+ "--socket=x11",
+ "--socket=wayland",
+ "--socket=session-bus",
+ "--socket=system-bus",
+ "--filesystem=host",
+ "--share=network",
+ "--filesystem=xdg-run/dconf",
+ "--filesystem=~/.config/dconf:ro",
+ "--talk-name=ca.desrt.dconf",
+ "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+ "--filesystem=/var/lib/flatpak",
+ "--env=FLATPAK_SYSTEM_DIR=/var/lib/flatpak",
+ "--filesystem=xdg-data/flatpak",
+ "--filesystem=/usr/share/appdata:ro",
+ "--filesystem=/usr/share/app-info:ro",
+ "--filesystem=/var/lib/app-info:ro",
+ "--filesystem=/var/cache/app-info:ro"
+ ],
+ "modules": [
+ {
+ "name": "libyaml",
+ "buildsystem": "autotools",
+ "builddir": true,
+ "config-opts": [
+ "--libdir=/app/lib"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://github.com/yaml/libyaml";
+ }
+ ]
+ },
+ {
+ "name": "lmdb",
+ "buildsystem": "simple",
+ "subdir": "libraries/liblmdb",
+ "build-commands": [
+ "make install prefix=/ DESTDIR=/app"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://git.openldap.org/openldap/openldap.git";
+ }
+ ]
+ },
+ {
+ "name": "appstream",
+ "buildsystem": "meson",
+ "config-opts": [
+ "-Dstemming=false",
+ "-Dapidocs=false"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://github.com/ximion/appstream.git";
+ }
+ ]
+ },
+ {
+ "name": "libxmlb",
+ "buildsystem": "meson",
+ "config-opts": [
+ "-Dgtkdoc=false"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://github.com/hughsie/libxmlb.git";
+ }
+ ]
+ },
+ {
+ "name": "gnome-online-accounts",
+ "buildsystem": "meson",
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git";
+ }
+ ]
+ },
+ {
+ "name": "intltool",
+ "buildsystem": "autotools",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/intltool/0.40/intltool-0.40.6.tar.bz2";,
+ "sha256": "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"
+ }
+ ]
+ },
+ {
+ "name": "linux-pam",
+ "buildsystem": "autotools",
+ "config-opts": [
+ "--disable-doc",
+ "--includedir=/app/include/security"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://github.com/linux-pam/linux-pam.git";
+ }
+ ]
+ },
+ {
+ "name": "polkit",
+ "buildsystem": "meson",
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://gitlab.freedesktop.org/polkit/polkit.git";
+ }
+ ]
+ },
+ {
+ "name": "libfuse",
+ "buildsystem": "simple",
+ "build-commands": [
+ "./makeconf.sh",
+ "./configure --disable-util --disable-example --prefix=/",
+ "make install DESTDIR=/app"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://github.com/libfuse/libfuse.git";,
+ "branch": "fuse_2_9_bugfix"
+ }
+ ]
+ },
+ {
+ "name": "ostree",
+ "buildsystem": "autotools",
+ "config-opts": [
+ "--disable-rofiles-fuse"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://github.com/ostreedev/ostree.git";
+ }
+ ]
+ },
+ {
+ "name": "pyparsing",
+ "buildsystem": "simple",
+ "build-commands": [
+ "pip3 install --prefix=/app --no-deps ./pyparsing-*.whl"
+ ],
+ "sources": [
+ {
+ "type": "file",
+ "url":
"https://files.pythonhosted.org/packages/8a/bb/488841f56197b13700afd5658fc279a2025a39e22449b7cf29864669b15d/pyparsing-2.4.7-py2.py3-none-any.whl";,
+ "sha256": "ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"
+ }
+ ]
+ },
+ {
+ "name": "flatpak",
+ "buildsystem": "autotools",
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://github.com/flatpak/flatpak.git";
+ }
+ ]
+ },
+ {
+ "buildsystem": "meson",
+ "builddir": true,
+ "name": "gnome-software",
+ "config-opts": [
+ "--libdir=/app/lib",
+ "-Dgspell=false",
+ "-Dpackagekit=false",
+ "-Dpackagekit_autoremove=false",
+ "-Dfwupd=false",
+ "-Dflatpak=true",
+ "-Dmalcontent=false",
+ "-Dgudev=false",
+ "-Dgtk_doc=false",
+ "-Dprofile=Devel"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://gitlab.gnome.org/GNOME/gnome-software.git";
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]