From 385d15a709f3e60451d1be345ff3eac04f1de428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= Date: Fri, 22 Apr 2022 23:03:52 +0100 Subject: flatpak: Pin gnome-desktop to stable branch The master branch introduces incompatible API changes in the thumbnailing component. The previously cherry-picked patch has been reverted because it shouldn't have been applied to the stable branch. Instead, in order to pass the pipeline, use stable dependency. Fixes https://gitlab.gnome.org/GNOME/nautilus/-/issues/2237 (cherry picked from commit ca306b56d9f72afd60f515f311ed14bf95fdb028) --- build-aux/flatpak/org.gnome.Nautilus.json | 3 ++- build-aux/flatpak/org.gnome.Nautilus.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index fecae9ea1..de832eaad 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -97,7 +97,8 @@ "sources": [ { "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git" + "url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git", + "branch": "gnome-42" } ] }, diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index 06c6b2434..4bf25a84b 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -75,6 +75,7 @@ modules: sources: - type: git url: https://gitlab.gnome.org/GNOME/gnome-desktop.git + branch: gnome-42 - name: gnome-autoar buildsystem: meson builddir: true -- cgit v1.2.1