From patchwork Thu Aug 24 00:53:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Covrig X-Patchwork-Id: 53169 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 837B527BBE2; Thu, 24 Aug 2023 01:55:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C653D27BBE9 for ; Thu, 24 Aug 2023 01:55:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYycm-0004vD-SE; Wed, 23 Aug 2023 20:55:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYyck-0004us-Nd for guix-patches@gnu.org; Wed, 23 Aug 2023 20:54:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYyck-0007HZ-FI for guix-patches@gnu.org; Wed, 23 Aug 2023 20:54:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYycn-0007VS-Ol for guix-patches@gnu.org; Wed, 23 Aug 2023 20:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65483] [PATCH] Updating EternalTerminal Resent-From: Aaron Covrig Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Aug 2023 00:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65483@debbugs.gnu.org Cc: Aaron Covrig X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169283847028814 (code B ref -1); Thu, 24 Aug 2023 00:55:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Aug 2023 00:54:30 +0000 Received: from localhost ([127.0.0.1]:35660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYycH-0007Ue-1a for submit@debbugs.gnu.org; Wed, 23 Aug 2023 20:54:30 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYycC-0007UM-3p for submit@debbugs.gnu.org; Wed, 23 Aug 2023 20:54:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYyc2-0004td-9h for guix-patches@gnu.org; Wed, 23 Aug 2023 20:54:14 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYybz-0006rt-Eg for guix-patches@gnu.org; Wed, 23 Aug 2023 20:54:14 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-76dc77fd01fso89733585a.3 for ; Wed, 23 Aug 2023 17:54:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1692838448; x=1693443248; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=m7gscAQwqKiY6JHrZ2dQoo2lx3cVkRPdWjWAcmbg1RM=; b=CgibV2pDHQEhcQialLmgBVKa8GMXCtV1isgdcdlrG56Be8YkkCZKzI2KTZysq4xrZk JlMWwNbc6Gh1QK3v7VtKInSYHVtBUwiQmajrl9M+ZFDMeggWWk2FAt+nzkKKy1CfHS1l UVoKYRZpTy+5xHqpXwBq4Sfq+kABjvY0WB4Lo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692838448; x=1693443248; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=m7gscAQwqKiY6JHrZ2dQoo2lx3cVkRPdWjWAcmbg1RM=; b=jGLnVGXYjsFzx+PvzqO2sYBXlZelW4lCHQHqhSmWanbudmtvNiqkEqVUqB0ivYXLvk E3r24lyIgywvCqtdu8aW0KsZa0Z2fNAtm99VRb6aGwbSdhEbIjh6ylmnu+HkMh9NxKEG 3E53nnfNGaLpwNmSM74Qs97gQgr3FboV9wDrg7T5Ll/7x6sKV83XGWQUHNIGeL/5BnxM UC5gwzMaAmr7Sw/DnXx6k8EvVZXS1Z/dQgX26OAoqOVso/wFGaaFvi/WgJJeWKndSIoh LIc5gn2hdl5ES7x0s+juj6g45CKUDQnEOeugMgahEJaztAroR2HJbDux7NO9+WnAM2CK sNPA== X-Gm-Message-State: AOJu0YwQtt0fouZjj59sKMxOxC+cniD/wngArdoS3/AjIXMuXC7E4TrS 5trL1PDpafapTJVD4eJR9CjjSBHOx34zv65PMQWqOYAfj1qaZ7YB6z79yW0XD8g+QVd4AopkwO/ PSzFIG/wR47co3OqvZmDKngIIcxEqgQ1sy55e4+K9rdpwGjFa+cGCKl6PyJt/IGAoyi3nDbSeKG 2GVDdF X-Google-Smtp-Source: AGHT+IGfjoPkfiffTK1BOhgAPG/SfZsdYeKMzo3C7WHEsuKI4eE2EE6umPrbWHO7N1jF7AHz6LmnYA== X-Received: by 2002:a05:620a:c8d:b0:76c:99a0:46 with SMTP id q13-20020a05620a0c8d00b0076c99a00046mr14099575qki.43.1692838448163; Wed, 23 Aug 2023 17:54:08 -0700 (PDT) Received: from mobile-dev.lan (c-73-172-106-204.hsd1.md.comcast.net. [73.172.106.204]) by smtp.gmail.com with ESMTPSA id z19-20020a05620a101300b00754b7ee6922sm4267458qkj.9.2023.08.23.17.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 17:54:07 -0700 (PDT) Date: Wed, 23 Aug 2023 20:53:18 -0400 Message-ID: <30759e57065acfe35b3bbeae71ab090c90610e5a.1692838398.git.aaron.covrig.us@ieee.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72f; envelope-from=aaron.covrig.us@ieee.org; helo=mail-qk1-x72f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Aaron Covrig X-ACL-Warn: , Aaron Covrig via Guix-patches X-Patchwork-Original-From: Aaron Covrig via Guix-patches via From: Aaron Covrig Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Changes: 1. Updated EternalTerminal to the current latest release (which fixes build issues) 2. Removed GoogleTest dependency from EternalTerminal as the project has replaced it with Catch2 3. Added (gnu packages curl) to inclusions as EternalTerminal now depends on curl --- gnu/packages/terminals.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) base-commit: 3ce3466311953cc5f00a4fb34ff094a9a3501399 diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index c59b1a6588..624b845a58 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -74,6 +74,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) @@ -1301,30 +1302,20 @@ (define-public kitty (define-public eternalterminal (package (name "eternalterminal") - (version "6.0.13") - (source + (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)) - (sha256 - (base32 "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r")))) + (sha256 + (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