[gnome-builder/gnome-builder-3-32] flatpak: import stable manifest
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/gnome-builder-3-32] flatpak: import stable manifest
- Date: Sat, 27 Apr 2019 18:18:29 +0000 (UTC)
commit fcc3214a24b48a5192a6d014ad1c7db5ef3413d2
Author: Christian Hergert <chergert redhat com>
Date: Sat Apr 27 11:18:10 2019 -0700
flatpak: import stable manifest
This should improve the auto-builds from CI to be closer to the actual
release.
build-aux/flatpak/flatpak-builder-watch-bus.patch | 39 ++++++++++
build-aux/flatpak/org.gnome.Builder.json | 87 +++++++++++++----------
2 files changed, 87 insertions(+), 39 deletions(-)
---
diff --git a/build-aux/flatpak/flatpak-builder-watch-bus.patch
b/build-aux/flatpak/flatpak-builder-watch-bus.patch
new file mode 100644
index 000000000..6cffe361d
--- /dev/null
+++ b/build-aux/flatpak/flatpak-builder-watch-bus.patch
@@ -0,0 +1,39 @@
+From 70c280094ccd0fc718f3aabfe56a91b6bee81efd Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert redhat com>
+Date: Thu, 18 Apr 2019 21:52:49 -0700
+Subject: [PATCH] utils: force exit host commands when flatpak-builder exits
+
+If we are spawning applications on the host using the Development service,
+then we want those commands to exit when the flatpak-builder process
+exits, as can happen from Ctrl^C or kill().
+---
+ src/builder-flatpak-utils.h | 1 +
+ src/builder-utils.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/builder-flatpak-utils.h b/src/builder-flatpak-utils.h
+index 4d878d98..86631002 100644
+--- a/src/builder-flatpak-utils.h
++++ b/src/builder-flatpak-utils.h
+@@ -33,6 +33,7 @@
+
+ typedef enum {
+ FLATPAK_HOST_COMMAND_FLAGS_CLEAR_ENV = 1 << 0,
++ FLATPAK_HOST_COMMAND_FLAGS_WATCH_BUS = 1 << 1,
+ } FlatpakHostCommandFlags;
+
+ typedef void (*FlatpakLoadUriProgress) (guint64 downloaded_bytes,
+diff --git a/src/builder-utils.c b/src/builder-utils.c
+index 37de88c9..54bba04c 100644
+--- a/src/builder-utils.c
++++ b/src/builder-utils.c
+@@ -1750,7 +1750,8 @@ builder_host_spawnv (GFile *dir,
+ argv,
+ g_variant_builder_end (fd_builder),
+ g_variant_builder_end (env_builder),
+- FLATPAK_HOST_COMMAND_FLAGS_CLEAR_ENV),
++ FLATPAK_HOST_COMMAND_FLAGS_CLEAR_ENV |
++ FLATPAK_HOST_COMMAND_FLAGS_WATCH_BUS),
+ G_VARIANT_TYPE ("(u)"),
+ G_DBUS_CALL_FLAGS_NONE, -1,
+ fd_list, NULL,
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 86a63ff10..c77037dc6 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -1,22 +1,17 @@
{
"app-id" : "org.gnome.Builder",
"runtime" : "org.gnome.Sdk",
- "runtime-version" : "master",
+ "runtime-version" : "3.32",
"sdk" : "org.gnome.Sdk",
"command" : "gnome-builder",
- "tags" : [
- "nightly"
- ],
- "desktop-file-name-prefix" : "(Nightly) ",
"finish-args" : [
"--require-version=1.0.0",
"--allow=devel",
"--talk-name=org.freedesktop.Flatpak",
"--device=dri",
"--share=ipc",
- "--socket=fallback-x11",
+ "--socket=x11",
"--socket=wayland",
- "--socket=ssh-auth",
"--filesystem=home",
"--filesystem=host",
"--share=network",
@@ -39,10 +34,6 @@
"--filesystem=/var/lib/flatpak",
"--env=G_SLICE=always-malloc"
],
- "x-run-args" : [
- "--standalone",
- "-vvvv"
- ],
"build-options" : {
"env" : {
"BASH_COMPLETIONSDIR" : "/app/share/bash-completion/completions",
@@ -222,14 +213,15 @@
"name" : "libgit2-glib",
"config-opts" : [
"--libdir=/app/lib",
- "--buildtype=debugoptimized"
+ "--buildtype=release"
],
"buildsystem" : "meson",
"builddir" : true,
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/libgit2-glib.git";
+ "url" : "https://gitlab.gnome.org/GNOME/libgit2-glib.git";,
+ "branch" : "v0.27.8"
}
]
},
@@ -243,7 +235,8 @@
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/libpeas.git";
+ "url" : "https://gitlab.gnome.org/GNOME/libpeas.git";,
+ "branch" : "libpeas-1.22.0"
}
]
},
@@ -252,7 +245,8 @@
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/gtksourceview.git";
+ "url" : "https://gitlab.gnome.org/GNOME/gtksourceview.git";,
+ "branch" : "gtksourceview-4-2"
}
]
},
@@ -263,7 +257,8 @@
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/amtk.git";
+ "url" : "https://gitlab.gnome.org/GNOME/amtk.git";,
+ "branch" : "5.0.0"
}
]
},
@@ -273,7 +268,7 @@
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib",
- "--buildtype=debugoptimized"
+ "--buildtype=release"
],
"cleanup" : [
"/bin/*",
@@ -287,7 +282,8 @@
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/devhelp.git";
+ "url" : "https://gitlab.gnome.org/GNOME/devhelp.git";,
+ "branch" : "3.32.0"
}
]
},
@@ -300,12 +296,13 @@
],
"config-opts" : [
"--libdir=/app/lib",
- "--buildtype=debugoptimized"
+ "--buildtype=release"
],
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/json-glib.git";
+ "url" : "https://gitlab.gnome.org/GNOME/json-glib.git";,
+ "branch" : "1.4.4"
}
]
},
@@ -348,7 +345,7 @@
"name" : "sysprof",
"config-opts" : [
"--libdir=/app/lib",
- "--buildtype=debugoptimized",
+ "--buildtype=release",
"-Denable_gtk=true",
"-Dwith_sysprofd=host"
],
@@ -365,7 +362,8 @@
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/sysprof.git";
+ "url" : "https://gitlab.gnome.org/GNOME/sysprof.git";,
+ "branch" : "sysprof-3.32.0"
}
]
},
@@ -373,14 +371,15 @@
"name" : "template-glib",
"config-opts" : [
"--libdir=/app/lib",
- "--buildtype=debugoptimized"
+ "--buildtype=release"
],
"buildsystem" : "meson",
"builddir" : true,
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/template-glib.git";
+ "url" : "https://gitlab.gnome.org/GNOME/template-glib.git";,
+ "branch" : "3.32.0"
}
]
},
@@ -388,14 +387,15 @@
"name" : "jsonrpc-glib",
"config-opts" : [
"--libdir=/app/lib",
- "--buildtype=debugoptimized"
+ "--buildtype=release"
],
"buildsystem" : "meson",
"builddir" : true,
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/jsonrpc-glib.git";
+ "url" : "https://gitlab.gnome.org/GNOME/jsonrpc-glib.git";,
+ "branch" : "3.32.0"
}
]
},
@@ -403,7 +403,7 @@
"name" : "libdazzle",
"config-opts" : [
"--libdir=/app/lib",
- "--buildtype=debugoptimized"
+ "--buildtype=release"
],
"buildsystem" : "meson",
"builddir" : true,
@@ -413,7 +413,8 @@
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/libdazzle.git";
+ "url" : "https://gitlab.gnome.org/GNOME/libdazzle.git";,
+ "branch" : "libdazzle-3-32"
}
]
},
@@ -466,8 +467,8 @@
"sources" : [
{
"type" : "archive",
- "url" :
"https://github.com/flatpak/flatpak/releases/download/1.2.3/flatpak-1.2.3.tar.xz";,
- "sha256" : "bb4720307fc10465660e37bb9489c1d9a349c19143e24f65ddb49032f8b00d44"
+ "url" :
"https://github.com/flatpak/flatpak/releases/download/1.2.4/flatpak-1.2.4.tar.xz";,
+ "sha256" : "1b6539d94d31e571661a2545cfcece7ec9267b4e2552e3cc0f617f4790f6c3e1"
}
]
},
@@ -476,8 +477,12 @@
"sources" : [
{
"type" : "archive",
- "url" :
"https://github.com/flatpak/flatpak-builder/releases/download/1.0.5/flatpak-builder-1.0.5.tar.xz";,
- "sha256" : "ab9a2d6395def37d60983a232c4105d6ed8dd8ba4f798e76ba75b8c366bfb0d0"
+ "url" :
"https://github.com/flatpak/flatpak-builder/releases/download/1.0.6/flatpak-builder-1.0.6.tar.xz";,
+ "sha256" : "3b572ad7b7cce9ca6a8632ca69a49a47b20e99066fe064b7b56e7896dca789bb"
+ },
+ {
+ "type" : "patch",
+ "path" : "flatpak-builder-watch-bus.patch"
}
]
},
@@ -527,7 +532,8 @@
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/glade.git";
+ "url" : "https://gitlab.gnome.org/GNOME/glade.git";,
+ "branch" : "glade-3-22"
}
]
},
@@ -535,7 +541,7 @@
"name" : "deviced",
"config-opts" : [
"--libdir=/app/lib",
- "--buildtype=debugoptimized",
+ "--buildtype=release",
"-Ddaemon=false",
"-Dtools=false"
],
@@ -544,7 +550,8 @@
"sources" : [
{
"type" : "git",
- "url" : "https://gitlab.gnome.org/chergert/deviced.git";
+ "url" : "https://gitlab.gnome.org/chergert/deviced.git";,
+ "branch" : "0805fe4c94e4ed9049ed2aaf55c4624328e860d3"
}
]
},
@@ -554,14 +561,15 @@
"builddir" : true,
"config-opts" : [
"--libdir=lib",
- "--buildtype=debugoptimized",
+ "--buildtype=release",
"-Dctags_path=/app/bin/ctags",
"-Dfusermount_wrapper=true",
"-Dtcmalloc=true",
"-Dpython_libprefix=python3.7",
- "-Dtracing=true",
+ "-Dtracing=false",
"-Dhelp=true",
- "-Dchannel=flatpak-nightly",
+ "-Dchannel=flatpak-stable",
+ "-Dplugin_podman=true",
"-Dplugin_deviced=true"
],
"cleanup" : [
@@ -573,7 +581,8 @@
{
"disable-shallow-clone" : true,
"type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/gnome-builder.git";
+ "url" : "https://gitlab.gnome.org/GNOME/gnome-builder.git";,
+ "branch" : "gnome-builder-3-32"
}
]
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
