From unknown Fri Sep 05 11:02:02 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#31060 <31060@debbugs.gnu.org> To: bug#31060 <31060@debbugs.gnu.org> Subject: Status: [PATCH] gnu: cool-retro-term: Update to 1.0.1. Reply-To: bug#31060 <31060@debbugs.gnu.org> Date: Fri, 05 Sep 2025 18:02:02 +0000 retitle 31060 [PATCH] gnu: cool-retro-term: Update to 1.0.1. reassign 31060 guix-patches submitter 31060 Eric Bavier severity 31060 normal tag 31060 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 04 09:33:49 2018 Received: (at submit) by debbugs.gnu.org; 4 Apr 2018 13:33:49 +0000 Received: from localhost ([127.0.0.1]:37863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3iXo-0001AZ-GD for submit@debbugs.gnu.org; Wed, 04 Apr 2018 09:33:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46399) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3iXk-0001AG-Hf for submit@debbugs.gnu.org; Wed, 04 Apr 2018 09:33:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3iXb-0007Lu-GS for submit@debbugs.gnu.org; Wed, 04 Apr 2018 09:33:35 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:50981) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f3iXb-0007Lq-A3 for submit@debbugs.gnu.org; Wed, 04 Apr 2018 09:33:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3iXW-0000jz-J4 for guix-patches@gnu.org; Wed, 04 Apr 2018 09:33:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3iXS-0007J3-UW for guix-patches@gnu.org; Wed, 04 Apr 2018 09:33:26 -0400 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:17089 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f3iXS-0007IO-Ff for guix-patches@gnu.org; Wed, 04 Apr 2018 09:33:22 -0400 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1522848800; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=Tvt55Uqg8tvcCniaJ6iTkUTC9CI=; b=ph+ZhpcKJkxoV8y22QUvQPbbz2A02ZiiUCEZd6nwucKJRARV/2S2l6smin4xK1lW SXMz3dfWhdaII9xi3QITmFE1BOlovEogknUac0EVS7QcONLV6elu/G5S6ry7WeEt BKgduvdZawxmUyZTKXfngQ9MPlar1MEqsKcboInun0FMoxzgyeAtVKVrFISMNcQu hcbFxTPNgeR/JcktDvHnfccJEVJCLud+Mt84PYQFoDa2h8HAUhcwQ63rdd97falc jO53LjA5rC62AbOsTB/sn/q5SYNy8N1+RD6z/vgszwc5e0iX7HZrQ0IpvygDRhAG WCc6gVUV56vMIJkv2fAYpg==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.2 cv=SpXS07G0 c=1 sm=1 tr=0 a=Yo6TUpWCeBsq3Z+ms6lZMQ==:117 a=Yo6TUpWCeBsq3Z+ms6lZMQ==:17 a=KGjhK52YXX0A:10 a=Kd1tUaAdevIA:10 a=zSv6zi-ZgakA:10 a=xN2lO_ix7PvHD3aeNGYA:9 a=CjuIK1q_8ugA:10 a=inoG4m36AAAA:8 a=kAEYNsmcwSgxZc6AH_QA:9 a=uIdclGBO0U8A:10 a=AuuLUmzNjIVKm4kSLIIA:9 a=_Qgj-RFg6mImvLaOgLPg:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp03.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.173.58] ([97.116.173.58:57722] helo=localhost) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=AES256-GCM-SHA384) id 25/CE-01657-024D4CA5; Wed, 04 Apr 2018 09:33:20 -0400 Date: Wed, 4 Apr 2018 08:33:13 -0500 From: Eric Bavier To: guix-patches@gnu.org Subject: [PATCH] gnu: cool-retro-term: Update to 1.0.1. Message-ID: <20180404083313.24964f07@centurylink.net> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/EYFOfc0rTXglk0c+cVwbYeb"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --Sig_/EYFOfc0rTXglk0c+cVwbYeb Content-Type: multipart/mixed; boundary="MP_/uFxqCQyN23gHqD2IeprPPzY" --MP_/uFxqCQyN23gHqD2IeprPPzY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hello Guix, This patch updates cool-retro-term to version 1.0.1. This version added a new font, Knight-TV (GPL). Rather than adjust the patch that removes non-free font support, I took the liberty of implementing a snippet that does the work. IMHO this is a bit clearer and more future-proof than the large patch. `~Eric --MP_/uFxqCQyN23gHqD2IeprPPzY Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-cool-retro-term-Update-to-1.0.1.patch =46rom f4fa9801601259280ebd13c2334fd89bc5d689b6 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 21 Mar 2018 00:04:12 -0500 Subject: [PATCH] gnu: cool-retro-term: Update to 1.0.1. * gnu/packages/terminals.scm (cool-retro-term): Update to 1.0.1. [source]: Programmatically remove fonts. [arguments]: Simplify 'configure phase and use 'invoke'. Add 'install-man phase. 'let*' -> 'let' where possible. * gnu/packages/patches/cool-retro-term-remove-non-free-fonts.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../cool-retro-term-remove-non-free-fonts.patch | 205 -----------------= ---- gnu/packages/terminals.scm | 178 ++++++++++++------ 3 files changed, 123 insertions(+), 261 deletions(-) delete mode 100644 gnu/packages/patches/cool-retro-term-remove-non-free-fo= nts.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2705fb37a..2d9e11264 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -606,7 +606,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/cool-retro-term-dont-check-uninit-member.patch \ %D%/packages/patches/cool-retro-term-fix-array-size.patch \ %D%/packages/patches/cool-retro-term-memory-leak-1.patch \ - %D%/packages/patches/cool-retro-term-remove-non-free-fonts.patch \ %D%/packages/patches/cpio-CVE-2016-2037.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cracklib-CVE-2016-6318.patch \ diff --git a/gnu/packages/patches/cool-retro-term-remove-non-free-fonts.pat= ch b/gnu/packages/patches/cool-retro-term-remove-non-free-fonts.patch deleted file mode 100644 index 7a033df41..000000000 --- a/gnu/packages/patches/cool-retro-term-remove-non-free-fonts.patch +++ /dev/null @@ -1,205 +0,0 @@ -From 96ceffdfdcedd3ae33c46b11357aa2518e0a6152 Mon Sep 17 00:00:00 2001 -From: Petter -Date: Thu, 27 Apr 2017 18:55:10 +0200 -Subject: [PATCH] Remove non-free fonts from settings menu - ---- a/app/qml/ApplicationSettings.qml -+++ b/app/qml/ApplicationSettings.qml -@@ -409,7 +409,7 @@ - obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000"= ,"bloom":0.4,"brightness":0.5,"flickering":0.1,"contrast":0.85,"fontName":"= TERMINUS_SCALED","fontColor":"#0ccc68","frameName":"SIMPLE_WHITE_FRAME","gl= owingLine":0.2,"horizontalSync":0.16,"jitter":0.18,"burnIn":0.45,"staticNoi= se":0.1,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaCo= lor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":= false,"customCommand":""}' - builtin: true - } -- ListElement{ -+ /*ListElement{ - text: "Default Scanlines" - obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000"= ,"bloom":0.4,"brightness":0.5,"flickering":0.1,"contrast":0.85,"fontName":"= COMMODORE_PET","fontColor":"#00ff5b","frameName":"SIMPLE_WHITE_FRAME","glow= ingLine":0.2,"horizontalSync":0.14,"jitter":0.11,"burnIn":0.4,"staticNoise"= :0.05,"rasterization":1,"screenCurvature":0.1,"windowOpacity":1,"chromaColo= r":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":fa= lse,"customCommand":""}' - builtin: true -@@ -433,7 +433,7 @@ - text: "IBM Dos" - obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000"= ,"bloom":0.4,"brightness":0.5,"flickering":0.07,"contrast":0.85,"fontName":= "IBM_DOS","fontColor":"#ffffff","frameName":"SIMPLE_WHITE_FRAME","glowingLi= ne":0.13,"horizontalSync":0,"jitter":0.16,"burnIn":0.3,"staticNoise":0.03,"= rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":1,"s= aturationColor":0,"rbgShift":0.35,"fontWidth":1.0,"useCustomCommand":false,= "customCommand":""}' - builtin: true -- } -+ }*/ - ListElement{ - text: "IBM 3278" - obj_string: '{"ambientLight":0.1,"backgroundColor":"#000000",= "bloom":0.15,"brightness":0.5,"flickering":0,"contrast":0.85,"fontName":"IB= M_3278","fontColor":"#0ccc68","frameName":"SIMPLE_WHITE_FRAME","glowingLine= ":0,"horizontalSync":0,"jitter":0,"burnIn":0.6,"staticNoise":0,"rasterizati= on":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationCo= lor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand= ":""}' -diff --git a/app/qml/FontPixels.qml b/app/qml/FontPixels.qml -index 6ff85da..6f0d0ba 100644 ---- a/app/qml/FontPixels.qml -+++ b/app/qml/FontPixels.qml -@@ -32,7 +32,7 @@ QtObject{ - property bool lowResolutionFont: true -=20 - property ListModel fontlist: ListModel{ -- ListElement{ -+ /*ListElement{ - name: "COMMODORE_PET" - text: "Commodore PET (1977)" - source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf" -@@ -40,7 +40,7 @@ QtObject{ - pixelSize: 8 - baseScaling: 4.0 - fontWidth: 0.8 -- } -+ }*/ - ListElement{ - name: "PROGGY_TINY" - text: "Proggy Tiny (Modern)" -@@ -68,7 +68,7 @@ QtObject{ - baseScaling: 3.0 - fontWidth: 1.0 - } -- ListElement{ -+ /*ListElement{ - name: "APPLE_II" - text: "Apple ][ (1977)" - source: "fonts/1977-apple2/PrintChar21.ttf" -@@ -76,8 +76,8 @@ QtObject{ - pixelSize: 8 - baseScaling: 4.0 - fontWidth: 0.9 -- } -- ListElement{ -+ }*/ -+ /*ListElement{ - name: "ATARI_400" - text: "Atari 400-800 (1979)" - source: "fonts/1979-atari-400-800/ATARI400800_original.TTF" -@@ -85,8 +85,8 @@ QtObject{ - pixelSize: 8 - baseScaling: 4.0 - fontWidth: 0.8 -- } -- ListElement{ -+ }*/ -+ /*ListElement{ - name: "COMMODORE_64" - text: "Commodore 64 (1982)" - source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf" -@@ -94,6 +94,6 @@ QtObject{ - pixelSize: 8 - baseScaling: 4.0 - fontWidth: 0.8 -- } -+ }*/ - } - } -diff --git a/app/qml/FontScanlines.qml b/app/qml/FontScanlines.qml -index eebf00b..410d7b6 100644 ---- a/app/qml/FontScanlines.qml -+++ b/app/qml/FontScanlines.qml -@@ -32,7 +32,7 @@ QtObject{ - property bool lowResolutionFont: true -=20 - property ListModel fontlist: ListModel{ -- ListElement{ -+ /*ListElement{ - name: "COMMODORE_PET" - text: "Commodore PET (1977)" - source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf" -@@ -40,7 +40,7 @@ QtObject{ - pixelSize: 8 - baseScaling: 4.0 - fontWidth: 0.7 -- } -+ }*/ - ListElement{ - name: "PROGGY_TINY" - text: "Proggy Tiny (Modern)" -@@ -68,7 +68,7 @@ QtObject{ - baseScaling: 3.0 - fontWidth: 1.0 - } -- ListElement{ -+ /*ListElement{ - name: "APPLE_II" - text: "Apple ][ (1977)" - source: "fonts/1977-apple2/PrintChar21.ttf" -@@ -76,8 +76,8 @@ QtObject{ - pixelSize: 8 - baseScaling: 4.0 - fontWidth: 0.8 -- } -- ListElement{ -+ }*/ -+ /*ListElement{ - name: "ATARI_400" - text: "Atari 400-800 (1979)" - source: "fonts/1979-atari-400-800/ATARI400800_original.TTF" -@@ -85,8 +85,8 @@ QtObject{ - pixelSize: 8 - baseScaling: 4.0 - fontWidth: 0.7 -- } -- ListElement{ -+ }*/ -+ /*ListElement{ - name: "COMMODORE_64" - text: "Commodore 64 (1982)" - source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf" -@@ -94,6 +94,6 @@ QtObject{ - pixelSize: 8 - baseScaling: 4.0 - fontWidth: 0.7 -- } -+ }*/ - } - } -diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml -index ad20844..882808a 100644 ---- a/app/qml/Fonts.qml -+++ b/app/qml/Fonts.qml -@@ -80,7 +80,7 @@ - fontWidth: 1.0 - lowResolutionFont: true - } -- ListElement{ -+ /*ListElement{ - name: "COMMODORE_PET_SCALED" - text: "Commodore PET (1977)" - source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf" -@@ -89,7 +89,7 @@ - baseScaling: 3.5 - fontWidth: 0.7 - lowResolutionFont: true -- } -+ }*/ - ListElement{ - name: "PROGGY_TINY_SCALED" - text: "Proggy Tiny (Modern)" -@@ -100,7 +100,7 @@ - fontWidth: 0.9 - lowResolutionFont: true - } -- ListElement{ -+ /*ListElement{ - name: "APPLE_II_SCALED" - text: "Apple ][ (1977)" - source: "fonts/1977-apple2/PrintChar21.ttf" -@@ -149,7 +149,7 @@ - baseScaling: 2.0 - fontWidth: 1.0 - lowResolutionFont: true -- } -+ }*/ - ListElement{ - name: "HERMIT" - text: "HD: Hermit (Modern)" -@@ -177,7 +177,7 @@ - fontWidth: 1.0 - lowResolutionFont: false - } -- ListElement{ -+ /*ListElement{ - name: "MONACO" - text: "HD: Monaco (Modern)" - source: "fonts/modern-monaco/monaco.ttf" -@@ -185,7 +185,7 @@ - pixelSize: 30 - fontWidth: 1.0 - lowResolutionFont: false -- } -+ }*/ - ListElement{ - name: "INCONSOLATA" - text: "HD: Inconsolata (Modern)" diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 6f3453670..e8b035720 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -440,11 +440,11 @@ embedded kernel situations.") (license license:expat))) =20 (define-public cool-retro-term - (let ((commit "e48719fa44e5307df71dbd0fad234f8a6a53f863") + (let ((commit "dd799cf5c0eda92cf44f3938c0c2dcae5651a99e") (revision "1")) (package (name "cool-retro-term") - (version (string-append "1.0.0-" revision "." (string-take commit 7)= )) + (version (string-append "1.0.1-" revision "." (string-take commit 7)= )) (source (origin (method git-fetch) (file-name (string-append name "-" version "-checkout")) @@ -453,34 +453,111 @@ embedded kernel situations.") (commit commit) (recursive? #t))) (sha256 - (base32 "1sgqbirninkvgwchr35zgn5vzqvsmrf3cp7lqady1xgrawb8= lsz3")) + (base32 "08mrvj8zk9ck15q90ipjzza1acnnsjhprv2rxg8yyck0xl9p= 40jd")) (patches - (search-patches "cool-retro-term-remove-non-free-fonts.pa= tch" - "cool-retro-term-fix-array-size.patch" + (search-patches "cool-retro-term-fix-array-size.patch" "cool-retro-term-dont-check-uninit-member= .patch" "cool-retro-term-memory-leak-1.patch")) - (modules '((guix build utils))) + (modules '((guix build utils) + (srfi srfi-1) + (srfi srfi-26) + (ice-9 rdelim) + (ice-9 regex))) (snippet - '(for-each (lambda (font) - (delete-file-recursively - (string-append "app/qml/fonts/" font)) - (substitute* '("app/qml/resources.qrc") - (((string-append "fonts/" font ".*")) - ""))) - '(;"1971-ibm-3278" ; BSD 3-clause - "1977-apple2" ; Non-Free - "1977-commodore-pet" ; Non-Free - "1979-atari-400-800" ; Non-Free - "1982-commodore64" ; Non-Free - "1985-atari-st" ; ? - "1985-ibm-pc-vga" ; Unclear - ;"modern-fixedsys-excelsior" ; Redistributab= le - ;"modern-hermit" ; SIL - ;"modern-inconsolata"; SIL - ;"modern-pro-font-win-tweaked" ; X11 - ;"modern-proggy-tiny"; X11 - ;"modern-terminus" ; SIL - "modern-monaco"))))) ; Apple non-free + '(let* ((fonts '(;"1971-ibm-3278" ; BSD 3-clause + ;"1975-knight-tv" ; GPL + "1977-apple2" ; Non-Free + "1977-commodore-pet" ; Non-Free + "1979-atari-400-800" ; Non-Free + "1982-commodore64" ; Non-Free + "1985-atari-st" ; ? + "1985-ibm-pc-vga" ; Unclear + ;"modern-fixedsys-excelsior" ; Redistrib= utable + ;"modern-hermit" ; SIL + ;"modern-inconsolata"; SIL + ;"modern-pro-font-win-tweaked" ; X11 + ;"modern-proggy-tiny"; X11 + ;"modern-terminus" ; SIL + "modern-monaco")) ; Apple Non-Free + (name-rx (make-regexp " *name: *\"([^\"]*)\"")) + (source-rx (make-regexp " *source: \"fonts/([^/]*= )[^\"]*\"")) + (fontname-rx (make-regexp "\"fontName\":\"([^\"]*= ).*")) + (names + ;; Gather font names from all Fonts*.qml files. + ;; These will be used to remove items from the + ;; default profiles. + (fold + (lambda (font-file names) + (call-with-input-file font-file + (lambda (port) + (let loop ((name #f) (names names)) + (let ((line (read-line port))) + (cond + ((eof-object? line) (pk 'names names= )) + ((regexp-exec name-rx line) + =3D> (lambda (m) + (loop (match:substring m 1) na= mes))) + ((regexp-exec source-rx line) + =3D> (lambda (m) + (let ((font (match:substring m= 1))) + (if (member font fonts) + (loop #f (lset-adjoin st= ring=3D? + na= mes name)) + (loop #f names))))) + (else (loop name names)))))))) + '() (find-files "app/qml" "Font.*\\.qml")))) + ;; Remove the font files themselves + (for-each (lambda (font) + (delete-file-recursively + (string-append "app/qml/fonts/" font))) + fonts) + ;; Remove mention of those fonts in the source + (substitute* "app/qml/resources.qrc" + (((string-append " *fonts/(" + (string-join fonts "|") + ").*")) + "")) + (for-each + (lambda (file) + (let ((start-rx (make-regexp " *ListElement\\{")) + (end-rx (make-regexp " *\\}"))) + (with-atomic-file-replacement file + (lambda (in out) + (let loop ((line-buffer '()) + (hold? #f) + (discard? #f)) + (let ((line (read-line in 'concat))) + (cond + ((eof-object? line) #t) ;done + ((regexp-exec start-rx line) + (loop (cons line line-buffer) #t #f)) + ((or (regexp-exec source-rx line) + (regexp-exec fontname-rx line)) + =3D> (lambda (m) + (let ((font-or-name (match:substrin= g m 1))) + (if (or (member font-or-name font= s) + (member font-or-name name= s)) + (loop '() #f #t) + (loop (cons line line-buffer) + hold? #f))))) + ((regexp-exec end-rx line) + (unless discard? + (for-each (cut display <> out) + (reverse line-buffer)) + (display line out)) + (loop '() #f #f)) + (hold? (loop (cons line line-buffer) + hold? discard?)) + (discard? (loop line-buffer #f #t)) + (else (display line out) + (loop '() #f #f))))))))) + '("app/qml/FontPixels.qml" + "app/qml/FontScanlines.qml" + "app/qml/Fonts.qml" + "app/qml/ApplicationSettings.qml")) + ;; Final substitution for default scanline and pixel f= onts + (substitute* "app/qml/ApplicationSettings.qml" + (("COMMODORE_PET") "PROGGY_TINY")))))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) @@ -492,46 +569,37 @@ embedded kernel situations.") (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share"))) + (let ((out (assoc-ref outputs "out"))) (substitute* '("qmltermwidget/qmltermwidget.pro") (("INSTALL_DIR =3D \\$\\$\\[QT_INSTALL_QML\\]") (string-append "INSTALL_DIR =3D " out "/lib/qt5/qml"))) - (substitute* '("app/app.pro") - (("target.path \\+=3D /usr") - (string-append "target.path +=3D " out)) - (("icon32.path =3D /usr/share") - (string-append "icon32.path =3D " share)) - (("icon64.path =3D /usr/share") - (string-append "icon64.path =3D " share)) - (("icon128.path =3D /usr/share") - (string-append "icon128.path =3D " share)) - (("icon256.path =3D /usr/share") - (string-append "icon256.path =3D " share))) - (zero? (system* "qmake"))))) - (add-before 'install 'fix-Makefiles - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (substitute* '("Makefile") - (("\\$\\(INSTALL_ROOT\\)/usr") out))))) + (substitute* '("cool-retro-term.pro" "app/app.pro") + (("/usr") out)) + (invoke "qmake")))) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (qml "/lib/qt5/qml")) + (let ((out (assoc-ref outputs "out")) + (qml "/lib/qt5/qml")) (wrap-program (string-append out "/bin/cool-retro-term") `("QML2_IMPORT_PATH" ":" prefix (,(string-append out qml) - ,(string-append - (assoc-ref inputs "qtdeclarative") qml) - ,(string-append - (assoc-ref inputs "qtgraphicaleffects") qml) - ,(string-append - (assoc-ref inputs "qtquickcontrols") qml))))))) + ,@(map (lambda (i) + (string-append (assoc-ref inputs i) qml)) + '("qtdeclarative" + "qtgraphicaleffects" + "qtquickcontrols"))))) + #t))) (add-after 'install 'add-alternate-name (lambda* (#:key outputs #:allow-other-keys) - (let* ((bin (string-append (assoc-ref outputs "out") "/bin"= ))) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")= )) (symlink (string-append bin "/cool-retro-term") - (string-append bin "/crt")))))))) + (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)))))) (synopsis "Terminal emulator") (description "Cool-retro-term (crt) is a terminal emulator which mimics the look= and --=20 2.16.2 --MP_/uFxqCQyN23gHqD2IeprPPzY-- --Sig_/EYFOfc0rTXglk0c+cVwbYeb Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlrE1BkACgkQ/XPKxxnT JWaTvBAAj5DhRRXCr73KOWtvf4yHxXXfcqZDY1DR7v47nju1QEmwWXozRKEu2idb lr07uOT9TRGFkj4m9B3XETFc88XUK+bKi3a20w15VRTRQOgjU6jcyhQlF3i8Zl4A dhES1lvQwWiTvuY5O14vOGKBl+SHC69VmzzeMxr6hgWaoyZS2YPsKg15sSKOuANq QsFYJ3LgWC8dTFQv8GARI0hg5kWnNYfDlp2lu78Z9uPyL+NlX7qtYZykLphfeO2e J48CfIrDfPD7tvwXAodVcuZofzK5I2lASsTxn4Bkvk3nEeLnWcK28bwvkrXumTa0 wZUe1U0yzcLLtGyAmxDLC9ENJuOh7T9aQKLyKSKbnOt7O3ZlQve2uiPzMcQDkAmj OJ9gTXsZ3lf4IR2rAs9uFVaZltNj73j4QmGTkH2G2E/jkZkwLzg0Iu1ZvlQhF4/S ABHjijnw6jErPk8xP2MPJEAsHV5Hl+Fxkk9xMDkHALb/eI6z4s9kbeej4xk5IUNe k3xqvMX4QAABOqoW8Y2qcQOYkB6gVB54+3AFPtVF/Sb2Vn0l8DwcI+JCyEEPh6D4 TcmzyTS755H5NxZL+3YV6YlzHKMUdIlDX7Wr87hPA+de2xDc2pxbOlmHYok3rroC jP7daWEAe/13FnPF1Lf3HpEIaz0CoeuMaWPUbCl6tTQKUeLRiMc= =zxAu -----END PGP SIGNATURE----- --Sig_/EYFOfc0rTXglk0c+cVwbYeb-- From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 05 21:51:17 2018 Received: (at 31060) by debbugs.gnu.org; 6 Apr 2018 01:51:17 +0000 Received: from localhost ([127.0.0.1]:39754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f4GX7-0004jd-9A for submit@debbugs.gnu.org; Thu, 05 Apr 2018 21:51:17 -0400 Received: from mout01.posteo.de ([185.67.36.65]:36934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f4GX5-0004jP-Bs for 31060@debbugs.gnu.org; Thu, 05 Apr 2018 21:51:16 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id BE79520BB8 for <31060@debbugs.gnu.org>; Fri, 6 Apr 2018 03:51:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1522979468; bh=VYatTaRq+qvPcIkigy6Hq+0+HntCohvtJGNuFZ3LcdY=; h=From:To:Cc:Subject:Date:From; b=Z2zLnpnkaClNdTihOJZOK/AWWR+9BLpGNRqIWw6EU1ALOSGmmezB2OjKwFnJDQktJ sIyiR5E1Qrvwr6uzkW6jGRiPwndHl/q2+LPkrCbMkS73Q/PYeTjcvtxXSLQa4F/otj 23h865Ir5X98fOpSFKxlUDRiuN6DgiQDBCPcJ/su7ES6iZOtI/SEgaU9EVyiJDfbcV L/t6xAU6USAPzx0SXQGxGd3CKyr7CWM8YPbTEeU5LkqZLw53k/4UIg5SIFTde9GegF U6x5ROXtAXA4z6SB/DAi18ZMKyZK2c3eBZ0wx9lVkhK0HvsVRcI2YXBfPXL2wvR41q 4PRiXPc97gwwQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 40HN2g4HcTz9rxF; Fri, 6 Apr 2018 03:51:07 +0200 (CEST) From: Kei Kebreau To: Eric Bavier Subject: Re: [bug#31060] [PATCH] gnu: cool-retro-term: Update to 1.0.1. References: <20180404083313.24964f07@centurylink.net> Date: Thu, 05 Apr 2018 21:50:55 -0400 In-Reply-To: <20180404083313.24964f07@centurylink.net> (Eric Bavier's message of "Wed, 4 Apr 2018 08:33:13 -0500") Message-ID: <87efjt6r28.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 31060 Cc: 31060@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain Eric Bavier writes: > Hello Guix, > > This patch updates cool-retro-term to version 1.0.1. > > This version added a new font, Knight-TV (GPL). Rather than adjust the > patch that removes non-free font support, I took the liberty of > implementing a snippet that does the work. IMHO this is a bit clearer > and more future-proof than the large patch. > > `~Eric Hello Eric, This patch lints and builds reproducibly on my machine, and the changes look fine. Thanks for your work on the snippet! It is indeed clearer than the patch it replaces. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlrG0n8ACgkQ5qXuPBlG eg2HyBAAxQAJ2w0EJ1drQV8bzkmLDP4y459TU+CNUhA2SLNlo460JbgbJTI0BJt9 5iwF7yfPnIrLLm1BQkxJSSYnWW76HCGncvD+AqeZhwuzzDhOHkysv+1Gi3RDCAOl luB7SMsoU3AmxAow+51aXYIP7pqRf9f3RVoDZMK+Uc3KHm1Ksq7Opji6o+lAa8j8 B6uT86vhPRnz+hStbB2PBMh6dETcXaiSQlEoUcVHJQQVtP2NIItq5QlktyR3LV4n AlnepHznW43FTajqm7pSRVcNHQjObEgeQ2EPMJnZN4yePennxv8KnxKh59cZZvvP b9TD05bFEgAEFm6JTrHY3zLuIoZ9hcvux5IkzxwO8BBPqhsBG8qiMUURXNgGd2Tx 1kkb6KuepeWGDjlFyxDUQoiXyzaEunmc2oitQF/W0aXBGzlgeglTE4QmUCtAGE8Y uyv7FSOR9Gwzs4Ys98VxgQFUlQ/3H916U1emUkMRk6HNc0D/10wGTJeP0jVRmu+o Jm8EDOwj6DlE43rOuTOgiPK1UPuC8AORmph8z/KmsMlfmeGarvWlHNBs1GQiURdE YN5USbmgwsFYyevmHGbO1CCgF110YwDpCCsZ4+e8nLRLG5NRpNRLec6hL7gwlxsE zpJVLOl/YGSi8e8YXf39Litn5MHnBV7ULb3JZmXmDm8cwfKsLWs= =/boI -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 12 23:07:18 2018 Received: (at 31060-done) by debbugs.gnu.org; 13 Apr 2018 03:07:18 +0000 Received: from localhost ([127.0.0.1]:48960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f6p3V-0004iV-Un for submit@debbugs.gnu.org; Thu, 12 Apr 2018 23:07:18 -0400 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:56010 helo=smtp.centurylink.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f6p3T-0004iH-PE for 31060-done@debbugs.gnu.org; Thu, 12 Apr 2018 23:07:16 -0400 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1523588830; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=th1MiDQmbltwmHuW62qWZR1rLDU=; b=DqmDYEKIfuMmGJbkm6HGru0vOt4ca6KZPn/KTdeJmoTCqHAHs4KQMyoG0ULS4XfP XGaiOlvk7pwkUX0R8LUVfT6GWg9b0q1BmjhojBc6Az078gmti5d1KGYmQED/w11i FCWUhBi3jlJ1WZaXCgYkmCj2qYU0lfnamGOr+bf1DLXXvTFgFHit0c+AuVcKoHE8 QyIkppPVaHSSdW64Z1BBUfpd3lSIOaLEY+mbNHPzgv263GvERFRI3MnzqWddFxDi fFuJvstYItIm7hOufaSroMczPG+phcUIuNmgKcwAbLAt4kdcWeIvCQBoWcG92FlX IBBgLwOw7sl/GL2o/a2Www==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.2 cv=dNbko6Rb c=1 sm=1 tr=0 a=SDwRNc20ifO3oWaubAnCMw==:117 a=SDwRNc20ifO3oWaubAnCMw==:17 a=KGjhK52YXX0A:10 a=Kd1tUaAdevIA:10 a=zSv6zi-ZgakA:10 a=uChsZFC9AAAA:8 a=I_5RNyk1AAAA:8 a=uBdNa27wCAwg5j8Vk3gA:9 a=CjuIK1q_8ugA:10 a=RuVsO0HzZ9lHFAedGLIA:9 a=ULtXvzFHYWHLyBAuiDia:22 a=Eh9yxdLE6B1twWrs3SXz:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp02.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.191.14] ([97.116.191.14:46468] helo=localhost) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=AES256-GCM-SHA384) id C7/A7-06540-DDE10DA5; Thu, 12 Apr 2018 23:07:10 -0400 Date: Thu, 12 Apr 2018 22:07:08 -0500 From: Eric Bavier To: Kei Kebreau Subject: Re: [bug#31060] [PATCH] gnu: cool-retro-term: Update to 1.0.1. Message-ID: <20180412220708.119bd8ab@centurylink.net> In-Reply-To: <87efjt6r28.fsf@posteo.net> References: <20180404083313.24964f07@centurylink.net> <87efjt6r28.fsf@posteo.net> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/V8nFF3wfk0OC7wWBvO+0dM="; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31060-done Cc: 31060-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/V8nFF3wfk0OC7wWBvO+0dM= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hello Kei, Thanks for testing the build! On Thu, 05 Apr 2018 21:50:55 -0400 Kei Kebreau wrote: > Eric Bavier writes: >=20 > > Hello Guix, > > > > This patch updates cool-retro-term to version 1.0.1. > > > > This version added a new font, Knight-TV (GPL). Rather than adjust the > > patch that removes non-free font support, I took the liberty of > > implementing a snippet that does the work. IMHO this is a bit clearer > > and more future-proof than the large patch. > > > > `~Eric =20 >=20 > Hello Eric, >=20 > This patch lints and builds reproducibly on my machine, and the changes > look fine. Thanks for your work on the snippet! It is indeed clearer > than the patch it replaces. Pushed in 306d8630dc2cb6d802a86630e301d49da04149e8 `~Eric --Sig_/V8nFF3wfk0OC7wWBvO+0dM= Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlrQHtwACgkQ/XPKxxnT JWYKGA/8DNK25rEleSosp0wiYBi9XQd4ZY0BGH/u1ugCh8J1C1oDZ+rH/aW44R8Y y7Fzgva1C6TAcex/rHJrMJfqBpfn7P+tQzVri1U80guAb1P9G1+Eteq9Ev17ky1B 6uNsoZtOuY9StWuZTYYiYrSNOWrWVtkoljd3/uKO06KoHKZ6ez95xj37snrCf0ie mJH1XPa6u/8QiiAcX6TXPDlRBdl3eDt1dY2TNJZvUDc5liv0CfnQUDHd5VAWCiJZ rp68mFevKKMP1+bmdkVBtnqhOTYel4+UU9jqvvOEMoIm3KwGGcB30sd9yC4DKUZI 1BtHgPftub737EWd0Ikr1OtO9Ksy08sHP/CWwjU8OU04rIjILNaSDaNfWtnK4PdA 0v+SkbmRrij4JRNS7W6r6BUhyqKXPjnD6tU3UMCM4JYx3vjRcNIqUbNcF0KAqdFs hYLnOyUG3HFgBm1aT5d07t1XvOKPb8l9e8WkRG9ncKpHGcEls9P3Yb30h38ugBr4 b/HoVXXv6C6SGG/CAM/iSOK1wa/7WMCyIqcnZT5cAewn+fV5On4Vx5Zta9X7x05S jMtKkb6AMq0/VCrxNekQ5zOJBup2Qcet9dpUZM4SnMZzSNtPEZanqcK8I2YgMhF9 7Aeoe8qvGqqYdUOvX2hVIdc0OeI+fKoUqdbpIhmvUnHT6PbrSug= =3gis -----END PGP SIGNATURE----- --Sig_/V8nFF3wfk0OC7wWBvO+0dM=-- From unknown Fri Sep 05 11:02:02 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 11 May 2018 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator