From unknown Sun Jun 15 08:55:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65938] [PATCH] gnu: Add edbrowse. Resent-From: "B. Wilson" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Sep 2023 06:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65938@debbugs.gnu.org Cc: "B. Wilson" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169467380322709 (code B ref -1); Thu, 14 Sep 2023 06:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Sep 2023 06:43:23 +0000 Received: from localhost ([127.0.0.1]:36639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgg4R-0005uD-7Y for submit@debbugs.gnu.org; Thu, 14 Sep 2023 02:43:23 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgg4N-0005tu-0D for submit@debbugs.gnu.org; Thu, 14 Sep 2023 02:43:22 -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 1qgg4B-0003K9-LE for guix-patches@gnu.org; Thu, 14 Sep 2023 02:43:07 -0400 Received: from m42-5.mailgun.net ([69.72.42.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgg48-0006lM-LV for guix-patches@gnu.org; Thu, 14 Sep 2023 02:43:07 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.wilsonb.com; q=dns/txt; s=krs; t=1694673782; x=1694680982; h=Content-Transfer-Encoding: MIME-Version: Message-ID: Date: Subject: Subject: Cc: To: To: From: From: Sender: Sender; bh=pJRxUY647pyR6irnEozqQZUi68zcbZt4pGNpFY5j+Qk=; b=rrcVY5zo6XwQhyGrfU62uV66Im0BkeLZa8ejCH1VjIrZx1zgEzZbvl2NBg4CzwwX/LmFqRbq56+8nFs2cjXGDluw9XQlqq5zCzyfvqgzcMiq7wRr5/9nVtL79KItEiVwy50QqV2PqLNFM6KxvweJhQpi/q+H2bkn0cDCkgJMl0XdNHi6UL9bt+CBLmeSt1OFspBjMznGVsTPz1KemS4VTXzLAeUuHKyahB7rKeHOHMvZb5AsoQmpWmaefaE/kCUxPzaLkqnux7O2uhwUKwUduzrzTWMFEX2hNEncd4lsGit1ZdsOfVUoEnqPtBuenT3cT7UraZlW0lAjEZmoZVaB9A== X-Mailgun-Sending-Ip: 69.72.42.5 X-Mailgun-Sid: WyI5MmEzMyIsImd1aXgtcGF0Y2hlc0BnbnUub3JnIiwiMDg1NDdhIl0= Received: from wilsonb.com (wilsonb.com [104.199.203.42]) by cd430d738e31 with SMTP id 6502ab76e22249a83285edfe (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Thu, 14 Sep 2023 06:43:02 GMT Received: from localhost (199.147.145.153.ap.dti.ne.jp [153.145.147.199]) by wilsonb.com (Postfix) with ESMTPSA id 4D8A7A0586; Thu, 14 Sep 2023 06:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wilsonb.com; s=201703; t=1694673780; bh=pJRxUY647pyR6irnEozqQZUi68zcbZt4pGNpFY5j+Qk=; h=From:To:Cc:Subject:Date:From; b=JVUaEsoZ0BjTY4pEfGjFnwk6XYw5n/JngGul+x4ILKeoEWnSCewIDPeIZZpw3VvUA lNgjtjYxRYUena5mnozvH0rrl6UjscqJzVZrIEeY4TI8VroIZyG+rX6wMn9YFPfFmC sSFyiBIZzOVTjvtlqLuO4xPngdeECC5h3vlNnKwf6XWMLK4AqD1Pnok/sjLDYRiczx 2Dse4iyMhGSZMG4DdB1vBKlnT9apdTao8wtGLvlDKgDbHxom7W88/XSZ9yzYLDYkBK VeBzfIunaNAqyyIq21rjnf2ZPbfCQ/W334fw/4mk8xzV6koHjiQsDvcr6RJBfXZrcU 0aaHdGNdQgDWnmkuXRTepFGE2c3UQUY/YuUw5e8f2bYYP+gqrnDZVTl0DgAE08zFIQ xPmXWDFIT5EoJHLcZJ66YlZNGuP3sv7M4HlPc8cOSVccp+JECKg91BdPTL9nN2lhQ9 PAx32XxH+AX53fEmxghePfVYaY00z8lQsw0NdP18ChKmG8jP1iK3Ckcv4TmGKoEmJh VCxcUKU5oYoVNMZhnl4Jd7tvkH9EICWtOqdzKtB08KcQACTcKpc0cTnxLZxWrXr+sO 5MS5yrBHUy6ryEKn7gEhBRDlNmCGMzCJlytT90z+Vx54ZXO0zk87sZCBbMJ1zIl+Hq NjdrM/Nv3WcL/79NM59jSxrM= From: "B. Wilson" Date: Thu, 14 Sep 2023 15:42:55 +0900 Message-ID: <20230914064256.16485-1-elaexuotee@wilsonb.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=69.72.42.5; envelope-from=bounce+686de0.08547a-guix-patches=gnu.org@mg.wilsonb.com; helo=m42-5.mailgun.net X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_BL_SPAMCOP_NET=1.347, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 @@ [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see ] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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\"") ""))) + '("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 From unknown Sun Jun 15 08:55:12 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 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+))) base-commit: 4d994f98a49e1a6e58b9b0b512a05efc1c431a50 -- 2.41.0 From unknown Sun Jun 15 08:55:12 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: "B. Wilson" Subject: bug#65938: closed (Re: [bug#65938] [PATCH v2] gnu: Add edbrowse.) Message-ID: References: <878r1shwsd.fsf@cbaines.net> <20230914064256.16485-1-elaexuotee@wilsonb.com> X-Gnu-PR-Message: they-closed 65938 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 65938@debbugs.gnu.org Date: Fri, 05 Apr 2024 11:31:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1712316662-701-1" This is a multi-part message in MIME format... ------------=_1712316662-701-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #65938: [PATCH] gnu: Add edbrowse. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 65938@debbugs.gnu.org. --=20 65938: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D65938 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1712316662-701-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 65938-done) by debbugs.gnu.org; 5 Apr 2024 11:30:24 +0000 Received: from localhost ([127.0.0.1]:35288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rshm3-00079k-1N for submit@debbugs.gnu.org; Fri, 05 Apr 2024 07:30:23 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:40737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rshm0-0006zl-De for 65938-done@debbugs.gnu.org; Fri, 05 Apr 2024 07:30:21 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 7A15527BBE2; Fri, 5 Apr 2024 12:30:13 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 70d4e5df; Fri, 5 Apr 2024 11:30:13 +0000 (UTC) From: Christopher Baines To: Christina O'Donnell Subject: Re: [bug#65938] [PATCH v2] gnu: Add edbrowse. In-Reply-To: <7e2e19e6c2953905b2ed021f7702b770a78a2143.1712138351.git.cdo@mutix.org> (Christina O'Donnell's message of "Wed, 3 Apr 2024 10:59:11 +0100") References: <20230914064256.16485-1-elaexuotee@wilsonb.com> <7e2e19e6c2953905b2ed021f7702b770a78a2143.1712138351.git.cdo@mutix.org> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Fri, 05 Apr 2024 12:30:10 +0100 Message-ID: <878r1shwsd.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 65938-done Cc: 65938-done@debbugs.gnu.org, "B. Wilson" , Steve George X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Christina O'Donnell writes: > 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. 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYP4MJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeAuRAAlusJ0plbzLruMURbaKfbReEEdyZiiNx6 8TA44yRv4fazNBn0c5xKOS1Sz3UjcVIc1u5Ie2ETl30I9OjpELK8K9B0iZ/Q7U71 OKMpI32qTHqkkQ8WBOfRLnmMGhkydr2lJz6DgmkzEL2GYmLyeIAHD/kB8IUti43p E9/MOdD4NMOCzxIT+SNCljZxYELHFzs5w6xPhmiMzVi0JvQzqI4/y9znhnAJOFsm OkL1fzCgrgjcOeBQjLrodDKZOce0tQ4P4XDSHKz8uSM3HTBhJMvar8D5hPlgshpr V7knAgoW7RbRxJqlcd+Rn4zx4BP7w+Vw/cRvg/oM675DXYt2KqPva+1YZ0WC7JjJ msg0lY0k8kysaVOR6fWpgbkXD50N4e1ELrrE2rV5Md2ohV4z2c9CgdKGiZeG6aeb 1ZDoeatnpuq5BWz6EuptEUa0Qrzs/alC0OniFv0uSpkwaVufnGV9d/FMKwEzJQMr qa0BFk9V92V3VZ3cNZHI00WcjoCiIbB71vSgPmzW/ugPjfzgUL0nOAX703ZxVbYF xdC8wU1XXW0W8FCMgBWF5/9xtiUzOekeElGMIxRpknLwOS0qTZ6+Rz3C+aULGH56 OufqdOk0EoFrihaTMcCPjTokfi4rVZWB+LFH8lwti+kD/+JflXsx219d0LsYa/fw r09oSw4VVps= =UsBr -----END PGP SIGNATURE----- --=-=-=-- ------------=_1712316662-701-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 14 Sep 2023 06:43:23 +0000 Received: from localhost ([127.0.0.1]:36639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgg4R-0005uD-7Y for submit@debbugs.gnu.org; Thu, 14 Sep 2023 02:43:23 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgg4N-0005tu-0D for submit@debbugs.gnu.org; Thu, 14 Sep 2023 02:43:22 -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 1qgg4B-0003K9-LE for guix-patches@gnu.org; Thu, 14 Sep 2023 02:43:07 -0400 Received: from m42-5.mailgun.net ([69.72.42.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgg48-0006lM-LV for guix-patches@gnu.org; Thu, 14 Sep 2023 02:43:07 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.wilsonb.com; q=dns/txt; s=krs; t=1694673782; x=1694680982; h=Content-Transfer-Encoding: MIME-Version: Message-ID: Date: Subject: Subject: Cc: To: To: From: From: Sender: Sender; bh=pJRxUY647pyR6irnEozqQZUi68zcbZt4pGNpFY5j+Qk=; b=rrcVY5zo6XwQhyGrfU62uV66Im0BkeLZa8ejCH1VjIrZx1zgEzZbvl2NBg4CzwwX/LmFqRbq56+8nFs2cjXGDluw9XQlqq5zCzyfvqgzcMiq7wRr5/9nVtL79KItEiVwy50QqV2PqLNFM6KxvweJhQpi/q+H2bkn0cDCkgJMl0XdNHi6UL9bt+CBLmeSt1OFspBjMznGVsTPz1KemS4VTXzLAeUuHKyahB7rKeHOHMvZb5AsoQmpWmaefaE/kCUxPzaLkqnux7O2uhwUKwUduzrzTWMFEX2hNEncd4lsGit1ZdsOfVUoEnqPtBuenT3cT7UraZlW0lAjEZmoZVaB9A== X-Mailgun-Sending-Ip: 69.72.42.5 X-Mailgun-Sid: WyI5MmEzMyIsImd1aXgtcGF0Y2hlc0BnbnUub3JnIiwiMDg1NDdhIl0= Received: from wilsonb.com (wilsonb.com [104.199.203.42]) by cd430d738e31 with SMTP id 6502ab76e22249a83285edfe (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Thu, 14 Sep 2023 06:43:02 GMT Received: from localhost (199.147.145.153.ap.dti.ne.jp [153.145.147.199]) by wilsonb.com (Postfix) with ESMTPSA id 4D8A7A0586; Thu, 14 Sep 2023 06:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wilsonb.com; s=201703; t=1694673780; bh=pJRxUY647pyR6irnEozqQZUi68zcbZt4pGNpFY5j+Qk=; h=From:To:Cc:Subject:Date:From; b=JVUaEsoZ0BjTY4pEfGjFnwk6XYw5n/JngGul+x4ILKeoEWnSCewIDPeIZZpw3VvUA lNgjtjYxRYUena5mnozvH0rrl6UjscqJzVZrIEeY4TI8VroIZyG+rX6wMn9YFPfFmC sSFyiBIZzOVTjvtlqLuO4xPngdeECC5h3vlNnKwf6XWMLK4AqD1Pnok/sjLDYRiczx 2Dse4iyMhGSZMG4DdB1vBKlnT9apdTao8wtGLvlDKgDbHxom7W88/XSZ9yzYLDYkBK VeBzfIunaNAqyyIq21rjnf2ZPbfCQ/W334fw/4mk8xzV6koHjiQsDvcr6RJBfXZrcU 0aaHdGNdQgDWnmkuXRTepFGE2c3UQUY/YuUw5e8f2bYYP+gqrnDZVTl0DgAE08zFIQ xPmXWDFIT5EoJHLcZJ66YlZNGuP3sv7M4HlPc8cOSVccp+JECKg91BdPTL9nN2lhQ9 PAx32XxH+AX53fEmxghePfVYaY00z8lQsw0NdP18ChKmG8jP1iK3Ckcv4TmGKoEmJh VCxcUKU5oYoVNMZhnl4Jd7tvkH9EICWtOqdzKtB08KcQACTcKpc0cTnxLZxWrXr+sO 5MS5yrBHUy6ryEKn7gEhBRDlNmCGMzCJlytT90z+Vx54ZXO0zk87sZCBbMJ1zIl+Hq NjdrM/Nv3WcL/79NM59jSxrM= From: "B. Wilson" To: guix-patches@gnu.org Subject: [PATCH] gnu: Add edbrowse. Date: Thu, 14 Sep 2023 15:42:55 +0900 Message-ID: <20230914064256.16485-1-elaexuotee@wilsonb.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=69.72.42.5; envelope-from=bounce+686de0.08547a-guix-patches=gnu.org@mg.wilsonb.com; helo=m42-5.mailgun.net X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_BL_SPAMCOP_NET=1.347, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: "B. Wilson" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 @@ [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see ] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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\"") ""))) + '("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 ------------=_1712316662-701-1--