[recipes] Switch the flatpak build to meson
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] Switch the flatpak build to meson
- Date: Wed, 22 Feb 2017 02:20:10 +0000 (UTC)
commit 9aef516675cd0e3d0e41ad2dc17abb761022e52c
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Feb 21 20:37:59 2017 -0500
Switch the flatpak build to meson
meson-glib-check.patch | 11 +++++++++++
org.gnome.Recipes.flatpak.json | 24 ++++++++++++++++++++++++
setuptools-makefile | 5 +++++
3 files changed, 40 insertions(+), 0 deletions(-)
---
diff --git a/meson-glib-check.patch b/meson-glib-check.patch
new file mode 100644
index 0000000..eea326f
--- /dev/null
+++ b/meson-glib-check.patch
@@ -0,0 +1,11 @@
+--- mesonbuild/modules/gnome.py.glib 2017-02-21 20:45:17.187843787 -0500
++++ mesonbuild/modules/gnome.py 2017-02-21 20:46:18.062188395 -0500
+@@ -37,7 +37,7 @@
+ #
+ # https://github.com/ninja-build/ninja/issues/1184
+ # https://bugzilla.gnome.org/show_bug.cgi?id=774368
+-gresource_dep_needed_version = '>= 2.52.0'
++gresource_dep_needed_version = '>= 2.50.0'
+
+ native_glib_version = None
+ girwarning_printed = False
diff --git a/org.gnome.Recipes.flatpak.json b/org.gnome.Recipes.flatpak.json
index 3478aa4..e1c2253 100644
--- a/org.gnome.Recipes.flatpak.json
+++ b/org.gnome.Recipes.flatpak.json
@@ -53,7 +53,31 @@
]
},
{
+ "name": "meson",
+ "no-autogen": true,
+ "sources": [
+ {
+ "type": "archive",
+ "url":
"https://github.com/mesonbuild/meson/releases/download/0.38.1/meson-0.38.1.tar.gz",
+ "sha256": "dcb05349b32427924fa2a258a5e23e40e09c1bf9dd09919198c3a2ae1c38ba53"
+ },
+ {
+ "type": "patch",
+ "path": "meson-glib-check.patch",
+ "strip-components": 0
+
+ },
+ {
+ "type": "file",
+ "path": "setuptools-makefile",
+ "dest-filename": "Makefile"
+ }
+ ]
+ },
+ {
"name": "recipes",
+ "buildsystem": "meson",
+ "builddir": true,
"sources": [
{
"type": "git",
diff --git a/setuptools-makefile b/setuptools-makefile
new file mode 100644
index 0000000..96c28f0
--- /dev/null
+++ b/setuptools-makefile
@@ -0,0 +1,5 @@
+all:
+ python3 ./setup.py build
+
+install:
+ python3 ./setup.py install --prefix=/app --skip-build --optimize=1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]