v0.70.3

Update the tilix patch and make it build again.

3 files changed, 167 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8acc11330cf1..89bfc798a180 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = vte3-tilix
-	pkgdesc = Virtual Terminal Emulator widget for use with GTK3 with Fedora and Tilix patches
-	pkgver = 0.56.3
+	pkgdesc = Virtual Terminal Emulator widget (GTK3) (Fedora and Tilix patches)
+	pkgver = 0.70.3
 	pkgrel = 1
 	url = https://github.com/gnunn1/tilix/tree/master/experimental/vte
 	arch = x86_64
 	license = LGPL
+	makedepends = gi-docgen
 	makedepends = intltool
 	makedepends = gobject-introspection
 	makedepends = gtk-doc
@@ -16,23 +17,24 @@ pkgbase = vte3-tilix
 	depends = pcre2
 	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 = 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 = add-zsh-notfication-support.patch
-	source = alternate-screen.patch-c07d449d90f56c420003311ecab22f82c7c84956::https://github.com/gnunn1/tilix/raw/c07d449d90f56c420003311ecab22f82c7c84956/experimental/vte/0.54/alternate-screen.patch
+	source = alternate-screen.patch
 	sha256sums = SKIP
-	sha256sums = 5de49179d88acba730e7446913724ca012b4b5aedb6392b2547a11725829180b
+	sha256sums = e5672a857c51a620ca5448da29e4ea5b0e319c2a54416a4ca615b0e0392e00a9
 	sha256sums = 150a151404ca565f70259044661b2ef5cda43142ca677e7da324614eef8cf45a
-	sha256sums = 490c0e3ec3d44e6642e19de71843b7d4d1d2c56ae3b243a8fd432ad6fdb244db
+	sha256sums = 36fdf6a98c2be1b0c5b38a6116f160cdf0f270db688796ff1199234d64e49600
 
 pkgname = vte3-tilix
 	depends = gtk3
 	depends = pcre2
 	depends = gnutls
 	depends = vte-tilix-common
-	provides = vte3=0.56.3
-	provides = vte3-notification=0.56.3-2
+	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
@@ -41,10 +43,9 @@ pkgname = vte-tilix-common
 	pkgdesc = Common files used by vte and vte3
 	arch = any
 	depends = sh
-	provides = vte-common=0.56.3
-	provides = vte-notification-common=0.56.3-2
+	provides = vte-common=0.70.3
+	provides = vte-notification-common=0.70.3-2
 	provides = vte-terminix-common-git
 	conflicts = vte-common
 	conflicts = vte-notification-common
 	conflicts = vte3-terminix-common-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 7828bb9c96b5..48dae84415de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,76 +3,58 @@
 
 pkgbase='vte3-tilix'
 pkgname=("${pkgbase}" 'vte-tilix-common')
-pkgver=0.56.3
+pkgver=0.70.3
 pkgrel=1
-pkgdesc='Virtual Terminal Emulator widget for use with GTK3 with Fedora and Tilix patches'
+pkgdesc='Virtual Terminal Emulator widget (GTK3) (Fedora and Tilix patches)'
 arch=('x86_64')
 url='https://github.com/gnunn1/tilix/tree/master/experimental/vte'
 license=('LGPL')
 depends=('gtk3' 'pcre2' 'gnutls')
-makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala' 'gperf' 'glade' 'git')
+makedepends=('gi-docgen' 'intltool' 'gobject-introspection' 'gtk-doc' 'vala' 'gperf' 'glade' 'git')
 options=('!emptydirs')
 
-# Fedora patches: https://src.fedoraproject.org/cgit/rpms/vte291.git/tree/
+# Fedora patches: https://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/
 _frepourl='https://src.fedoraproject.org/rpms/vte291'
-_frepobranch='f29'
-_fpatchfile='vte291-command-notify-scroll-speed.patch'
-_fcommit='94ec580d203552c728f6d46ce539fd321d991500'
+_frepobranch='rawhide'
+_fpatchfile='vte291-cntnr-precmd-preexec-scroll.patch'
+_fcommit='de03576168f1ec4beeb7330239f4debf3234b842'
 
 # VTE source ref
-#_vtecommit='837cce9ced6bfe317cb97aeca171001da92cb3a1'
 _vtetag=${pkgver}
 
-# Tilix source ref
-_tilixpatchfile1='alternate-screen.patch'
-_tilixcommit='c07d449d90f56c420003311ecab22f82c7c84956'
-
 source=(
-	#"git+https://git.gnome.org/browse/vte#commit=$_vtecommit"
-	"git+https://git.gnome.org/browse/vte#tag=$_vtetag"
+	"git+https://gitlab.gnome.org/GNOME/vte.git#tag=$_vtetag"
 	"${_fpatchfile}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile}"
 	'add-zsh-notfication-support.patch'
-	"${_tilixpatchfile1}-${_tilixcommit}::https://github.com/gnunn1/tilix/raw/${_tilixcommit}/experimental/vte/0.54/alternate-screen.patch"
+	'alternate-screen.patch'
 )
 sha256sums=('SKIP'
-            '5de49179d88acba730e7446913724ca012b4b5aedb6392b2547a11725829180b'
+            'e5672a857c51a620ca5448da29e4ea5b0e319c2a54416a4ca615b0e0392e00a9'
             '150a151404ca565f70259044661b2ef5cda43142ca677e7da324614eef8cf45a'
-            '490c0e3ec3d44e6642e19de71843b7d4d1d2c56ae3b243a8fd432ad6fdb244db')
+            '36fdf6a98c2be1b0c5b38a6116f160cdf0f270db688796ff1199234d64e49600')
 
 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}-${_tilixcommit}"
-
 	echo '-> Applying Fedora patches'
 	patch -p1 -i "../${_fpatchfile}-${_fcommit}"
 	#patch -p1 -i '../add-zsh-notfication-support.patch'
 
 	echo '-> Applying tilix patch'
-	patch -p1 -i "../${_tilixpatchfile1}-${_tilixcommit}"
-
-	NOCONFIGURE=1 ./autogen.sh
+	patch -p1 -i "../alternate-screen.patch"
 }
 
 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 b_lto=false -D docs=true -D gtk4=false
+	meson compile -C build
 }
 
 package_vte3-tilix(){
 	depends+=('vte-tilix-common')
 	provides=("vte3=${pkgver}" "vte3-notification=${pkgver}-2" 'vte3-terminix-git')
+	provides+=(libvte-2.91.so)
 	conflicts=('vte3' 'vte3-notification' 'vte3-terminix-git')
-	cd "vte"
-	make DESTDIR="${pkgdir}" install
+	meson install -C build --destdir "$pkgdir"
 
 	rm "${pkgdir}/etc/profile.d/vte.sh"
 }
@@ -83,7 +65,5 @@ package_vte-tilix-common() {
 	arch=('any')
 	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"
-
-	install -Dm644 'src/vte.sh' "${pkgdir}/etc/profile.d/vte.sh"
+	install -Dm644 'build/src/vte.sh' "${pkgdir}/etc/profile.d/vte.sh"
 }
diff --git a/alternate-screen.patch b/alternate-screen.patch
new file mode 100644
index 000000000000..7816814ab496
--- /dev/null
+++ b/alternate-screen.patch
@@ -0,0 +1,137 @@
+From a5272e25f5b8f95b341ec9682a0cdd7cb24b87b1 Mon Sep 17 00:00:00 2001
+From: gnunn1 <gerald.b.nunn@gmail.com>
+Date: Sat, 20 Aug 2016 14:25:54 -0400
+Subject: [PATCH] Add terminal-screen-changed signal
+
+---
+ src/vte/vteterminal.h |  6 ++++--
+ src/vtegtk.cc         | 19 +++++++++++++++++++
+ src/vtegtk.hh         |  1 +
+ src/vteinternal.hh    |  2 ++
+ src/vteseq.cc         | 14 ++++++++++++++
+ 5 files changed, 40 insertions(+), 2 deletions(-)
+
+diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
+index 12ecf181..bc953e21 100644
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -116,11 +116,13 @@ struct _VteTerminalClass {
+ 
+         /* Add new vfuncs here, and subtract from the padding below. */
+ 
++        void (*terminal_screen_changed)(VteTerminal* terminal);
++
+         /* Padding for future expansion. */
+ #if _VTE_GTK == 3
+-        gpointer _padding[13];
++        gpointer _padding[12];
+ #elif _VTE_GTK == 4
+-        gpointer _padding[16];
++        gpointer _padding[15];
+ #endif /* _VTE_GTK */
+ 
+ // FIXMEgtk4 use class private data instead
+diff --git a/src/vtegtk.cc b/src/vtegtk.cc
+index 1c5a4983..4a5688fa 100644
+--- a/src/vtegtk.cc
++++ b/src/vtegtk.cc
+@@ -1306,6 +1306,8 @@ vte_terminal_class_init(VteTerminalClass *klass)
+ 
+         klass->bell = NULL;
+ 
++        klass->terminal_screen_changed = NULL;
++
+         /* GtkScrollable interface properties */
+         g_object_class_override_property (gobject_class, PROP_HADJUSTMENT, "hadjustment");
+         g_object_class_override_property (gobject_class, PROP_VADJUSTMENT, "vadjustment");
+@@ -2000,6 +2002,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
+                                    G_OBJECT_CLASS_TYPE(klass),
+                                    g_cclosure_marshal_VOID__VOIDv);
+ 
++        /**
++         * VteTerminal::screen-changed:
++         * @vteterminal: the object which received the signal
++         *
++         * This signal is emitted when the terminal screen changes between
++         * normal and alternate screen.
++         */
++        signals[SIGNAL_TERMINAL_SCREEN_CHANGED] =
++                g_signal_new(I_("terminal-screen-changed"),
++                             G_OBJECT_CLASS_TYPE(klass),
++                             G_SIGNAL_RUN_LAST,
++                             G_STRUCT_OFFSET(VteTerminalClass, bell),
++                             NULL,
++                             NULL,
++                             g_cclosure_marshal_VOID__INT,
++                             G_TYPE_NONE, 1, G_TYPE_INT);
++
+         /**
+          * VteTerminal:allow-bold:
+          *
+diff --git a/src/vtegtk.hh b/src/vtegtk.hh
+index 0a31d205..64cb46f5 100644
+--- a/src/vtegtk.hh
++++ b/src/vtegtk.hh
+@@ -57,6 +57,7 @@ enum {
+         SIGNAL_SHELL_PREEXEC,
+         SIGNAL_NOTIFICATION_RECEIVED,
+ #endif
++        SIGNAL_TERMINAL_SCREEN_CHANGED,
+         SIGNAL_WINDOW_TITLE_CHANGED,
+         LAST_SIGNAL
+ };
+diff --git a/src/vteinternal.hh b/src/vteinternal.hh
+index 0c52442b..0f0243a3 100644
+--- a/src/vteinternal.hh
++++ b/src/vteinternal.hh
+@@ -1587,6 +1587,8 @@ public:
+ #undef _VTE_CMD_HANDLER
+ #undef _VTE_CMD_HANDLER_NOP
+ #undef _VTE_CMD_HANDLER_R
++
++        void emit_terminal_screen_changed(int screen);
+ };
+ 
+ } // namespace terminal
+diff --git a/src/vteseq.cc b/src/vteseq.cc
+index 8a7f5b34..5ec0448a 100644
+--- a/src/vteseq.cc
++++ b/src/vteseq.cc
+@@ -220,6 +220,14 @@ Terminal::emit_resize_window(guint columns,
+         g_signal_emit(m_terminal, signals[SIGNAL_RESIZE_WINDOW], 0, columns, rows);
+ }
+ 
++/* Emit a "terminal-screen-changed" signal */
++void
++Terminal::emit_terminal_screen_changed(int screen)
++{
++        _vte_debug_print(VTE_DEBUG_SIGNALS, "Emitting `terminal_screen_changed'.\n");
++        g_signal_emit(m_terminal, signals[SIGNAL_TERMINAL_SCREEN_CHANGED], 0, screen);
++}
++
+ /* Some common functions */
+ 
+ /* In Xterm, upon printing a character in the last column the cursor doesn't
+@@ -392,6 +400,9 @@ void
+ Terminal::switch_normal_screen()
+ {
+         switch_screen(&m_normal_screen);
++
++        /* Emit signal */
++        emit_terminal_screen_changed(0);
+ }
+ 
+ void
+@@ -426,6 +437,9 @@ void
+ Terminal::switch_alternate_screen()
+ {
+         switch_screen(&m_alternate_screen);
++
++        /* Emit signal */
++        emit_terminal_screen_changed(1);
+ }
+ 
+ void
+-- 
+2.39.2.13.g1fb56cf030
+