summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntónio Fernandes <antoniof@gnome.org>2022-04-22 23:03:52 +0100
committerAntónio Fernandes <antoniof@gnome.org>2022-04-22 23:05:45 +0100
commitca306b56d9f72afd60f515f311ed14bf95fdb028 (patch)
tree542b9168116438b08856789f9ba39f7a94277b58
parent5896e6af41b1fe89c9c5aef12793224d7492b482 (diff)
downloadnautilus-ca306b56d9f72afd60f515f311ed14bf95fdb028.tar.gz
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
-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 1ce13e3aa..f3045d0e2 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -98,7 +98,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 8538efa78..014ce69cf 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -76,6 +76,7 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gnome-desktop.git
+ branch: gnome-42
- name: gnome-autoar
buildsystem: meson
builddir: true