Update PKGBUILD for meson and 0.58.0

Signed-off-by: mydongistiny <jaysonedson@gmail.com>

3 files changed, 17 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 71baca3d5a0f..3484d97f17fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vte3-notification
 	pkgdesc = Virtual Terminal Emulator widget for use with GTK3 with Fedora patches
-	pkgver = 0.56.3
+	pkgver = 0.58.0
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Terminal/VTE
 	arch = i686
@@ -10,6 +10,8 @@ pkgbase = vte3-notification
 	makedepends = intltool
 	makedepends = gobject-introspection
 	makedepends = gtk-doc
+	makedepends = meson
+	makedepends = pango
 	makedepends = vala
 	makedepends = gperf
 	makedepends = glade
@@ -18,11 +20,9 @@ pkgbase = vte3-notification
 	depends = gnutls
 	options = !emptydirs
 	source = git+https://git.gnome.org/browse/vte#tag=0.56.3
-	source = vte291-command-notify-scroll-speed.patch-94ec580d203552c728f6d46ce539fd321d991500::https://src.fedoraproject.org/rpms/vte291/raw/94ec580d203552c728f6d46ce539fd321d991500/f/vte291-command-notify-scroll-speed.patch
-	source = add-zsh-notfication-support.patch
+	source = vte291-cntnr-precmd-preexec-scroll.patch-b067afd77f6dbc789b9844dbe4b455ed77540464::https://src.fedoraproject.org/rpms/vte291/raw/b067afd77f6dbc789b9844dbe4b455ed77540464/f/vte291-cntnr-precmd-preexec-scroll.patch
 	sha256sums = SKIP
-	sha256sums = 5de49179d88acba730e7446913724ca012b4b5aedb6392b2547a11725829180b
-	sha256sums = 150a151404ca565f70259044661b2ef5cda43142ca677e7da324614eef8cf45a
+	sha256sums = 9e2f27aad738d11226161f066c0eefc831a3aa1ec6f043d53104382a8e752d2d
 
 pkgname = vte3-notification
 	depends = gtk3
diff --git a/PKGBUILD b/PKGBUILD
index 7efd48ba3196..eeec8cfc5cb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,61 +2,45 @@
 # Contributor: Manuel Hüsers <manuel.huesers@uni-ol.de>
 # Contributor: Fernando Fernandez <fernando@softwareperonista.com.ar>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Jason Edson <jaysonedson@gmail.com>
 
 pkgbase='vte3-notification'
 pkgname=("${pkgbase}" 'vte-notification-common')
-pkgver=0.56.3
-pkgrel=2
+pkgver=0.58.0
+pkgrel=1
 pkgdesc='Virtual Terminal Emulator widget for use with GTK3 with Fedora patches'
 arch=('i686' 'x86_64')
 url='https://wiki.gnome.org/Apps/Terminal/VTE'
 license=('LGPL')
 depends=('gtk3' 'pcre2' 'gnutls')
-makedepends=('git' 'intltool' 'gobject-introspection' 'gtk-doc' 'vala' 'gperf' 'glade')
+makedepends=('git' 'intltool' 'gobject-introspection' 'gtk-doc' 'meson' 'pango' 'vala' 'gperf' 'glade')
 options=('!emptydirs')
 
 # Fedora patches: https://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/
 _frepourl='https://src.fedoraproject.org/rpms/vte291'
 _frepobranch='f30'
-_fpatchfile='vte291-command-notify-scroll-speed.patch'
-_fcommit='94ec580d203552c728f6d46ce539fd321d991500'
+_fpatchfile='vte291-cntnr-precmd-preexec-scroll.patch'
+_fcommit='b067afd77f6dbc789b9844dbe4b455ed77540464'
 
 # VTE source ref
-#_vtecommit='837cce9ced6bfe317cb97aeca171001da92cb3a1'
 _vtetag=${pkgver}
 
 source=(
-	#"git+https://git.gnome.org/browse/vte#commit=$_vtecommit"
 	"git+https://git.gnome.org/browse/vte#tag=$_vtetag"
 	"${_fpatchfile}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile}"
-	'add-zsh-notfication-support.patch'
 )
 sha256sums=('SKIP'
-            '5de49179d88acba730e7446913724ca012b4b5aedb6392b2547a11725829180b'
-            '150a151404ca565f70259044661b2ef5cda43142ca677e7da324614eef8cf45a')
-
-#pkgver() {
-#	cd vte
-#	git describe --tags | sed 's/-/+/g'
-#}
+            '9e2f27aad738d11226161f066c0eefc831a3aa1ec6f043d53104382a8e752d2d')
 
 prepare () {
 	cd "vte"
 
 	patch -p1 -i "../${_fpatchfile}-${_fcommit}"
-	#patch -p1 -i '../add-zsh-notfication-support.patch'
-
-	NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-	cd "vte"
-	./configure --prefix='/usr' --sysconfdir='/etc' \
-		--libexecdir='/usr/lib/vte' \
-		--localstatedir='/var' --disable-static \
-		--enable-introspection --enable-glade-catalogue --enable-gtk-doc
-	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-	make
+	arch-meson vte build -D docs=true
+	ninja -C build
 }
 
 package_vte3-notification(){
@@ -64,10 +48,9 @@ package_vte3-notification(){
 	provides=("vte3=${pkgver}")
 	conflicts=('vte3')
 
-	cd "vte"
-	make DESTDIR="${pkgdir}" install
+	DESTDIR="${pkgdir}" meson install -C build
 
-	rm "${pkgdir}/etc/profile.d/vte.sh"
+	mv "$pkgdir/etc/profile.d/vte.sh" "$srcdir"
 }
 
 package_vte-notification-common() {
@@ -76,7 +59,6 @@ package_vte-notification-common() {
 	arch=('any')
 	provides=("vte-common=${pkgver}")
 	conflicts=('vte-common')
-	cd "vte"
 
-	install -Dm644 'src/vte.sh' "${pkgdir}/etc/profile.d/vte.sh"
+	install -Dt "$pkgdir/etc/profile.d" -m644 vte.sh
 }
diff --git a/add-zsh-notfication-support.patch b/add-zsh-notfication-support.patch
deleted file mode 100644
index 31c3309466cb..000000000000
--- a/add-zsh-notfication-support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9e2914d67cdb8cbaf43b4371aac79b0870f843ae Mon Sep 17 00:00:00 2001
-From: Fernando Fernandez <fernando@softwareperonista.com.ar>
-Date: Fri, 3 Apr 2015 16:40:47 -0300
-Subject: [PATCH 1/1] add zsh notfication support
-
----
- src/vte.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/vte.sh b/src/vte.sh
-index 2d211ca..6730aa3 100644
---- a/src/vte.sh
-+++ b/src/vte.sh
-@@ -46,7 +46,9 @@ __vte_ps1() {
- }
- 
- __vte_osc7 () {
--  printf "\033]7;file://%s%s\007" "${HOSTNAME:-}" "$(__vte_urlencode "${PWD}")"
-+  last_command=$(history | tail -n1 - | cut -c8-)
-+
-+  printf "\033]777;notify;Command completed;%s\007\033]7;file://%s%s\007" "${last_command}" "${HOSTNAME:-}" "$(__vte_urlencode "${PWD}")"
- }
- 
- __vte_prompt_command() {
--- 
-2.3.4
-