From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id UOcjDl0jDWZlaAAAqHPOHw:P1 (envelope-from ) for ; Wed, 03 Apr 2024 11:37:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id UOcjDl0jDWZlaAAAqHPOHw (envelope-from ) for ; Wed, 03 Apr 2024 11:37:33 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712137053; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=LSokFBgpYhYYyK3smN0nKeEFVh2XLnIkVM28bK6tA60=; b=QR6cbfzeeM8ehjMZw36HIi3+UMeyf6qYHgUrPeiDhlP/ZQ47QyDBqJxR22262Kco0m6U5n Yon/xruYANLv+MjaoS2llFOdSz1ioXm5NYO0e8nBqvIcXw3LPQFb0nA8+1k86P+GBx0hFP 4PkXtYaummoGkTKPCoEv7wlNTbT9N0wwcNFxZDV9WQzicY4/WYsnN53U02rUuf37eFCgVu n8MWIqfFB4inVIhXk4b63wMD3Cb3dUrQf0apIcmoSUdabueN0kbCEnyNzdP0tfNxNhol7t zsdcnk7oIdpB3QBIE048V1oy0e+PciCElDDaxQHxiJSZ3XUtSkQPgbRurzi6AQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712137053; a=rsa-sha256; cv=none; b=Cyicn7L99+54xEa9EU0hvAY7pXb0D1HYPlsUeUQhwKK8JfCwjzhqcZMmyyiyC8vsG+MK02 TGO3hUCOcXaIZdrXZSKmsJwl2oQW10iJxYCkjzDCoSSYyladZLyuW5yHNQ4/2M/a+Jr6ad l7kcBQZdrCqn2b7QHJoM0z5UotPcckfdLIMpntmNI8jhDuh4UikUsTKWEum+/cJgcJtyOv p1LVVJb0IGm0uToxoLdIWKyboob20AiMHRXIrEDCqpWnJdVvYNfERy33GfABzS2WtcE6jS 6qqoyHyI8XNA9vef1o2ND0dNpq+myJD+hSjdJLckeaWJuhiUm/g8yx2aWBDHfA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CCC3A15F31 for ; Wed, 3 Apr 2024 11:37:32 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrx3F-0001B7-5G; Wed, 03 Apr 2024 05:37: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 1rrx3C-00017J-MD for guix-patches@gnu.org; Wed, 03 Apr 2024 05:36: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 1rrx3C-0006Vw-Cy for guix-patches@gnu.org; Wed, 03 Apr 2024 05:36:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrx3G-00041V-87 for guix-patches@gnu.org; Wed, 03 Apr 2024 05:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70159] [PATCH v2] gnu: Add edbrowse. Resent-From: Christina O'Donnell Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 09:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70159 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70159@debbugs.gnu.org Cc: "B. Wilson" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171213700715365 (code B ref -1); Wed, 03 Apr 2024 09:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2024 09:36:47 +0000 Received: from localhost ([127.0.0.1]:57085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrx30-0003zj-R6 for submit@debbugs.gnu.org; Wed, 03 Apr 2024 05:36:47 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrx2y-0003z2-GX for submit@debbugs.gnu.org; Wed, 03 Apr 2024 05:36:45 -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 1rrx2o-00014Q-1m for guix-patches@gnu.org; Wed, 03 Apr 2024 05:36:34 -0400 Received: from vmi993448.contaboserver.net ([194.163.141.236] helo=mutix.org) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrx2k-0006Na-Fi for guix-patches@gnu.org; Wed, 03 Apr 2024 05:36:32 -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 B9F7BA6105A; Wed, 3 Apr 2024 11:36:26 +0200 (CEST) From: Christina O'Donnell Date: Wed, 3 Apr 2024 10:33:31 +0100 Message-ID: <7e2e19e6c2953905b2ed021f7702b770a78a2143.1712136811.git.cdo@mutix.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=194.163.141.236; envelope-from=cdo@mutix.org; helo=mutix.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.86 X-Spam-Score: -4.86 X-Migadu-Queue-Id: CCC3A15F31 X-Migadu-Scanner: mx13.migadu.com X-TUID: Gzs/aiwvElIv From: "B. Wilson" * 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