[bug#55246] Update cool-retro-term

[bug#55246] Update cool-retro-term

[kiasoc5 via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0002-gnu-cool-retro-term-Lint-package-definition.patch --]
[-- Type: text/x-patch, Size: 2980 bytes --]

From 8a68868e00db782ab53a8ba85d211ea9836c80ed Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@tutanota.com>
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


[-- Attachment #3: 0001-gnu-cool-retro-term-Upgrade-to-1.2.0.patch --]
[-- Type: text/x-patch, Size: 2775 bytes --]

From b102b1f5a6d8c17d30c8d042c2122510b4c649b9 Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@tutanota.com>
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

bug#55246: Update cool-retro-term

[Ludovic Courtès]

Hi,

kiasoc5 <kiasoc5@tutanota.com> skribis:

>>From 8a68868e00db782ab53a8ba85d211ea9836c80ed Mon Sep 17 00:00:00 2001
> From: kiasoc5 <kiasoc5@tutanota.com>
> 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.

[...]

>>From b102b1f5a6d8c17d30c8d042c2122510b4c649b9 Mon Sep 17 00:00:00 2001
> From: kiasoc5 <kiasoc5@tutanota.com>
> 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.

Applied, thanks!

Ludo’.