[gtk/wip/jimmac/fix-flatpak-build] Flatpak: Update build manifests
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/jimmac/fix-flatpak-build] Flatpak: Update build manifests
- Date: Fri, 5 Mar 2021 17:02:04 +0000 (UTC)
commit 8e7e821033abb291391c26aa288a83b136dabd4a
Author: Jakub Steiner <jimmac gmail com>
Date: Fri Mar 5 18:00:17 2021 +0100
Flatpak: Update build manifests
- point to the upstream repo for wayland
- disable disabling of sassc
- switch wayland from autotools to meson
build-aux/flatpak/org.gtk.Demo4.json | 3 +--
build-aux/flatpak/org.gtk.IconBrowser4.json | 7 +++----
build-aux/flatpak/org.gtk.WidgetFactory4.json | 7 +++----
3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/build-aux/flatpak/org.gtk.Demo4.json b/build-aux/flatpak/org.gtk.Demo4.json
index b987981577..9922c759e0 100644
--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -43,7 +43,7 @@
"sources" : [
{
"type" : "git",
- "url" : "https://github.com/wayland-project/wayland.git"
+ "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
}
]
},
@@ -70,7 +70,6 @@
"config-opts" : [
"--libdir=/app/lib",
"-Denable_vulkan=no",
- "-Dsassc=disabled",
"-Dbuildtype=debugoptimized",
"-Dprofile=devel"
],
diff --git a/build-aux/flatpak/org.gtk.IconBrowser4.json b/build-aux/flatpak/org.gtk.IconBrowser4.json
index 580e4e7af9..1c14244999 100644
--- a/build-aux/flatpak/org.gtk.IconBrowser4.json
+++ b/build-aux/flatpak/org.gtk.IconBrowser4.json
@@ -35,15 +35,15 @@
"modules" : [
{
"name" : "wayland",
- "buildsystem" : "autotools",
+ "buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
- "--disable-documentation"
+ "-Ddocumentation=false"
],
"sources" : [
{
"type" : "git",
- "url" : "https://github.com/wayland-project/wayland.git"
+ "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
}
]
},
@@ -70,7 +70,6 @@
"config-opts" : [
"--libdir=/app/lib",
"-Denable_vulkan=no",
- "-Dsassc=disabled",
"-Dbuildtype=debugoptimized",
"-Dprofile=devel"
],
diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json
index 138a6c73b5..bcbee387e7 100644
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -35,15 +35,15 @@
"modules" : [
{
"name" : "wayland",
- "buildsystem" : "autotools",
+ "buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
- "--disable-documentation"
+ "-Ddocumentation=false"
],
"sources" : [
{
"type" : "git",
- "url" : "https://github.com/wayland-project/wayland.git"
+ "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
}
]
},
@@ -70,7 +70,6 @@
"config-opts" : [
"--libdir=/app/lib",
"-Denable_vulkan=no",
- "-Dsassc=disabled",
"-Dbuildtype=debugoptimized",
"-Dprofile=devel"
],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]