diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-Treat-XDG_DATA_DIRS-like-PATH.patch | 30 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
3 files changed, 5 insertions, 41 deletions
@@ -1,6 +1,6 @@ pkgbase = snapd pkgdesc = Service and tools for management of snap packages. - pkgver = 2.54.3 + pkgver = 2.54.4 pkgrel = 1 url = https://github.com/snapcore/snapd install = snapd.install @@ -27,9 +27,7 @@ pkgbase = snapd conflicts = snap-confine options = !strip options = emptydirs - source = snapd-2.54.3.tar.xz::https://github.com/snapcore/snapd/releases/download/2.54.3/snapd_2.54.3.vendor.tar.xz - source = 0001-Treat-XDG_DATA_DIRS-like-PATH.patch - sha256sums = 462b2f5fdc74632ed5891cc589045c43f11687951863f7f51f260d52fde60801 - sha256sums = eadd601d659a60386a5c4509c7add50cb37018e47c5fad03dffae3ef9d021d00 + source = snapd-2.54.4.tar.xz::https://github.com/snapcore/snapd/releases/download/2.54.4/snapd_2.54.4.vendor.tar.xz + sha256sums = c00a041dd5665cc5e3d6977e0a53ac896cae1cc73c93ee9c5339efb17264bd39 pkgname = snapd diff --git a/0001-Treat-XDG_DATA_DIRS-like-PATH.patch b/0001-Treat-XDG_DATA_DIRS-like-PATH.patch deleted file mode 100644 index 47141f30b10c..000000000000 --- a/0001-Treat-XDG_DATA_DIRS-like-PATH.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - @@ -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.3 +pkgver=2.54.4 pkgrel=1 arch=('x86_64' 'i686' 'armv7h' 'aarch64') url="https://github.com/snapcore/snapd" @@ -19,12 +19,8 @@ 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=( - '462b2f5fdc74632ed5891cc589045c43f11687951863f7f51f260d52fde60801' - 'eadd601d659a60386a5c4509c7add50cb37018e47c5fad03dffae3ef9d021d00' ) +sha256sums=('c00a041dd5665cc5e3d6977e0a53ac896cae1cc73c93ee9c5339efb17264bd39') _gourl=github.com/snapcore/snapd |