summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Edson2021-03-26 09:09:24 -0700
committerJason Edson2021-03-26 09:09:24 -0700
commit3ae3e4282246e2a8e8af6afd15bca644e6944780 (patch)
tree513a9ea665f017a9ca84e88cbd1d5298232f5d25
parent250d2f526aff0703b02bc561da5b11916e2ead4e (diff)
downloadaur-3ae3e4282246e2a8e8af6afd15bca644e6944780.tar.gz
3.21.0.109.gfff5bc5d: Little change to PKGBUILD
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50e181457142..319c14760ce4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = meld-git
pkgdesc = Visual diff and merge tool
- pkgver = 3.21.0.62.gb43834eb
+ pkgver = 3.21.0.109.gfff5bc5d
pkgrel = 1
url = http://meldmerge.org/
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index adaa9e5782d1..47c7dcf8159d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=meld
pkgname=$_pkgname-git
-pkgver=3.21.0.62.gb43834eb
+pkgver=3.21.0.109.gfff5bc5d
pkgrel=1
_realver=3.21.0
pkgdesc='Visual diff and merge tool'
@@ -19,8 +19,8 @@ makedepends=('git'
'meson'
'yelp-tools')
optdepends=('python-dbus: open a new tab in an already running instance')
-conflicts=('meld' 'meld-dev')
provides=('meld')
+conflicts=('meld' 'meld-dev')
options=('!emptydirs')
source=("git+https://gitlab.gnome.org/GNOME/meld.git")
sha256sums=('SKIP')