upgpkg: snapd 2.54.2-1

upstream release

Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>

3 files changed, 41 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17d413b26ed3..a658ed16e45d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = snapd
 	pkgdesc = Service and tools for management of snap packages.
-	pkgver = 2.54.1
+	pkgver = 2.54.2
 	pkgrel = 1
 	url = https://github.com/snapcore/snapd
 	install = snapd.install
@@ -27,7 +27,9 @@ pkgbase = snapd
 	conflicts = snap-confine
 	options = !strip
 	options = emptydirs
-	source = snapd-2.54.1.tar.xz::https://github.com/snapcore/snapd/releases/download/2.54.1/snapd_2.54.1.vendor.tar.xz
-	sha256sums = 561dc06fc21e2b20a5b59d6f43fc884c807af4bd4b2f79b13f5fb2d0f5f43ade
+	source = snapd-2.54.2.tar.xz::https://github.com/snapcore/snapd/releases/download/2.54.2/snapd_2.54.2.vendor.tar.xz
+	source = 0001-Treat-XDG_DATA_DIRS-like-PATH.patch
+	sha256sums = 5db29c6cbcb5a77fecdc69c5d287d70ff8a940340e181debdb95ce0ac0283bd2
+	sha256sums = eadd601d659a60386a5c4509c7add50cb37018e47c5fad03dffae3ef9d021d00
 
 pkgname = snapd
diff --git a/0001-Treat-XDG_DATA_DIRS-like-PATH.patch b/0001-Treat-XDG_DATA_DIRS-like-PATH.patch
new file mode 100644
index 000000000000..47141f30b10c
--- /dev/null
+++ b/0001-Treat-XDG_DATA_DIRS-like-PATH.patch
@@ -0,0 +1,30 @@
+From 77cb1707f8bb2a5fae69a1b9e92881c8823cf620 Mon Sep 17 00:00:00 2001
+Message-Id: <77cb1707f8bb2a5fae69a1b9e92881c8823cf620.1641985440.git.maciej.zenon.borzecki@canonical.com>
+From: Jakub Duchateau <duchateaujakub@gmail.com>
+Date: Sat, 8 Jan 2022 10:50:06 +0100
+Subject: [PATCH] Threat XDG_DATA_DIRS like PATH
+
+Tell fish to treat XDG_DATA_DIRS as a column separated list and not space separated (default).
+Otherwise, get corrupted list with mixed separators:
+XDG_DATA_DIRS=/var/lib/flatpak/exports/share:/usr/local/share/:/usr/share/:/var/lib/snapd/desktop /var/lib/snapd/desktop /var/lib/snapd/desktop
+
+Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
+---
+ data/env/snapd.fish.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/env/snapd.fish.in b/data/env/snapd.fish.in
+index f2a6591249595661b7c9a829b6c252e27fcb3d08..f208c60702dccadb37d7fade6b677cf5c028f430 100644
+--- a/data/env/snapd.fish.in
++++ b/data/env/snapd.fish.in
+@@ -6,6 +6,7 @@ fish_add_path -aP $snap_bin_path
+ # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for
+ # snappy applications' desktop files.
+ set -u snap_xdg_path /var/lib/snapd/desktop
++set --path XDG_DATA_DIRS $XDG_DATA_DIRS
+ if ! contains $snap_xdg_path $XDG_DATA_DIRS
+     set XDG_DATA_DIRS $XDG_DATA_DIRS $snap_xdg_path
+ end
+-- 
+2.34.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 4865db53b577..2358a9cddae6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="Service and tools for management of snap packages."
 depends=('squashfs-tools' 'libseccomp' 'libsystemd' 'apparmor')
 optdepends=('bash-completion: bash completion support'
             'xdg-desktop-portal: desktop integration')
-pkgver=2.54.1
+pkgver=2.54.2
 pkgrel=1
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url="https://github.com/snapcore/snapd"
@@ -19,8 +19,12 @@ options=('!strip' 'emptydirs')
 install=snapd.install
 source=(
     "$pkgname-$pkgver.tar.xz::https://github.com/snapcore/${pkgname}/releases/download/${pkgver}/${pkgname}_${pkgver}.vendor.tar.xz"
+    "0001-Treat-XDG_DATA_DIRS-like-PATH.patch"
+)
+sha256sums=(
+  '5db29c6cbcb5a77fecdc69c5d287d70ff8a940340e181debdb95ce0ac0283bd2'
+  'eadd601d659a60386a5c4509c7add50cb37018e47c5fad03dffae3ef9d021d00'
 )
-sha256sums=('561dc06fc21e2b20a5b59d6f43fc884c807af4bd4b2f79b13f5fb2d0f5f43ade')
 
 
 _gourl=github.com/snapcore/snapd