From 37550264cc6de086a62a886acb648269d1ec0018 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 7 Dec 2018 17:12:09 +0100 Subject: [PATCH] [Flatpak manifests] Build geocode-glib directly with meson As geocode-glib is provided with a ./configure script the build system in Flatpak had been chosen to be autotool, even the script calls meson in the background. This script requires 'mesontest' binary, which had been removed in meson 0.48.0. Using meson build system directly makes the build work regardless of used meson version. --- flatpak/org.gnome.Evolution-master.json | 5 +++-- flatpak/org.gnome.Evolution-stable.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json index 0724469350..add47d7cab 100644 --- a/flatpak/org.gnome.Evolution-master.json +++ b/flatpak/org.gnome.Evolution-master.json @@ -110,9 +110,10 @@ { "name": "geocode-glib", + "buildsystem": "meson", "config-opts": [ - "--disable-introspection", - "--disable-gtk-doc" + "-Denable-introspection=false", + "-Denable-gtk-doc=false" ], "cleanup": [ "/share/gtk-doc" diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json index a5977e0497..d0c1f03207 100644 --- a/flatpak/org.gnome.Evolution-stable.json +++ b/flatpak/org.gnome.Evolution-stable.json @@ -109,9 +109,10 @@ { "name": "geocode-glib", + "buildsystem": "meson", "config-opts": [ - "--disable-introspection", - "--disable-gtk-doc" + "-Denable-introspection=false", + "-Denable-gtk-doc=false" ], "cleanup": [ "/share/gtk-doc"