From 51ef7a83da8050ac6313bd1254aa34e6ccd013be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 15 Apr 2024 13:29:42 -0400
Subject: [PATCH] snapcraft: fix build
Change-Id: I8ac570f0ad859b2ea2ee83ca8fe3927848148ff3
---
extras/packaging/gnu-linux/docker/Dockerfile_snap | 3 ++-
extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_snap b/extras/packaging/gnu-linux/docker/Dockerfile_snap
index a0f1b7ae9..e9a59a486 100644
--- a/extras/packaging/gnu-linux/docker/Dockerfile_snap
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_snap
@@ -1,5 +1,5 @@
ARG RISK=edge
-ARG UBUNTU=jammy
+ARG UBUNTU=focal
FROM ubuntu:$UBUNTU as builder
ARG RISK
@@ -83,6 +83,7 @@ ENV PATH="/snap/bin:/snap/snapcraft/current/usr/bin:/snap/snapcraft/current/libe
ENV SNAP="/snap/snapcraft/current"
ENV SNAP_NAME="snapcraft"
ENV SNAP_ARCH="amd64"
+ENV DISABLE_PIPEWIRE=true
ADD extras/packaging/gnu-linux/scripts/build-package-snap.sh /opt/build-package-snap.sh
CMD ["/opt/build-package-snap.sh"]
diff --git a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
index f7cb3566e..c32cd20a6 100644
--- a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
+++ b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
@@ -168,7 +168,7 @@ package-repositories:
components: [main]
suites: [jami]
key-id: A295D773307D25A33AE72F2F64CD5FA175348F84
- url: https://dl.jami.net/nightly/ubuntu_22.04/
+ url: https://dl.jami.net/nightly/ubuntu_20.04/
parts:
desktop-launch:
@@ -304,7 +304,7 @@ parts:
- libswscale-dev
- libva-dev
- libvdpau-dev
- - libpipewire-0.3-dev
+ - libpipewire-0.2-dev
- libargon2-0-dev # opendht
- libexpat1-dev
- libjsoncpp-dev
@@ -327,7 +327,7 @@ parts:
- libegl1
- libgbm1
- libgudev-1.0-0
- - libjsoncpp25
+ - libjsoncpp1
- libllvm12
- libminizip1
- libnm0
--
GitLab