From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id cCeRGENUcWKbAQEAbAwnHQ (envelope-from ) for ; Tue, 03 May 2022 18:11:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id QPSFGENUcWLNeAAA9RJhRA (envelope-from ) for ; Tue, 03 May 2022 18:11:47 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C1F60129BB for ; Tue, 3 May 2022 18:11:46 +0200 (CEST) Received: from localhost ([::1]:48854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlv7p-0007ll-TR for larch@yhetil.org; Tue, 03 May 2022 12:11:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlv3H-000209-9J for guix-patches@gnu.org; Tue, 03 May 2022 12:07:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlv3G-0003De-O5 for guix-patches@gnu.org; Tue, 03 May 2022 12:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlv3G-0000KY-Iv for guix-patches@gnu.org; Tue, 03 May 2022 12:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55246] Update cool-retro-term Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 May 2022 16:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 55246@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.16515940211259 (code B ref -1); Tue, 03 May 2022 16:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 May 2022 16:07:01 +0000 Received: from localhost ([127.0.0.1]:40742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlv3E-0000KD-JP for submit@debbugs.gnu.org; Tue, 03 May 2022 12:07:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:49462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlv3D-0000K7-IJ for submit@debbugs.gnu.org; Tue, 03 May 2022 12:06:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlv3A-0001uJ-Vf for guix-patches@gnu.org; Tue, 03 May 2022 12:06:57 -0400 Received: from w1.tutanota.de ([81.3.6.162]:41624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlv35-0003Co-OL for guix-patches@gnu.org; Tue, 03 May 2022 12:06:54 -0400 Received: from w3.tutanota.de (unknown [192.168.1.164]) by w1.tutanota.de (Postfix) with ESMTP id CFD9FFBF5FB for ; Tue, 3 May 2022 16:06:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1651594007; s=s1; d=tutanota.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=fwQkOlrIlRRjiCoh5ZRgeHshRt5PiQqymU/kAi1yWik=; b=EvDspDfvxUY2RazOf4Vy0zB8brvgThrDYm3kMoAGpGHfYJKFTsqJWXkyLZAxo5aT rs/fdBDsf64rI5eOG0m0B0rPmWDMI8JZsYaJAO2aXeG8UCxS+APF+9Jz3Bgh3/eMLa4 q9by8OEabYihouzDTaybsvzIWqQV01gaZTh00Byphsj9hmzIWPkaxLdLceVe31+mn3a qpGtOihisVvQePi5gcntRNwaEWPIEwNT/TqIPFWjtDAVwRHoNnvQD86tovjZgjYjt9c YTuJrUOjSLDPG6p424DgE8j/+dmrPXjd8vpakFzgAE39tLV5RZTIM9bkl4IAUac9Ojt imJk+/hA+A== Date: Tue, 3 May 2022 18:06:47 +0200 (CEST) Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_38299_1171515012.1651594007832" Received-SPF: pass client-ip=81.3.6.162; envelope-from=kiasoc5@tutanota.com; helo=w1.tutanota.de 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_PASS=-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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches From: kiasoc5 via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651594306; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=fwQkOlrIlRRjiCoh5ZRgeHshRt5PiQqymU/kAi1yWik=; b=AvgzDtOBYGUyZcO1fza9OzLVD0+G+MPM1Wu4BCIq/WvmbmYu031lWgkIxFH6ySpM5sWAyr 6J0U0PPkxvX+1McSXrmUCDmjybUp4D8v4DezA5yU/A27Zt1Pw8yRslH5hbL8fEmh8VLTqU lxF71Ahs3QuQaRFedUDC8yNU2YlgJ9o7ZLkJ9S+NexFZPO8pruM0zLeAguT1yuNZ5puxI8 R4lp9kl/vz2DpjmJFopSDU1k+6iIjOWxfYfgm+WaBX5hEa5rMOhXcLIsIzn9Cx+fX5pi0Y qTXh5TcW+3LRmEdaTr8nL0dUkMhDorreTaAYRhcqhJY9ZO6cwJG27LiDA3KmEQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651594306; a=rsa-sha256; cv=none; b=Yu+eBKWyMnahfJhiPlHrKSQuvd5G72onCIgeiy1oB0FGwS2lnU2ZpEiICkL8UddJfrhfGa IKHywB4RKo3KwVsNE9KkhYimBZ6gtwesmfYaNZ8S8YnTc13hvHuTBTps7TMiy2KlpaEtNE T69WcKQzGGVrS5Nv0gQJQArBX2UskuSNP7JUfsbMEncKWMfRiKj8duUoPYE3sHQFTRIlG3 lIePRFeN0HZFKcXTMKhHbVKiadvLc04sMHQ12yi988ct8sDUzBdGqi+/lkN8wO/FoBlVUj CjgVEHhMWx87iBmCcF13sqGGZKUC6RhqWd+PX6Xw2MkH0fPNul57vNZ5kngYEw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tutanota.com header.s=s1 header.b=EvDspDfv; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.58 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tutanota.com header.s=s1 header.b=EvDspDfv; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C1F60129BB X-Spam-Score: -4.58 X-Migadu-Scanner: scn0.migadu.com X-TUID: bOaumqz5lEl9 ------=_Part_38299_1171515012.1651594007832 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ------=_Part_38299_1171515012.1651594007832 Content-Type: text/x-patch; charset=us-ascii; name=0002-gnu-cool-retro-term-Lint-package-definition.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-cool-retro-term-Lint-package-definition.patch >From 8a68868e00db782ab53a8ba85d211ea9836c80ed Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Tue, 3 May 2022 12:05:12 -0400 Subject: [PATCH 2/2] gnu: cool-retro-term: Lint package definition. * gnu/packages/terminals.scm [inputs]: Add bash-minimal. [source]: Remove trailing #t. [arguments]: Remove trailing #t from phases. --- gnu/packages/terminals.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 17e4fd9c00..58fd569ff2 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -63,6 +63,7 @@ (define-module (gnu packages terminals) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -776,11 +777,10 @@ (define-public cool-retro-term "app/qml/ApplicationSettings.qml")) ;; Final substitution for default scanline and pixel fonts (substitute* "app/qml/ApplicationSettings.qml" - (("COMMODORE_PET") "PROGGY_TINY")) - #t)))) + (("COMMODORE_PET") "PROGGY_TINY")))))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtgraphicaleffects qtquickcontrols2)) + (list qtbase-5 qtdeclarative qtgraphicaleffects qtquickcontrols2 bash-minimal)) (arguments `(#:phases (modify-phases %standard-phases @@ -804,20 +804,17 @@ (define-public cool-retro-term (string-append (assoc-ref inputs i) qml)) '("qtdeclarative" "qtgraphicaleffects" - "qtquickcontrols2"))))) - #t))) + "qtquickcontrols2")))))))) (add-after 'install 'add-alternate-name (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (symlink (string-append bin "/cool-retro-term") - (string-append bin "/crt")) - #t))) + (string-append bin "/crt"))))) (add-after 'install 'install-man (lambda* (#:key outputs #:allow-other-keys) (let ((mandir (string-append (assoc-ref outputs "out") "/share/man/man1"))) - (install-file "packaging/debian/cool-retro-term.1" mandir) - #t)))))) + (install-file "packaging/debian/cool-retro-term.1" mandir))))))) (synopsis "Terminal emulator") (description "Cool-retro-term (crt) is a terminal emulator which mimics the look and -- 2.36.0 ------=_Part_38299_1171515012.1651594007832 Content-Type: text/x-patch; charset=us-ascii; name=0001-gnu-cool-retro-term-Upgrade-to-1.2.0.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-cool-retro-term-Upgrade-to-1.2.0.patch >From b102b1f5a6d8c17d30c8d042c2122510b4c649b9 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Tue, 3 May 2022 12:05:03 -0400 Subject: [PATCH 1/2] gnu: cool-retro-term: Upgrade to 1.2.0. * gnu/packages/terminals.scm (cool-retro-term): Upgrade to 1.2.0. [source]: Use commit as version. [inputs]: Use qtquickcontrols2 instead of qtquickcontrols. --- gnu/packages/terminals.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 009809442c..17e4fd9c00 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -666,20 +666,18 @@ (define-public libvterm (license license:expat))) (define-public cool-retro-term - (let ((commit "1.1.1") - (revision "0")) ;not used currently (package (name "cool-retro-term") - (version "1.1.1") + (version "1.2.0") (source (origin (method git-fetch) (file-name (string-append name "-" version "-checkout")) (uri (git-reference (url (string-append "https://github.com/Swordfish90/" name)) - (commit commit) + (commit version) (recursive? #t))) (sha256 - (base32 "0wb6anchxa5jpn9c73kr4byrf2xlj8x8qzc5x7ny6saj7kbbvp75")) + (base32 "02mj70gcpx9fvrhsy6iqwp399dya9iyakx940b6ws952d23xn337")) (modules '((guix build utils) (srfi srfi-1) (srfi srfi-26) @@ -782,7 +780,7 @@ (define-public cool-retro-term #t)))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtgraphicaleffects qtquickcontrols)) + (list qtbase-5 qtdeclarative qtgraphicaleffects qtquickcontrols2)) (arguments `(#:phases (modify-phases %standard-phases @@ -806,7 +804,7 @@ (define-public cool-retro-term (string-append (assoc-ref inputs i) qml)) '("qtdeclarative" "qtgraphicaleffects" - "qtquickcontrols"))))) + "qtquickcontrols2"))))) #t))) (add-after 'install 'add-alternate-name (lambda* (#:key outputs #:allow-other-keys) @@ -832,7 +830,7 @@ (define-public cool-retro-term ;; Fonts license:silofl1.1 license:x11 - license:bsd-3))))) + license:bsd-3)))) (define-public foot (package base-commit: 654f878f0b9d2136affa3e3d32da1639e6942a54 -- 2.36.0 ------=_Part_38299_1171515012.1651594007832--