From patchwork Sun Jul 23 02:39:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 51933 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 7042E27BBEA; Sun, 23 Jul 2023 03:41: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 autolearn=ham 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 15E3D27BBE9 for ; Sun, 23 Jul 2023 03:41:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNP1t-0007wA-90; Sat, 22 Jul 2023 22:41:05 -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 1qNP1r-0007vv-7t for guix-patches@gnu.org; Sat, 22 Jul 2023 22:41:03 -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 1qNP1r-0007pM-05 for guix-patches@gnu.org; Sat, 22 Jul 2023 22:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNP1q-0002N9-GW for guix-patches@gnu.org; Sat, 22 Jul 2023 22:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64796] [PATCH] gnu: termite: Update to 16.6 (a maintained fork). Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 02:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64796 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64796@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16900800099013 (code B ref -1); Sun, 23 Jul 2023 02:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jul 2023 02:40:09 +0000 Received: from localhost ([127.0.0.1]:37717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNP0y-0002LI-R4 for submit@debbugs.gnu.org; Sat, 22 Jul 2023 22:40:09 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNP0w-0002KV-3w for submit@debbugs.gnu.org; Sat, 22 Jul 2023 22:40:07 -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 1qNP0q-0007rr-KM for guix-patches@gnu.org; Sat, 22 Jul 2023 22:40:00 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qNP0o-0007O9-AI for guix-patches@gnu.org; Sat, 22 Jul 2023 22:40:00 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 27EDA38A1924; Sun, 23 Jul 2023 02:39:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1690079992; bh=PlRdcuT4kFOnQzb5ouI1ESs2Os2m1W4s1tAMDbbbZH0=; h=From:To:Cc:Subject:Date:From; b=RRAXqf4IT+5UQ1N8rcxbdo3f/hkhs6aXMSPzI25cgs/FtUdUMAGAEzYKBXkQQYw3j qUCKwh7WqxUQ+DttqfMD1d7D/AF6NW6SfagkCxfQdvVkelZY9OFV5o5rEDdZV5qUrk KZEQeqcDTZ9rrErsYPYAQUWGzVEO9ITc879eku93dmpJLgoGMNv74N29+Kzn+kNxrx a/vlDDq5lAKjhYhpk0JxWK/JH79r78Y9GWfLh2uTiRMYGpvYgYtBrVfCQN0rRtFSMC ZYTJmacIGA86rm5EJIWc26TFHfHsBtcxgfDDpJobQxFFac1KpIViV7zWRYZ+f/Ug1x a8yXXj3iiXfSCj5mtPmUTaabkzZ6CAjXda/NeJYZGETAu1C58gPn2736aLZxwA8ioe iC0Vcu1Ct6UoryqeHvu19uh24RoYkLa2Yu5ZIt7kPqdGX1CGkJdBCQ8njZLnQt1L0K kciSVQuUUaZBt8sutBmWAXkVlU9wvvOzVV5r8Sup2BnS7hQ74KENTco4DpNj/rzCEI H9sJzvf1AgNJG7QSBgYuNAJXUJEXU8k9hW7spZ44DTIDTkEauBeMFgiBPskat9Tt8m m5SI3P3KsFWeHRYbVta0DjnUQ1FJqUqOILa6ldHEbgptoLv9MBSAID0fOXyNJYPFZo IfVH4wfTHqWX1Ei2cWtCiu04= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Q3KllrO63wiP; Sun, 23 Jul 2023 02:39:48 +0000 (UTC) Received: from localhost (unknown [117.174.235.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sun, 23 Jul 2023 02:39:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 76c1f170; Sun, 23 Jul 2023 02:39:32 +0000 (UTC) Date: Sun, 23 Jul 2023 10:39:29 +0800 Message-ID: <45ce7bd82c514684e45f4f811c1722917a8c5dbb.1690079941.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/terminals.scm (termite): Switch to maintained fork. [description]: Adjust. --- gnu/packages/terminals.scm | 75 ++++++++++++++------------------------ 1 file changed, 28 insertions(+), 47 deletions(-) base-commit: fdfea4c4ed0d31494fcb3633c26290f4eba9d2af diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 9b705c874f..94d0917542 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -92,6 +92,7 @@ (define-module (gnu packages terminals) #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) @@ -105,6 +106,7 @@ (define-module (gnu packages terminals) #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages textutils) + #:use-module (gnu packages tls) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -184,61 +186,40 @@ (define-public tilda (define-public termite (package (name "termite") - (version "15") + (version "16.6") (source (origin - (method git-fetch) - (uri (git-reference - (url (string-append "https://github.com/thestinger/" - name ".git")) - (commit (string-append "v" version)) - (recursive? #t))) - (file-name (string-append name "-" version "-checkout")) + (method url-fetch) + ;; XXX: The release includes a modified version of VTE. + (uri (string-append + "https://github.com/aperezdc/termite/releases/download/v" + version "/termite-" version ".tar.xz")) (sha256 (base32 - "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k")))) - (build-system gnu-build-system) + "1n8x84pkp7l9xl0sd07jbj5gjb574qm3w7656qlnzw8hf9kr69il")))) + (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-xdg-open - (lambda _ - (substitute* "termite.cc" - (("xdg-open") (which "xdg-open"))) - #t)) - (delete 'configure)) - #:tests? #f - ;; This sets the destination when installing the necessary terminal - ;; capability data, which are not provided by 'ncurses'. See - ;; . - #:make-flags (list "PREFIX=" - (string-append "VERSION=v" (version)) - (string-append "DESTDIR=" - (assoc-ref %outputs "out"))))) + (list #:configure-flags + #~(list "-Dvte:_systemd=false") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-xdg-open + (lambda _ + (substitute* "termite.cc" + (("xdg-open") (which "xdg-open"))))) + (replace 'install + (lambda _ + (invoke "meson" "install" "--skip-subprojects" "vte")))))) (inputs - `(("vte" ,vte-ng) - ("gtk+" ,gtk+) - ("xdg-utils" ,xdg-utils) - ("ncurses" ,ncurses))) + (list gnutls gtk+ pcre2 xdg-utils)) (native-inputs - (list pkg-config)) - - ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is - ;; provided for usability reasons. See . - (native-search-paths - (list (search-path-specification - (variable "TERMINFO_DIRS") - (files '("share/terminfo"))))) - (home-page "https://github.com/thestinger/termite/") + (list (list glib "bin") pkg-config)) + (home-page "https://github.com/aperezdc/termite/") (synopsis "Keyboard-centric, VTE-based terminal") - (description "Termite is a minimal terminal emulator. It is no longer -maintained as the author considers it obsoleted by Alacritty. - -It was designed for use with tiling window managers. It is a modal -application, similar to Vim, with an insert mode and command mode where -keybindings have different functions.") - - ;; Files under util/ are under the Expat license; the rest is LGPLv2+. + (description "Termite is a minimal terminal emulator, with a slightly +modified version of VTE exposing the necessary functions for keyboard text +selection and URL hints. It was designed for use with tiling window +managers.") (license license:lgpl2.0+))) (define-public asciinema