From a7c36bb0b5df185c7df6198fb5dbb56c53c7ad40 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Thu, 19 Jan 2023 20:06:07 +0900
Subject: [PATCH] et: Bump to 6.2.2

Also migrate to Git URL due to submodules missing from release tarball.
---
 packages/et/build.sh           |  9 ++++-----
 packages/et/fix-includes.patch | 10 ++++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 packages/et/fix-includes.patch

diff --git a/packages/et/build.sh b/packages/et/build.sh
index b4aea61e69..94f32a5cbe 100644
--- a/packages/et/build.sh
+++ b/packages/et/build.sh
@@ -2,13 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://eternalterminal.dev
 TERMUX_PKG_DESCRIPTION="A remote shell that automatically reconnects without interrupting the session"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=6.2.2
+TERMUX_PKG_SRCURL=git+https://github.com/MisterTea/EternalTerminal
+TERMUX_PKG_GIT_BRANCH=et-v${TERMUX_PKG_VERSION}
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+"
-TERMUX_PKG_VERSION="6.2.1"
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=https://github.com/MisterTea/EternalTerminal/archive/et-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=fdf68a51cb8b62b3dbbacd1d2aeba5d5491e5142e65c97713c2f1ce61d4fdbed
-TERMUX_PKG_DEPENDS="libc++, protobuf, libsodium, openssl"
+TERMUX_PKG_DEPENDS="libc++, libsodium, openssl, protobuf, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DDISABLE_VCPKG=1"
 
 termux_step_pre_configure() {
diff --git a/packages/et/fix-includes.patch b/packages/et/fix-includes.patch
new file mode 100644
index 0000000000..284729fa0b
--- /dev/null
+++ b/packages/et/fix-includes.patch
@@ -0,0 +1,10 @@
+--- a/src/base/TunnelUtils.hpp
++++ b/src/base/TunnelUtils.hpp
+@@ -2,6 +2,7 @@
+ #define __ET_TUNNEL_UTILS__
+ 
+ #include "ETerminal.pb.h"
++#include "Headers.hpp"
+ 
+ namespace et {
+