diff options
| author | Jeremy Kescher | 2023-08-19 19:21:54 +0200 |
|---|---|---|
| committer | Jeremy Kescher | 2023-08-19 19:21:54 +0200 |
| commit | de9580250a3b65842224d78b5d7e0205d74248b1 (patch) | |
| tree | 70627af045c821f6dfcfae1d8b0cbe06abb0b016 | |
| parent | f9a7bb7ea823fd308bbb4e8e7a95ba447bd8fed3 (diff) | |
| download | aur-de9580250a3b65842224d78b5d7e0205d74248b1.tar.gz | |
Remove epoch due to version checks (so we align with the main Arch package again), simplify pkgver()
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
2 files changed, 4 insertions, 13 deletions
@@ -1,8 +1,7 @@ pkgbase = xdg-desktop-portal-git pkgdesc = Desktop integration portals for sandboxed apps - pkgver = 1.16.0.r69.gdea5cac + pkgver = 1.17.0.r6.g4434b20 pkgrel = 1 - epoch = 1 url = https://github.com/flatpak/xdg-desktop-portal arch = x86_64 license = LGPL @@ -22,7 +21,7 @@ pkgbase = xdg-desktop-portal-git depends = pipewire depends = rtkit depends = systemd - provides = xdg-desktop-portal=1.16.0.r69.gdea5cac + provides = xdg-desktop-portal=1.17.0.r6.g4434b20 conflicts = xdg-desktop-portal source = git+https://github.com/flatpak/xdg-desktop-portal b2sums = SKIP @@ -4,9 +4,8 @@ pkgname=xdg-desktop-portal-git _pkgname="${pkgname%-git}" -pkgver=1.16.0.r69.gdea5cac +pkgver=1.17.0.r6.g4434b20 pkgrel=1 -epoch=1 pkgdesc="Desktop integration portals for sandboxed apps" url="https://github.com/flatpak/${_pkgname}" arch=(x86_64) @@ -39,14 +38,7 @@ b2sums=('SKIP') pkgver() { cd "${_pkgname}" - # Generate git tag based version. Count only proper (v)#.#* [#=number] tags. - local _gitversion=$(git describe --long --tags --match '[v0-9][0-9.][0-9.]*' | sed -e 's|^v||' | tr '[:upper:]' '[:lower:]') - - # Format git-based version for pkgver - echo "${_gitversion}" | sed \ - -e 's|^\([0-9][0-9.]*\)-\([a-zA-Z]\+\)|\1\2|' \ - -e 's|\([0-9]\+-g\)|r\1|' \ - -e 's|-|.|g' + git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { |