Update vte to 0.64.2a

2 files changed, 14 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3aafbb842a65..a277621fc2df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = termite
 	pkgdesc = A simple VTE-based terminal
 	pkgver = 15
-	pkgrel = 4
+	pkgrel = 6
 	url = https://github.com/thestinger/termite/
 	install = termite.install
 	arch = x86_64
@@ -11,12 +11,13 @@ pkgbase = termite
 	makedepends = intltool
 	makedepends = gperf
 	makedepends = gtk-doc
+	makedepends = meson
 	depends = gtk3
 	depends = pcre2
 	depends = gnutls
 	depends = vte-common
 	source = git+https://github.com/thestinger/termite.git#tag=v15?signed
-	source = git+https://github.com/thestinger/vte-ng.git#tag=0.56.2.a
+	source = git+https://github.com/BarbUk/vte-ng.git#tag=0.64.2a
 	source = termite-util::git+https://github.com/thestinger/util.git#tag=409b8449ab51fccf51057621168c9c15c54d4807
 	validpgpkeys = E499C79F53C96A54E572FEE1C06086337C50773E
 	validpgpkeys = 65EEFE022108E2B708CBFCF7F9E712E59AF5F22A
diff --git a/PKGBUILD b/PKGBUILD
index befe1af630d2..02ac3fa78890 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,23 @@
 # Maintainer: Frederik Schwan <freswa@archlinux.org>
 # Contributor: Jelle van der Waa <jelle@archlinux.org>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Julien Virey <julien.virey@gmail.com>
 
 pkgbase=termite
 pkgname=('termite' 'termite-terminfo')
 pkgver=15
-pkgrel=4
-_vtever='0.56.2.a'
+pkgrel=6
+_vtever='0.64.2a'
 _commit='409b8449ab51fccf51057621168c9c15c54d4807'
 pkgdesc='A simple VTE-based terminal'
 url='https://github.com/thestinger/termite/'
+install=termite.install
 license=('LGPL')
 arch=('x86_64')
-install=termite.install
 depends=('gtk3' 'pcre2' 'gnutls' 'vte-common')
-makedepends=('git' 'ncurses' 'intltool' 'gperf' 'gtk-doc')
+makedepends=('git' 'ncurses' 'intltool' 'gperf' 'gtk-doc' 'meson')
 source=("git+https://github.com/thestinger/termite.git#tag=v${pkgver}?signed"
-        "git+https://github.com/thestinger/vte-ng.git#tag=${_vtever}"
+        "git+https://github.com/BarbUk/vte-ng.git#tag=${_vtever}"
         "termite-util::git+https://github.com/thestinger/util.git#tag=${_commit}")
 validpgpkeys=('E499C79F53C96A54E572FEE1C06086337C50773E'  # Jelle van der Waa
               '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A') # Daniel Micay
@@ -25,31 +26,18 @@ sha256sums=('SKIP'
             'SKIP')
 
 prepare() {
-  cd vte-ng
-  echo 'sources: $(BUILT_SOURCES)' >> src/Makefile.am 
-  NOCONFIGURE=1 ./autogen.sh
-
-  cd ../termite
+  cd termite
   git submodule init
   git config --local submodule.util.url "${srcdir}"/termite-util
   git submodule update
 }
 
 build() {
-  cd vte-ng
-  ./configure \
-    --prefix="${srcdir}"/vte-static \
-    --localedir=/usr/share/termite/locale \
-    --enable-static \
-    --disable-shared \
-    enable_introspection=no \
-    enable_vala=no \
-    --disable-gtk-doc \
-    --disable-glade-catalogue
-  make -C src sources install-exec install-data -j 1 # makefile bug does not allow -j
-  make install-pkgconfigDATA
+  arch-meson vte-ng build --prefix="${srcdir}"/vte-static --default-library=static -D docs=true -D b_lto=false -D static=true -D gir=false -D vapi=false -D docs=false
+  meson compile -C build
+  meson install -C build
 
-  cd ../termite
+  cd termite
   export PKG_CONFIG_PATH="${srcdir}"/vte-static/lib/pkgconfig
   make
 }
@@ -58,7 +46,6 @@ package_termite() {
   depends+=('termite-terminfo')
   backup=(etc/xdg/termite/config)
 
-  make -C vte-ng/po DESTDIR="${pkgdir}" install-data
   make -C termite DESTDIR="${pkgdir}" PREFIX=/usr install
   rm -r "${pkgdir}"/usr/share/terminfo
 }