diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | COPYHEADER | 39 | ||||
| -rw-r--r-- | COPYHEADER.asc | 6 | ||||
| -rw-r--r-- | PACKAGE/lynx.nsi | 64 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTUtils.h | 9 |
6 files changed, 87 insertions, 44 deletions
diff --git a/CHANGES b/CHANGES index d06f4414..26f25970 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,10 @@ --- $LynxId: CHANGES,v 1.676 2013/10/08 21:41:30 tom Exp $ +-- $LynxId: CHANGES,v 1.677 2013/10/09 19:20:47 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2013-10-08 (2.8.8dev.17) +2013-10-09 (2.8.8dev.17) +* add NSIS script, to allow building Windows installer via cross-compiling -TD * fixes to configure script and makefiles to work with empty $prefix, e.g., as used in MSYS -TD * improve configure check for sleep() for cross-compiling to MinGW -TD diff --git a/COPYHEADER b/COPYHEADER index 5e6fea82..5eedc6e5 100644 --- a/COPYHEADER +++ b/COPYHEADER @@ -1,6 +1,3 @@ --- $LynxId: COPYHEADER,v 1.6 2013/10/02 14:18:35 tom Exp $ --- vile:txtmode fc=72 - Copyright 1997-2012,2013 Thomas E. Dickey This copyright notice must be included in all copies or substantial @@ -14,31 +11,33 @@ License (Version 2). Note that the License text after the terms and conditions is advisory in nature, and contains neither terms nor conditions. You may choose to follow that advice. -The copyright owners and developers for Lynx grant their permission for -using any version of these common libraries (which are known to have -problematic licensing issues) with any operating system or platform: - - GNUTLS +The copyright owners and developers for Lynx grant their express +permission for using any version of these common libraries (which are +known to have problematic licensing issues) with any operating system or +platform, irregardless of the manner in which the libraries are +connected to the Lynx program: - libbsd, e.g., from http://libbsd.freedesktop.org/releases/ + GNUTLS - libidn + libbsd http://libbsd.freedesktop.org/releases/ - libutf8 + libidn - OpenSSL + OpenSSL http://www.openssl.org Additionally, the developers understand that these additional libraries have no licensing issues. Permission is in any case granted to use Lynx without restriction for these as well: - libiconv + libbz2 http://www.bzip.org/ + + libiconv - nss_compat_ossl, e.g, http://fedoraproject.org/wiki/Nss_compat_ossl + libutf8 http://www.haible.de/bruno/packages-libutf8.html - zlib, e.g., http://www.gzip.org/zlib/ + nss_compat_ossl http://fedoraproject.org/wiki/Nss_compat_ossl - libbz2, e.g., http://www.bzip.org/ + zlib http://www.gzip.org/zlib/ The list given is by no means exhaustive and may not be interpreted to limit the set of libraries with which Lynx can be used. @@ -49,11 +48,11 @@ modifying, distributing modified versions. Any licensing questions should be directed to the mailing list: - lynx-dev@nongnu.org + lynx-dev@nongnu.org or to the developer/maintainer (Thomas E. Dickey): - dickey@invisible-island.net + dickey@invisible-island.net ------------------------------------------------------------------------------ For reference, below is the original copyright notice for Lynx (2.4.2). @@ -79,3 +78,7 @@ For reference, below is the original copyright notice for Lynx (2.4.2). Any licensing or usage questions should be directed to Michael Grobe <grobe@ukans.edu>. */ +------------------------------------------------------------------------------ +-- vile:txtmode fc=72 noti +-- $LynxId: COPYHEADER,v 1.10 2013/10/09 23:18:10 tom Exp $ +------------------------------------------------------------------------------ diff --git a/COPYHEADER.asc b/COPYHEADER.asc index e9e46c74..aaa63a78 100644 --- a/COPYHEADER.asc +++ b/COPYHEADER.asc @@ -2,7 +2,7 @@ Version: GnuPG v1.4.10 (GNU/Linux) Comment: See http://invisible-island.net/public/public.html for info -iEYEABECAAYFAlJMK18ACgkQcCNT4PfkjtuMdQCdHzZhW8At2wa9zbshAUPIJamP -GhoAn0Cz8ya3W9O59gdLwhziNcoi8/Qa -=siaX +iEYEABECAAYFAlJV5EMACgkQcCNT4PfkjtuigACbB9Rtz249Xu9CtMYZBa2Lq9qH +mlsAoMECj5+oRPcPGXoJN0OhHK9Uddg2 +=c3aN -----END PGP SIGNATURE----- diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi index 8cb443a0..25bbec1b 100644 --- a/PACKAGE/lynx.nsi +++ b/PACKAGE/lynx.nsi @@ -1,4 +1,4 @@ -; $LynxId: lynx.nsi,v 1.1 2013/10/09 01:02:56 tom Exp $ +; $LynxId: lynx.nsi,v 1.3 2013/10/09 19:06:24 tom Exp $ ; Script originally generated with the Venis Install Wizard, but customized. ; The Inno Setup script is preferred; but this can be built via cross-compiling. @@ -19,7 +19,7 @@ ; Main Install settings Name "${INSTALL}" -InstallDir "$PROGRAMFILES\${SUBKEY}" +InstallDir "$PROGRAMFILES\${INSTALL}" InstallDirRegKey HKLM "Software\${SUBKEY}" "$INSTDIR\bin" OutFile "NSIS-Output\${APPNAME}-${VERSION}-setup.exe" @@ -73,30 +73,57 @@ Section "${APPNAME}" Section1 ; Set Section Files and Shortcuts SetOutPath "$INSTDIR" File /oname=${EXENAME} ".\bin\*${EXENAME}" + File ".\bin\bzip2.exe" + File ".\bin\gzip.exe" + File ".\bin\*.dll" ; TODO: bzip2.exe, gzip.exe, *.dll CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\${EXENAME}" CreateShortCut "$SENDTO\${APPNAME}.lnk" "$INSTDIR\${EXENAME}" CreateDirectory "$SMPROGRAMS\${INSTALL}" - CreateShortCut "$SMPROGRAMS\${INSTALL}\${APPNAME}.lnk" "$INSTDIR\${EXENAME}" + CreateShortCut "$SMPROGRAMS\${INSTALL}\${INSTALL}.lnk" "$INSTDIR\${EXENAME}" CreateShortCut "$SMPROGRAMS\${INSTALL}\Uninstall.lnk" "$INSTDIR\uninstall.exe" File ".\share\lynx_doc\samples\*.lss" - File ".\etc\${LYNX_CFG}" - !appendfile "${LYNX_CFG}" "HELPFILE:${INSTDIR}\help\Lynx_help_main.html.gz$\n" - !appendfile "${LYNX_CFG}" "COLOR_STYLE:${INSTDIR}\opaque.lss$\n" - - !appendfile "${LYNX_CFG}" "CHMOD_PATH:$\n" - !appendfile "${LYNX_CFG}" "COPY_PATH:$\n" - !appendfile "${LYNX_CFG}" "MKDIR_PATH:$\n" - !appendfile "${LYNX_CFG}" "MV_PATH:$\n" - !appendfile "${LYNX_CFG}" "RMDIR_PATH:$\n" - !appendfile "${LYNX_CFG}" "RM_PATH:$\n" - !appendfile "${LYNX_CFG}" "TOUCH_PATH:$\n" - - !delfile "${LYNX_CFG}" + ; preinstall lynx.cfg as a temporary file + File /oname=config.tmp ".\etc\${LYNX_CFG}" + + ; at install-time, append our customization + FileOpen $0 "config.tmp" r + FileOpen $1 ".\${LYNX_CFG}" w + loop: + FileRead $0 $2 + IfErrors done + FileWrite $1 "$2" + goto loop + done: + FileWrite $1 "HELPFILE:$INSTDIR\help\Lynx_help_main.html.gz$\n" + FileWrite $1 "COLOR_STYLE:$INSTDIR\opaque.lss$\n" + FileWrite $1 "CHMOD_PATH:$\n" + FileWrite $1 "COPY_PATH:$\n" + FileWrite $1 "MKDIR_PATH:$\n" + FileWrite $1 "MV_PATH:$\n" + FileWrite $1 "RMDIR_PATH:$\n" + FileWrite $1 "RM_PATH:$\n" + FileWrite $1 "TOUCH_PATH:$\n" + FileClose $0 + FileClose $1 + + Delete "config.tmp" + + File "..\samples\lynx.bat" + File "..\samples\lynx-demo.cfg" + + File "..\samples\jumps.htm" + File "..\samples\home.htm" + File "..\samples\lynx_bookmarks.htm" + + SetOutPath "$INSTDIR\icon" + File "..\samples\lynx.ico" + + SetOutPath "$INSTDIR\tmp" SectionEnd @@ -108,6 +135,9 @@ Section "documentation" Section2 SetOverwrite on ; Set Section Files and Shortcuts + SetOutPath "$INSTDIR" + File "..\lynx.man" + SetOutPath "$INSTDIR\doc" File ".\share\lynx_doc\CHANGES*.*" File ".\share\lynx_doc\COPY*.*" @@ -139,6 +169,7 @@ Section "samples" Section3 SectionEnd Section -FinishSection + WriteRegStr HKLM "Software\${SUBKEY}" "" "$INSTDIR" WriteRegStr HKLM "Software\${SUBKEY}" "Environment" "" WriteRegStr HKLM "Software\${SUBKEY}\Environment" "LYNX_CFG" "$INSTDIR\${LYNX_CFG}" @@ -188,6 +219,7 @@ Section Uninstall Delete "$INSTDIR\*.htm" Delete "$INSTDIR\*.man" Delete "$INSTDIR\*.lss" + Delete "$INSTDIR\*.tmp" ; Remove remaining directories RMDir "$SMPROGRAMS\${INSTALL}" diff --git a/README b/README index 739dc5cb..53c49283 100644 --- a/README +++ b/README @@ -144,5 +144,9 @@ LYNX-DEV MAILING LIST questions or comments in the archive since more often than not nobody will send a carbon copy to you. View the archives at: - "lynx-dev Mailing list archives" - <URL:http://mail.gnu.org/mailman/listinfo/lynx-dev/> + "lynx-dev Mailing list archives" + <URL:http://mail.gnu.org/mailman/listinfo/lynx-dev/> +------------------------------------------------------------------------------ +-- vile:txtmode fc=72 noti +-- $LynxId: README,v 1.28 2013/10/09 23:10:22 tom Exp $ +------------------------------------------------------------------------------ diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index 8e713520..27086a4e 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -1,5 +1,5 @@ /* - * $LynxId: HTUtils.h,v 1.117 2013/10/08 20:13:41 tom Exp $ + * $LynxId: HTUtils.h,v 1.118 2013/10/10 00:06:59 tom Exp $ * * Utility macros for the W3 code library * MACROS FOR GENERAL USE @@ -226,13 +226,16 @@ extern off_t LYatoll(const char *value); #include <dos.h> #endif -#if defined(DECL_SLEEP) -#undef sleep /* 1998/06/23 (Tue) 16:54:53 */ +#if defined(DECL_SLEEP) && defined(HAVE_CONFIG_H) +# undef sleep # if defined(__MINGW32__) # define sleep(n) Sleep((n)*100) # else extern void sleep(unsigned __seconds); # endif +#elif !defined(__MINGW32__) +# undef sleep +extern void sleep(unsigned __seconds); #endif #define popen _popen |