GNU bug report logs - #54311
[PATCH] gnu: tint2: Update to 17.0.2.

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 54311 in the body.
You can then email your comments to 54311 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: "Wamm K. D" <jaft.r <at> outlook.com>
To: guix-patches <at> gnu.org
Cc: "Wamm K. D" <jaft.r <at> outlook.com>
Subject: [PATCH] gnu: tint2: Update to 17.0.2.
Date: Wed,  9 Mar 2022 13:34:08 -0600

---
Noticed that the version currently is ~4 years old from the latest…
 gnu/packages/xdisorg.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 6dc40f0910..f5d981413c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -54,6 +54,7 @@
 ;;; Copyright © 2021 jgart <jgart <at> dismail.de>
 ;;; Copyright © 2022 John Kehayias <john.kehayias <at> protonmail.com>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan <at> gmail.com>
+;;; Copyright © 2022 Wamm K. D. <jaft.r <at> outlook.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1791,15 +1792,15 @@ (define-public rofi-calc
 (define-public tint2
   (package
     (name "tint2")
-    (version "0.14.6")
+    (version "17.0.2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://gitlab.com/o9000/" name
-                                  "/repository/archive.tar.gz?ref=" version))
+              (uri (string-append "https://gitlab.com/o9000/" name "/-/archive/"
+                                  version "/" name "-" version ".tar.gz"))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1kwzwxy4myagybm3rc7dgynfgp75742n348qibn1p2an9ggyivda"))))
+                "0k72kjr4rmprbrhs5ik1g7vwdi2lbzvkf5zw28gz6ckd2xz18zzq"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f                      ;no test target
@@ -1811,7 +1812,7 @@ (define-public tint2
                (("/etc") "${CMAKE_INSTALL_PREFIX}/etc"))
              #t)))))
     (inputs
-     (list gtk+-2
+     (list gtk+
            imlib2
            librsvg
            libxcomposite
-- 
2.34.0

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

From: Maxime Devos <maximedevos <at> telenet.be>
To: "Wamm K. D" <jaft.r <at> outlook.com>, 54311 <at> debbugs.gnu.org
Subject: Re: [bug#54311] [PATCH] gnu: tint2: Update to 17.0.2.
Date: Wed, 09 Mar 2022 21:28:33 +0100

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

Wamm K. D schreef op wo 09-03-2022 om 13:34 [-0600]:
>       '(#:tests? #f                      ;no test target


There seem to be some tests in the 'test' directory.

>              #t)))))

Trailing #t aren't necessary anymore.

Greetings,

[signature.asc (application/pgp-signature, inline)]

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

From: Maxime Devos <maximedevos <at> telenet.be>
To: "Wamm K. D" <jaft.r <at> outlook.com>, 54311 <at> debbugs.gnu.org
Subject: Re: [bug#54311] [PATCH] gnu: tint2: Update to 17.0.2.
Date: Wed, 09 Mar 2022 21:30:12 +0100

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

Wamm K. D schreef op wo 09-03-2022 om 13:34 [-0600]:
> +              (uri (string-append "https://gitlab.com/o9000/" name "/-/archive/"
> +                                  version "/" name "-" version ".tar.gz"))

Is this uri stable?

Also, there seems to be a 'v' missing before version.  Does
"guix download
https://gitlab.com/o9000/tint2/-/archive/17.0.2/tint2-17.0.2.tar.gz"
succeed?

Greetings,
Maxime.

[signature.asc (application/pgp-signature, inline)]

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

From: Maxime Devos <maximedevos <at> telenet.be>
To: "Wamm K. D" <jaft.r <at> outlook.com>, 54311 <at> debbugs.gnu.org
Subject: Re: [bug#54311] [PATCH] gnu: tint2: Update to 17.0.2.
Date: Wed, 09 Mar 2022 21:31:02 +0100

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

Wamm K. D schreef op wo 09-03-2022 om 13:34 [-0600]:
> @@ -1811,7 +1812,7 @@ (define-public tint2
>                 (("/etc") "${CMAKE_INSTALL_PREFIX}/etc"))

Is this still necessary?

Greetings,
Maxime.

[signature.asc (application/pgp-signature, inline)]

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

From: Jaft <jaft.r <at> outlook.com>
To: "54311 <at> debbugs.gnu.org" <54311 <at> debbugs.gnu.org>, 
 Maxime Devos <maximedevos <at> telenet.be>
Subject: Re: [bug#54311] [PATCH] gnu: tint2: Update to 17.0.2.
Date: Wed, 9 Mar 2022 21:46:27 +0000 (UTC)

> On Wednesday, March 9, 2022, 02:30:14 PM CST, Maxime Devos <maximedevos <at> telenet.be> wrote: 
>
>
>
>
>
> Wamm K. D schreef op wo 09-03-2022 om 13:34 [-0600]:
>
> > +              (uri (string-append "https://gitlab.com/o9000/" name "/-/archive/"
> > +                                  version "/" name "-" version ".tar.gz"))
>
>
> Is this uri stable?

I think it's a standard GitLab URL? It's what was given when choosing to download the .tar.gz file from GitLab; I went with it to avoid a lot of changes to the original package definition but, given it's just Git, we could just use a git-download instead. Let me know if that's preferred.

> Also, there seems to be a 'v' missing before version.  Does
> "guix download
> https://gitlab.com/o9000/tint2/-/archive/17.0.2/tint2-17.0.2.tar.gz"
> succeed?

It does (I'm running version 17.0.2 on my machine, right now); the tint2 project tags versions with both no "v" and with a "v" so either would work. Both "https://gitlab.com/o9000/tint2/-/archive/17.0.2/tint2-17.0.2.tar.gz" and "https://gitlab.com/o9000/tint2/-/archive/v17.0.2/tint2-v17.0.2.tar.gz" should be valid (https://gitlab.com/o9000/tint2/-/tags).

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

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Jaft <jaft.r <at> outlook.com>, "54311 <at> debbugs.gnu.org" <54311 <at> debbugs.gnu.org>,
 Maxime Devos <maximedevos <at> telenet.be>
Subject: Re: [bug#54311] [PATCH] gnu: tint2: Update to 17.0.2.
Date: Wed, 09 Mar 2022 21:57:45 +0000

What Maxime means is that some forges (like GitHub) generate these archives on the fly, instead of the author uploading a 'stable' file.  You can usually tell them apart by the URL, but I forget GitLab's conventions.

These archives might be cached for a while but if they are regenerated the hash could change even if the unpacked data didn't.  This has happened in the past and breaks e.g. guix time-machine even if 'fixed' on master.

Hence we prefer git-fetch when available, or tarballs that look human-generated.

Kind regards,

T G-R

Sent on the go.  Excuse or enjoy my brevity.

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

From: Jaft <jaft.r <at> outlook.com>
To: "54311 <at> debbugs.gnu.org" <54311 <at> debbugs.gnu.org>, 
 Maxime Devos <maximedevos <at> telenet.be>, 
 Tobias Geerinckx-Rice <me <at> tobias.gr>
Subject: Re: [bug#54311] [PATCH] gnu: tint2: Update to 17.0.2.
Date: Wed, 9 Mar 2022 22:16:38 +0000 (UTC)

> On Wednesday, March 9, 2022, 03:57:51 PM CST, Tobias Geerinckx-Rice <me <at> tobias.gr> wrote: 
>
>
>
>
>
> What Maxime means is that some forges (like GitHub) generate these archives on the fly, instead of the author uploading a 'stable' file.  You can usually tell them apart by the URL, but I forget GitLab's conventions.
>
> These archives might be cached for a while but if they are regenerated the hash could change even if the unpacked data didn't.  This has happened in the past and breaks e.g. guix time-machine even if 'fixed' on master.
>
> Hence we prefer git-fetch when available, or tarballs that look human-generated.
>
> Kind regards,
>
> T G-R

Ahhh; I see. Thanks a ton for the explanation, Tobias. I'll get this switched over to git-fetch, Maxime, while I look over your other feedback.

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

From: "Wamm K. D" <jaft.r <at> outlook.com>
To: 54311 <at> debbugs.gnu.org
Cc: "Wamm K. D" <jaft.r <at> outlook.com>, maximedevos <at> telenet.be
Subject: [PATCH v2] gnu: tint2: Update to 17.0.2.
Date: Sat,  2 Apr 2022 22:01:28 -0500

---
Here we go, Maxime; I've switched the ~fetch~ method to =git=.

I think you're absolutely right about the =fix-installation-prefix= phase not
being necessary as "etc" isn't even in the =CMakeLists.txt= file, anymore; I had
no issues building with the phase removed, as well.

Removing not–running-tests, however, did result in a "make: *** No rule to make
target 'test'.  Stop." error, however, so I'm guessing that, while the files in
that directory are used for testing, they are not incorporated as part of the
build process and there still is no target so I've left that in.

Hopefully this addresses everything and thanks a ton for looking over this!

 gnu/packages/xdisorg.scm | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d2caee85ec..a7738aac47 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -54,6 +54,7 @@
 ;;; Copyright © 2021 jgart <jgart <at> dismail.de>
 ;;; Copyright © 2022 John Kehayias <john.kehayias <at> protonmail.com>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan <at> gmail.com>
+;;; Copyright © 2022 Wamm K. D. <jaft.r <at> outlook.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1790,27 +1791,20 @@ (define-public rofi-calc
 (define-public tint2
   (package
     (name "tint2")
-    (version "0.14.6")
+    (version "17.0.2")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://gitlab.com/o9000/" name
-                                  "/repository/archive.tar.gz?ref=" version))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url (string-append "https://gitlab.com/o9000/" name "/"))
+                    (commit version)))
               (sha256
                (base32
-                "1kwzwxy4myagybm3rc7dgynfgp75742n348qibn1p2an9ggyivda"))))
+                "123apmgs6x2zfv1q57dyl4mwqf0vsw5ndh5jsg6p3fvhr66l1aja"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:tests? #f                      ;no test target
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-installation-prefix
-           (lambda _
-             (substitute* "CMakeLists.txt"
-               (("/etc") "${CMAKE_INSTALL_PREFIX}/etc"))
-             #t)))))
+     '(#:tests? #f))                      ;no test target
     (inputs
-     (list gtk+-2
+     (list gtk+
            imlib2
            librsvg
            libxcomposite
-- 
2.34.0

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

From: Jaft <jaft.r <at> outlook.com>
To: "54311 <at> debbugs.gnu.org" <54311 <at> debbugs.gnu.org>
Cc: "maximedevos <at> telenet.be" <maximedevos <at> telenet.be>
Subject: Re: [PATCH v2] gnu: tint2: Update to 17.0.2.
Date: Tue, 10 May 2022 02:05:47 +0000 (UTC)

Let me know if there's any other changes needed but just a reminder that this should be ready, I think.

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

From: Maxime Devos <maximedevos <at> telenet.be>
To: "Wamm K. D" <jaft.r <at> outlook.com>, 54311 <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: tint2: Update to 17.0.2.
Date: Wed, 11 May 2022 11:51:09 +0200

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

Wamm K. D schreef op za 02-04-2022 om 22:01 [-0500]:
> ---
> Here we go, Maxime; I've switched the ~fetch~ method to =git=.
> 
> I think you're absolutely right about the =fix-installation-prefix= phase not
> being necessary as "etc" isn't even in the =CMakeLists.txt= file, anymore; I had
> no issues building with the phase removed, as well.
> 
> Removing not–running-tests, however, did result in a "make: *** No rule to make
> target 'test'.  Stop." error, however, so I'm guessing that, while the files in
> that directory are used for testing, they are not incorporated as part of the
> build process and there still is no target so I've left that in.

There's 'regression.py' which has a 'main' and 'run_unit_tests'.  Maybe
'regression.py' can be run in the 'check' phase?

> 
> Hopefully this addresses everything and thanks a ton for looking over this!

Looks ok (except for 'regression.py' not being run), but for
completeneess you might want to run it in a a pure environment (./pre-
inst-env guix shell --pure tint2) and look for problems like missing
icons or configuration not working or ‘warning: configuration scheme
things / file chooser’ things.

Greetings,
Maxime.

[signature.asc (application/pgp-signature, inline)]

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

From: Jaft <jaft.r <at> outlook.com>
To: "54311 <at> debbugs.gnu.org" <54311 <at> debbugs.gnu.org>, 
 Maxime Devos <maximedevos <at> telenet.be>
Subject: Re: [PATCH v2] gnu: tint2: Update to 17.0.2.
Date: Thu, 19 May 2022 04:54:04 +0000 (UTC)

> On Wednesday, May 11, 2022, 04:51:19 AM CDT, Maxime Devos <maximedevos <at> telenet.be> wrote: 
>
>
>
>
>
> There's 'regression.py' which has a 'main' and 'run_unit_tests'.  Maybe
> 'regression.py' can be run in the 'check' phase?

Fair; would you know how to manually call it in that phase? I'm afraid I don't have any experience outside of the check phase automatically calling the designated tests files.

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

From: Maxime Devos <maximedevos <at> telenet.be>
To: Jaft <jaft.r <at> outlook.com>, "54311 <at> debbugs.gnu.org" <54311 <at> debbugs.gnu.org>
Subject: Re: [PATCH v2] gnu: tint2: Update to 17.0.2.
Date: Thu, 19 May 2022 15:13:57 +0200

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

Jaft schreef op do 19-05-2022 om 04:54 [+0000]:
> > 
> > 
> > There's 'regression.py' which has a 'main' and 'run_unit_tests'. 
> > Maybe
> > 'regression.py' can be run in the 'check' phase?
> 
> Fair; would you know how to manually call it in that phase? I'm
> afraid I don't have any experience outside of the check phase
> automatically calling the designated tests files.

(lambda* (#:key tests? #:allow-other-keys)
  (when tests?
    (invoke "regression.py"))) ; or maybe (invoke "python3" "regression.py")

[signature.asc (application/pgp-signature, inline)]

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

From: Jaft <jaft.r <at> outlook.com>
To: "54311 <at> debbugs.gnu.org" <54311 <at> debbugs.gnu.org>, 
 Maxime Devos <maximedevos <at> telenet.be>
Subject: Re: [PATCH v2] gnu: tint2: Update to 17.0.2.
Date: Thu, 19 May 2022 15:57:30 +0000 (UTC)

> On Thursday, May 19, 2022, 08:14:11 AM CDT, Maxime Devos <maximedevos <at> telenet.be> wrote: 
>
>
>
>
>
> (lambda* (#:key tests? #:allow-other-keys)
>   (when tests?
>     (invoke "regression.py"))) ; or maybe (invoke "python3" "regression.py")

Awesome; thanks a ton, Maxime. I'll try this out.

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

From: Jaft <jaft.r <at> outlook.com>
To: "54311 <at> debbugs.gnu.org" <54311 <at> debbugs.gnu.org>, 
 Maxime Devos <maximedevos <at> telenet.be>
Subject: Re: [PATCH v2] gnu: tint2: Update to 17.0.2.
Date: Sun, 22 May 2022 07:49:45 +0000 (UTC)

Alright; finally got a chance to try this.

Running the file ends up failing due to line 384; it tries to call a =top= command (~top -bn5 | grep 'Cpu(s)' | grep -o '[0-9\.]* id' | cut -d ' ' -f 1~) but it's not working since "Cpu(s)" isn't anywhere in the ~top -bn5~ output. The =regression.py= file was written for Python 2 so maybe the command was written for an older version of =top=? But I dunno.

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

From: 宋文武 <iyzsong <at> envs.net>
To: Jaft <jaft.r <at> outlook.com>
Cc: Maxime Devos <maximedevos <at> telenet.be>,
 "54311 <at> debbugs.gnu.org" <54311-done <at> debbugs.gnu.org>
Subject: Re: bug#54311: [PATCH] gnu: tint2: Update to 17.0.2.
Date: Thu, 04 Aug 2022 10:17:41 +0800

Jaft <jaft.r <at> outlook.com> writes:

> Alright; finally got a chance to try this.
>
> Running the file ends up failing due to line 384; it tries to call a
> =top= command (~top -bn5 | grep 'Cpu(s)' | grep -o '[0-9\.]* id' | cut
> -d ' ' -f 1~) but it's not working since "Cpu(s)" isn't anywhere in
> the ~top -bn5~ output. The =regression.py= file was written for Python
> 2 so maybe the command was written for an older version of =top=? But
> I dunno.

Thanks for investigating, pushed now!

Previous Next

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