GNU bug report logs - #65330
[PATCH] Fixing tilix compile issue by upgrading version

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65330 in the body.
You can then email your comments to 65330 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Aaron Covrig <aaron.covrig.us <at> ieee.org>
To: guix-patches <at> gnu.org
Cc: Aaron Covrig <aaron.covrig.us <at> ieee.org>
Subject: [PATCH] Fixing tilix compile issue by upgrading version
Date: Tue, 15 Aug 2023 21:34:59 -0400

Changes:
1. Changed tilix from v1.9.5 to untagged v1.9.6
---
 gnu/packages/terminals.scm | 92 +++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 081ef19af1..57f72881a8 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2022 Felipe Balbi <balbi <at> kernel.org>
 ;;; Copyright © 2022 ( <paren <at> disroot.org>
 ;;; Copyright © 2022 jgart <jgart <at> dismail.de>
+;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us <at> ieee.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1339,50 +1340,51 @@ (define-public wterm
   (deprecated-package "wterm" foot))
 
 (define-public tilix
-  (package
-    (name "tilix")
-    (version "1.9.5")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/gnunn1/tilix")
-               (commit version)))
-        (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ij3ix6yhi8hicxvglrxjyyv8bch9birrgsr8ml6jfh3hvk4pxdh"))))
-    (build-system meson-build-system)
-    (arguments
-     `(#:glib-or-gtk? #t
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'set-env-variables
-           (lambda _
-             (setenv "CC" ,(cc-for-target))))
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           (lambda _
-             (substitute* "meson_post_install.py"
-               (("gtk-update-icon-cache") (which "true"))
-               (("update-desktop-database") (which "true"))))))))
-    (inputs
-     (list dbus
-           dconf
-           gsettings-desktop-schemas
-           gtk+
-           gtkd
-           ldc
-           libsecret
-           libunwind
-           vte))
-    (native-inputs
-     (list appstream
-           gettext-minimal
-           (list glib "bin")
-           ldc
-           pkg-config))
-    (home-page "https://gnunn1.github.io/tilix-web/")
-    (synopsis "Tiling terminal emulator")
-    (description "Tilix is a tiling terminal emulator following the
+  (let ((commit "e2c75f417a84ad784735524f1b8bf01c516f705d")
+        (revision "1"))          ;Guix package revision
+    (package
+      (name "tilix")
+      ;; unreleased version 1.9.6 (RELEASE.md reports 1.9.6, but no Git tag created)
+      (version (git-version "1.9.6" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/gnunn1/tilix")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1k5r99c9ab1l0v37hs1zy08rspgv8n7y3bd13ljqg607cyalbgbf"))))
+      (build-system meson-build-system)
+      (arguments
+       `(#:glib-or-gtk? #t
+         #:phases (modify-phases %standard-phases
+                    (add-after 'unpack 'set-env-variables
+                      (lambda _
+                        (setenv "CC"
+                                ,(cc-for-target))))
+                    (add-after 'unpack 'skip-gtk-update-icon-cache
+                      (lambda _
+                        (substitute* "meson_post_install.py"
+                          (("gtk-update-icon-cache")
+                           (which "true"))
+                          (("update-desktop-database")
+                           (which "true"))))))))
+      (inputs (list dbus
+                    dconf
+                    gsettings-desktop-schemas
+                    gtk+
+                    gtkd
+                    ldc
+                    libsecret
+                    libunwind
+                    vte))
+      (native-inputs (list appstream gettext-minimal
+                           (list glib "bin") ldc pkg-config))
+      (home-page "https://gnunn1.github.io/tilix-web/")
+      (synopsis "Tiling terminal emulator")
+      (description
+       "Tilix is a tiling terminal emulator following the
 Gnome Human Interface Guidelines.  Its features include:
 @enumerate
 @item Layout terminals in any fashion by splitting them horizontally or
@@ -1394,7 +1396,7 @@ (define-public tilix
 terminal are replicated to the others.
 @item Supports notifications when processes are completed out of view.
 @end enumerate")
-    (license license:mpl2.0)))
+      (license license:mpl2.0))))
 
 (define-public tio
   (package

base-commit: be6f5edd445850720dfcec2642db643b84fc0645
-- 
2.41.0

Message #8 received at 65330 <at> debbugs.gnu.org (full text, mbox):

From: Aaron Covrig <aaron.covrig.us <at> ieee.org>
To: 65330 <at> debbugs.gnu.org
Cc: Aaron Covrig <aaron.covrig.us <at> ieee.org>
Subject: [PATCH v1] Fixing tilix compile issues by including updates
Date: Mon, 21 Aug 2023 00:26:15 -0400

1. Changed tilix from v1.9.5 to v1.9.5 + commits
---
This revision changes the version to reflect that this is built
upon v1.9.5 with added commits, rather than being v1.9.6;
additionally, it corrects line spacing so that only the
changed parts are seen as modified by git
 gnu/packages/terminals.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 5fc72d7937..fd55233a5b 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2022 Felipe Balbi <balbi <at> kernel.org>
 ;;; Copyright © 2022 ( <paren <at> disroot.org>
 ;;; Copyright © 2022 jgart <jgart <at> dismail.de>
+;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us <at> ieee.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1339,18 +1340,21 @@ (define-public wterm
   (deprecated-package "wterm" foot))
 
 (define-public tilix
+(let ((commit "e2c75f417a84ad784735524f1b8bf01c516f705d")
+      (revision "0"))
   (package
     (name "tilix")
-    (version "1.9.5")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/gnunn1/tilix")
-               (commit version)))
-        (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ij3ix6yhi8hicxvglrxjyyv8bch9birrgsr8ml6jfh3hvk4pxdh"))))
+    ;; includes commits that fix glibc related build issues
+    (version (git-version "1.9.5" revision commit))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/gnunn1/tilix")
+                    (commit commit)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1k5r99c9ab1l0v37hs1zy08rspgv8n7y3bd13ljqg607cyalbgbf"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
@@ -1394,7 +1398,7 @@ (define-public tilix
 terminal are replicated to the others.
 @item Supports notifications when processes are completed out of view.
 @end enumerate")
-    (license license:mpl2.0)))
+    (license license:mpl2.0))))
 
 (define-public tio
   (package

base-commit: 7cad70566322262f6acdbbb965e867e34010eb55
-- 
2.41.0

Message #13 received at 65330-done <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Aaron Covrig <aaron.covrig.us <at> ieee.org>
Cc: 65330-done <at> debbugs.gnu.org
Subject: Re: bug#65330: [PATCH] Fixing tilix compile issue by upgrading version
Date: Tue, 22 Aug 2023 19:08:26 +0000

Hello,

On Mon, Aug 21, 2023 at 12:26 AM, Aaron Covrig wrote:

> 1. Changed tilix from v1.9.5 to v1.9.5 + commits
> ---
> This revision changes the version to reflect that this is built
> upon v1.9.5 with added commits, rather than being v1.9.6;
> additionally, it corrects line spacing so that only the
> changed parts are seen as modified by git

We were discussing on IRC the other day. I meant that no changes to the
formatting besides the spacing introduced by the let should be made;
this still requires re-indenting the rest of the package definition.

Anyway, I adjusted the commit message, fixed the formatting, and used
the latest commit of tilix. I checked that this built locally as well.

Thanks for your contribution!

John

>  gnu/packages/terminals.scm | 26 +++++++++++++++-----------
>  1 file changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
> index 5fc72d7937..fd55233a5b 100644
> --- a/gnu/packages/terminals.scm
> +++ b/gnu/packages/terminals.scm
> @@ -33,6 +33,7 @@
>  ;;; Copyright © 2022 Felipe Balbi <balbi <at> kernel.org>
>  ;;; Copyright © 2022 ( <paren <at> disroot.org>
>  ;;; Copyright © 2022 jgart <jgart <at> dismail.de>
> +;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us <at> ieee.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -1339,18 +1340,21 @@ (define-public wterm
>    (deprecated-package "wterm" foot))
>
>  (define-public tilix
> +(let ((commit "e2c75f417a84ad784735524f1b8bf01c516f705d")
> +      (revision "0"))
>    (package
>      (name "tilix")
> -    (version "1.9.5")
> -    (source
> -      (origin
> -        (method git-fetch)
> -        (uri (git-reference
> -               (url "https://github.com/gnunn1/tilix")
> -               (commit version)))
> -        (file-name (git-file-name name version))
> -       (sha256
> -        (base32 "1ij3ix6yhi8hicxvglrxjyyv8bch9birrgsr8ml6jfh3hvk4pxdh"))))
> +    ;; includes commits that fix glibc related build issues
> +    (version (git-version "1.9.5" revision commit))
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/gnunn1/tilix")
> +                    (commit commit)))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32
> +                "1k5r99c9ab1l0v37hs1zy08rspgv8n7y3bd13ljqg607cyalbgbf"))))
>      (build-system meson-build-system)
>      (arguments
>       `(#:glib-or-gtk? #t
> @@ -1394,7 +1398,7 @@ (define-public tilix
>  terminal are replicated to the others.
>  @item Supports notifications when processes are completed out of view.
>  @end enumerate")
> -    (license license:mpl2.0)))
> +    (license license:mpl2.0))))
>
>  (define-public tio
>    (package
>
> base-commit: 7cad70566322262f6acdbbb965e867e34010eb55

Message #16 received at 65330 <at> debbugs.gnu.org (full text, mbox):

From: Aaron Covrig <aaron.covrig.us <at> ieee.org>
To: John Kehayias <john.kehayias <at> protonmail.com>
Cc: 65330 <at> debbugs.gnu.org
Subject: Re: bug#65330: [PATCH] Fixing tilix compile issue by upgrading version
Date: Tue, 22 Aug 2023 21:45:54 -0400

[Message part 1 (text/plain, inline)]

Awesome, thank you John for your assistance and reviewing!

v/r,

Aaron Covrig

On Tue, 22 Aug 2023 19:08:26 +0000
John Kehayias <john.kehayias <at> protonmail.com> wrote:

> Hello,
> 
> On Mon, Aug 21, 2023 at 12:26 AM, Aaron Covrig wrote:
> 
> > 1. Changed tilix from v1.9.5 to v1.9.5 + commits
> > ---
> > This revision changes the version to reflect that this is built
> > upon v1.9.5 with added commits, rather than being v1.9.6;
> > additionally, it corrects line spacing so that only the
> > changed parts are seen as modified by git  
> 
> We were discussing on IRC the other day. I meant that no changes to
> the formatting besides the spacing introduced by the let should be
> made; this still requires re-indenting the rest of the package
> definition.
> 
> Anyway, I adjusted the commit message, fixed the formatting, and used
> the latest commit of tilix. I checked that this built locally as well.
> 
> Thanks for your contribution!
> 
> John
> 
> >  gnu/packages/terminals.scm | 26 +++++++++++++++-----------
> >  1 file changed, 15 insertions(+), 11 deletions(-)
> >
> > diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
> > index 5fc72d7937..fd55233a5b 100644
> > --- a/gnu/packages/terminals.scm
> > +++ b/gnu/packages/terminals.scm
> > @@ -33,6 +33,7 @@
> >  ;;; Copyright © 2022 Felipe Balbi <balbi <at> kernel.org>
> >  ;;; Copyright © 2022 ( <paren <at> disroot.org>
> >  ;;; Copyright © 2022 jgart <jgart <at> dismail.de>
> > +;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us <at> ieee.org>
> >  ;;;
> >  ;;; This file is part of GNU Guix.
> >  ;;;
> > @@ -1339,18 +1340,21 @@ (define-public wterm
> >    (deprecated-package "wterm" foot))
> >
> >  (define-public tilix
> > +(let ((commit "e2c75f417a84ad784735524f1b8bf01c516f705d")
> > +      (revision "0"))
> >    (package
> >      (name "tilix")
> > -    (version "1.9.5")
> > -    (source
> > -      (origin
> > -        (method git-fetch)
> > -        (uri (git-reference
> > -               (url "https://github.com/gnunn1/tilix")
> > -               (commit version)))
> > -        (file-name (git-file-name name version))
> > -       (sha256
> > -        (base32
> > "1ij3ix6yhi8hicxvglrxjyyv8bch9birrgsr8ml6jfh3hvk4pxdh"))))
> > +    ;; includes commits that fix glibc related build issues
> > +    (version (git-version "1.9.5" revision commit))
> > +    (source (origin
> > +              (method git-fetch)
> > +              (uri (git-reference
> > +                    (url "https://github.com/gnunn1/tilix")
> > +                    (commit commit)))
> > +              (file-name (git-file-name name version))
> > +              (sha256
> > +               (base32
> > +
> > "1k5r99c9ab1l0v37hs1zy08rspgv8n7y3bd13ljqg607cyalbgbf"))))
> > (build-system meson-build-system) (arguments
> >       `(#:glib-or-gtk? #t
> > @@ -1394,7 +1398,7 @@ (define-public tilix
> >  terminal are replicated to the others.
> >  @item Supports notifications when processes are completed out of
> > view. @end enumerate")
> > -    (license license:mpl2.0)))
> > +    (license license:mpl2.0))))
> >
> >  (define-public tio
> >    (package
> >
> > base-commit: 7cad70566322262f6acdbbb965e867e34010eb55  
> 

[Message part 2 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.