[bug#35922] [PATCH] gnu: add terminator

[bug#35922] [PATCH] gnu: add terminator

[atai]

From: Andy Tai <atai@atai.org>

* gnu/packages/gnome.scm (terminator): Add at 1.91
---
 gnu/packages/gnome.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6a2a683f58..77269ba503 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2019 Li-Cheng (Andy) Tai <atai@atai.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -162,6 +163,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -7973,3 +7975,40 @@ functionality.")
     (license (list license:lgpl2.1 license:lgpl3 ; either one of these
                    license:openldap2.8 ; addressbook/gui/component/openldap-extract.h
                    license:lgpl2.1+))))  ; smime/lib/*
+
+(define-public terminator
+  (package
+    (name "terminator")
+    (version "1.91")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://launchpad.net/" name "/"
+                                  "gtk3/" version "/" "+download/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0sdyqwydmdnh7j6mn74vrywz35m416kqsbxbrqcnv5ak08y6xxwm"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("glib" ,glib "bin")
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo)       
+       ("gtk+" ,gtk+)
+       ("gobject-introspection" ,gobject-introspection)
+       ("pango" ,pango)
+       ("python" ,python-2)
+       ("python2-pycairo" ,python2-pycairo)
+       ("python2-pygobject" ,python2-pygobject)
+       ("python2-psutil" ,python2-psutil)
+       ("vte" ,vte)))
+    (arguments
+     `(#:python ,python-2))
+    (home-page "https://gnometerminator.blogspot.com/")
+    (synopsis "Store and run multiple GNOME terminals in one window")
+    (description
+     "A tool to allow running multiple GNOME terminals in a grid and
+     tabs and support for drag and drop re-ordering of terminals")
+    (license license:gpl2)))
-- 
2.20.1

[bug#35922] [PATCH] gnu: add terminator

[Ludovic Courtès]

Hello,

atai@atai.org skribis:

> From: Andy Tai <atai@atai.org>
>
> * gnu/packages/gnome.scm (terminator): Add at 1.91

[...]

> +    (arguments
> +     `(#:python ,python-2))

Python 2.x is reaching EOL real soon.  Can it run on Python 3?

> +    (description
> +     "A tool to allow running multiple GNOME terminals in a grid and
> +     tabs and support for drag and drop re-ordering of terminals")

Could you make a full sentence and remove the trailing spaces?  See
<https://www.gnu.org/software/guix/manual/en/html_node/Synopses-and-Descriptions.html>.

> +    (license license:gpl2)))

This means “version 2 only”.  Is there an explicit “version 2 only”
statement, for example in source file headers?  If not, it should be
‘gpl2+’.

Could you send an updated patch?

Thank you,
Ludo’.

[bug#35922] [PATCH] gnu: add terminator

[Andy Tai]

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

On Wed, May 29, 2019 at 2:10 PM Ludovic Courtès <ludo@gnu.org> wrote:

> Hello,
>
> atai@atai.org skribis:
>
> > From: Andy Tai <atai@atai.org>
> >
> > * gnu/packages/gnome.scm (terminator): Add at 1.91
>
> [...]
>
> > +    (arguments
> > +     `(#:python ,python-2))
>
> Python 2.x is reaching EOL real soon.  Can it run on Python 3?
>

hi, no, not the current upstream... I tried with python-3 and won't run

>
> > +    (description
> > +     "A tool to allow running multiple GNOME terminals in a grid and
> > +     tabs and support for drag and drop re-ordering of terminals")
>
> Could you make a full sentence and remove the trailing spaces?  See
> <
> https://www.gnu.org/software/guix/manual/en/html_node/Synopses-and-Descriptions.html
> >.
>
> will update


> > +    (license license:gpl2)))
>
> This means “version 2 only”.  Is there an explicit “version 2 only”
> statement, for example in source file headers?  If not, it should be
> ‘gpl2+’.
>
> source clearly labeled gpl "Version 2 Only"

> Could you send an updated patch?
>
> will do

> Thank you,
> Ludo’.
>


-- 
Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat:
andytai1010
Year 2019 民國108年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能

[-- Attachment #2: Type: text/html, Size: 3398 bytes --]

[bug#35922] [PATCH] gnu: add terminator

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Hello,
>
> atai@atai.org skribis:
>
>> From: Andy Tai <atai@atai.org>
>>
>> * gnu/packages/gnome.scm (terminator): Add at 1.91
>
> [...]
>
>> +    (arguments
>> +     `(#:python ,python-2))
>
> Python 2.x is reaching EOL real soon.  Can it run on Python 3?

It looks like terminator is no longer maintained since 2017.

-- 
Ricardo

[bug#35922] [PATCH] gnu: add terminator

[Andy Tai]

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

Hi, this is a popular program used by many people and in repos of Fedora
and Ubuntu.  2017 was only 2 years ago, so "not maintained" for two years
seems not unusual in the Free Software world.   In any case, that would not
prevent other python2 programs from being in Guix or other GNU/Linux
distributions.   Migration to Python 3 would be issue for the upstream or
for anyone taking over maintenance, common for widely used programs if the
needs rises.

On Thu, May 30, 2019 at 2:55 AM Ricardo Wurmus <rekado@elephly.net> wrote:

>
> Ludovic Courtès <ludo@gnu.org> writes:
>
> > Hello,
> >
> > atai@atai.org skribis:
> >
> >> From: Andy Tai <atai@atai.org>
> >>
> >> * gnu/packages/gnome.scm (terminator): Add at 1.91
> >
> > [...]
> >
> >> +    (arguments
> >> +     `(#:python ,python-2))
> >
> > Python 2.x is reaching EOL real soon.  Can it run on Python 3?
>
> It looks like terminator is no longer maintained since 2017.
>
> --
> Ricardo
>
>

-- 
Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat:
andytai1010
Year 2019 民國108年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能

[-- Attachment #2: Type: text/html, Size: 2147 bytes --]

[bug#35922] [PATCH] gnu: add terminator

[Ricardo Wurmus]

Hi Andy,

> Hi, this is a popular program used by many people and in repos of Fedora
> and Ubuntu.  2017 was only 2 years ago, so "not maintained" for two years
> seems not unusual in the Free Software world.

Sure.  What I meant is that it’s unlikely that upstream will migrate it
to Python 3 and by the time Python 2 hits EOL this will be our problem.

-- 
Ricardo

[bug#35922] [PATCH] gnu: add terminator

[Andy Tai]

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

Rewrite in guile?:)

On Fri, May 31, 2019, 12:53 AM Ricardo Wurmus <rekado@elephly.net> wrote:

>
> Hi Andy,
>
> > Hi, this is a popular program used by many people and in repos of Fedora
> > and Ubuntu.  2017 was only 2 years ago, so "not maintained" for two years
> > seems not unusual in the Free Software world.
>
> Sure.  What I meant is that it’s unlikely that upstream will migrate it
> to Python 3 and by the time Python 2 hits EOL this will be our problem.
>
> --
> Ricardo
>
>

[-- Attachment #2: Type: text/html, Size: 813 bytes --]

[bug#35922] [PATCH] gnu: add terminator

[atai]

From: Andy Tai <atai@atai.org>

* gnu/packages/gnome.scm (terminator): Add at 1.91
---
 gnu/packages/gnome.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 14e63280ed..9775d1f82d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2019 Li-Cheng (Andy) Tai <atai@atai.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -162,6 +163,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -7974,3 +7976,40 @@ functionality.")
     (license (list license:lgpl2.1 license:lgpl3 ; either one of these
                    license:openldap2.8 ; addressbook/gui/component/openldap-extract.h
                    license:lgpl2.1+))))  ; smime/lib/*
+
+(define-public terminator
+  (package
+    (name "terminator")
+    (version "1.91")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://launchpad.net/" name "/"
+                                  "gtk3/" version "/" "+download/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0sdyqwydmdnh7j6mn74vrywz35m416kqsbxbrqcnv5ak08y6xxwm"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("glib" ,glib "bin")
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo) 
+       ("gtk+" ,gtk+)
+       ("gobject-introspection" ,gobject-introspection)
+       ("pango" ,pango)
+       ("python" ,python-2)
+       ("python2-pycairo" ,python2-pycairo)
+       ("python2-pygobject" ,python2-pygobject)
+       ("python2-psutil" ,python2-psutil)
+       ("vte" ,vte)))
+    (arguments
+     `(#:python ,python-2))
+    (home-page "https://gnometerminator.blogspot.com/")
+    (synopsis "Store and run multiple GNOME terminals in one window")
+    (description
+     "Terminator allows running multiple GNOME terminals in a grid and
+tabs and supports for drag and drop re-ordering of terminals")
+    (license license:gpl2)))
-- 
2.20.1

[bug#35922] [PATCH] gnu: add terminator

[Ludovic Courtès]

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

Hi Andy,

atai@atai.org skribis:

> From: Andy Tai <atai@atai.org>
>
> * gnu/packages/gnome.scm (terminator): Add at 1.91

I propose the small changes below.

However, it fails to run in this context:

--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix environment --ad-hoc terminator --pure -- terminator
Traceback (most recent call last):
  File "/gnu/store/frwq9qja9m8i8dvk0lgj9mg5rnmc5377-terminator-1.91/bin/.terminator-real", line 33, in <module>
    gi.require_version('Gtk','3.0')
  File "/gnu/store/q4b7cr9j6f3g7v4xpg0zm3kkhd6l4dmg-python2-pygobject-3.28.3/lib/python2.7/site-packages/gi/__init__.py", line 130, in require_version
    raise ValueError('Namespace %s not available' % namespace)
ValueError: Namespace Gtk not available
--8<---------------cut here---------------end--------------->8---

It seems we’re missing an environment variable or something to allow
pygobject to find the GIR file for GTK+.  I’m sure this has been
addressed in other packages before, but I don’t remember how.

Anyone here?

Thanks,
Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1201 bytes --]

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9775d1f82d..e0142a7fb5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7996,20 +7996,19 @@ functionality.")
        ("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("cairo" ,cairo) 
+     `(("cairo" ,cairo)
        ("gtk+" ,gtk+)
        ("gobject-introspection" ,gobject-introspection)
        ("pango" ,pango)
-       ("python" ,python-2)
        ("python2-pycairo" ,python2-pycairo)
        ("python2-pygobject" ,python2-pygobject)
        ("python2-psutil" ,python2-psutil)
        ("vte" ,vte)))
     (arguments
-     `(#:python ,python-2))
+     `(#:python ,python-2))                       ;Python 3 not supported
     (home-page "https://gnometerminator.blogspot.com/")
     (synopsis "Store and run multiple GNOME terminals in one window")
     (description
-     "Terminator allows running multiple GNOME terminals in a grid and
-tabs and supports for drag and drop re-ordering of terminals")
+     "Terminator allows you to runn multiple GNOME terminals in a grid and
+tabs, and it supports drag and drop re-ordering of terminals.")
     (license license:gpl2)))

[bug#35922] [PATCH] gnu: add terminator

[Andy Tai]

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

Hi, I just sent a new patch that works with Ludo's command line

./pre-inst-env guix environment --ad-hoc terminator --pure -- terminator

Thanks

On Sat, Jun 1, 2019 at 5:48 AM Ludovic Courtès <ludo@gnu.org> wrote:

> Hi Andy,
>
> atai@atai.org skribis:
>
> > From: Andy Tai <atai@atai.org>
> >
> > * gnu/packages/gnome.scm (terminator): Add at 1.91
>
> I propose the small changes below.
>
> However, it fails to run in this context:
>
> --8<---------------cut here---------------start------------->8---
> $ ./pre-inst-env guix environment --ad-hoc terminator --pure -- terminator
> Traceback (most recent call last):
>   File
> "/gnu/store/frwq9qja9m8i8dvk0lgj9mg5rnmc5377-terminator-1.91/bin/.terminator-real",
> line 33, in <module>
>     gi.require_version('Gtk','3.0')
>   File
> "/gnu/store/q4b7cr9j6f3g7v4xpg0zm3kkhd6l4dmg-python2-pygobject-3.28.3/lib/python2.7/site-packages/gi/__init__.py",
> line 130, in require_version
>     raise ValueError('Namespace %s not available' % namespace)
> ValueError: Namespace Gtk not available
> --8<---------------cut here---------------end--------------->8---
>
> It seems we’re missing an environment variable or something to allow
> pygobject to find the GIR file for GTK+.  I’m sure this has been
> addressed in other packages before, but I don’t remember how.
>
> Anyone here?
>
> Thanks,
> Ludo’.
>
>

-- 
Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat:
andytai1010
Year 2019 民國108年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能

[-- Attachment #2: Type: text/html, Size: 2847 bytes --]

[bug#35922] [PATCH] gnu: add terminator

[atai]

From: Andy Tai <atai@atai.org>

* gnu/packages/gnome.scm (terminator): Add at 1.91
---
 gnu/packages/gnome.scm | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 60141fce9b..962657b9d7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -162,6 +162,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -8021,3 +8022,49 @@ functionality.")
     (description "GThumb is an image viewer, browser, organizer, editor and
 advanced image management tool")
     (license license:gpl2+)))
+
+(define-public terminator
+  (package
+    (name "terminator")
+    (version "1.91")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://launchpad.net/" name "/"
+                                  "gtk3/" version "/" "+download/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0sdyqwydmdnh7j6mn74vrywz35m416kqsbxbrqcnv5ak08y6xxwm"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("glib:bin" ,glib "bin")                   ; for glib-compile-resources
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo)
+       ("gobject-introspection" ,gobject-introspection)
+       ("python" ,python-2)
+       ("python2-pycairo" ,python2-pycairo)
+       ("python2-pygobject" ,python2-pygobject)
+       ("python2-psutil" ,python2-psutil)
+       ("vte" ,vte)))
+    (arguments
+     `(#:python ,python-2                          ;Python 3 not supported
+       #:phases
+       (modify-phases %standard-phases
+         (add-after
+          'install 'wrap-program
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let ((prog (string-append (assoc-ref outputs "out")
+                                       "/bin/terminator")))
+              (wrap-program prog
+                `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
+                `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
+              #t))))))
+    (home-page "https://gnometerminator.blogspot.com/")
+    (synopsis "Store and run multiple GNOME terminals in one window")
+    (description
+     "Terminator allows you to runn multiple GNOME terminals in a grid and
++tabs, and it supports drag and drop re-ordering of terminals.")
+    (license license:gpl2)))
-- 
2.20.1

bug#35922: [PATCH] gnu: add terminator

[Ludovic Courtès]

atai@atai.org skribis:

> From: Andy Tai <atai@atai.org>
>
> * gnu/packages/gnome.scm (terminator): Add at 1.91

Applied, thanks!