[PATCH 0/2] Add tilda

[PATCH 0/2] Add tilda

[Efraim Flashner]

Tilda is a dropdown terminal that is fairly low on resources. I started this one
a while ago but didn't realize that it needed an earlier version of vte, but
I've finally figured that out today. I don't think I've gotten the commit
message correct for vte.

Efraim Flashner (2):
  gnu: vte: Provide 0.36.5.
  gnu: Add tilda.

 gnu-system.am              |  1 +
 gnu/packages/gnome.scm     | 18 ++++++++++++
 gnu/packages/terminals.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 gnu/packages/terminals.scm

-- 
2.6.2

[PATCH 1/2] gnu: vte: Provide 0.36.5.

[Efraim Flashner]

* gnu/packages/gnome.scm (vte): Add version 0.36.5.
---
 gnu/packages/gnome.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 387f9ef..b48ce57 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
+;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1701,6 +1702,23 @@ gnome-terminal, but can also be used to embed a console/terminal in games,
 editors, IDEs, etc.")
     (license license:lgpl2.1+)))
 
+;; provides vte 2.90, required for some terminal emulators
+(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)
-- 
2.6.2

[PATCH 2/2] gnu: Add tilda.

[Efraim Flashner]

* gnu/packages/terminals.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am              |  1 +
 gnu/packages/terminals.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 gnu/packages/terminals.scm

diff --git a/gnu-system.am b/gnu-system.am
index f3ded69..430c740 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -299,6 +299,7 @@ GNU_SYSTEM_MODULES =				\
   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..a45a2be
--- /dev/null
+++ b/gnu/packages/terminals.scm
@@ -0,0 +1,70 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(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-after 'patch-source-shebangs 'autogen
+                  (lambda _       ; tries to run ./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))) ; try in 1.3 to use vte-0.38 or higher
+    (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 build-in consoles in games such as Quake or Half-life.  Tilda
+is highly configureable through a graphical wizard.")
+    (home-page "https://github.com/lanoxx/tilda")
+    (license license:gpl2+)))
-- 
2.6.2

Re: [PATCH 1/2] gnu: vte: Provide 0.36.5.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/gnome.scm (vte): Add version 0.36.5.

[...]

> +;; provides vte 2.90, required for some terminal emulators
> +(define-public vte-0.36
> +  (package (inherit vte)
> +    (name "vte")
> +    (version "0.36.5")

Is this particular version really needed?  We already have 0.40 and
0.28.2 so it would be great if one of these could be used (the comment
above makes me think that 0.40 would do as well, but it’s not completely
clear.)

Now, if Tilda really requires this specific version, that’s fine.

Thanks,
Ludo’.

Re: [PATCH 1/2] gnu: vte: Provide 0.36.5.

[Efraim Flashner]

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

On Sun, 15 Nov 2015 18:46:04 +0100
ludo@gnu.org (Ludovic Courtès) wrote:

> Efraim Flashner <efraim@flashner.co.il> skribis:
> 
> > * gnu/packages/gnome.scm (vte): Add version 0.36.5.  
> 
> [...]
> 
> > +;; provides vte 2.90, required for some terminal emulators
> > +(define-public vte-0.36
> > +  (package (inherit vte)
> > +    (name "vte")
> > +    (version "0.36.5")  
> 
> Is this particular version really needed?  We already have 0.40 and
> 0.28.2 so it would be great if one of these could be used (the comment
> above makes me think that 0.40 would do as well, but it’s not completely
> clear.)
> 
> Now, if Tilda really requires this specific version, that’s fine.
> 
> Thanks,
> Ludo’.

There's been a bug report against tilda for more than a year to get them to
update their vte version.  Some of the things tilda can do, like an opaque
background, are unsupported in vte 2.91.  Unfortunately this puts tilda in a
tight spot, needing at least 0.30 and less than 0.38. Some of the other
terminals out there either use or used this version also, but I haven't
checked to see if they've moved on yet or not.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 2/2] gnu: Add tilda.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/terminals.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

Not sure if it warrants a new file, but I don’t have a better idea.

[...]

> +     `(#:phases (modify-phases %standard-phases
> +                 (add-after 'patch-source-shebangs 'autogen

I think it should be ‘add-before’ so that the shebangs in generated
files are patched.

> +                  (lambda _       ; tries to run ./configure

Rather: “Avoid running ./configure.”

> +                   (substitute* "autogen.sh" (("^.*\\$srcdir/configure.*") ""))

Newline after "autogen.sh".

> +       ("vte" ,vte-0.36))) ; try in 1.3 to use vte-0.38 or higher

Add “XXX” or “TODO” to make it more visible.

> +    (synopsis "Gtk based drop down terminal")

“GTK+-based drop-down terminal emulator” maybe?

> +    (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 build-in consoles in games such as Quake or Half-life.  Tilda

Rather: “similar to the built-in consoles in some applications.”

Could you send an updated patch?

Thanks!

Ludo’.

Re: [PATCH 1/2] gnu: vte: Provide 0.36.5.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> On Sun, 15 Nov 2015 18:46:04 +0100
> ludo@gnu.org (Ludovic Courtès) wrote:
>
>> Efraim Flashner <efraim@flashner.co.il> skribis:
>> 
>> > * gnu/packages/gnome.scm (vte): Add version 0.36.5.  
>> 
>> [...]
>> 
>> > +;; provides vte 2.90, required for some terminal emulators
>> > +(define-public vte-0.36
>> > +  (package (inherit vte)
>> > +    (name "vte")
>> > +    (version "0.36.5")  
>> 
>> Is this particular version really needed?  We already have 0.40 and
>> 0.28.2 so it would be great if one of these could be used (the comment
>> above makes me think that 0.40 would do as well, but it’s not completely
>> clear.)
>> 
>> Now, if Tilda really requires this specific version, that’s fine.
>> 
>> Thanks,
>> Ludo’.
>
> There's been a bug report against tilda for more than a year to get them to
> update their vte version.  Some of the things tilda can do, like an opaque
> background, are unsupported in vte 2.91.  Unfortunately this puts tilda in a
> tight spot, needing at least 0.30 and less than 0.38. Some of the other
> terminals out there either use or used this version also, but I haven't
> checked to see if they've moved on yet or not.

Fair enough.  In that case, it’s fine to commit this intermediate
version.  It would be ideal if you could add a link to the Tilda bug
report that discusses this issue.

Thanks,
Ludo’.

Re: [PATCH 1/2] gnu: vte: Provide 0.36.5.

[Efraim Flashner]

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

On Sun, 15 Nov 2015 22:22:31 +0100
ludo@gnu.org (Ludovic Courtès) wrote:

> Efraim Flashner <efraim@flashner.co.il> skribis:
> 
>  [...]  
> Fair enough.  In that case, it’s fine to commit this intermediate
> version.  It would be ideal if you could add a link to the Tilda bug
> report that discusses this issue.
> 
> Thanks,
> Ludo’.

sounds good. I'll put a link to the bug report with the tilda package also.

recorded here for posterity:

tilda:
bug report: https://github.com/lanoxx/tilda/issues/94
status: update builds from master, not ready for release

sakura:
bug report: https://bugs.launchpad.net/sakura/+bug/1337962, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788021
status: builds against vte 2.91

pantheon-terminal (elementary):
bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788021
status: fixed in master, not released yet

roxterm:
bug report: http://sourceforge.net/p/roxterm/bugs/107/
status: progress stalled, waiting developer waiting on vte 0.40 for further development

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 2/2] gnu: Add tilda.

[Efraim Flashner]

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

On Sun, 15 Nov 2015 21:28:12 +0100
ludo@gnu.org (Ludovic Courtès) wrote:

> Efraim Flashner <efraim@flashner.co.il> skribis:
> 
> > * gnu/packages/terminals.scm: New file.
> > * gnu-system.am (GNU_SYSTEM_MODULES): Add it.  
> 
> Not sure if it warrants a new file, but I don’t have a better idea.

Agreed, but it didn't seem to really fit in any of the other files. gnome or 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 gnome/lxde/xfce.scm, terminology in enlightenment.scm. On the other hand, c-ares in in aria2.scm since that's where it was first needed and there are other ones like that, or w3m, links and conqeror could all be in a new file browsers.scm. But without rearranging everything, making more genericly named files going forward is probably the best bet.

> [...]
> 
> Could you send an updated patch?
> 
> Thanks!
> 
> Ludo’.

Attached :)

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-vte-Provide-0.36.5.patch --]
[-- Type: text/x-patch, Size: 1994 bytes --]

From e6063394c9741595a239dd1cdc2b4b8d71cdee43 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
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 © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
+;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1708,6 +1709,27 @@ gnome-terminal, but can also be used to embed a console/terminal in games,
 editors, IDEs, etc.")
     (license license:lgpl2.1+)))
 
+;; 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?bug=788021
+;; 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)
-- 
2.6.2


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-tilda.patch --]
[-- Type: text/x-patch, Size: 4221 bytes --]

From dc5bb6c298074949d90bf30be31946c783304827 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
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 =				\
   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 © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(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+)))
-- 
2.6.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 2/2] gnu: Add tilda.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> On Sun, 15 Nov 2015 21:28:12 +0100
> ludo@gnu.org (Ludovic Courtès) wrote:
>
>> Efraim Flashner <efraim@flashner.co.il> skribis:
>> 
>> > * gnu/packages/terminals.scm: New file.
>> > * gnu-system.am (GNU_SYSTEM_MODULES): Add it.  
>> 
>> Not sure if it warrants a new file, but I don’t have a better idea.
>
> Agreed, but it didn't seem to really fit in any of the other files. gnome or 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 gnome/lxde/xfce.scm, terminology in enlightenment.scm. On the other hand, c-ares in in aria2.scm since that's where it was first needed and there are other ones like that, or w3m, links and conqeror could all be in a new file browsers.scm. But without rearranging everything, making more genericly named files going forward is probably the best bet.

Yeah.  It’s not always easy to find a category that makes sense.

> From dc5bb6c298074949d90bf30be31946c783304827 Mon Sep 17 00:00:00 2001
> From: Efraim Flashner <efraim@flashner.co.il>
> 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.

OK!

Thanks,
Ludo’.