update conflicts/provides, pkgver()

2 files changed, 15 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3998b93eaf9d..3669af83e90e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vte3-git
 	pkgdesc = Virtual Terminal Emulator widget for use with GTK3
-	pkgver = 0.73.0.r23.gdce7b5f0
+	pkgver = 0.73.0.r26.g092d8b8f
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/vte
 	arch = x86_64
@@ -17,10 +17,12 @@ pkgbase = vte3-git
 	depends = vte-common
 	depends = glibc
 	depends = pcre2
-	provides = vte3=0.73.0.r23.gdce7b5f0
+	provides = vte3=0.73.0.r26.g092d8b8f
 	provides = libvte-2.91.so
 	provides = vte-common
+	provides = vte-git
 	conflicts = vte-common
+	conflicts = vte-git
 	conflicts = vte3
 	options = !emptydirs
 	source = vte::git+https://gitlab.gnome.org/GNOME/vte
diff --git a/PKGBUILD b/PKGBUILD
index 5d313adc4cd0..844e1b0bf687 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 _gitname="vte"
 _pkgname="vte3"
 pkgname="$_pkgname-git"
-pkgver=0.73.0.r23.gdce7b5f0
+pkgver=0.73.0.r26.g092d8b8f
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('x86_64')
@@ -36,9 +36,11 @@ provides=(
   "vte3=$pkgver"
   'libvte-2.91.so'
   'vte-common'
+  'vte-git'
 )
 conflicts=(
   'vte-common'
+  'vte-git'
   'vte3'
 )
 
@@ -52,12 +54,17 @@ sha256sums=(
 pkgver() {
   cd "$srcdir/$_gitname"
 
+  _regex="^\s+version:\s+'([0-9]+\\.[0-9]+\\.[0-9]+)',\$"
+  _file='meson.build'
+
+  _line=$(
+    grep -E "$_regex" "$_file" | head -1
+  )
   _version=$(
-    grep -E "^\s+version:\s+'([0-9]+\.[0-9]+\.[0-9]+)',\$" meson.build \
-      | sed -E "s@^\s+version:\s+'([0-9]+\.[0-9]+\.[0-9]+)',\$@\1@"
+    echo "$_line" | sed -E "s@$_regex@\1@"
   )
   _commit=$(
-    git log -S "$_version" -1 --pretty=oneline | sed 's@\ .*$@@'
+    git log -S "$_line" -1 --pretty=oneline --no-color | sed 's@\ .*$@@'
   )
   _revision=$(
     git rev-list --count $_commit..HEAD