From 4f38fea57e97704c6299b5a93a4ef5ba89f30d37 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Tue, 19 Jun 2018 20:22:07 +0300 Subject: [PATCH] lynx: update to v2.8.9dev.19 --- packages/lynx/LYUtils.c.patch | 12 ----------- packages/lynx/build.sh | 20 +++++++++++++++++-- ...WW_Library_Implementation_HTFormat.c.patch | 12 +++++++++++ ...WWW_Library_Implementation_www_tcp.h.patch | 12 +++++++++++ ...tch => lynx2.8.9dev.19_src_LYMain.c.patch} | 8 ++++---- .../lynx/lynx2.8.9dev.19_src_LYUtils.c.patch | 12 +++++++++++ ...patch => lynx2.8.9dev.19_userdefs.h.patch} | 14 ++++++------- packages/lynx/www_tcp.h.patch | 12 ----------- 8 files changed, 65 insertions(+), 37 deletions(-) delete mode 100644 packages/lynx/LYUtils.c.patch create mode 100644 packages/lynx/lynx2.8.9dev.19_WWW_Library_Implementation_HTFormat.c.patch create mode 100644 packages/lynx/lynx2.8.9dev.19_WWW_Library_Implementation_www_tcp.h.patch rename packages/lynx/{LYMain.c.patch => lynx2.8.9dev.19_src_LYMain.c.patch} (62%) create mode 100644 packages/lynx/lynx2.8.9dev.19_src_LYUtils.c.patch rename packages/lynx/{userdefs.h.patch => lynx2.8.9dev.19_userdefs.h.patch} (84%) delete mode 100644 packages/lynx/www_tcp.h.patch diff --git a/packages/lynx/LYUtils.c.patch b/packages/lynx/LYUtils.c.patch deleted file mode 100644 index dbf8945e7..000000000 --- a/packages/lynx/LYUtils.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../lynx2-8-8/src/LYUtils.c ./src/LYUtils.c ---- ../lynx2-8-8/src/LYUtils.c 2014-03-09 22:43:10.000000000 +0100 -+++ ./src/LYUtils.c 2014-07-02 07:57:42.616342959 +0200 -@@ -5282,7 +5282,7 @@ - /* - * Use /tmp; it should be writable. - */ -- StrAllocCopy(HomeDir, "/tmp"); -+ StrAllocCopy(HomeDir, "@TERMUX_PREFIX@/tmp"); - } - #endif - #endif /* VMS */ diff --git a/packages/lynx/build.sh b/packages/lynx/build.sh index b8e882023..5531a9dc2 100644 --- a/packages/lynx/build.sh +++ b/packages/lynx/build.sh @@ -1,11 +1,27 @@ TERMUX_PKG_HOMEPAGE=http://lynx.browser.org/ TERMUX_PKG_DESCRIPTION="The text web browser" -TERMUX_PKG_VERSION=2.8.9dev.17 -TERMUX_PKG_SHA256=a43811b9078c46ccd6d91a3d5ae0a8bc1f247a4dd89c1a6ccdbcd6c2b3d56ed3 +TERMUX_PKG_VERSION=2.8.9dev.19 +TERMUX_PKG_SHA256=0223706f8310ecb738342c6bc51ebbe1879f2890a56c5e6f099e28289a8a8e9f 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" +## 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" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_COMPRESS=${TERMUX_PREFIX}/bin/compress" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_GZIP=${TERMUX_PREFIX}/bin/gzip" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_INSTALL=${TERMUX_PREFIX}/bin/install" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_MSGINIT=${TERMUX_PREFIX}/bin/msginit" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_MV=${TERMUX_PREFIX}/bin/mv" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_RM=${TERMUX_PREFIX}/bin/rm" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_TAR=${TERMUX_PREFIX}/bin/tar" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_TELNET=${TERMUX_PREFIX}/bin/applets/telnet" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_UNCOMPRESS=${TERMUX_PREFIX}/bin/uncompress" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_UNZIP=${TERMUX_PREFIX}/bin/unzip" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_UUDECODE=${TERMUX_PREFIX}/bin/uudecode" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_ZCAT=${TERMUX_PREFIX}/bin/zcat" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_path_ZIP=${TERMUX_PREFIX}/bin/zip" + termux_step_pre_configure() { CC+=" $LDFLAGS" unset LDFLAGS 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 new file mode 100644 index 000000000..a0ee15fbb --- /dev/null +++ b/packages/lynx/lynx2.8.9dev.19_WWW_Library_Implementation_HTFormat.c.patch @@ -0,0 +1,12 @@ +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_WWW_Library_Implementation_www_tcp.h.patch b/packages/lynx/lynx2.8.9dev.19_WWW_Library_Implementation_www_tcp.h.patch new file mode 100644 index 000000000..d098fbb59 --- /dev/null +++ b/packages/lynx/lynx2.8.9dev.19_WWW_Library_Implementation_www_tcp.h.patch @@ -0,0 +1,12 @@ +diff -uNr lynx2.8.9dev.19/WWW/Library/Implementation/www_tcp.h lynx2.8.9dev.19.mod/WWW/Library/Implementation/www_tcp.h +--- lynx2.8.9dev.19/WWW/Library/Implementation/www_tcp.h 2018-05-16 23:31:43.000000000 +0300 ++++ lynx2.8.9dev.19.mod/WWW/Library/Implementation/www_tcp.h 2018-06-19 19:40:07.064834756 +0300 +@@ -797,7 +797,7 @@ + + #if defined(VMS) + #define socklen_t unsigned +-#else ++#elif !defined(__APPLE__) + #define socklen_t int /* used for default LY_SOCKLEN definition */ + #endif + diff --git a/packages/lynx/LYMain.c.patch b/packages/lynx/lynx2.8.9dev.19_src_LYMain.c.patch similarity index 62% rename from packages/lynx/LYMain.c.patch rename to packages/lynx/lynx2.8.9dev.19_src_LYMain.c.patch index e0c252e89..bc6145e98 100644 --- a/packages/lynx/LYMain.c.patch +++ b/packages/lynx/lynx2.8.9dev.19_src_LYMain.c.patch @@ -1,7 +1,7 @@ -diff -u -r ../lynx2-8-8/src/LYMain.c ./src/LYMain.c ---- ../lynx2-8-8/src/LYMain.c 2014-02-14 14:00:16.000000000 +0100 -+++ ./src/LYMain.c 2014-07-02 08:39:17.064274768 +0200 -@@ -398,7 +398,7 @@ +diff -uNr lynx2.8.9dev.19/src/LYMain.c lynx2.8.9dev.19.mod/src/LYMain.c +--- lynx2.8.9dev.19/src/LYMain.c 2018-05-12 02:11:18.000000000 +0300 ++++ lynx2.8.9dev.19.mod/src/LYMain.c 2018-06-19 19:40:07.051501423 +0300 +@@ -394,7 +394,7 @@ BOOLEAN LYSetCookies = SET_COOKIES; /* Process Set-Cookie headers? */ BOOLEAN LYUseDefSelPop = TRUE; /* Command line -popup toggle */ BOOLEAN LYUseDefaultRawMode = TRUE; diff --git a/packages/lynx/lynx2.8.9dev.19_src_LYUtils.c.patch b/packages/lynx/lynx2.8.9dev.19_src_LYUtils.c.patch new file mode 100644 index 000000000..5c712e64c --- /dev/null +++ b/packages/lynx/lynx2.8.9dev.19_src_LYUtils.c.patch @@ -0,0 +1,12 @@ +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 */ diff --git a/packages/lynx/userdefs.h.patch b/packages/lynx/lynx2.8.9dev.19_userdefs.h.patch similarity index 84% rename from packages/lynx/userdefs.h.patch rename to packages/lynx/lynx2.8.9dev.19_userdefs.h.patch index 354bc573d..51ff1e146 100644 --- a/packages/lynx/userdefs.h.patch +++ b/packages/lynx/lynx2.8.9dev.19_userdefs.h.patch @@ -1,6 +1,6 @@ -diff -u -r ../lynx2-8-8/userdefs.h ./userdefs.h ---- ../lynx2-8-8/userdefs.h 2014-03-09 22:43:10.000000000 +0100 -+++ ./userdefs.h 2014-07-02 10:03:04.780137325 +0200 +diff -uNr lynx2.8.9dev.19/userdefs.h lynx2.8.9dev.19.mod/userdefs.h +--- lynx2.8.9dev.19/userdefs.h 2018-05-16 00:12:20.000000000 +0300 ++++ lynx2.8.9dev.19.mod/userdefs.h 2018-06-19 19:40:07.061501423 +0300 @@ -366,7 +366,7 @@ * the "TMPDIR" (unix), or "TEMP" or "TMP" (Windows,DOS,OS/2) * variable. @@ -10,7 +10,7 @@ diff -u -r ../lynx2-8-8/userdefs.h ./userdefs.h /******************************** * Comment this line out to disable code that implements command logging -@@ -738,7 +738,7 @@ +@@ -741,7 +741,7 @@ * RFC 1345 Mnemonic mnemonic * Transparent x-transparent */ @@ -19,7 +19,7 @@ diff -u -r ../lynx2-8-8/userdefs.h ./userdefs.h /***************************** * PREFERRED_LANGUAGE is the language in MIME notation (e.g., "en", -@@ -767,7 +767,7 @@ +@@ -770,7 +770,7 @@ * an error response with the 406 (not acceptable) status code, though * the sending of an unacceptable response is also allowed. (RFC2068) */ @@ -28,7 +28,7 @@ diff -u -r ../lynx2-8-8/userdefs.h ./userdefs.h /***************************** * If MULTI_BOOKMARK_SUPPORT is set to MBM_STANDARD or MBM_ADVANCED, and -@@ -921,7 +921,7 @@ +@@ -924,7 +924,7 @@ * The default defined here can be changed in lynx.cfg, and .lynxrc, or * toggled via the -accept_all_cookies command line switch. */ @@ -37,7 +37,7 @@ diff -u -r ../lynx2-8-8/userdefs.h ./userdefs.h /**************************************************************** * Section 2. Things that you probably want to change or review -@@ -972,7 +972,7 @@ +@@ -975,7 +975,7 @@ * and configuration defaults, and the default always can be toggled * via the -show_cursor command line switch. */ diff --git a/packages/lynx/www_tcp.h.patch b/packages/lynx/www_tcp.h.patch deleted file mode 100644 index a118e89e6..000000000 --- a/packages/lynx/www_tcp.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../lynx2-8-8/WWW/Library/Implementation/www_tcp.h ./WWW/Library/Implementation/www_tcp.h ---- ../lynx2-8-8/WWW/Library/Implementation/www_tcp.h 2013-07-29 23:38:35.000000000 +0200 -+++ ./WWW/Library/Implementation/www_tcp.h 2016-06-20 00:19:17.000000000 +0200 -@@ -797,7 +797,7 @@ - - #if defined(VMS) - #define socklen_t unsigned --#else -+#elif !defined(__APPLE__) - #define socklen_t int /* used for default LY_SOCKLEN definition */ - #endif -