From 6dada8f2e0a01ef052b07811c5e9a9ca02ccec28 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 25 May 2022 13:04:52 +1000
Subject: [PATCH] Ocatave: use kpty terminal

---
 sci-mathematics/octave/octave-7.1.0.recipe    |  4 +--
 .../octave/patches/octave-7.1.0.patchset      | 32 +++++++++++++++++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/sci-mathematics/octave/octave-7.1.0.recipe b/sci-mathematics/octave/octave-7.1.0.recipe
index d37eddf32..f6e35c986 100644
--- a/sci-mathematics/octave/octave-7.1.0.recipe
+++ b/sci-mathematics/octave/octave-7.1.0.recipe
@@ -5,7 +5,7 @@ for solving linear and nonlinear problems numerically."
 HOMEPAGE="http://www.octave.org/"
 COPYRIGHT="1996-2022 John W. Eaton"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://ftp.gnu.org/gnu/octave/octave-$portVersion.tar.gz"
 CHECKSUM_SHA256="d4a9d81f3f67b4a6e07cb7a80dcb10ad5e9176fcc30762c70a81580a64b8b0b6"
 PATCHES="octave-$portVersion.patchset"
@@ -228,7 +228,7 @@ INSTALL()
 	mkdir -p $appsDir
 	cat > $appsDir/Octave << EOF
 #!/bin/sh
-$binDir/octave-gui --gui --experimental-terminal-widget
+$binDir/octave-gui --gui
 EOF
 	chmod +x $appsDir/Octave
 	copyattr -n "BEOS:ICON" $binDir/octave-gui $appsDir/Octave
diff --git a/sci-mathematics/octave/patches/octave-7.1.0.patchset b/sci-mathematics/octave/patches/octave-7.1.0.patchset
index 09ca06f50..e7a73721d 100644
--- a/sci-mathematics/octave/patches/octave-7.1.0.patchset
+++ b/sci-mathematics/octave/patches/octave-7.1.0.patchset
@@ -1,4 +1,4 @@
-From 9927db23bd64572f23ee309aae6e0edf8aaa5a30 Mon Sep 17 00:00:00 2001
+From 6318e424c368baf644c140fb93aecd566ad174a8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sun, 26 Mar 2017 19:42:22 +0200
 Subject: rusage Haiku patch
@@ -43,7 +43,7 @@ index a22cd2e..b430281 100644
 2.36.1
 
 
-From b78ff69da5586f47ce5413a99b90fb9988db26b4 Mon Sep 17 00:00:00 2001
+From 534c52f22a174dd192993576579f1c07bbdafdb4 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 24 May 2022 21:46:17 +1000
 Subject: Disable adjust figure position
@@ -66,7 +66,7 @@ index 3fa56a0..22eba33 100644
 2.36.1
 
 
-From 3099a7b216c964324c5fa781e4b5786cd11ddc97 Mon Sep 17 00:00:00 2001
+From 2a0ddea06c7d98d08e2e62e6674d672bf2e5eddb Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 25 May 2022 11:10:42 +1000
 Subject: Use Noto Sans Mono by Default
@@ -101,3 +101,29 @@ index b0bbafa..29b4d6f 100644
 -- 
 2.36.1
 
+
+From 297486ce3fd58402428c76ca93adec9f6c414129 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 25 May 2022 12:08:26 +1000
+Subject: kpty: enable echo
+
+
+diff --git a/libgui/qterminal/libqterminal/unix/kpty.cpp b/libgui/qterminal/libqterminal/unix/kpty.cpp
+index 09d1db8..30fde45 100644
+--- a/libgui/qterminal/libqterminal/unix/kpty.cpp
++++ b/libgui/qterminal/libqterminal/unix/kpty.cpp
+@@ -390,6 +390,11 @@ bool KPty::open()
+   t.c_iflag &= ~IXON;
+   t.c_lflag &= ~ECHOCTL;
+   tcSetAttr(&t);
++
++#ifdef __HAIKU__
++  setEcho(true);
++#endif
++
+   return true;
+ }
+ 
+-- 
+2.36.1
+