From patchwork Wed Apr 3 09:59:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christina O'Donnell X-Patchwork-Id: 62670 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4AA8927BBEA; Wed, 3 Apr 2024 11:04:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 010C827BBE2 for ; Wed, 3 Apr 2024 11:04:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrxTN-0006xm-A9; Wed, 03 Apr 2024 06:04:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rrxTK-0006xP-Hn for guix-patches@gnu.org; Wed, 03 Apr 2024 06:03:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrxTK-0000k4-7Z for guix-patches@gnu.org; Wed, 03 Apr 2024 06:03:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrxTO-0000hG-5Y for guix-patches@gnu.org; Wed, 03 Apr 2024 06:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65938] [PATCH v2] gnu: Add edbrowse. References: <20230914064256.16485-1-elaexuotee@wilsonb.com> In-Reply-To: <20230914064256.16485-1-elaexuotee@wilsonb.com> Resent-From: Christina O'Donnell Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 10:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65938@debbugs.gnu.org Cc: Christina O'Donnell , "B. Wilson" , Steve George Received: via spool by 65938-submit@debbugs.gnu.org id=B65938.17121386122521 (code B ref 65938); Wed, 03 Apr 2024 10:04:02 +0000 Received: (at 65938) by debbugs.gnu.org; 3 Apr 2024 10:03:32 +0000 Received: from localhost ([127.0.0.1]:57104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrxSt-0000eb-TC for submit@debbugs.gnu.org; Wed, 03 Apr 2024 06:03:32 -0400 Received: from vmi993448.contaboserver.net ([194.163.141.236]:53080 helo=mutix.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrxSr-0000dy-2M for 65938@debbugs.gnu.org; Wed, 03 Apr 2024 06:03:30 -0400 Received: from [86.132.246.87] (host81-147-82-218.range81-147.btcentralplus.com [81.147.82.218]) (Authenticated sender: cdo) by mutix.org (Postfix) with ESMTPSA id 86118A61F45; Wed, 3 Apr 2024 12:03:23 +0200 (CEST) From: Christina O'Donnell Date: Wed, 3 Apr 2024 10:59:11 +0100 Message-ID: <7e2e19e6c2953905b2ed021f7702b770a78a2143.1712138351.git.cdo@mutix.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: "Christina O'Donnell" * 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 base-commit: 4d994f98a49e1a6e58b9b0b512a05efc1c431a50 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\"") ""))) + '("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+)))