From 048032e3540d4a649fcef38f63454933d62e212e Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.org>
Date: Thu, 5 May 2022 08:58:47 +0200
Subject: [PATCH] et: update to 6.2.0

Fixes https://github.com/termux/termux-packages/issues/10499.
---
 packages/et/build.sh                           |  5 ++---
 .../src-terminal-TerminalServerMain.cpp.patch  | 18 ++++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/et/build.sh b/packages/et/build.sh
index 9265388b6..5d5168b53 100644
--- a/packages/et/build.sh
+++ b/packages/et/build.sh
@@ -4,10 +4,9 @@ TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+"
-TERMUX_PKG_VERSION=6.1.11
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=6.2.0
 TERMUX_PKG_SRCURL=https://github.com/MisterTea/EternalTerminal/archive/et-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=bff58ae9122a39a7012e741d2d514b0966725c942021f3279fa7e2b00cfd20a3
+TERMUX_PKG_SHA256=e16e2faf98e4471ea3db03aab7c607763ad172add720e00a40c6848de876b35a
 TERMUX_PKG_DEPENDS="libc++, protobuf, libsodium, openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DDISABLE_VCPKG=1"
 
diff --git a/packages/et/src-terminal-TerminalServerMain.cpp.patch b/packages/et/src-terminal-TerminalServerMain.cpp.patch
index 89e9bc139..762341298 100644
--- a/packages/et/src-terminal-TerminalServerMain.cpp.patch
+++ b/packages/et/src-terminal-TerminalServerMain.cpp.patch
@@ -1,8 +1,6 @@
-diff --git a/src/terminal/TerminalServerMain.cpp b/src/terminal/TerminalServerMain.cpp
-index a8d59c6..23fa0ae 100644
---- a/src/terminal/TerminalServerMain.cpp
-+++ b/src/terminal/TerminalServerMain.cpp
-@@ -28,11 +28,11 @@ int main(int argc, char **argv) {
+--- ./src/terminal/TerminalServerMain.cpp~	2022-05-05 06:28:11.000000000 +0200
++++ ./src/terminal/TerminalServerMain.cpp	2022-05-05 08:56:50.241909706 +0200
+@@ -40,11 +40,11 @@
          ("logtostdout", "log to stdout")                    //
          ("pidfile", "Location of the pid file",
           cxxopts::value<std::string>()->default_value(
@@ -11,8 +9,8 @@ index a8d59c6..23fa0ae 100644
          ("v,verbose", "Enable verbose logging",
           cxxopts::value<int>()->default_value("0"), "LEVEL")  //
          ("serverfifo",
--         "If set, listens on the matching fifo name",                     //
-+         "If set, listens on the matching server fifo name",              //
-          cxxopts::value<std::string>()->default_value(ROUTER_FIFO_NAME))  //
-         ;
- 
+-         "If set, listens on the matching fifo name",       //
++         "If set, listens on the matching server fifo name",       //
+          cxxopts::value<std::string>()->default_value(""))  //
+         ("telemetry",
+          "Allow et to anonymously send errors to guide future improvements",