[evolution/gnome-3-30] [Flatpak manifests] Build geocode-glib directly with meson



commit b36482d9bcc2225ab82ed5d4f52ea676b368bd14
Author: Milan Crha <mcrha redhat com>
Date:   Fri Dec 7 17:12:09 2018 +0100

    [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 e85c7ba885..19024dd9f2 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -104,9 +104,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 c4f8781f77..d6d38ac65c 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -103,9 +103,10 @@
 
                {
                        "name": "geocode-glib",
+                       "buildsystem": "meson",
                        "config-opts": [
-                               "--disable-introspection",
-                               "--disable-gtk-doc"
+                               "-Denable-introspection=false",
+                               "-Denable-gtk-doc=false"
                        ],
                        "cleanup": [
                                "/share/gtk-doc"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]