summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerdinand Bachmann2022-05-30 19:33:15 +0200
committerFerdinand Bachmann2022-05-30 19:33:15 +0200
commite84dea3911b7e903b79c27f2389c20e78468af1e (patch)
tree6b9a557c6acb79ec8a0b3637dcf0836ef58796ff
parent6a724063dc16c7c215a3b340d05c5a8963edecb0 (diff)
parent9915770484d00e1f06256308f900fe4204bd1b5e (diff)
downloadaur-e84dea3911b7e903b79c27f2389c20e78468af1e.tar.gz
merge upstream changes
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2c1705dc7bd4..0208f9c9584e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wlroots-asan-git
pkgdesc = Modular Wayland compositor library (git version, with address sanitizer)
- pkgver = 0.16.0.r5387.e279266f
+ pkgver = 0.16.0.r5511.e59f4d4f
pkgrel = 1
url = https://gitlab.freedesktop.org/wlroots/wlroots
arch = x86_64
@@ -26,7 +26,7 @@ pkgbase = wlroots-asan-git
depends = xorg-xwayland
provides = libwlroots.so
provides = wlroots=0.16.0
- provides = wlroots-git=0.16.0.r5387.e279266f
+ provides = wlroots-git=0.16.0.r5511.e59f4d4f
conflicts = wlroots
options = debug
source = wlroots::git+https://gitlab.freedesktop.org/wlroots/wlroots.git
diff --git a/PKGBUILD b/PKGBUILD
index 7e9cb68852c1..1720eb2cf5b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Antonin Décimo <antonin dot decimo at gmail dot com>
pkgname=wlroots-asan-git
_pkgname=wlroots
-pkgver=0.16.0.r5387.e279266f
+pkgver=0.16.0.r5542.98c5f58a
pkgrel=1
license=(custom:MIT)
pkgdesc='Modular Wayland compositor library (git version, with address sanitizer)'
@@ -54,7 +54,7 @@ pkgver () {
(
set -o pipefail
meson introspect --projectinfo "${_builddir_pkgver}" \
- | awk 'match($0, /"version":\s*"([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)"/, ret) {printf "%s",ret[1]}'
+ | awk 'match($0, /"version":\s*"([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)-dev"/, ret) {printf "%s",ret[1]}'
)
cd "${_pkgname}"
printf ".r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"