edbrowse: 3.7.7 -> 3.8.0

This commit is contained in:
AndersonTorres 2021-06-07 19:42:42 -03:00
parent bab9dcdaac
commit 6749372e17
2 changed files with 78 additions and 20 deletions

View File

@ -0,0 +1,20 @@
diff -Naur source.old/src/makefile source/src/makefile
--- source.old/src/makefile 1969-12-31 21:00:01.000000000 -0300
+++ source/src/makefile 2021-06-07 18:58:48.851231787 -0300
@@ -101,14 +101,14 @@
# need packages nodejs and libnode-dev
js_hello_v8 : js_hello_v8.cpp
- g++ -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8
+ $(CXX) -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8
HELLOEXTRA = stringfile.o messages.o msg-strings.o startwindow.o ebrc.o format.o http.o isup.o fetchmail.o sendmail.o plugin.o buffers.o dbstubs.o html.o decorate.o html-tidy.o css.o
js_hello_moz : js_hello_moz.o $(HELLOEXTRA) jseng-moz.o
$(CC) js_hello_moz.o $(HELLOEXTRA) jseng-moz.o $(LDFLAGS) -lmozjs-$(SMV) -lstdc++ -o $@
js_hello_quick : js_hello_quick.c
- gcc $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick -L/usr/local/lib/quickjs -lquickjs -lm -ldl -lpthread -latomic
+ $(CC) $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick $(QUICKJS_LDFLAGS) -lm -lpthread
hello: js_hello_duk js_hello_v8 js_hello_moz js_hello_quick

View File

@ -1,41 +1,79 @@
{ lib, stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
{ lib
, stdenv
, fetchFromGitHub
, curl
, duktape
, html-tidy
, openssl
, pcre
, perl
, pkg-config
, quickjs
, readline
, which
}:
stdenv.mkDerivation rec {
pname = "edbrowse";
version = "3.7.7";
version = "3.8.0";
buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
src = fetchFromGitHub {
owner = "CMB";
repo = pname;
rev = "v${version}";
hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU=";
};
nativeBuildInputs = [
pkg-config
which
];
buildInputs = [
curl
duktape
html-tidy
openssl
pcre
perl
quickjs
readline
];
patches = [
# Fixes some small annoyances on src/makefile
./0001-small-fixes.patch
];
postPatch = ''
for i in ./tools/*.pl
do
substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl"
substituteInPlace src/makefile --replace\
'-L/usr/local/lib/quickjs' '-L${quickjs}/lib/quickjs'
for i in $(find ./tools/ -type f ! -name '*.c'); do
patchShebangs $i
done
'';
makeFlags = [
"-C" "src"
"prefix=${placeholder "out"}"
"PREFIX=${placeholder "out"}"
];
src = fetchFromGitHub {
owner = "CMB";
repo = "edbrowse";
rev = "v${version}";
sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf";
};
meta = with lib; {
homepage = "https://edbrowse.org/";
description = "Command Line Editor Browser";
longDescription = ''
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.
'';
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 = licenses.gpl1Plus;
homepage = "https://edbrowse.org/";
maintainers = with maintainers; [ schmitthenner vrthra equirosa ];
platforms = platforms.linux;
};
}
# TODO: send the patch to upstream developers