summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Feletto2021-10-01 10:33:15 +0200
committerAndrea Feletto2021-10-01 10:33:15 +0200
commit3c766ac9f349d9192dbb8fbf394a8bd48a6764db (patch)
tree88b30898ad446830ce61d78feb2cd02fc2f69bc1
parent9aeba4a8f0fe1c8a73ea1989b5ae7e8d7679e557 (diff)
downloadaur-3c766ac9f349d9192dbb8fbf394a8bd48a6764db.tar.gz
add river-noxwayland-git to conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 59e8599afe02..0dc07c44042d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = river-git
pkgdesc = A dynamic tiling wayland compositor.
- pkgver = r736.6616d32
+ pkgver = r738.e6bb373
pkgrel = 1
url = https://github.com/ifreund/river
arch = x86_64
@@ -21,6 +21,7 @@ pkgbase = river-git
provides = riverctl
provides = rivertile
conflicts = river
+ conflicts = river-noxwayland-git
source = git+https://github.com/ifreund/river
source = git+https://github.com/ifreund/zig-pixman.git
source = git+https://github.com/ifreund/zig-wayland.git
diff --git a/PKGBUILD b/PKGBUILD
index c30c6fb7d403..f292df1ee6c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=river-git
_pkgname=${pkgname%-*}
-pkgver=r736.6616d32
+pkgver=r738.e6bb373
pkgrel=1
pkgdesc='A dynamic tiling wayland compositor.'
arch=('x86_64')
@@ -16,7 +16,7 @@ depends=(
)
makedepends=('zig>=0.8.0' 'git' 'scdoc')
provides=('river' 'riverctl' 'rivertile')
-conflicts=('river')
+conflicts=('river' 'river-noxwayland-git')
source=(
"git+$url"
'git+https://github.com/ifreund/zig-pixman.git'