From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 2/2] gnu: Add tilda. Date: Mon, 16 Nov 2015 10:29:44 +0200 Message-ID: <20151116102944.00fbb3b3@debian-netbook> References: <1447150040-10401-1-git-send-email-efraim@flashner.co.il> <1447150040-10401-3-git-send-email-efraim@flashner.co.il> <87fv07t3c3.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/NCvsqcUk.D+jO78urHmt7Va"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyFH5-0000ct-QK for guix-devel@gnu.org; Mon, 16 Nov 2015 03:36:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyFH3-0008Af-Pn for guix-devel@gnu.org; Mon, 16 Nov 2015 03:36:31 -0500 In-Reply-To: <87fv07t3c3.fsf@gnu.org> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?UTF-8?B?Q291cnTDqHM=?= Cc: guix-devel@gnu.org --Sig_/NCvsqcUk.D+jO78urHmt7Va Content-Type: multipart/mixed; boundary="MP_/eVJuk+Gqav.TO=nIAOZUMxr" --MP_/eVJuk+Gqav.TO=nIAOZUMxr Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sun, 15 Nov 2015 21:28:12 +0100 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Efraim Flashner skribis: >=20 > > * gnu/packages/terminals.scm: New file. > > * gnu-system.am (GNU_SYSTEM_MODULES): Add it. =20 >=20 > Not sure if it warrants a new file, but I don=E2=80=99t have a better ide= a. Agreed, but it didn't seem to really fit in any of the other files. gnome o= r gtk seemed like the most likely choice, but it's neither a gnome program = or a gtk library. xterm is in xorg.scm, {gnome-,lx,xfce-}terminal are in gn= ome/lxde/xfce.scm, terminology in enlightenment.scm. On the other hand, c-a= res in in aria2.scm since that's where it was first needed and there are ot= her ones like that, or w3m, links and conqeror could all be in a new file b= rowsers.scm. But without rearranging everything, making more genericly name= d files going forward is probably the best bet. > [...] >=20 > Could you send an updated patch? >=20 > Thanks! >=20 > Ludo=E2=80=99. Attached :) --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --MP_/eVJuk+Gqav.TO=nIAOZUMxr Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-vte-Provide-0.36.5.patch =46rom e6063394c9741595a239dd1cdc2b4b8d71cdee43 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 10 Nov 2015 11:32:43 +0200 Subject: [PATCH 1/2] gnu: vte: Provide 0.36.5. * gnu/packages/gnome.scm (vte): Add version 0.36.5. --- gnu/packages/gnome.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4bd9d9c..8eec16d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11,6 +11,7 @@ ;;; Copyright =C2=A9 2015 Ricardo Wurmus ;;; Copyright =C2=A9 2015 Mark H Weaver ;;; Copyright =C2=A9 2015 David Thompson +;;; Copyright =C2=A9 2015 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -1708,6 +1709,27 @@ gnome-terminal, but can also be used to embed a cons= ole/terminal in games, editors, IDEs, etc.") (license license:lgpl2.1+))) =20 +;; provides vte 2.90, required for some terminal emulators +;; tilda bug: https://github.com/lanoxx/tilda/issues/94 +;; pantheon-terminal bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bu= g=3D788021 +;; roxterm bug: http://sourceforge.net/p/roxterm/bugs/107/ +;; pantheon-terminal, roxterm are not currently packaged +(define-public vte-0.36 + (package (inherit vte) + (name "vte") + (version "0.36.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1psfnqsmxx4qzc55qwvb8jai824ix4pqcdqhgxk0g2zh82bcxhn2")))) + (propagated-inputs + `(("gtk" ,gtk+) + ("ncurses" ,ncurses))))) + ;; stable version for gtk2, required by xfce4-terminal. (define-public vte/gtk+-2 (package (inherit vte) --=20 2.6.2 --MP_/eVJuk+Gqav.TO=nIAOZUMxr Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-Add-tilda.patch =46rom dc5bb6c298074949d90bf30be31946c783304827 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Aug 2015 22:48:40 +0300 Subject: [PATCH 2/2] gnu: Add tilda. * gnu/packages/terminals.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/terminals.scm | 72 ++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 73 insertions(+) create mode 100644 gnu/packages/terminals.scm diff --git a/gnu-system.am b/gnu-system.am index c80f086..75914b7 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -302,6 +302,7 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/tcl.scm \ gnu/packages/tcsh.scm \ gnu/packages/telephony.scm \ + gnu/packages/terminals.scm \ gnu/packages/texinfo.scm \ gnu/packages/texlive.scm \ gnu/packages/textutils.scm \ diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm new file mode 100644 index 0000000..0c28c5d --- /dev/null +++ b/gnu/packages/terminals.scm @@ -0,0 +1,72 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2015 Efraim Flashner +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages terminals) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build utils) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (gnu packages autotools) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages wm) + #:use-module (gnu packages zip)) + +(define-public tilda + (package + (name "tilda") + (version "1.2.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/lanoxx/tilda/archive= /" + "tilda-" version ".zip")) + (sha256 + (base32 + "06r7q0b1xjclagsnw0ilxhw5az5ddly2f7xc1lcwlrf337x0jrar")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'autogen + (lambda _ ; Avoid running ./configure. + (substitute* "autogen.sh" + (("^.*\\$srcdir/configure.*") "")) + (zero? (system* "sh" "autogen.sh"))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gnu-gettext) + ("pkg-config" ,pkg-config) + ("unzip" ,unzip))) + (inputs + `(("glib" ,glib "bin") + ("gtk+" ,gtk+) + ("libconfuse" ,libconfuse) + ("vte" ,vte-0.36))) ; TODO: try to use vte-0.38+ in 1.3 + ; https://github.com/lanoxx/tilda/issues/94 + (synopsis "GTK+-based drop-down terminal") + (description "Tilda is a terminal emulator similar to normal terminals= like +gnome-terminal (GNOME) or Konsole (KDE), with the difference that it drops= down +from the edge of a screen when a certain configurable hotkey is pressed. = This +is similar to the built-in consoles in some applications. Tilda is highly +configureable through a graphical wizard.") + (home-page "https://github.com/lanoxx/tilda") + (license license:gpl2+))) --=20 2.6.2 --MP_/eVJuk+Gqav.TO=nIAOZUMxr-- --Sig_/NCvsqcUk.D+jO78urHmt7Va Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJWSZP4AAoJEPTB05F+rO6T1k4QAJmQeCzPDor5VvHUcFpF05a1 oxleSLFhXYnd6eI5lWkbcwpc87BSJxxyBTj3Db/5tzN+7JRvezrq4oK/3Sts4WoO 5+rhptKtZ7btz9VmgD3ifMewOynDdj1o4pEoCabImBlIp5Rgz/wo1ew859EXzrot f3KO/HC78AczsBEKAIfWN3GXgLizzOYU5wtYK1NvzaNeTGPdFTu879aussEtHn86 JGftQryhNbyRorlEti+v0ByuVe19FtzK+Lju4vRXfI+HVN/A8kZ+P1aEyq6NvkCv hxeyTay0Nu7GTsIMnPu2ot0ixz1JbbIkH2iNjJ/g1lCcDueKCQTqfl3X2f/SJ1CN X90Mo1kOYlg06Bk+wFqCZT4XuMJJ3UAxOUrypRg3Sx8TjI8MPalihuMChKTxT9Tm ywRY7hM7yIKUFGjBfHZdHf+2bCKQv28rFQuL83fUV074AD2sT+blrcInF1jqaSei aMj+upzvkqRNWTWnzXPfXorNW3KmKtDtEjZJtakwX3vzVssIb3GnECwqi9g++33L ozThztgUg01fYKJA2Bjoi6RNovwwkkGuqNVck+64Eq+SsKAxmr1LnJN8/Y5gvPuS g2S9eFzDeNIsuStrXlqWWwzbrmDWj9HSsM7slz29IVFKnBe1WU1OEuG6ItKKuhO5 DJsBb0zOYNV6jsDJH2HJ =vFax -----END PGP SIGNATURE----- --Sig_/NCvsqcUk.D+jO78urHmt7Va--