[bug#65938] [PATCH] gnu: Add edbrowse.

[bug#65938] [PATCH] gnu: Add edbrowse.

[B. Wilson via Guix-patches via]

* gnu/packages/web-browsers.scm (edbrowse): New variable.
---
 gnu/packages/web-browsers.scm | 61 +++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index a8ef7099f5..b0d0a1cae0 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -57,6 +57,7 @@ (define-module (gnu packages web-browsers)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fontutils)
@@ -72,6 +73,7 @@ (define-module (gnu packages web-browsers)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages javascript)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages libunistring)
@@ -93,9 +95,11 @@ (define-module (gnu packages web-browsers)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xorg))
 
@@ -1022,3 +1026,60 @@ (define-public av-98
 @item Support for any character encoding recognised by Python.
 @end itemize")
     (license license:bsd-2)))
+
+(define-public edbrowse
+  (package
+    (name "edbrowse")
+    (version "3.8.7")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/CMB/edbrowse.git")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1bbh619aii0fma18yj05i8bb5xmnn907ffx6zfyn5a323s35nvn5"))
+        (modules '((guix build utils)))
+        (snippet
+          '(begin
+             (for-each
+               (lambda (file)
+                 (substitute* file
+                   (("\"quickjs-libc.h\"") "<quickjs/quickjs-libc.h>")))
+               '("src/js_hello_quick.c" "src/jseng-quick.c"))
+             #t))))
+    (build-system gnu-build-system)
+    (inputs (list curl-ssh pcre2 quickjs openssl readline-7 tidy-html
+                  unixodbc))
+    (native-inputs (list perl pkg-config))
+    (arguments
+     `(#:make-flags (list (string-append "CC=" ,(cc-for-target))
+                          "EBDEBUG=1" ; Prevent upstream makefile from stipping
+                          (string-append "QUICKJS_DIR="
+                                         (assoc-ref %build-inputs "quickjs")
+                                         "/lib/quickjs"))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'check)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (doc (string-append out "/doc/" ,name)))
+               (mkdir-p doc)
+               (install-file "doc/usersguide.html" doc)
+               (install-file "src/edbrowse" bin)))))))
+    (home-page "https://edbrowse.org/")
+    (synopsis "Command-line editor and web browser")
+    (description "Edbrowse is a combination editor, browser, and mail client
+that is 100% text based.  The interface is similar to /bin/ed, though there are
+many more features, such as editing multiple files simultaneously, and
+rendering html.  This program was originally written for blind users, but many
+sighted users have taken advantage of the unique scripting capabilities of this
+program, which can be found nowhere else.  A batch job, or cron job, can access
+web pages on the internet, submit forms, and send email, with no human
+intervention whatsoever.  edbrowse can also tap into databases through odbc.
+It was primarily written by Karl Dahlke.")
+    (license license:gpl2+)))
-- 
2.41.0

[bug#65938] [PATCH v2] gnu: Add edbrowse.

[Christina O'Donnell]

From: "Christina O'Donnell" <cdo@mutix.org>

* gnu/packages/web-browsers.scm (edbrowse): New variable.
---
 gnu/packages/web-browsers.scm | 59 +++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

Dear B. Wilson,

Thank you for this patch that you submitted in September. Sorry it's
been a while since you sent this in, Guix is a bit short of developers
and reviewers at the moment.

I'm a new contributor trying to help with the backlog of patches, so
you can take my points with a grain of salt.

This package is good. It applies, builds and runs. The formatting is
more or less right.

I have no idea how to use or test edbrowse but it runs at least and
passes `guix lint`.

I've made the following changes:

 - I've reformatted the code to the guix style.
 - I've updated from 3.8.7 to 3.8.9.
 - I've removed the EBDEBUG make flag as this is a release build.
 - I've changed QUICKJS_DIR to QUICKJS_LIB as this was changed
   between 3.8.7 and 3.8.9.
 - I've opted for passing '#:tests #f' instead of deleting 'check.
 - I've set the doc path to /share/doc/ instead of /doc/.

Aside from these points, I think this patch is ready to be pushed.

Kind regards,
Christina

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index e6bc6a0c7b..23a85107ee 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -58,6 +58,7 @@ (define-module (gnu packages web-browsers)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fontutils)
@@ -74,6 +75,7 @@ (define-module (gnu packages web-browsers)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages javascript)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages libunistring)
@@ -94,11 +96,13 @@ (define-module (gnu packages web-browsers)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages text-editors)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xorg))
 
@@ -1022,3 +1026,58 @@ (define-public av-98
 @item Support for any character encoding recognised by Python.
 @end itemize")
     (license license:bsd-2)))
+
+(define-public edbrowse
+  (package
+    (name "edbrowse")
+    (version "3.8.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/CMB/edbrowse.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0hxvdvplmbnn0jzw4ls8a03k2s7qdylghln74910yljzjf392mld"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (for-each
+            (lambda (file)
+              (substitute* file
+                (("\"quickjs-libc.h\"") "<quickjs/quickjs-libc.h>")))
+            '("src/js_hello_quick.c" "src/jseng-quick.c"))
+           #t))))
+    (build-system gnu-build-system)
+    (inputs (list curl-ssh pcre2 quickjs openssl readline-7 tidy-html
+                  unixodbc))
+    (native-inputs (list perl pkg-config))
+    (arguments
+     `(#:make-flags (list (string-append "CC=" ,(cc-for-target))
+                          (string-append "QUICKJS_LIB="
+                                         (assoc-ref %build-inputs "quickjs")
+                                         "/lib/quickjs"))
+       #:tests? #f ; Edbrowse doesn't have tests
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (doc (string-append out "/share/doc/" ,name "-" ,version)))
+               (mkdir-p doc)
+               (install-file "doc/usersguide.html" doc)
+               (install-file "src/edbrowse" bin)))))))
+    (home-page "https://edbrowse.org/")
+    (synopsis "Command-line editor and web browser")
+    (description "Edbrowse is a combination editor, browser, and mail client that is
+100% text based.  The interface is similar to /bin/ed, though there are many more
+features, such as editing multiple files simultaneously, and rendering html.  This
+program was originally written for blind users, but many sighted users have taken
+advantage of the unique scripting capabilities of this program, which can be found
+nowhere else.  A batch job, or cron job, can access web pages on the internet, submit
+forms, and send email, with no human intervention whatsoever.  edbrowse can also tap
+into databases through odbc.  It was primarily written by Karl Dahlke.")
+    (license license:gpl2+)))

base-commit: 4d994f98a49e1a6e58b9b0b512a05efc1c431a50
-- 
2.41.0

bug#65938: [PATCH v2] gnu: Add edbrowse.

[Christopher Baines]

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

Christina O'Donnell <cdo@mutix.org> writes:

> From: "Christina O'Donnell" <cdo@mutix.org>
>
> * gnu/packages/web-browsers.scm (edbrowse): New variable.
> ---
>  gnu/packages/web-browsers.scm | 59 +++++++++++++++++++++++++++++++++++
>  1 file changed, 59 insertions(+)
>
> Dear B. Wilson,
>
> Thank you for this patch that you submitted in September. Sorry it's
> been a while since you sent this in, Guix is a bit short of developers
> and reviewers at the moment.
>
> I'm a new contributor trying to help with the backlog of patches, so
> you can take my points with a grain of salt.
>
> This package is good. It applies, builds and runs. The formatting is
> more or less right.
>
> I have no idea how to use or test edbrowse but it runs at least and
> passes `guix lint`.
>
> I've made the following changes:
>
>  - I've reformatted the code to the guix style.
>  - I've updated from 3.8.7 to 3.8.9.
>  - I've removed the EBDEBUG make flag as this is a release build.
>  - I've changed QUICKJS_DIR to QUICKJS_LIB as this was changed
>    between 3.8.7 and 3.8.9.
>  - I've opted for passing '#:tests #f' instead of deleting 'check.
>  - I've set the doc path to /share/doc/ instead of /doc/.
>
> Aside from these points, I think this patch is ready to be pushed.

Thanks both, I've pushed this now to master as
869fa14b786e81f5eb832bc7fd8250248b12651b.

I made a few more changes:

 - Using a gexp for the arguments (this is the newer style).

 - Reset the author and added Christina as a co-author in the commit
   message

 - Moved the patching to a phase rather than a snippet, as I think this
   is simpler

Thanks again,

Chris

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