From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petter Subject: Re: [PATCH] gnu: Add cool-retro-term. Date: Mon, 24 Apr 2017 14:30:26 +0200 Message-ID: <20170424143026.53563696@mykolab.ch> References: <20170423135526.5ed9d143@mykolab.ch> <87inlvhr0y.fsf@gmail.com> <20170423231207.4adb15e7@mykolab.ch> <87vapuwvj0.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/X.G/KY1z7=Bu4V_6FIu8ljE"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2d8j-0000w3-7K for guix-devel@gnu.org; Mon, 24 Apr 2017 08:30:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2d8f-00041V-Kg for guix-devel@gnu.org; Mon, 24 Apr 2017 08:30:49 -0400 Received: from mx.kolabnow.com ([95.128.36.1]:42322 helo=mx-out01.mykolab.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2d8f-000415-2s for guix-devel@gnu.org; Mon, 24 Apr 2017 08:30:45 -0400 In-Reply-To: <87vapuwvj0.fsf@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Chris Marusich Cc: guix-devel@gnu.org --Sig_/X.G/KY1z7=Bu4V_6FIu8ljE Content-Type: multipart/mixed; boundary="MP_/i6p=u_TpZg0KunSWSCwsjPj" --MP_/i6p=u_TpZg0KunSWSCwsjPj Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi Chris, >=20 > By the way, the output of 'guix lint' points out the following: Oh lint, I had forgotten about that. > --8<---------------cut here---------------start------------->8--- > [0] marusich@garuda:~/guix > $ ./pre-inst-env guix lint cool-retro-term > gnu/packages/terminals.scm:493:5: cool-retro-term@1.0.0-1.e4871 > 9f: sentences in description should be followed by two spaces;=20 > possible infraction at 117 =20 > checking cool-retro-term@1.0.0-1.e48719f [inputs-should-be-nati > checking cool-retro-term@1.0.0-1.e48719f [inputs-should-not-be- > gnu/packages/terminals.scm:490:14: cool-retro-term@1.0.0-1.e487 > 19f: synopsis should be less than 80 characters long =20 > [0] marusich@garuda:~/guix > $ > --8<---------------cut here---------------end--------------->8--- >=20 > Think you could submit one more patch to tidy up those? Anyway, I > can't commit your patch (I don't have commit access), but somebody > else probably can. I sure can. Thanks for helping out! I lowercased the Cool-retro-term abbreviation, (crt). I think it's a little better, but no strong feelings. What do you think of adding `crt` as an alternative name for the binary? I see it's been briefly discussed here, https://github.com/Swordfish90/cool-retro-term/issues/258 > Love this contribution, by the way. I'm sending an email from within > CRT right now...! :-) Glad you enjoy it! I'm fond of it too, it makes the whole terminal experience more engaging/alive or something :) Unfortunately it has the capasity to introduce lag in my entire system. F.ex. scrolling and changing tabs in Icecat would take noticeable time with the default effects settings. I've adjusted them a bit, and got the lag under control. Is this the case for you as well? I'm on an x200. Best, Petter =46rom 553902e8a736f356bdc5c7a5bf28e339f9f5cde6 Mon Sep 17 00:00:00 2001 From: Petter Date: Sun, 23 Apr 2017 13:46:41 +0200 Subject: [PATCH] gnu: Add cool-retro-term. * gnu/packages/terminals.scm (cool-retro-term): New variable. --- gnu/packages/terminals.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 979278a53..e53062b16 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2016, 2017 Jos=C3=A9 Miguel S=C3=A1nchez Garc=C3=ADa ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2017 Ricardo Wurmus +;;; Copyright =C2=A9 2017 Petter ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,6 +50,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages docbook) + #:use-module (gnu packages qt) #:use-module (srfi srfi-26)) =20 (define-public tilda @@ -433,3 +435,63 @@ its embedding program should provide it to draw on its behalf. It avoids calling @code{malloc} during normal running state, allowing it to be used in embedded kernel situations.") (license license:expat))) + +(define-public cool-retro-term + (let ((commit "e48719fa44e5307df71dbd0fad234f8a6a53f863") + (revision "1")) + (package + (name "cool-retro-term") + (version (string-append "1.0.0-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (modules '((guix build utils))) + (file-name (string-append name "-" version "-checkout")) + (uri (git-reference + (url (string-append "https://github.com/Swordfish90/" name)) + (commit commit) + (recursive? #t))) + (sha256 + (base32 "1sgqbirninkvgwchr35zgn5vzqvsmrf3cp7lqady1xgrawb8lsz3")))) + (build-system gnu-build-system) + (inputs + `(("qt" ,qt))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* '("qmltermwidget/qmltermwidget.pro") + (("INSTALL_DIR =3D \\$\\$\\[QT_INSTALL_QML\\]") + (string-append "INSTALL_DIR =3D " out "/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 " out "/share")) + (("icon64.path =3D /usr/share") + (string-append "icon64.path =3D " out "/share")) + (("icon128.path =3D /usr/share") + (string-append "icon128.path =3D " out "/share")) + (("icon256.path =3D /usr/share") + (string-append "icon256.path =3D " out "/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))))) + (add-after 'install 'wrap-executable + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/cool-retro-term") + `("QML2_IMPORT_PATH" ":" prefix + (,(string-append out "/qml")))))))))) + (synopsis "Terminal emulator mimicking old cathode ray tube (CRT) +screens") + (description + "Cool-retro-term (crt) is a terminal emulator which mimics the look and +feel of the old cathode ray tube (CRT) screens. It has been designed to be +eye-candy, customizable, and reasonably lightweight.") + (home-page "https://github.com/Swordfish90/cool-retro-term") + (license (list license:gpl2 license:gpl3))))) --=20 2.12.2 --MP_/i6p=u_TpZg0KunSWSCwsjPj Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-Add-cool-retro-term.patch =46rom 553902e8a736f356bdc5c7a5bf28e339f9f5cde6 Mon Sep 17 00:00:00 2001 From: Petter Date: Sun, 23 Apr 2017 13:46:41 +0200 Subject: [PATCH] gnu: Add cool-retro-term. * gnu/packages/terminals.scm (cool-retro-term): New variable. --- gnu/packages/terminals.scm | 62 ++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 979278a53..e53062b16 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2016, 2017 Jos=C3=A9 Miguel S=C3=A1nchez Garc=C3=ADa = ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2017 Ricardo Wurmus +;;; Copyright =C2=A9 2017 Petter ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,6 +50,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages docbook) + #:use-module (gnu packages qt) #:use-module (srfi srfi-26)) =20 (define-public tilda @@ -433,3 +435,63 @@ its embedding program should provide it to draw on its= behalf. It avoids calling @code{malloc} during normal running state, allowing it to be used = in embedded kernel situations.") (license license:expat))) + +(define-public cool-retro-term + (let ((commit "e48719fa44e5307df71dbd0fad234f8a6a53f863") + (revision "1")) + (package + (name "cool-retro-term") + (version (string-append "1.0.0-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (modules '((guix build utils))) + (file-name (string-append name "-" version "-checkout")) + (uri (git-reference + (url (string-append "https://github.com/Swordfish90/" = name)) + (commit commit) + (recursive? #t))) + (sha256 + (base32 "1sgqbirninkvgwchr35zgn5vzqvsmrf3cp7lqady1xgrawb8ls= z3")))) + (build-system gnu-build-system) + (inputs + `(("qt" ,qt))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* '("qmltermwidget/qmltermwidget.pro") + (("INSTALL_DIR =3D \\$\\$\\[QT_INSTALL_QML\\]") + (string-append "INSTALL_DIR =3D " out "/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 " out "/share")) + (("icon64.path =3D /usr/share") + (string-append "icon64.path =3D " out "/share")) + (("icon128.path =3D /usr/share") + (string-append "icon128.path =3D " out "/share")) + (("icon256.path =3D /usr/share") + (string-append "icon256.path =3D " out "/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))))) + (add-after 'install 'wrap-executable + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/cool-retro-= term") + `("QML2_IMPORT_PATH" ":" prefix + (,(string-append out "/qml")))))))))) + (synopsis "Terminal emulator mimicking old cathode ray tube (CRT) +screens") + (description + "Cool-retro-term (crt) is a terminal emulator which mimics the look a= nd +feel of the old cathode ray tube (CRT) screens. It has been designed to be +eye-candy, customizable, and reasonably lightweight.") + (home-page "https://github.com/Swordfish90/cool-retro-term") + (license (list license:gpl2 license:gpl3))))) --=20 2.12.2 --MP_/i6p=u_TpZg0KunSWSCwsjPj-- --Sig_/X.G/KY1z7=Bu4V_6FIu8ljE Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEB+Ude/iUmL3PehPCvgTmz6aYnSEFAlj97+IACgkQvgTmz6aY nSFQ3w//W+rEIG9xgyiHwH4KaseC3k2fzt+tg3U29ZqHIy6rssaVHjXgue+9ABWW yfMkQ9sM48keXqeNjLUhP4ON2hskjW+zTSyqlYLQ0eJBCNLKQI3znttrAHTJunWL cxwlp7ksmGXXdsxA6IJ+UaH6pftxTXZ9bv8KtKCDNO4dB/wW7W4BX1Li0Cjfxfk2 5gTp5TW8sHGROuN2z84fmRToFnQcqUco2FXyWydXfqN16+yvGtM8nb+naO4MnPbl wx8qP1n9fOMtldC8u6PgnmqTZI0wsQw4uIXOe+1yZjlBqEBTs1HvLePuAdgFqBPt wx3bJgCtVNiPRILfwrP3NJtnEJ/qnKAxt6YBLJtilThRquw81NFLshm3UFUNF66Y FHZjdAvUh9jZYD8RzHlNMR4P//xlcFsle0VkWTlUvG9SWGoiVFQR4AHc2Wd/iCgN N+JFk1PvhxhjCQmq96Bnn3lZQSYN5r5KRcJNrQv1lreQKFhwipfywFXpjSnAZrCd sdc2ZqD32Uk7HY9c3IDvIiUM5lkq8aseY0MI+tM6Bz2DRV/We6AxcBBOnCkBUaz8 XLfX7wCU8PgLuwCIc/epxIV7umZEmbWZee4zEgCgu8mYcqsEAcNeDf1ouWemQGk+ 1kbDt3B4nfuyccJBFzv/9in0dxgYSHVaB9i/J6FbRKRIbdTA/o4= =pglC -----END PGP SIGNATURE----- --Sig_/X.G/KY1z7=Bu4V_6FIu8ljE--