since vte{3,4}-git doesn't want to make those packages unconflicting and merge them in a single pkgbase, I am making vte-git the git package for vte4 upstream package and I am issuing vtethree-git as git package for vte3 upstream package; they both depend on vte-common and they are not conflicting; as far I am concerned, both vte3-git and vte4-git are broken

2 files changed, 84 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1b1a4ee246e..9035b47af202 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,25 +21,45 @@ pkgbase = vte-git
 	makedepends = pcre2
 	makedepends = systemd
 	makedepends = vala
-	depends = sh
 	options = !emptydirs
 	options = !lto
-	source = vte::git+https://gitlab.gnome.org/GNOME/vte
+	source = vte::git+https://gitlab.gnome.org/GNOME/vte.git
 	sha256sums = SKIP
 
 pkgname = vte-git
-	pkgdesc = Virtual Terminal Emulator widget (metapackage)
-	depends = sh
-	depends = vte-common-git
-	depends = vte3-git
-	depends = vte4-git
-	depends = vte-docs-git
+	pkgdesc = Virtual Terminal Emulator widget (GTK4)
+	depends = fribidi
+	depends = gnutls
+	depends = gtk4
+	depends = pcre2
+	depends = systemd
+	depends = vte-common
+	provides = libvte-2.91-gtk4.so
+	provides = vte4-git=0.73.0.r26.g092d8b8f
+	provides = vte4=0.73.0.r26.g092d8b8f
+	conflicts = vte4-git
+	conflicts = vte4
 
 pkgname = vte-common-git
 	pkgdesc = Virtual Terminal Emulator widget (common files)
+	depends = sh
 	provides = vte-common=0.73.0.r26.g092d8b8f
 	conflicts = vte-common
 
+pkgname = vtethree-git
+	pkgdesc = Virtual Terminal Emulator widget (GTK3)
+	depends = fribidi
+	depends = gnutls
+	depends = gtk3
+	depends = pcre2
+	depends = systemd
+	depends = vte-common
+	provides = libvte-2.91.so
+	provides = vte3-git=0.73.0.r26.g092d8b8f
+	provides = vte3=0.73.0.r26.g092d8b8f
+	conflicts = vte3-git
+	conflicts = vte3
+
 pkgname = vte-docs-git
 	pkgdesc = Virtual Terminal Emulator widget (documentation)
 	provides = vte-docs=0.73.0.r26.g092d8b8f
diff --git a/PKGBUILD b/PKGBUILD
index 820d069485f6..5adfbd30f359 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,4 @@
 # Maintainer: Pellegrino Prevete <pellegrinoprevete@gmail.com>
-# Co-Maintainer: xiota
 # Contributor: David Garfias <jose.garfias@ingenieria.unam.edu>
 # Contributor: Igor <f2404@yandex.ru>
 # Contributor: Lubosz Sarnecki <lubosz@gmail.com>
@@ -10,7 +9,8 @@ _pkgname="${_pkg}-common"
 pkgbase="${_pkg}-git"
 pkgname=(
   "${pkgbase}"
-  "${_pkgname}-git"
+  "${_pkg}-common-git"
+  "${_pkg}three-git"
   "${_pkg}-docs-git")
 pkgver=0.73.0.r26.g092d8b8f
 pkgrel=1
@@ -23,7 +23,6 @@ arch=(
   armv7h)
 license=('LGPL')
 url="https://gitlab.gnome.org/GNOME/${_pkg}"
-depends=(sh)
 makedepends=(
   fribidi
   gi-docgen
@@ -42,7 +41,7 @@ options=(
   !emptydirs
   !lto)
 source=(
-  "${_pkg}::git+${url}"
+  "${_pkg}::git+${url}.git"
 )
 sha256sums=(
   'SKIP'
@@ -76,6 +75,7 @@ build() {
   local meson_options=(
     -D b_lto=false
     -D docs=true
+    -D gtk3=true
     -D gtk4=true
   )
   arch-meson "${_pkg}" build "${meson_options[@]}"
@@ -98,11 +98,14 @@ _pick() {
 
 package_vte-common-git() {
   pkgdesc+=" (common files)"
-  provides+=("${_pkgname}=${pkgver}")
-  conflicts+=("${_pkgname}")
-  DESTDIR="${pkgdir}" ninja install -C build
+  depends=(sh)
+  provides+=("${_pkg}-common=${pkgver}")
+  conflicts+=("${_pkg}-common")
+
   meson install -C build --destdir "${pkgdir}"
+
   cd "${pkgdir}"
+
   _pick gtk3 "usr/bin/${_pkg}-2.91"
   _pick gtk3 "usr/include/${_pkg}-2.91"
   _pick gtk3 "usr/lib/lib${_pkg}-2.91.so"*
@@ -123,6 +126,52 @@ package_vte-common-git() {
   _pick docs usr/share/doc
 }
 
+package_vte-git() {
+  pkgdesc+=" (GTK4)"
+  depends=(
+    fribidi
+    gnutls
+    gtk4
+    pcre2
+    systemd
+    vte-common
+  )
+  provides+=(
+    libvte-2.91-gtk4.so
+    "${_pkg}4-git=${pkgver}"
+    "${_pkg}4=${pkgver}"
+  )
+  conflicts+=(
+    "${_pkg}4-git"
+    "${_pkg}4"
+  )
+
+  mv gtk4/* "$pkgdir"
+}
+
+package_vtethree-git() {
+  pkgdesc+=" (GTK3)"
+  depends=(
+    fribidi
+    gnutls
+    gtk3
+    pcre2
+    systemd
+    vte-common
+  )
+  provides+=(
+    libvte-2.91.so
+    "${_pkg}3-git=${pkgver}"
+    "${_pkg}3=${pkgver}"
+  )
+  conflicts+=(
+    "${_pkg}3-git"
+    "${_pkg}3"
+  )
+
+  mv gtk3/* "$pkgdir"
+}
+
 package_vte-docs-git() {
   provides+=("${_pkg}-docs=${pkgver}")
   conflicts+=("${_pkg}-docs")
@@ -131,12 +180,4 @@ package_vte-docs-git() {
   mv docs/* "$pkgdir"
 }
 
-package_vte-git() {
-  pkgdesc+=" (metapackage)"
-  depends+=("${_pkgname}-git"
-            "${_pkg}3-git"
-            "${_pkg}4-git"
-            "${_pkg}-docs-git")
-}
-
 # vim:set sw=2 sts=-1 et: