GNU bug report logs - #47433
[PATCH 0/2] gnu: Add lagrange.

Previous Next

Package: guix-patches;

Reported by: Léo Le Bouter <lle-bout <at> zaclys.net>

Date: Sat, 27 Mar 2021 13:46:01 UTC

Severity: normal

Tags: patch

Done: Guillaume Le Vaillant <glv <at> posteo.net>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sat, 27 Mar 2021 13:46:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Léo Le Bouter <lle-bout <at> zaclys.net>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sat, 27 Mar 2021 13:46:02 GMT) Full text and rfc822 format available.

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

From: Léo Le Bouter <lle-bout <at> zaclys.net>
To: guix-patches <at> gnu.org
Cc: Léo Le Bouter <lle-bout <at> zaclys.net>
Subject: [PATCH 0/2] gnu: Add lagrange.
Date: Sat, 27 Mar 2021 14:45:35 +0100
One pending minor packaging issue submitted upstream:
https://github.com/skyjake/lagrange/issues/225

Probably a revised patchset will come once that is solved.

Otherwise, tested and it builds and works fine! No extended testing of the usage
of lagrange itself was made though.

Léo Le Bouter (2):
  gnu: Add the-foundation.
  gnu: Add lagrange.

 gnu/packages/web.scm | 80 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

-- 
2.31.0





Information forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sat, 27 Mar 2021 13:47:01 GMT) Full text and rfc822 format available.

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

From: Léo Le Bouter <lle-bout <at> zaclys.net>
To: 47433 <at> debbugs.gnu.org
Cc: Léo Le Bouter <lle-bout <at> zaclys.net>
Subject: [PATCH 2/2] gnu: Add lagrange.
Date: Sat, 27 Mar 2021 14:46:29 +0100
* gnu/packages/web.scm (lagrange): New variable.
---
 gnu/packages/web.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index dc45c2a3b2..c814638ec1 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -143,6 +143,7 @@
   #:use-module (gnu packages mail)
   #:use-module (gnu packages man)
   #:use-module (gnu packages markup)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages nss)
@@ -160,6 +161,7 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages re2c)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages sdl)
   #:use-module (gnu packages search)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages texinfo)
@@ -6675,6 +6677,48 @@ point of view of someone who appreciates the user-friendliness of Qt and some
 of the thinking behind C++ STL.")
       (license license:bsd-2))))
 
+;; When upgrading, also upgrade the "the-foundation" package just above.
+;; Lagrange pins specific commits of it and "the-foundation" does not make
+;; releases (yet?).
+(define-public lagrange
+  (package
+    (name "lagrange")
+    (version "1.2.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.skyjake.fi/skyjake/lagrange")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0djwr0n06z993kdpvks1dj7nr4j6481sfh5mjjg7q2hsfnsj9kmx"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file-recursively "lib/the_Foundation")
+                  #t))))
+    (build-system cmake-build-system)
+    (arguments
+     `(;; No tests
+       #:tests? #f))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("the-foundation" ,the-foundation)
+       ("sdl2" ,sdl2)
+       ("curl" ,curl)
+       ("zlib" ,zlib)
+       ("pcre" ,pcre)
+       ("mpg123" ,mpg123)))
+    (home-page "https://gmi.skyjake.fi/lagrange/")
+    (synopsis "Beautiful desktop GUI client for browsing Geminispace")
+    (description "@code{Lagrange} is a desktop GUI client for browsing
+Geminispace.  It offers modern conveniences familiar from web browsers, such
+as smooth scrolling, inline image viewing, multiple tabs, visual themes,
+Unicode fonts, bookmarks, history, and page outlines.")
+    (license license:bsd-2)))
+
 (define-public python-py-ubjson
   (package
     (name "python-py-ubjson")
-- 
2.31.0





Information forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sat, 27 Mar 2021 13:47:02 GMT) Full text and rfc822 format available.

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

From: Léo Le Bouter <lle-bout <at> zaclys.net>
To: 47433 <at> debbugs.gnu.org
Cc: Léo Le Bouter <lle-bout <at> zaclys.net>
Subject: [PATCH 1/2] gnu: Add the-foundation.
Date: Sat, 27 Mar 2021 14:46:28 +0100
* gnu/packages/web.scm (the-foundation): New variable.
---
 gnu/packages/web.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ae41588037..dc45c2a3b2 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6639,6 +6639,42 @@ Rust with GTK.  It currently supports the Gemini, Gopher and Finger
 protocols.")
     (license license:expat)))
 
+(define-public the-foundation
+  (let ((commit "8172d35cad24ec392bfd27e1f4de3a2205f988d2"))
+    (package
+      (name "the-foundation")
+      (version (string-take commit 7))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.skyjake.fi/skyjake/the_Foundation")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "010kgbii33rb52g6iyrcjpb9sicnfw684pyrfwv1h8igpiv6hsv9"))))
+      (build-system cmake-build-system)
+      (arguments
+       `(;; Tests are not meant to be run automatically for now.
+         ;; See https://codeberg.org/skyjake/the_Foundation/issues/2
+         #:tests? #f))
+      (native-inputs
+       `(("git" ,git-minimal)
+         ("pkg-config" ,pkg-config)))
+      (inputs
+       `(("curl" ,curl)
+         ("zlib" ,zlib)
+         ("pcre" ,pcre)
+         ("openssl" ,openssl)
+         ("libunistring" ,libunistring)))
+      (home-page "https://git.skyjake.fi/skyjake/the_Foundation")
+      (synopsis "Opinionated C11 library for low-level functionality")
+      (description "@code{the_Foundation} is a C11 library and a coding
+convention for object-oriented programming that has been designed from the
+point of view of someone who appreciates the user-friendliness of Qt and some
+of the thinking behind C++ STL.")
+      (license license:bsd-2))))
+
 (define-public python-py-ubjson
   (package
     (name "python-py-ubjson")
-- 
2.31.0





Information forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sat, 27 Mar 2021 18:14:01 GMT) Full text and rfc822 format available.

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

From: Leo Famulari <leo <at> famulari.name>
To: Léo Le Bouter via Guix-patches via <guix-patches <at> gnu.org>
Cc: 47433 <at> debbugs.gnu.org,
 Léo Le Bouter <lle-bout <at> zaclys.net>
Subject: Re: [bug#47433] [PATCH 1/2] gnu: Add the-foundation.
Date: Sat, 27 Mar 2021 14:12:55 -0400
On Sat, Mar 27, 2021 at 02:46:28PM +0100, Léo Le Bouter via Guix-patches via wrote:
> * gnu/packages/web.scm (the-foundation): New variable.

Thanks!

> +(define-public the-foundation
> +  (let ((commit "8172d35cad24ec392bfd27e1f4de3a2205f988d2"))

Please add a "revision" variable ...

> +    (package
> +      (name "the-foundation")
> +      (version (string-take commit 7))

... and use the git-version procedure, as described in the manual
section Version Numbers:

https://guix.gnu.org/manual/en/html_node/Version-Numbers.html

> +      (native-inputs
> +       `(("git" ,git-minimal)

Does it only use Git at build-time, and not keep a reference to the Git
package? You can check like this:

$ guix gc --references $(guix build --no-grafts thefoundation) | grep git

If it keeps a reference, then Git should be a regular input. I ask
because it's unusual for Guix packages to need to Git as a
native-inputs, because the .git directory is deleted before building,
and there is no network access at build time.

Otherwise, looks good to me.




Information forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sat, 27 Mar 2021 18:14:02 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sat, 27 Mar 2021 18:19:01 GMT) Full text and rfc822 format available.

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

From: Leo Famulari <leo <at> famulari.name>
To: Léo Le Bouter via Guix-patches via <guix-patches <at> gnu.org>
Cc: 47433 <at> debbugs.gnu.org,
 Léo Le Bouter <lle-bout <at> zaclys.net>
Subject: Re: [bug#47433] [PATCH 2/2] gnu: Add lagrange.
Date: Sat, 27 Mar 2021 14:18:16 -0400
On Sat, Mar 27, 2021 at 02:46:29PM +0100, Léo Le Bouter via Guix-patches via wrote:
> * gnu/packages/web.scm (lagrange): New variable.

Thanks!

> +;; When upgrading, also upgrade the "the-foundation" package just above.
> +;; Lagrange pins specific commits of it and "the-foundation" does not make
> +;; releases (yet?).

Can you add a note about how to figure out which commit is pinned?

> +              (modules '((guix build utils)))
> +              (snippet
> +               '(begin
> +                  (delete-file-recursively "lib/the_Foundation")
> +                  #t))))

Please add a comment explaining why we have this snippet. In general,
snippets are only used to transform "non-free" source code into
something that conforms with the Free System Distribution Guidelines
[0], or to correct grave bugs in the source code.


> +    (synopsis "Beautiful desktop GUI client for browsing Geminispace")

The manual section Synopses and Descriptions asks us to avoid so-called
"marketing language". Beauty is in the eye of the beholder... :)

Otherwise, LGTM!

[0] https://www.gnu.org/distros/free-system-distribution-guidelines.en.html




Information forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sat, 27 Mar 2021 18:19:02 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sun, 28 Mar 2021 15:50:02 GMT) Full text and rfc822 format available.

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

From: Léo Le Bouter <lle-bout <at> zaclys.net>
To: 47433 <at> debbugs.gnu.org
Cc: Léo Le Bouter <lle-bout <at> zaclys.net>
Subject: [PATCH v2 0/2] gnu: Add lagrange.
Date: Sun, 28 Mar 2021 17:49:41 +0200
Thanks for the review, I have not been able to integrate the review comments
yet, but I am sending a revised patchset because upstream has solved the issues
previously described. To be continued.

Léo Le Bouter (2):
  gnu: Add the-foundation.
  gnu: Add lagrange.

 gnu/packages/web.scm | 77 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sun, 28 Mar 2021 15:50:03 GMT) Full text and rfc822 format available.

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

From: Léo Le Bouter <lle-bout <at> zaclys.net>
To: 47433 <at> debbugs.gnu.org
Cc: Léo Le Bouter <lle-bout <at> zaclys.net>
Subject: [PATCH v2 1/2] gnu: Add the-foundation.
Date: Sun, 28 Mar 2021 17:49:42 +0200
* gnu/packages/web.scm (the-foundation): New variable.
---
 gnu/packages/web.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ae41588037..7896094726 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6639,6 +6639,42 @@ Rust with GTK.  It currently supports the Gemini, Gopher and Finger
 protocols.")
     (license license:expat)))
 
+(define-public the-foundation
+  (let ((commit "c8bbd0d694578e5277f50f1523315f01ca910ec6"))
+    (package
+      (name "the-foundation")
+      (version (string-take commit 7))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.skyjake.fi/skyjake/the_Foundation")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "169v4n30vfr5hmvv37fccnds1nxhx86h6h428qxkqs2n21f2xb7w"))))
+      (build-system cmake-build-system)
+      (arguments
+       `(;; Tests are not meant to be run automatically for now.
+         ;; See https://codeberg.org/skyjake/the_Foundation/issues/2
+         #:tests? #f))
+      (native-inputs
+       `(("git" ,git-minimal)
+         ("pkg-config" ,pkg-config)))
+      (inputs
+       `(("curl" ,curl)
+         ("zlib" ,zlib)
+         ("pcre" ,pcre)
+         ("openssl" ,openssl)
+         ("libunistring" ,libunistring)))
+      (home-page "https://git.skyjake.fi/skyjake/the_Foundation")
+      (synopsis "Opinionated C11 library for low-level functionality")
+      (description "@code{the_Foundation} is a C11 library and a coding
+convention for object-oriented programming that has been designed from the
+point of view of someone who appreciates the user-friendliness of Qt and some
+of the thinking behind C++ STL.")
+      (license license:bsd-2))))
+
 (define-public python-py-ubjson
   (package
     (name "python-py-ubjson")
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#47433; Package guix-patches. (Sun, 28 Mar 2021 15:50:04 GMT) Full text and rfc822 format available.

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

From: Léo Le Bouter <lle-bout <at> zaclys.net>
To: 47433 <at> debbugs.gnu.org
Cc: Léo Le Bouter <lle-bout <at> zaclys.net>
Subject: [PATCH v2 2/2] gnu: Add lagrange.
Date: Sun, 28 Mar 2021 17:49:43 +0200
* gnu/packages/web.scm (lagrange): New variable.
---
 gnu/packages/web.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7896094726..5edb720a41 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -143,6 +143,7 @@
   #:use-module (gnu packages mail)
   #:use-module (gnu packages man)
   #:use-module (gnu packages markup)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages nss)
@@ -160,6 +161,7 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages re2c)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages sdl)
   #:use-module (gnu packages search)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages texinfo)
@@ -6675,6 +6677,45 @@ point of view of someone who appreciates the user-friendliness of Qt and some
 of the thinking behind C++ STL.")
       (license license:bsd-2))))
 
+;; When upgrading, also upgrade the "the-foundation" package just above.
+;; Lagrange pins specific commits of it and "the-foundation" does not make
+;; releases (yet?).
+(define-public lagrange
+  (package
+    (name "lagrange")
+    (version "1.2.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.skyjake.fi/skyjake/lagrange")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0djwr0n06z993kdpvks1dj7nr4j6481sfh5mjjg7q2hsfnsj9kmx"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file-recursively "lib/the_Foundation")
+                  #t))))
+    (build-system cmake-build-system)
+    (arguments
+     `(;; No tests
+       #:tests? #f))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("the-foundation" ,the-foundation)
+       ("sdl2" ,sdl2)
+       ("mpg123" ,mpg123)))
+    (home-page "https://gmi.skyjake.fi/lagrange/")
+    (synopsis "Beautiful desktop GUI client for browsing Geminispace")
+    (description "@code{Lagrange} is a desktop GUI client for browsing
+Geminispace.  It offers modern conveniences familiar from web browsers, such
+as smooth scrolling, inline image viewing, multiple tabs, visual themes,
+Unicode fonts, bookmarks, history, and page outlines.")
+    (license license:bsd-2)))
+
 (define-public python-py-ubjson
   (package
     (name "python-py-ubjson")
-- 
2.31.1





Reply sent to Guillaume Le Vaillant <glv <at> posteo.net>:
You have taken responsibility. (Thu, 07 Apr 2022 12:12:02 GMT) Full text and rfc822 format available.

Notification sent to Léo Le Bouter <lle-bout <at> zaclys.net>:
bug acknowledged by developer. (Thu, 07 Apr 2022 12:12:02 GMT) Full text and rfc822 format available.

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

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: 47433-close <at> debbugs.gnu.org
Subject: [PATCH 0/2] gnu: Add lagrange.
Date: Thu, 07 Apr 2022 12:08:59 +0000
[Message part 1 (text/plain, inline)]
Lagrange was added in 8ec8fe0fcc155e0e3e0cc14a3b04b51c1a7ac10c.
Closing.
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 06 May 2022 11:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 3 years and 42 days ago.

Previous Next


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