about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES8
-rw-r--r--PACKAGE/debian/changelog4
-rw-r--r--PACKAGE/lynx.nsi6
-rw-r--r--PACKAGE/lynx.spec4
-rw-r--r--PACKAGE/version.iss2
-rwxr-xr-xconfigure2
-rw-r--r--configure.in6
-rw-r--r--lynx.cfg6
-rw-r--r--makefile.in4
-rw-r--r--src/LYIcon.rc10
-rw-r--r--src/chrtrans/makefile.in16
-rw-r--r--userdefs.h6
12 files changed, 37 insertions, 37 deletions
diff --git a/CHANGES b/CHANGES
index 78d52295..32074989 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,14 @@
--- $LynxId: CHANGES,v 1.974 2018/05/06 20:06:36 tom Exp $
+-- $LynxId: CHANGES,v 1.977 2018/05/08 00:47:48 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2018-05-07 (2.8.9dev.19)
+* trim unnecessary intllib symbols from src/chrtrans/makefile.in -TD
+* when cross-compiling, trim LDFLAGS from makefile rule linking makeuctb,
+  because it is a build tool, which should generally use BUILD_LDFLAGS
+  (patch by Thomas Petazzoni)
+
 2018-05-06 (2.8.9dev.18)
 * ignore content-encoding in HTContentToCompressType() if the content-type is
   known, to improve the suggested filename (report by Russell Bell) -TD
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index e4cc86fc..88c67883 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.18) unstable; urgency=low
+lynx-dev (2.8.9dev.19) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 27 Mar 2018 04:22:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 07 May 2018 19:37:31 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 756df9be..1fab6659 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.40 2018/03/27 08:22:59 tom Exp $

+; $LynxId: lynx.nsi,v 1.41 2018/05/07 23:37:31 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.

 

@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"

 !define VERSION_MAJOR "8"

 !define VERSION_MINOR "9"

-!define VERSION_LEVEL "1018"

-!define VERSION_PATCH "dev.18"

+!define VERSION_LEVEL "1019"

+!define VERSION_PATCH "dev.19"

 

 !define SUBKEY "Lynx"

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 4bd2eaa2..0992fd78 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.48 2018/03/27 08:22:59 tom Exp $
+# $LynxId: lynx.spec,v 1.49 2018/05/07 23:37:31 tom Exp $
 Summary: A text-based Web browser
 Name: lynx-dev
 Version: 2.8.9
-Release: dev.18
+Release: dev.19
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 6c38736c..9bf10105 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.

 

 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$

-#define LYNX_VERSION "2.8.9dev.18"

+#define LYNX_VERSION "2.8.9dev.19"

 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.9"

diff --git a/configure b/configure
index 2a277c8e..314cf9f7 100755
--- a/configure
+++ b/configure
@@ -1274,7 +1274,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.18
+VERSION=2.8.9dev.19
 
 echo "$as_me:1279: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index 32c94948..80962ac8 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.298 2018/03/27 08:22:59 tom Exp $
+dnl $LynxId: configure.in,v 1.299 2018/05/07 23:37:31 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.9dev.18)
+AC_REVISION(2.8.9dev.19)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.18
+VERSION=2.8.9dev.19
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index 2d7b2772..b8a7ac7d 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.296 2018/03/27 23:23:53 tom Exp $
+# $LynxId: lynx.cfg,v 1.297 2018/05/07 23:37:31 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.9dev.18"
+#PRCS LYNX_VERSION "2.8.9dev.19"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Tue, 27 Mar 2018 04:22:59 -0400"
+#PRCS LYNX_DATE "Mon, 07 May 2018 19:37:31 -0400"
 #
 # Definition pairs (configuration settings) are of the form
 #	VARIABLE:DEFINITION
diff --git a/makefile.in b/makefile.in
index ab079a81..b8ccfc37 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.169 2018/03/27 08:22:59 tom Exp $
+# $LynxId: makefile.in,v 1.170 2018/05/07 23:37:31 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -45,7 +45,7 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.9dev.18
+LYNX_VERSION	= 2.8.9dev.19
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index 66bf2817..1ca88f80 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.34 2018/03/27 08:22:59 tom Exp $
+// $LynxId: LYIcon.rc,v 1.35 2018/05/07 23:37:31 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1018
-PRODUCTVERSION 2,8,9,1018
+FILEVERSION    2,8,9,1019
+PRODUCTVERSION 2,8,9,1019
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.1018"
+      VALUE "FileVersion",      "2.8.9.1019"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2018 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1018"
+      VALUE "ProductVersion",   "2.8.9.1019"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
index aab358fe..3e2dcfa4 100644
--- a/src/chrtrans/makefile.in
+++ b/src/chrtrans/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.41 2017/07/04 22:46:05 tom Exp $
+# $LynxId: makefile.in,v 1.43 2018/05/08 00:45:34 tom Exp $
 #
 # Makefile for the makeuctb and unicode tables.
 #
@@ -22,13 +22,7 @@ CFLAGS		= @CFLAGS@
 EXTRA_CPPFLAGS	= @EXTRA_CPPFLAGS@
 CPPFLAGS	= @CPPFLAGS@
 
-LIBS		= @LIBS@
-LDFLAGS		= @LDFLAGS@
-
-INTLLIB		= @INTLDIR_MAKE@@INTLLIBS@
-
 WWWINC		= WWW/Library/Implementation
-INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@-I$(top_srcdir)/intl
 
 SITE_DEFS	= # FIXME: set in parent makefile
 
@@ -37,7 +31,7 @@ BUILD_CPP	= @BUILD_CPP@
 BUILD_CFLAGS	= @BUILD_CFLAGS@
 BUILD_CPPFLAGS	= @BUILD_CPPFLAGS@ @DEFS@
 
-BUILD_LIBS	= @BUILD_LIBS@ #$(SITE_LIBS)
+BUILD_LIBS	= @BUILD_LIBS@
 BUILD_LDFLAGS	= @BUILD_LDFLAGS@
 
 x		= @EXEEXT@
@@ -50,11 +44,11 @@ CPP_OPTS	= \
 		-I$(top_srcdir)/src/chrtrans \
 		-I$(top_srcdir)/$(WWWINC) \
 		-I$(top_srcdir)/ \
-		$(INTLDIR_CPPFLAGS) $(SITE_DEFS) $(BUILD_CPPFLAGS)
+		$(SITE_DEFS) $(BUILD_CPPFLAGS)
 CC_OPTS		= $(CPP_OPTS) $(BUILD_CFLAGS)
 
 LINT		= @LINT@
-LINTOPTS	=
+LINTOPTS	= @LINT_OPTS@
 
 CTAGS		= @CTAGS@
 
@@ -123,7 +117,7 @@ OBJS		= makeuctb$o
 C_SRC		= $(OBJS:$o=.c)
 
 $(MAKEUCTB) : $(OBJS)
-	$(BUILD_CC) $(CC_OPTS) $(LDFLAGS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS)
+	$(BUILD_CC) $(CC_OPTS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(BUILD_LIBS)
 
 makeuctb$o : $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
 
diff --git a/userdefs.h b/userdefs.h
index ee505d3a..a53099d3 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.335 2018/03/27 08:22:59 tom Exp $
+ * $LynxId: userdefs.h,v 1.336 2018/05/07 23:37:31 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1445,11 +1445,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9dev.18"
+#define LYNX_VERSION "2.8.9dev.19"
 #define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Tue, 27 Mar 2018 04:22:59 -0400"
+#define LYNX_DATE "Mon, 07 May 2018 19:37:31 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-03 15:10:09 +0000