From 746298e54fddcd4f2f9b7a65355dd6b692f67a71 Mon Sep 17 00:00:00 2001
From: Aaron Covrig <aaron.covrig.us@ieee.org>
Date: Wed, 23 Aug 2023 20:53:18 -0400
Subject: gnu: eternalterminal: Update to 6.2.4.

* gnu/packages/terminals.scm (eternalterminal): Update to 6.2.4.
[arguments]: Add -DDISABLE_VCPKG=1 to #:configure-flags, remove #:phases.
[inputs]: Remove gflags, add openssl, zlib and curl.
[native-inputs]: Remove.

Signed-off-by: Christopher Baines <mail@cbaines.net>
---
 gnu/packages/terminals.scm | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 989fd00e61..c5cecfa6db 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages terminals)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crypto)
+  #:use-module (gnu packages curl)
   #:use-module (gnu packages dlang)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages fontutils)
@@ -1385,30 +1386,20 @@ (define-public kitty
 (define-public eternalterminal
   (package
     (name "eternalterminal")
-    (version "6.0.13")
+    (version "6.2.4")
     (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/MisterTea/EternalTerminal")
-               (commit (string-append "et-v" version))))
-        (file-name (git-file-name name version))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/MisterTea/EternalTerminal")
+             (commit (string-append "et-v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r"))))
+        (base32 "13vhr701j85ga37d53339bxgrf9fqa6z1zcp6s3ly5bb8p7lyvzm"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:configure-flags '("-DBUILD_TEST=ON")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'insert-googletests
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((tests (assoc-ref inputs "googletest")))
-               (copy-recursively tests "external/googletest"))
-             #t)))))
-    (inputs
-     (list gflags libsodium protobuf))
-    (native-inputs
-     `(("googletest" ,(package-source googletest))))
+     '(#:configure-flags '("-DBUILD_TEST=ON" "-DDISABLE_VCPKG=1")))
+    (inputs (list libsodium protobuf openssl zlib curl))
     (home-page "https://mistertea.github.io/EternalTerminal/")
     (synopsis "Remote shell that reconnects without interrupting the session")
     (description "@dfn{Eternal Terminal} (ET) is a remote shell that
-- 
cgit v1.2.3