From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petter Subject: Re: [PATCH] gnu: Add cool-retro-term. Date: Sun, 23 Apr 2017 23:12:07 +0200 Message-ID: <20170423231207.4adb15e7@mykolab.ch> References: <20170423135526.5ed9d143@mykolab.ch> <87inlvhr0y.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/+XkaNW4=M_U1ZgopEIscSFL" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2Onr-0001m6-Nc for guix-devel@gnu.org; Sun, 23 Apr 2017 17:12:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2Ono-0003CT-Fg for guix-devel@gnu.org; Sun, 23 Apr 2017 17:12:19 -0400 Received: from mx.kolabnow.com ([95.128.36.1]:24450 helo=mx-out03.mykolab.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2Onn-0003BE-Uf for guix-devel@gnu.org; Sun, 23 Apr 2017 17:12:16 -0400 In-Reply-To: <87inlvhr0y.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 --MP_/+XkaNW4=M_U1ZgopEIscSFL Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sun, 23 Apr 2017 12:18:05 -0700 Chris Marusich wrote: > Petter writes: >=20 > > Hi Guix, > > > > The past is finally here! Had a go at packaging a terminal emulator > > which mimics old cathode displays :) =20 >=20 > Wow!! This is really fun. Thanks for packaging it! :) > > + (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)) > > + (("icon64.path =3D /usr/share") > > + (string-append "icon64.path =3D " out)) > > + (("icon128.path =3D /usr/share") > > + (string-append "icon128.path =3D " out)) > > + (("icon256.path =3D /usr/share") > > + (string-append "icon256.path =3D " out))) > > + (zero? (system* "qmake"))))) =20 >=20 > Should these icons be put somewhere else, like in the $out/share path? > If it works, it works, though. (info '(standards) Directory > Variables'): Indeed, I've fixed it. > > + (synopsis "terminal emulator which mimics the look and feel of > > the old +cathode tube screens") > > + (description > > + "Cool-retro-term is a terminal emulator which mimics the look > > and feel of +the old cathode tube screens. It has been designed to > > be eye-candy, +customizable, and reasonably lightweight.") =20 >=20 > Just minor feedback: Maybe use the phrases "CRT" and "cathode ray > tube" to make this easier to discover? >=20 Sure! Added your suggestions in the updated patch. Thanks for the feedback! Best, Petter =46rom 453f6c6c2017c8598b29690b245f76d691d09870 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..69ca46c98 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 which mimics the look and feel of the old +cathode ray tube 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_/+XkaNW4=M_U1ZgopEIscSFL Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-Add-cool-retro-term.patch =46rom 453f6c6c2017c8598b29690b245f76d691d09870 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..69ca46c98 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 which mimics the look and feel of the old +cathode ray tube 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_/+XkaNW4=M_U1ZgopEIscSFL--