summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntónio Fernandes <antoniof@gnome.org>2022-04-22 23:03:52 +0100
committerAntónio Fernandes <antoniojpfernandes@gmail.com>2022-05-11 00:33:46 +0000
commit385d15a709f3e60451d1be345ff3eac04f1de428 (patch)
tree7ee4d6fabb2ec2e32746ab24d942db9fc0cab19c
parentaed076b346cf1fe53dcde5df820f5039d6e08d84 (diff)
downloadnautilus-gnome-41.tar.gz
flatpak: Pin gnome-desktop to stable branchgnome-41
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)
-rw-r--r--build-aux/flatpak/org.gnome.Nautilus.json3
-rw-r--r--build-aux/flatpak/org.gnome.Nautilus.yml1
2 files changed, 3 insertions, 1 deletions
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