From 3ffe06972b108ff52ded8449112828c59227067b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= Date: Sat, 14 Feb 2004 21:33:10 +0000 Subject: [PATCH] - updated to 2.8.5rel.1 Changed files: lynx-acfix.patch -> 1.7 lynx-autoconf.patch -> 1.7 lynx.spec -> 1.111 --- lynx-acfix.patch | 165 ++++++++++++++++++++++---------------------- lynx-autoconf.patch | 52 +++++++------- lynx.spec | 4 +- 3 files changed, 113 insertions(+), 108 deletions(-) diff --git a/lynx-acfix.patch b/lynx-acfix.patch index 360dc5e..7345a8b 100644 --- a/lynx-acfix.patch +++ b/lynx-acfix.patch @@ -1,35 +1,26 @@ ---- lynx2-8-5/makefile.in.orig Mon Oct 1 22:32:44 2001 -+++ lynx2-8-5/makefile.in Mon Oct 1 22:32:02 2001 -@@ -419,7 +419,7 @@ - @echo - @echo '**********************************************' - --cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.cache lynx_cfg.h -+cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.log lynx_cfg.h - @rm -f $@ - $(SHELL) -c '$(srcdir)/cfg_defs.sh $(srcdir)' - ---- lynx2-8-5/cfg_defs.sh.orig Thu Nov 18 05:08:08 1999 -+++ lynx2-8-5/cfg_defs.sh Mon Oct 1 22:43:01 2001 -@@ -16,11 +16,14 @@ +diff -burN lynx2-8-5.orig/cfg_defs.sh lynx2-8-5/cfg_defs.sh +--- lynx2-8-5.orig/cfg_defs.sh 2004-02-14 22:10:58.372423984 +0100 ++++ lynx2-8-5/cfg_defs.sh 2004-02-14 22:16:58.206720856 +0100 +@@ -19,11 +19,14 @@ EOF sed \ - -e '/^#/d' \ -+ -e '/^$/d' \ -+ -e '/^[^acgn]/d' \ -+ -e '/^.[^cfmst]/d' \ -+ -e '/^..[^s_]/d' \ ++ -e '/^$/d' \ ++ -e '/^[^acgn]/d' \ ++ -e '/^.[^cfmst]/d' \ ++ -e '/^..[^s_]/d' \ -e 's/^.[^=]*_cv_//' \ -e 's/=\${.*=/=/' \ -e 's/}$//' \ -- config.cache | /bin/sh $TOP/cfg_edit.sh >>$OUT -+ config.log | /bin/sh $TOP/cfg_edit.sh >>$OUT +- config.cache | $SHELL $TOP/cfg_edit.sh >>$OUT ++ config.log | $SHELL $TOP/cfg_edit.sh >>$OUT cat >>$OUT < */ +#undef HAVE_DELSCREEN +#undef HAVE_DIRENT_H -+#undef HAVE_FCNTL_H ++#undef HAVE_FCNTL_H #undef HAVE_FTIME -#undef HAVE_GAI_STRERROR /* CF_CHECK_IPV6 */ -#undef HAVE_GETADDRINFO /* CF_CHECK_IPV6 */ @@ -175,7 +166,7 @@ -#undef HAVE_LIBINTL_H /* AM_GNU_GETTEXT, or cleanup from that */ -#undef HAVE_LIBUTF8_H /* may be needed for libncursesw */ +#undef HAVE_LANGINFO_CODESET -+#undef HAVE_LC_MESSAGES ++#undef HAVE_LC_MESSAGES +#undef HAVE_LIBDBMALLOC +#undef HAVE_LIBDMALLOC +#undef HAVE_LIBGETTEXT_H @@ -203,13 +194,13 @@ -#undef HAVE_NCURSES_TERM_H /* have */ +#undef HAVE_NCURSESW_NCURSES_H +#undef HAVE_NCURSESW_TERM_H -+#undef HAVE_NCURSES_H ++#undef HAVE_NCURSES_H +#undef HAVE_NCURSES_NCURSES_H +#undef HAVE_NCURSES_TERM_H #undef HAVE_NEWPAD #undef HAVE_NEWTERM -#undef HAVE_NL_TYPES_H /* AM_GNU_GETTEXT */ -+#undef HAVE_NL_TYPES_H ++#undef HAVE_NL_TYPES_H #undef HAVE_PNOUTREFRESH #undef HAVE_POPEN #undef HAVE_PUTENV @@ -223,7 +214,7 @@ -#undef HAVE_SIGACTION /* CF_FUNC_SIGACTION */ -#undef HAVE_SIZECHANGE /* CF_SIZECHANGE */ -#undef HAVE_STDARG_H /* CF_VARARGS */ -+#undef HAVE_SIGACTION ++#undef HAVE_SIGACTION +#undef HAVE_SIZECHANGE +#undef HAVE_STDARG_H #undef HAVE_STDLIB_H @@ -249,7 +240,7 @@ -#undef HAVE_TERMIO_H /* have */ -#undef HAVE_TERM_H /* have */ +#undef HAVE_SYSV_TOUCHLINE -+#undef HAVE_SYS_DIR_H ++#undef HAVE_SYS_DIR_H +#undef HAVE_SYS_FCNTL_H +#undef HAVE_SYS_FILIO_H +#undef HAVE_SYS_IOCTL_H @@ -268,7 +259,7 @@ -#undef HAVE_TYPE_UNIONWAIT /* CF_UNION_WAIT */ -#undef HAVE_UNISTD_H /* have */ +#undef HAVE_TYPE_UNIONWAIT -+#undef HAVE_UNISTD_H ++#undef HAVE_UNISTD_H #undef HAVE_UNSETENV -#undef HAVE_USE_DEFAULT_COLORS /* ncurses extension */ -#undef HAVE_UTMP /* CF_UTMP */ @@ -279,12 +270,12 @@ -#undef HAVE_VALUES_H /* AM_GNU_GETTEXT */ -#undef HAVE_VARARGS_H /* CF_VARARGS */ +#undef HAVE_USE_DEFAULT_COLORS -+#undef HAVE_UTMP ++#undef HAVE_UTMP +#undef HAVE_UTMP_UT_HOST +#undef HAVE_UTMP_UT_SESSION +#undef HAVE_UTMP_UT_XSTATUS +#undef HAVE_UTMP_UT_XTIME -+#undef HAVE_VALUES_H ++#undef HAVE_VALUES_H +#undef HAVE_VARARGS_H #undef HAVE_VASPRINTF -#undef HAVE_VFORK_H /* have */ @@ -329,15 +320,15 @@ -#undef NSL_FORK /* CF_ARG_ENABLE(nsl-fork) */ +#undef HAVE_XCURSES +#undef HAVE___ARGZ_COUNT -+#undef HAVE___ARGZ_NEXT -+#undef HAVE___ARGZ_STRINGIFY -+#undef IGNORE_CTRL_C ++#undef HAVE___ARGZ_NEXT ++#undef HAVE___ARGZ_STRINGIFY ++#undef IGNORE_CTRL_C +#undef INCLUDE_PROTOTYPES -+#undef INSTALL_ARGS ++#undef INSTALL_ARGS +#undef INSTALL_PATH -+#undef LINUX ++#undef LINUX +#undef LOCALE -+#undef LONG_LIST ++#undef LONG_LIST +#undef LYNXCGI_LINKS +#undef LYNX_CFG_FILE +#undef LYNX_LSS_FILE @@ -345,21 +336,21 @@ +#undef LY_FIND_LEAKS +#undef LY_TRACELINE +#undef MKDIR_PATH -+#undef MV_PATH ++#undef MV_PATH +#undef NCURSES +#undef NCURSES_BROKEN +#undef NEED_PTEM_H +#undef NEED_REMOVE +#undef NEED_WCHAR_H -+#undef NGROUPS ++#undef NGROUPS +#undef NO_CHANGE_EXECUTE_PERMS -+#undef NO_CONFIG_INFO ++#undef NO_CONFIG_INFO +#undef NO_EXTENDED_HTMLDTD -+#undef NO_LYNX_TRACE ++#undef NO_LYNX_TRACE +#undef NO_OPTION_FORMS +#undef NO_OPTION_MENU +#undef NO_PARENT_DIR_REFERENCE -+#undef NSL_FORK ++#undef NSL_FORK #undef OK_INSTALL -#undef OK_OVERRIDE /* CF_ARG_DISABLE(dired-override) */ -#undef OK_PERMIT /* CF_ARG_DISABLE(dired-permit) */ @@ -371,7 +362,7 @@ +#undef OK_PERMIT +#undef REAL_UNIX_SYSTEM +#undef RLOGIN_PATH -+#undef RM_PATH ++#undef RM_PATH +#undef SOCKS #undef STDC_HEADERS -#undef SYSTEM_MAIL /* CF_DEFINE_PROG */ @@ -390,20 +381,20 @@ -#undef ULTRIX /* config.sub */ -#undef UNCOMPRESS_PATH /* CF_PATH_PROG(gunzip) */ -#undef UNDERLINE_LINKS /* CF_ARG_ENABLE(underlines) */ -+#undef SYSTEM_MAIL ++#undef SYSTEM_MAIL +#undef SYSTEM_MAIL_FLAGS +#undef SYSTEM_NAME -+#undef TAR_DOWN_OPTIONS ++#undef TAR_DOWN_OPTIONS +#undef TAR_FILE_OPTIONS -+#undef TAR_PATH -+#undef TAR_PIPE_OPTIONS ++#undef TAR_PATH ++#undef TAR_PIPE_OPTIONS +#undef TAR_UP_OPTIONS +#undef TELNET_PATH +#undef TERMIO_AND_CURSES +#undef TERMIO_AND_TERMIOS -+#undef TN3270_PATH ++#undef TN3270_PATH +#undef TOUCH_PATH -+#undef ULTRIX ++#undef ULTRIX +#undef UNCOMPRESS_PATH +#undef UNDERLINE_LINKS #undef UNIX @@ -453,44 +444,44 @@ +#undef USE_BZLIB +#undef USE_COLOR_STYLE +#undef USE_DEFAULT_COLORS -+#undef USE_EXECVP ++#undef USE_EXECVP +#undef USE_EXTERNALS +#undef USE_FCNTL -+#undef USE_FILE_UPLOAD ++#undef USE_FILE_UPLOAD +#undef USE_GNUTLS_INCL +#undef USE_OPENSSL_INCL -+#undef USE_PERSISTENT_COOKIES -+#undef USE_PRETTYSRC ++#undef USE_PERSISTENT_COOKIES ++#undef USE_PRETTYSRC +#undef USE_READPROGRESS +#undef USE_SCROLLBAR +#undef USE_SLANG +#undef USE_SOCKS4_PREFIX +#undef USE_SOCKS5 +#undef USE_SOURCE_CACHE -+#undef USE_SSL -+#undef USE_SYSV_UTMP ++#undef USE_SSL ++#undef USE_SYSV_UTMP +#undef USE_X509_SUPPORT -+#undef USE_ZLIB ++#undef USE_ZLIB +#undef UTF8 +#undef UTMPX_FOR_UTMP +#undef UUDECODE_PATH +#undef WAITPID_USES_UNION -+#undef WAIT_USES_UNION ++#undef WAIT_USES_UNION +#undef WIDEC_CURSES -+#undef XCURSES ++#undef XCURSES +#undef ZCAT_PATH -+#undef ZIP_PATH -+#undef _ALL_SOURCE -+#undef inline ++#undef ZIP_PATH ++#undef _ALL_SOURCE ++#undef inline +#undef lynx_rand +#undef lynx_srand -+#undef mode_t ++#undef mode_t +#undef off_t +#undef pid_t +#undef uid_t -+#undef ut_name ++#undef ut_name +#undef ut_xstatus -+#undef ut_xtime ++#undef ut_xtime #ifdef GZIP_PATH -#undef OK_GZIP /* CF_ARG_DISABLE(dired-gzip) */ @@ -509,7 +500,7 @@ #ifdef ZIP_PATH -#undef OK_ZIP /* CF_ARG_DISABLE(dired-zip) */ -+#undef OK_ZIP ++#undef OK_ZIP #endif /* @@ -530,3 +521,15 @@ #endif #ifndef HAVE_LSTAT +diff -burN lynx2-8-5.orig/makefile.in lynx2-8-5/makefile.in +--- lynx2-8-5.orig/makefile.in 2004-02-14 22:10:58.401419576 +0100 ++++ lynx2-8-5/makefile.in 2004-02-14 22:15:36.124199296 +0100 +@@ -394,7 +394,7 @@ + @echo + @echo '**********************************************' + +-cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.cache lynx_cfg.h ++cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.log lynx_cfg.h + @rm -f $@ + $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(srcdir)/cfg_defs.sh $(srcdir)' + diff --git a/lynx-autoconf.patch b/lynx-autoconf.patch index 4549d4d..62099c8 100644 --- a/lynx-autoconf.patch +++ b/lynx-autoconf.patch @@ -1,5 +1,20 @@ ---- lynx2-8-5/configure.in.orig Mon Dec 2 03:07:38 2002 -+++ lynx2-8-5/configure.in Mon Jan 13 16:39:12 2003 +diff -burN lynx2-8-5.orig/aclocal.m4 lynx2-8-5/aclocal.m4 +--- lynx2-8-5.orig/aclocal.m4 2004-02-14 22:10:58.336429456 +0100 ++++ lynx2-8-5/aclocal.m4 2004-02-14 22:14:16.154356560 +0100 +@@ -2226,9 +2226,7 @@ + dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23 + dnl --------------- + dnl Insert text into the help-message, for readability, from AC_ARG_WITH. +-AC_DEFUN([CF_HELP_MESSAGE], +-[AC_DIVERT_HELP([$1])dnl +-])dnl ++AC_DEFUN([CF_HELP_MESSAGE],[]) + dnl --------------------------------------------------------------------------- + dnl CF_INET_ADDR version: 4 updated: 1999/03/30 12:24:31 + dnl ------------ +diff -burN lynx2-8-5.orig/configure.in lynx2-8-5/configure.in +--- lynx2-8-5.orig/configure.in 2004-02-14 22:10:58.364425200 +0100 ++++ lynx2-8-5/configure.in 2004-02-14 22:13:35.179585672 +0100 @@ -16,7 +16,6 @@ # run to the next, as well as with tests that are order-dependent. rm -f config.cache @@ -8,7 +23,7 @@ AC_INIT(userdefs.h) # autoconf 2.5x defaults to no cache file; we need the cache file's information -@@ -71,9 +70,6 @@ +@@ -75,9 +74,6 @@ dnl Debug/development/test dnl -------------------------------------------------------------------------- @@ -18,7 +33,7 @@ CF_DISABLE_ECHO # special case for WWW/* -@@ -311,9 +307,6 @@ +@@ -308,9 +304,6 @@ dnl -------------------------------------------------------------------------- dnl -------------------------------------------------------------------------- @@ -28,7 +43,7 @@ dnl internationalization macros CF_BUNDLED_INTL(makefile,disable) -@@ -599,9 +592,6 @@ +@@ -609,9 +602,6 @@ dnl Experimental options that don't need to test system features dnl -------------------------------------------------------------------------- @@ -38,7 +53,7 @@ AC_MSG_CHECKING(if bibp: URLs should be supported) CF_ARG_DISABLE(bibp-urls, [ --disable-bibp-urls disable support for bibp: URLs], -@@ -801,9 +791,6 @@ +@@ -787,9 +777,6 @@ dnl Miscellaneous options that don't need to test system features dnl -------------------------------------------------------------------------- @@ -48,16 +63,16 @@ AC_MSG_CHECKING(if alternative line-edit bindings should be used) CF_ARG_ENABLE(alt-bindings, [ --disable-alt-bindings disable alternative line-edit bindings], -@@ -836,7 +823,7 @@ +@@ -862,7 +849,7 @@ AC_MSG_RESULT($use_externs) if test $use_externs != "no" ; then AC_DEFINE(USE_EXTERNALS) -- LIBOBJS="$LIBOBJS LYExtern.o" +- LIBOBJS="$LIBOBJS LYExtern\$o" + AC_LIBOBJ([LYExtern]) fi AC_MSG_CHECKING(if you want to use setfont support) -@@ -991,9 +978,6 @@ +@@ -1008,9 +995,6 @@ dnl DirEd (directory-editor) options dnl -------------------------------------------------------------------------- @@ -67,16 +82,16 @@ # All DirEd functions that were enabled on compilation can be disabled # or modified at run time via DIRED_MENU symbols in lynx.cfg. AC_MSG_CHECKING(if directory-editor code should be used) -@@ -1004,7 +988,7 @@ +@@ -1021,7 +1005,7 @@ AC_MSG_RESULT($use_dired) if test ".$use_dired" != ".no" ; then -- LIBOBJS="$LIBOBJS LYLocal.o" +- LIBOBJS="$LIBOBJS LYLocal\$o" + AC_LIBOBJ([LYLocal]) AC_DEFINE(DIRED_SUPPORT) AC_MSG_CHECKING(if you wish to allow extracting from archives via DirEd) -@@ -1113,7 +1097,6 @@ +@@ -1131,7 +1115,6 @@ AC_SUBST(COMPRESS_EXT) if test $cf_cv_screen = pdcurses ; then @@ -84,16 +99,3 @@ CF_PDCURSES_X11 else CF_TERMIO_AND_CURSES(LYCurses.h) ---- lynx2-8-5/aclocal.m4.orig 2004-01-08 03:03:09.000000000 +0100 -+++ lynx2-8-5/aclocal.m4 2004-01-18 21:41:08.791380608 +0100 -@@ -2215,9 +2215,7 @@ - dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23 - dnl --------------- - dnl Insert text into the help-message, for readability, from AC_ARG_WITH. --AC_DEFUN([CF_HELP_MESSAGE], --[AC_DIVERT_HELP([$1])dnl --])dnl -+AC_DEFUN([CF_HELP_MESSAGE],[]) - dnl --------------------------------------------------------------------------- - dnl CF_INET_ADDR version: 4 updated: 1999/03/30 12:24:31 - dnl ------------ diff --git a/lynx.spec b/lynx.spec index 394c639..cd5da85 100644 --- a/lynx.spec +++ b/lynx.spec @@ -7,12 +7,12 @@ Summary(pl): Przegl Summary(pt_BR): Navegador web modo texto Summary(tr): Metin ekranda WWW tarayýcý Name: lynx -Version: 2.8.5pre.4 +Version: 2.8.5rel.1 Release: 1 License: GPL Group: Applications/Networking Source0: http://lynx.isc.org/current/%{name}%{version}.tar.bz2 -# Source0-md5: b2ddd596eb43f6ed2c18fa83bf3c31ac +# Source0-md5: d1e5134e5d175f913c16cb6768bc30eb Source1: %{name}.desktop Source2: %{name}.png Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 -- 2.44.0