[bug#47433] [PATCH 0/2] gnu: Add lagrange.

[bug#47433] [PATCH 0/2] gnu: Add lagrange.

[Léo Le Bouter via Guix-patches via]

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

[bug#47433] [PATCH 1/2] gnu: Add the-foundation.

[Léo Le Bouter via Guix-patches via]

* 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

[bug#47433] [PATCH 2/2] gnu: Add lagrange.

[Léo Le Bouter via Guix-patches via]

* 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

[bug#47433] [PATCH 1/2] gnu: Add the-foundation.

[Leo Famulari]

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.

[bug#47433] [PATCH 2/2] gnu: Add lagrange.

[Leo Famulari]

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

[bug#47433] [PATCH v2 0/2] gnu: Add lagrange.

[Léo Le Bouter via Guix-patches via]

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

[bug#47433] [PATCH v2 1/2] gnu: Add the-foundation.

[Léo Le Bouter via Guix-patches via]

* 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

[bug#47433] [PATCH v2 2/2] gnu: Add lagrange.

[Léo Le Bouter via Guix-patches via]

* 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

bug#47433: [PATCH 0/2] gnu: Add lagrange.

[Guillaume Le Vaillant]

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

Lagrange was added in 8ec8fe0fcc155e0e3e0cc14a3b04b51c1a7ac10c.
Closing.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]