Cleanup

2 files changed, 25 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4abe01c9d83f..472eabe93e69 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,23 +16,18 @@ pkgbase = vte3-tilix
 	depends = gtk3
 	depends = pcre2
 	depends = gnutls
-	options = !emptydirs
+	depends = vte-common
+	provides = vte3=0.70.3
+	provides = vte3-notification=0.70.3
+	provides = vte3-terminix-git
+	provides = libvte-2.91.so
+	conflicts = vte3
+	options = !lto
 	source = git+https://gitlab.gnome.org/GNOME/vte.git#tag=0.70.3
-	source = vte291-cntnr-precmd-preexec-scroll.patch-de03576168f1ec4beeb7330239f4debf3234b842::https://src.fedoraproject.org/rpms/vte291/raw/de03576168f1ec4beeb7330239f4debf3234b842/f/vte291-cntnr-precmd-preexec-scroll.patch
 	source = alternate-screen.patch
+	source = vte291-cntnr-precmd-preexec-scroll.patch-de03576168f1ec4beeb7330239f4debf3234b842::https://src.fedoraproject.org/rpms/vte291/raw/de03576168f1ec4beeb7330239f4debf3234b842/f/vte291-cntnr-precmd-preexec-scroll.patch
 	sha256sums = SKIP
-	sha256sums = e5672a857c51a620ca5448da29e4ea5b0e319c2a54416a4ca615b0e0392e00a9
 	sha256sums = 36fdf6a98c2be1b0c5b38a6116f160cdf0f270db688796ff1199234d64e49600
+	sha256sums = e5672a857c51a620ca5448da29e4ea5b0e319c2a54416a4ca615b0e0392e00a9
 
 pkgname = vte3-tilix
-	depends = gtk3
-	depends = pcre2
-	depends = gnutls
-	depends = vte-common
-	provides = vte3=0.70.3
-	provides = vte3-notification=0.70.3-2
-	provides = vte3-terminix-git
-	provides = libvte-2.91.so
-	conflicts = vte3
-	conflicts = vte3-notification
-	conflicts = vte3-terminix-git
diff --git a/PKGBUILD b/PKGBUILD
index 39f799cc963a..115e35d555b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,39 +5,33 @@ pkgname='vte3-tilix'
 pkgver=0.70.3
 pkgrel=1
 pkgdesc='Virtual Terminal Emulator widget (GTK3) (Fedora and Tilix patches)'
-arch=('x86_64')
 url='https://github.com/gnunn1/tilix/tree/master/experimental/vte'
+arch=('x86_64')
 license=('LGPL')
-depends=('gtk3' 'pcre2' 'gnutls')
+depends=('gtk3' 'pcre2' 'gnutls' 'vte-common')
 makedepends=('gi-docgen' 'intltool' 'gobject-introspection' 'gtk-doc' 'vala' 'gperf' 'glade' 'git')
-options=('!emptydirs')
+options=('!lto')
+source=("git+https://gitlab.gnome.org/GNOME/vte.git#tag=$pkgver"
+	'alternate-screen.patch'
+)
+sha256sums=('SKIP'
+            '36fdf6a98c2be1b0c5b38a6116f160cdf0f270db688796ff1199234d64e49600')
+
+provides=("vte3=$pkgver" "vte3-notification=$pkgver" 'vte3-terminix-git' 'libvte-2.91.so')
+conflicts=('vte3')
 
 # Fedora patches: https://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/
 _frepourl='https://src.fedoraproject.org/rpms/vte291'
-_frepobranch='rawhide'
 _fpatchfile='vte291-cntnr-precmd-preexec-scroll.patch'
 _fcommit='de03576168f1ec4beeb7330239f4debf3234b842'
 
-# VTE source ref
-_vtetag=${pkgver}
-
-source=(
-	"git+https://gitlab.gnome.org/GNOME/vte.git#tag=$_vtetag"
-	"${_fpatchfile}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile}"
-	'alternate-screen.patch'
-)
-sha256sums=('SKIP'
-            'e5672a857c51a620ca5448da29e4ea5b0e319c2a54416a4ca615b0e0392e00a9'
-            '36fdf6a98c2be1b0c5b38a6116f160cdf0f270db688796ff1199234d64e49600')
+source+=("${_fpatchfile}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile}")
+sha256sums+=('e5672a857c51a620ca5448da29e4ea5b0e319c2a54416a4ca615b0e0392e00a9')
 
 prepare() {
-	cd "vte"
-
-	echo '-> Applying Fedora patches'
-	patch -p1 -i "../${_fpatchfile}-${_fcommit}"
-
-	echo '-> Applying tilix patch'
-	patch -p1 -i "../alternate-screen.patch"
+	cd "vte" || exit 1
+	patch -p1 -i "$srcdir/${_fpatchfile}-${_fcommit}"
+	patch -p1 -i "$srcdir/alternate-screen.patch"
 }
 
 build() {
@@ -46,10 +40,6 @@ build() {
 }
 
 package_vte3-tilix(){
-	depends+=('vte-common')
-	provides=("vte3=${pkgver}" "vte3-notification=${pkgver}-2" 'vte3-terminix-git')
-	provides+=(libvte-2.91.so)
-	conflicts=('vte3' 'vte3-notification' 'vte3-terminix-git')
 	meson install -C build --destdir "$pkgdir"
 
 	# remove vte-common