Update for 0.52.1

2 files changed, 26 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9196782cf6a4..eca3f1fff15f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vte3-tilix
 	pkgdesc = Virtual Terminal Emulator widget for use with GTK3 with Fedora and Tilix patches
-	pkgver = 0.50.2+1.7.1
+	pkgver = 0.52.1
 	pkgrel = 1
 	url = https://github.com/gnunn1/tilix/tree/master/experimental/vte
 	arch = x86_64
@@ -16,24 +16,22 @@ pkgbase = vte3-tilix
 	depends = pcre2
 	depends = gnutls
 	options = !emptydirs
-	source = git+https://git.gnome.org/browse/vte#tag=0.50.2
-	source = vte291-command-notify-scroll-speed.patch-7dce41935b8df88c353b88854780661a0232e699::https://src.fedoraproject.org/rpms/vte291/raw/7dce41935b8df88c353b88854780661a0232e699/f/vte291-command-notify-scroll-speed.patch
+	source = git+https://git.gnome.org/browse/vte#tag=0.52.1
+	source = vte291-command-notify-scroll-speed.patch-9cbc53f85711ce4f34e7ce0aae7e8baf0553012b::https://src.fedoraproject.org/rpms/vte291/raw/9cbc53f85711ce4f34e7ce0aae7e8baf0553012b/f/vte291-command-notify-scroll-speed.patch
 	source = add-zsh-notfication-support.patch
-	source = alternate-screen.patch-1.7.1::https://github.com/gnunn1/tilix/raw/1.7.1/experimental/vte/alternate-screen.patch
-	source = disable-bg-draw.patch-1.7.1::https://github.com/gnunn1/tilix/raw/1.7.1/experimental/vte/disable-bg-draw.patch
+	source = alternate-screen.patch-263160c6cb3adb03d25e13b8a96e56d8e8a4ebed::https://github.com/gnunn1/tilix/raw/263160c6cb3adb03d25e13b8a96e56d8e8a4ebed/experimental/vte/0.52/alternate-screen.patch
 	sha256sums = SKIP
-	sha256sums = 50bce46a90739eb6f150528b5c29a2beb08da529038762de050901055a225371
+	sha256sums = b22e1276202a10007004f19002ceb5eb186f1529e39a6a451e0b82f3d6bce9ee
 	sha256sums = 150a151404ca565f70259044661b2ef5cda43142ca677e7da324614eef8cf45a
-	sha256sums = 980b6bc75a30ec56fe70387784083b5c7ded79715b7a0611e1d4358ee27c4720
-	sha256sums = aa56313332850becb0b02aba1e05888ed978f7d8c006147679e2544cc0ca40cf
+	sha256sums = 09c225fc0aea4f88946b1ce637788997b76f0b16c8b1287671046c2b7e1a590d
 
 pkgname = vte3-tilix
 	depends = gtk3
 	depends = pcre2
 	depends = gnutls
 	depends = vte-tilix-common
-	provides = vte3=0.50.2
-	provides = vte3-notification=0.50.2-2
+	provides = vte3=0.52.1
+	provides = vte3-notification=0.52.1-2
 	provides = vte3-terminix-git
 	conflicts = vte3
 	conflicts = vte3-notification
@@ -43,8 +41,8 @@ pkgname = vte-tilix-common
 	pkgdesc = Common files used by vte and vte3
 	arch = any
 	depends = sh
-	provides = vte-common=0.50.2
-	provides = vte-notification-common=0.50.2-2
+	provides = vte-common=0.52.1
+	provides = vte-notification-common=0.52.1-2
 	provides = vte-terminix-common-git
 	conflicts = vte-common
 	conflicts = vte-notification-common
diff --git a/PKGBUILD b/PKGBUILD
index a6cb36e22952..6eb2c21e8502 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,7 @@
 
 pkgbase='vte3-tilix'
 pkgname=("${pkgbase}" 'vte-tilix-common')
-_vtever=0.50.2
-_tilixver=1.7.1
-pkgver=0.50.2+1.7.1
+pkgver=0.52.1
 pkgrel=1
 pkgdesc='Virtual Terminal Emulator widget for use with GTK3 with Fedora and Tilix patches'
 arch=('x86_64')
@@ -16,50 +14,44 @@ options=('!emptydirs')
 
 # Fedora patches: https://src.fedoraproject.org/cgit/rpms/vte291.git/tree/
 _frepourl='https://src.fedoraproject.org/rpms/vte291'
-_frepobranch='f27'
+_frepobranch='f28'
 _fpatchfile='vte291-command-notify-scroll-speed.patch'
-_fcommit='7dce41935b8df88c353b88854780661a0232e699'
+_fcommit='9cbc53f85711ce4f34e7ce0aae7e8baf0553012b'
 
 # VTE source ref
 #_vtecommit='837cce9ced6bfe317cb97aeca171001da92cb3a1'
-_vtetag=${_vtever}
+_vtetag=${pkgver}
 
+# Tilix source ref
 _tilixpatchfile1='alternate-screen.patch'
-_tilixpatchfile2='disable-bg-draw.patch'
+_tilixcommit='263160c6cb3adb03d25e13b8a96e56d8e8a4ebed'
+
 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'
-	"${_tilixpatchfile1}-${_tilixver}::https://github.com/gnunn1/tilix/raw/${_tilixver}/experimental/vte/${_tilixpatchfile1}"
-	"${_tilixpatchfile2}-${_tilixver}::https://github.com/gnunn1/tilix/raw/${_tilixver}/experimental/vte/${_tilixpatchfile2}"
+	"${_tilixpatchfile1}-${_tilixcommit}::https://github.com/gnunn1/tilix/raw/${_tilixcommit}/experimental/vte/0.52/alternate-screen.patch"
 )
 sha256sums=('SKIP'
-            '50bce46a90739eb6f150528b5c29a2beb08da529038762de050901055a225371'
+            'b22e1276202a10007004f19002ceb5eb186f1529e39a6a451e0b82f3d6bce9ee'
             '150a151404ca565f70259044661b2ef5cda43142ca677e7da324614eef8cf45a'
-            '980b6bc75a30ec56fe70387784083b5c7ded79715b7a0611e1d4358ee27c4720'
-            'aa56313332850becb0b02aba1e05888ed978f7d8c006147679e2544cc0ca40cf')
-pkgver() {
-	cd vte
-
-	echo `git describe --tags | sed 's/-/+/g'`+$_tilixver
-}
+            '09c225fc0aea4f88946b1ce637788997b76f0b16c8b1287671046c2b7e1a590d')
 
 prepare() {
 	cd "vte"
 
 	echo '-> Making the patch-sets compatible'
 	sed -r -e 's/(\-\s*gpointer padding\[)16/\115/g' \
-    	-e 's/(\+\s*gpointer padding\[)15/\114/g' \
-		-i "../${_tilixpatchfile1}-${_tilixver}"
+		-e 's/(\+\s*gpointer padding\[)15/\114/g' \
+		-i "../${_tilixpatchfile1}-${_tilixcommit}"
 
 	echo '-> Applying Fedora patches'
 	patch -p1 -i "../${_fpatchfile}-${_fcommit}"
 	patch -p1 -i '../add-zsh-notfication-support.patch'
 
-	echo '-> Applying terminix patches'
-	patch -p1 -i "../${_tilixpatchfile1}-${_tilixver}"
-	patch -p1 -i "../${_tilixpatchfile2}-${_tilixver}"
+	echo '-> Applying tilix patch'
+	patch -p1 -i "../${_tilixpatchfile1}-${_tilixcommit}"
 
 	NOCONFIGURE=1 ./autogen.sh
 }
@@ -76,7 +68,7 @@ build() {
 
 package_vte3-tilix(){
 	depends+=('vte-tilix-common')
-	provides=("vte3=${_vtever}" "vte3-notification=${_vtever}-2" 'vte3-terminix-git')
+	provides=("vte3=${pkgver}" "vte3-notification=${pkgver}-2" 'vte3-terminix-git')
 	conflicts=('vte3' 'vte3-notification' 'vte3-terminix-git')
 	cd "vte"
 	make DESTDIR="${pkgdir}" install
@@ -88,7 +80,7 @@ package_vte-tilix-common() {
 	depends=('sh')
 	pkgdesc='Common files used by vte and vte3'
 	arch=('any')
-	provides=("vte-common=${_vtever}" "vte-notification-common=${_vtever}-2" 'vte-terminix-common-git')
+	provides=("vte-common=${pkgver}" "vte-notification-common=${pkgver}-2" 'vte-terminix-common-git')
 	conflicts=('vte-common' 'vte-notification-common' 'vte3-terminix-common-git')
 	cd "vte"