Merge branch '43'

PKGBUILD

@@ -9,15 +9,28 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3-notification
-pkgname=("${pkgbase}" 'vte-notification-common')
+pkgname=(vte-notification-common vte3-notification vte4-notification)
 pkgver=0.70.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Virtual Terminal Emulator widget with Fedora patches"
-arch=('x86_64')
+arch=(x86_64)
 url="https://wiki.gnome.org/Apps/Terminal/VTE"
-license=('LGPL')
-depends=('gtk3' 'gtk4' 'pcre2' 'gnutls' 'fribidi' 'systemd')
-makedepends=('gobject-introspection' 'vala' 'git' 'gtk-doc' 'gperf' 'meson' 'gi-docgen')
+license=(LGPL)
+makedepends=(
+  fribidi
+  gi-docgen
+  git
+  gnutls
+  gobject-introspection
+  gperf
+  gtk3
+  gtk4
+  meson
+  pcre2
+  systemd
+  vala
+)
+options=(!lto)
 _commit=5bf476f1d7283bc805ac8ae6abe94f81ffd7be05  # tags/0.70.1^0
 
 # Fedora patches: https://src.fedoraproject.org/rpms/vte291/tree/
@@ -46,10 +59,13 @@ prepare () {
 }
 
 build() {
-  arch-meson vte build \
-    -D b_lto=false \
-    -D docs=true \
+  local meson_options=(
+    -D b_lto=false
+    -D docs=false
     -D gtk4=true
+  )
+
+  arch-meson vte build "${meson_options[@]}"
   meson compile -C build
 }
 
@@ -67,23 +83,62 @@ _pick() {
   done
 }
 
-package_vte3-notification(){
-  depends+=('vte-notification-common')
-  provides=("vte3=${pkgver}" 'libvte-2.91.so' 'libvte-2.91-gtk4.so')
-  conflicts=('vte3')
+package_vte-notification-common() {
+  pkgdesc+=" (common files)"
+  depends=(sh)
+  provides=("vte-common=${pkgver}")
+  conflicts=('vte-common')
 
   meson install -C build --destdir "$pkgdir"
 
-  ### Split vte-common
-  _pick vte-common "$pkgdir"/etc/profile.d
-  _pick vte-common "$pkgdir"/usr/lib/{systemd,vte-urlencode-cwd}
+  cd "$pkgdir"
+
+  _pick gtk3 usr/bin/vte-2.91
+  _pick gtk3 usr/include/vte-2.91
+  _pick gtk3 usr/lib/libvte-2.91.so*
+  _pick gtk3 usr/lib/pkgconfig/vte-2.91.pc
+  _pick gtk3 usr/lib/girepository-1.0/Vte-2.91.typelib
+  _pick gtk3 usr/share/gir-1.0/Vte-2.91.gir
+  _pick gtk3 usr/share/glade
+  _pick gtk3 usr/share/vala/vapi/vte-2.91.{deps,vapi}
+
+  _pick gtk4 usr/bin/vte-2.91-gtk4
+  _pick gtk4 usr/include/vte-2.91-gtk4
+  _pick gtk4 usr/lib/libvte-2.91-gtk4.so*
+  _pick gtk4 usr/lib/pkgconfig/vte-2.91-gtk4.pc
+  _pick gtk4 usr/lib/girepository-1.0/Vte-3.91.typelib
+  _pick gtk4 usr/share/gir-1.0/Vte-3.91.gir
+  _pick gtk4 usr/share/vala/vapi/vte-2.91-gtk4.{deps,vapi}
 }
 
-package_vte-notification-common() {
-  pkgdesc="Files shared by VTE libraries"
-  depends=('sh')
-  provides=("vte-common=${pkgver}")
-  conflicts=('vte-common')
+package_vte3-notification(){
+  pkgdesc+=" (GTK3)"
+  depends=(
+    fribidi
+    gnutls
+    gtk3
+    pcre2
+    systemd
+    vte-notification-common
+  )
+  provides=("vte3=${pkgver}" 'libvte-2.91.so')
+  conflicts=('vte3')
+
+  mv gtk3/* "$pkgdir"
+}
+
+package_vte4-notification() {
+  pkgdesc+=" (GTK4)"
+  depends=(
+    fribidi
+    gnutls
+    gtk4
+    pcre2
+    systemd
+    vte-notification-common
+  )
+  provides+=("vte4=${pkgver}" libvte-2.91-gtk4.so)
+  conflicts=(vte4)
 
-  mv vte-common/* "$pkgdir"
+  mv gtk4/* "$pkgdir"
 }