flatpak: Downgrade SDK, build libadwaita

Currently the master SDK is broken, and can't
be easily fixed due to build issues.
This commit is contained in:
Christopher Davis 2022-07-01 13:24:55 -04:00
parent 6e869ebb1b
commit 6b5e4bbd53
2 changed files with 19 additions and 2 deletions

View file

@ -9,7 +9,7 @@ variables:
BUNDLE: "org.gnome.Loupe.Devel.flatpak" BUNDLE: "org.gnome.Loupe.Devel.flatpak"
MANIFEST_PATH: "build-aux/flatpak/org.gnome.Loupe.Devel.json" MANIFEST_PATH: "build-aux/flatpak/org.gnome.Loupe.Devel.json"
FLATPAK_MODULE: "loupe" FLATPAK_MODULE: "loupe"
FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:42"
.flatpak_cache_template: &flatpak_cache .flatpak_cache_template: &flatpak_cache
cache: cache:

View file

@ -1,7 +1,7 @@
{ {
"app-id" : "org.gnome.Loupe.Devel", "app-id" : "org.gnome.Loupe.Devel",
"runtime" : "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version" : "master", "runtime-version" : "42",
"sdk" : "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",
"sdk-extensions" : [ "sdk-extensions" : [
"org.freedesktop.Sdk.Extension.rust-stable" "org.freedesktop.Sdk.Extension.rust-stable"
@ -35,6 +35,23 @@
"*.a" "*.a"
], ],
"modules" : [ "modules" : [
{
"name" : "libadwaita",
"buildsystem" : "meson",
"config-opts" : [
"-Dtests=false",
"-Dexamples=false",
"-Dvapi=false",
"-Dintrospection=disabled"
],
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libadwaita.git",
"branch" : "main"
}
]
},
{ {
"name" : "loupe", "name" : "loupe",
"builddir" : true, "builddir" : true,