w3m: Bump to 0.5.3.20220429

This commit is contained in:
Tee KOBAYASHI 2022-12-20 23:51:02 +09:00 committed by xtkoba
parent 5f3e5ae963
commit 50ee46b7b3
4 changed files with 57 additions and 5 deletions

View File

@ -6,6 +6,6 @@ diff -u -r ../w3m-0.5.3-git20170102/Str.h ./Str.h
#include <stdio.h>
#include <string.h>
+#include <strings.h>
#include <limits.h>
#ifdef __EMX__
#define strcasecmp stricmp
#define strncasecmp strnicmp

View File

@ -1,15 +1,15 @@
TERMUX_PKG_HOMEPAGE=http://w3m.sourceforge.net/
TERMUX_PKG_DESCRIPTION="Text based Web browser and pager"
TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_LICENSE="custom"
TERMUX_PKG_LICENSE_FILE="LICENSE"
TERMUX_PKG_MAINTAINER="@termux"
_MAJOR_VERSION=0.5.3
_MINOR_VERSION=20190105
_MINOR_VERSION=20220429
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}
TERMUX_PKG_REVISION=9
# The upstream w3m project is dead, but every linux distribution uses
# this maintained fork in debian:
TERMUX_PKG_SRCURL=https://github.com/tats/w3m/archive/v${_MAJOR_VERSION}+git${_MINOR_VERSION}.tar.gz
TERMUX_PKG_SHA256=0467bb5429b75749205a3f57b9f5e8abba49929272aeab6fce94ff17953f0784
TERMUX_PKG_SHA256=6d76fcccb7c94658f2753f0777f69283d5cb447004a0d0d3087c1d873edc0af3
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_DEPENDS="libgc, ncurses, openssl, zlib"
TERMUX_PKG_RECOMMENDS="libsixel"

View File

@ -0,0 +1,51 @@
--- a/etc.c
+++ b/etc.c
@@ -1431,7 +1431,7 @@ void
myExec(char *command)
{
mySignal(SIGINT, SIG_DFL);
- execl("/bin/sh", "sh", "-c", command, NULL);
+ execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", command, NULL);
exit(127);
}
--- a/rc.c
+++ b/rc.c
@@ -1368,7 +1368,7 @@ init_rc(void)
if (((tmp_dir = getenv("TMPDIR")) == NULL || *tmp_dir == '\0') &&
((tmp_dir = getenv("TMP")) == NULL || *tmp_dir == '\0') &&
((tmp_dir = getenv("TEMP")) == NULL || *tmp_dir == '\0'))
- tmp_dir = "/tmp";
+ tmp_dir = "@TERMUX_PREFIX@/tmp";
#ifdef HAVE_MKDTEMP
tmp_dir = mkdtemp(Strnew_m_charp(tmp_dir, "/w3m-XXXXXX", NULL)->ptr);
if (tmp_dir == NULL)
--- a/scripts/w3mman/w3mman.in
+++ b/scripts/w3mman/w3mman.in
@@ -1,7 +1,7 @@
#!@PERL@
@W3M = split(' ', $ENV{'W3MMAN_W3M'} || '@W3M@');
-$ENV{'W3MMAN_MAN'} ||= '@MAN@';
+$ENV{'W3MMAN_MAN'} ||= '@TERMUX_PREFIX@/bin/man';
$SCRIPT = 'file:///$LIB/w3mman2html.cgi';
sub usage {
--- a/scripts/w3mman/w3mman2html.cgi.in
+++ b/scripts/w3mman/w3mman2html.cgi.in
@@ -255,12 +255,9 @@ sub include_ref {
local($d);
for $d (
- "/usr/include",
- "/usr/local/include",
- "/usr/X11R6/include",
- "/usr/X11/include",
- "/usr/X/include",
- "/usr/include/X11"
+ "@TERMUX_PREFIX@/include",
+ "@TERMUX_PREFIX@/local/include",
+ "@TERMUX_PREFIX@/include/X11"
) {
-f "$d/$_" && return "<a href=\"$CGI2$d/$_\">$_</a>";
}

View File

@ -3,6 +3,7 @@
#define GC_INIT()
#define GC_MALLOC(arg) malloc(arg)
#define GC_malloc(arg) malloc(arg)
#define GC_REALLOC(arg1,arg2) realloc(arg1,arg2)
#define GC_MALLOC_ATOMIC(arg) malloc(arg)
#define GC_free(arg) free(arg)