From 9fbb8a85573f001e658bbeb2af504ea0dd1dfcc2 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Tue, 9 Oct 2018 12:08:17 +0200
Subject: Flatpak: Update to 3.30

---
 build-aux/flatpak/org.gnome.Nautilus.json | 23 +----------------------
 build-aux/flatpak/org.gnome.Nautilus.yml  | 11 +----------
 2 files changed, 2 insertions(+), 32 deletions(-)

(limited to 'build-aux/flatpak')

diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 586a94f80..dcecdd943 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -1,7 +1,7 @@
 {
     "app-id" : "org.gnome.NautilusDevel",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "3.28",
+    "runtime-version" : "3.30",
     "sdk" : "org.gnome.Sdk",
     "command" : "nautilus",
     "tags" : [
@@ -26,20 +26,6 @@
         "--env=TRACKER_SPARQL_BACKEND=bus"
     ],
     "modules" : [
-        {
-            "name" : "meson",
-            "buildsystem" : "simple",
-            "build-commands" : [
-                "python3 setup.py install --prefix=/app"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/mesonbuild/meson.git",
-                    "tag" : "0.47.2"
-                }
-            ]
-        },
         {
             "name" : "exiv2",
             "config-opts" : [
@@ -52,13 +38,6 @@
                     "type" : "archive",
                     "url" : "https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz",
                     "sha256" : "51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01"
-                },
-                {
-                    "type" : "shell",
-                    "commands" : [
-                        "cp -f /usr/share/automake-1.15/config.sub ./config/",
-                        "cp -f /usr/share/automake-1.15/config.guess ./config/"
-                    ]
                 }
             ]
         },
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index c0e44fb3b..ec90c2b18 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -1,6 +1,6 @@
 app-id: org.gnome.NautilusDevel
 runtime: org.gnome.Platform
-runtime-version: 3.28
+runtime-version: 3.30
 sdk: org.gnome.Sdk
 command: nautilus
 tags:
@@ -25,15 +25,6 @@ finish-args:
   - --env=TRACKER_SPARQL_BACKEND=bus
 
 modules:
-  - name: meson
-    buildsystem: simple
-    build-commands:
-      - python3 setup.py install --prefix=/app
-    sources:
-      - type: git
-        url: https://github.com/mesonbuild/meson.git
-        tag: 0.47.2
-
   - name: exiv2
     buildsystem: cmake
     build-options:
-- 
cgit v1.2.1