diff --git a/packages/lynx/build.sh b/packages/lynx/build.sh index 5bd7f46f5..b4b53d251 100644 --- a/packages/lynx/build.sh +++ b/packages/lynx/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://lynx.browser.org/ TERMUX_PKG_DESCRIPTION="The text web browser" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.8.9rel.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595 TERMUX_PKG_SRCURL=http://invisible-mirror.net/archives/lynx/tarballs/lynx${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="ncurses, openssl, libbz2, libidn" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-screen=ncursesw --enable-widec --enable-scrollbar --enable-nested-tables --enable-htmlized-cfg --with-ssl --with-zlib --with-bzlib --enable-cjk --enable-japanese-utf8 --enable-progressbar --enable-prettysrc --enable-forms-options --enable-8bit-toupper --enable-ascii-ctypes --disable-font-switch" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-screen=ncursesw --enable-widec --enable-scrollbar --enable-nested-tables --enable-htmlized-cfg --with-ssl --with-zlib --with-bzlib --enable-cjk --enable-japanese-utf8 --enable-progressbar --enable-prettysrc --enable-forms-options --enable-8bit-toupper --enable-ascii-ctypes --disable-font-switch --with-mime-libdir=$TERMUX_PREFIX/etc" ## set default paths for tools that may be used in runtime by 'lynx' binary TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_BZIP2=${TERMUX_PREFIX}/bin/bzip2" diff --git a/packages/lynx/fix-paths.patch b/packages/lynx/fix-paths.patch new file mode 100644 index 000000000..b6468c091 --- /dev/null +++ b/packages/lynx/fix-paths.patch @@ -0,0 +1,78 @@ +diff -uNr lynx2.8.9rel.1/src/LYNews.c lynx2.8.9rel.1.mod/src/LYNews.c +--- lynx2.8.9rel.1/src/LYNews.c 2018-03-18 20:51:02.000000000 +0200 ++++ lynx2.8.9rel.1.mod/src/LYNews.c 2019-03-01 22:04:51.671752655 +0200 +@@ -261,7 +261,7 @@ + StrAllocCat(cp, org); + } + #ifdef UNIX +- else if ((fp = fopen("/etc/organization", TXT_R)) != NULL) { ++ else if ((fp = fopen("@TERMUX_PREFIX@/etc/organization", TXT_R)) != NULL) { + char *buffer = 0; + + if (LYSafeGets(&buffer, fp) != NULL) { +diff -uNr lynx2.8.9rel.1/src/LYUtils.c lynx2.8.9rel.1.mod/src/LYUtils.c +--- lynx2.8.9rel.1/src/LYUtils.c 2018-05-16 00:20:52.000000000 +0300 ++++ lynx2.8.9rel.1.mod/src/LYUtils.c 2019-03-01 22:05:42.915339501 +0200 +@@ -165,7 +165,7 @@ + #if defined(__FreeBSD__) || defined(__bsdi__) + #define UTMP_FILE _PATH_UTMP + #else +-#define UTMP_FILE "/etc/utmp" ++#define UTMP_FILE "@TERMUX_PREFIX@/etc/utmp" + #endif /* __FreeBSD__ || __bsdi__ */ + #endif /* !UTMP_FILE */ + +@@ -5185,7 +5185,7 @@ + /* + * Use /tmp; it should be writable. + */ +- StrAllocCopy(HomeDir, "/tmp"); ++ StrAllocCopy(HomeDir, "@TERMUX_PREFIX@/tmp"); + } + #endif + #endif /* VMS */ +diff -uNr lynx2.8.9rel.1/WWW/Library/Implementation/HTFile.c lynx2.8.9rel.1.mod/WWW/Library/Implementation/HTFile.c +--- lynx2.8.9rel.1/WWW/Library/Implementation/HTFile.c 2018-05-12 02:20:35.000000000 +0300 ++++ lynx2.8.9rel.1.mod/WWW/Library/Implementation/HTFile.c 2019-03-01 22:04:51.675086005 +0200 +@@ -145,7 +145,7 @@ + static const char *HTCacheRoot = "/WWW$SCRATCH"; /* Where to cache things */ + + #else +-static const char *HTCacheRoot = "/tmp/W3_Cache_"; /* Where to cache things */ ++static const char *HTCacheRoot = "@TERMUX_PREFIX@/tmp/W3_Cache_"; /* Where to cache things */ + #endif /* VMS */ + + static char s_no_suffix[] = "*"; +@@ -743,7 +743,7 @@ + home = LYGetEnv("HOME"); + #endif + if (home == NULL) +- home = "/tmp"; ++ home = "@TERMUX_PREFIX@/tmp"; + #endif /* VMS */ + HTSprintf0(&result, "%s/WWW/%s/%s%s", home, acc_method, host, path); + } else { +diff -uNr lynx2.8.9rel.1/WWW/Library/Implementation/HTFormat.c lynx2.8.9rel.1.mod/WWW/Library/Implementation/HTFormat.c +--- lynx2.8.9rel.1/WWW/Library/Implementation/HTFormat.c 2018-05-12 01:18:24.000000000 +0300 ++++ lynx2.8.9rel.1.mod/WWW/Library/Implementation/HTFormat.c 2019-03-01 22:04:51.678419355 +0200 +@@ -27,7 +27,7 @@ + #ifdef NeXT + #define PRESENT_POSTSCRIPT "open %s; /bin/rm -f %s\n" + #else +-#define PRESENT_POSTSCRIPT "(ghostview %s ; /bin/rm -f %s)&\n" ++#define PRESENT_POSTSCRIPT "(ghostview %s ; rm -f %s)&\n" + /* Full pathname would be better! */ + #endif /* NeXT */ + #endif /* UNIX */ +diff -uNr lynx2.8.9rel.1/WWW/Library/Implementation/HTNews.c lynx2.8.9rel.1.mod/WWW/Library/Implementation/HTNews.c +--- lynx2.8.9rel.1/WWW/Library/Implementation/HTNews.c 2018-02-26 02:28:40.000000000 +0200 ++++ lynx2.8.9rel.1.mod/WWW/Library/Implementation/HTNews.c 2019-03-01 22:04:51.681752704 +0200 +@@ -36,7 +36,7 @@ + #endif /* DEFAULT_NEWS_HOST */ + + #ifndef NEWS_SERVER_FILE +-#define NEWS_SERVER_FILE "/usr/local/lib/rn/server" ++#define NEWS_SERVER_FILE "@TERMUX_PREFIX@/lib/rn/server" + #endif /* NEWS_SERVER_FILE */ + + #ifndef NEWS_AUTH_FILE diff --git a/packages/lynx/lynx2.8.9dev.19_WWW_Library_Implementation_HTFormat.c.patch b/packages/lynx/lynx2.8.9dev.19_WWW_Library_Implementation_HTFormat.c.patch deleted file mode 100644 index a0ee15fbb..000000000 --- a/packages/lynx/lynx2.8.9dev.19_WWW_Library_Implementation_HTFormat.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr lynx2.8.9dev.19/WWW/Library/Implementation/HTFormat.c lynx2.8.9dev.19.mod/WWW/Library/Implementation/HTFormat.c ---- lynx2.8.9dev.19/WWW/Library/Implementation/HTFormat.c 2018-05-12 01:18:24.000000000 +0300 -+++ lynx2.8.9dev.19.mod/WWW/Library/Implementation/HTFormat.c 2018-06-19 19:42:26.744841948 +0300 -@@ -27,7 +27,7 @@ - #ifdef NeXT - #define PRESENT_POSTSCRIPT "open %s; /bin/rm -f %s\n" - #else --#define PRESENT_POSTSCRIPT "(ghostview %s ; /bin/rm -f %s)&\n" -+#define PRESENT_POSTSCRIPT "(ghostview %s ; rm -f %s)&\n" - /* Full pathname would be better! */ - #endif /* NeXT */ - #endif /* UNIX */ diff --git a/packages/lynx/lynx2.8.9dev.19_src_LYUtils.c.patch b/packages/lynx/lynx2.8.9dev.19_src_LYUtils.c.patch deleted file mode 100644 index 5c712e64c..000000000 --- a/packages/lynx/lynx2.8.9dev.19_src_LYUtils.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr lynx2.8.9dev.19/src/LYUtils.c lynx2.8.9dev.19.mod/src/LYUtils.c ---- lynx2.8.9dev.19/src/LYUtils.c 2018-05-16 00:20:52.000000000 +0300 -+++ lynx2.8.9dev.19.mod/src/LYUtils.c 2018-06-19 19:40:07.058168089 +0300 -@@ -5185,7 +5185,7 @@ - /* - * Use /tmp; it should be writable. - */ -- StrAllocCopy(HomeDir, "/tmp"); -+ StrAllocCopy(HomeDir, "@TERMUX_PREFIX@/tmp"); - } - #endif - #endif /* VMS */