From 0f35faaf5b78521453987b6f35964462d02bcdd5 Mon Sep 17 00:00:00 2001
From: Amin Bandali <amin.bandali@savoirfairelinux.com>
Date: Tue, 3 May 2022 14:54:57 -0400
Subject: [PATCH] new stable jami snap release

Change-Id: I77f8de96f7a4726aae691a49a7e18cfc4206b69c
---
 client-qt              | 2 +-
 daemon                 | 2 +-
 docker/Dockerfile_snap | 7 ++++++-
 lrc                    | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/client-qt b/client-qt
index 83f68573..6d3ae747 160000
--- a/client-qt
+++ b/client-qt
@@ -1 +1 @@
-Subproject commit 83f68573324a453a6d26e025fd6439f175a79d1b
+Subproject commit 6d3ae747bc15033206662ff8bbd6995b3f859cb3
diff --git a/daemon b/daemon
index 02c5cecd..a6e0119c 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 02c5cecd363a1ee25a914d72e243d7903e44969b
+Subproject commit a6e0119ce72cc793259998ac70a5de328467dc56
diff --git a/docker/Dockerfile_snap b/docker/Dockerfile_snap
index 28371943..38606208 100644
--- a/docker/Dockerfile_snap
+++ b/docker/Dockerfile_snap
@@ -22,7 +22,12 @@ RUN unsquashfs -d /snap/core18/current core18.snap
 
 # Grab the snapcraft snap from the stable channel and unpack it in the proper
 # place.
-RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=stable' | jq '.download_url' -r) --output snapcraft.snap
+# RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=stable' | jq '.download_url' -r) --output snapcraft.snap
+# Current snapcraft snap is broken upstream again:
+#   https://forum.snapcraft.io/t/snapcraft-docker-images-broken-again/27942
+# Temporary workaround: pin to an older, non-broken version for now.
+# TODO: restore to the above once issue is fixed upstream.
+RUN curl -L https://api.snapcraft.io/api/v1/snaps/download/vMTKRaLjnOJQetI78HjntT37VuoyssFE_6751.snap --output snapcraft.snap
 RUN mkdir -p /snap/snapcraft
 RUN unsquashfs -d /snap/snapcraft/current snapcraft.snap
 
diff --git a/lrc b/lrc
index 48db64cb..b45f5815 160000
--- a/lrc
+++ b/lrc
@@ -1 +1 @@
-Subproject commit 48db64cbcd3a8d7a12cad940694ce9239b8db576
+Subproject commit b45f5815d9588ab8ae592de42335ffe46459419f
-- 
GitLab