[nautilus] flatpak: Unpin most dependencies



commit d95a616116bb8c02b01261afa3ed5b581f9f2e74
Author: António Fernandes <antoniojpfernandes gmail com>
Date:   Thu Feb 6 20:28:17 2020 +0000

    flatpak: Unpin most dependencies
    
    We are near 3.36, so let's update the dependencies.
    
    gexiv2 git master is failing to build locally, so I've
    updated it to the latest tag that builds locally.

 .gitlab-ci.yml                            |  2 +-
 build-aux/flatpak/org.gnome.Nautilus.json | 13 +++++--------
 build-aux/flatpak/org.gnome.Nautilus.yml  |  7 ++-----
 3 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73260dae1..ce677b920 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ stages:
 
 flatpak devel:
     extends: '.flatpak'
-    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.34
+    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
     variables:
         MANIFEST_PATH: "build-aux/flatpak/org.gnome.Nautilus.yml"
         MESON_ARGS: "-Dprofile=Devel -Dtests=all"
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 437396e39..d3d13e047 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.34",
+  "runtime-version": "master",
   "sdk": "org.gnome.Sdk",
   "command": "nautilus",
   "tags": [
@@ -55,7 +55,7 @@
         {
           "type": "git",
           "url": "https://gitlab.gnome.org/GNOME/gexiv2.git";,
-          "tag": "gexiv2-0.10.8"
+          "tag": "gexiv2-0.10.10"
         }
       ]
     },
@@ -81,8 +81,7 @@
       "sources": [
         {
           "type": "git",
-          "url": "https://gitlab.gnome.org/GNOME/tracker.git";,
-          "tag": "2.3.0"
+          "url": "https://gitlab.gnome.org/GNOME/tracker.git";
         }
       ]
     },
@@ -125,8 +124,7 @@
       "sources": [
         {
           "type": "git",
-          "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git";,
-          "tag": "2.3.0"
+          "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git";
         }
       ]
     },
@@ -150,8 +148,7 @@
       "sources": [
         {
           "type": "git",
-          "url": "https://gitlab.gnome.org/GNOME/gnome-autoar.git";,
-          "tag": "0.2.4"
+          "url": "https://gitlab.gnome.org/GNOME/gnome-autoar.git";
         }
       ]
     },
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index dbd12f025..a75103bcf 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -1,7 +1,7 @@
 ---
 app-id: org.gnome.NautilusDevel
 runtime: org.gnome.Platform
-runtime-version: "3.34"
+runtime-version: "master"
 sdk: org.gnome.Sdk
 command: nautilus
 tags:
@@ -44,7 +44,7 @@ modules:
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/gexiv2.git
-    tag: gexiv2-0.10.8
+    tag: gexiv2-0.10.10
 - name: tracker
   cleanup:
   - "/bin"
@@ -64,7 +64,6 @@ modules:
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/tracker.git
-    tag: 2.3.0
 # Bundle intltool until tracker-miners drops that dependency 
https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/29
 - name: intltool
   cleanup:
@@ -98,7 +97,6 @@ modules:
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/tracker-miners.git
-    tag: 2.3.0
 - name: gnome-desktop
   buildsystem: meson
   config-opts:
@@ -112,7 +110,6 @@ modules:
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
-    tag: 0.2.4
 - buildsystem: meson
   builddir: true
   name: nautilus


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