From 7a7c93b265186fb31298bd109c72470243119857 Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Fri, 12 Dec 2014 16:13:06 +0000
Subject: [PATCH] synch with TL 35798
---
source/texk/kpathsea/Makefile.in | 4 ++--
source/texk/web2c/ChangeLog | 6 ++++++
source/texk/web2c/Makefile.in | 6 ++++--
source/texk/web2c/luatexdir/ChangeLog | 11 +++++++++++
source/texk/web2c/luatexdir/am/luafontforge.am | 3 ++-
source/texk/web2c/luatexdir/am/luamisc.am | 1 +
source/texk/web2c/luatexdir/lua/liolibext.c | 7 ++++---
source/texk/web2c/luatexdir/lua/lnodelib.c | 4 ++++
.../luafontloader/fontforge/fontforge/fontviewbase.c | 1 +
.../texk/web2c/luatexdir/luafontloader/src/luafflib.c | 4 ++++
source/texk/web2c/luatexdir/slnunicode/slnunico.c | 4 ++++
11 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/source/texk/kpathsea/Makefile.in b/source/texk/kpathsea/Makefile.in
index 7ecb5f0c7..6d82eb5f3 100644
--- a/source/texk/kpathsea/Makefile.in
+++ b/source/texk/kpathsea/Makefile.in
@@ -110,8 +110,8 @@ DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/c-auto.in \
- $(srcdir)/kpathsea.pc.in strtol.c putenv.c strcasecmp.c \
- strstr.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \
+ $(srcdir)/kpathsea.pc.in putenv.c strstr.c strtol.c \
+ strcasecmp.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \
$(top_srcdir)/../../build-aux/depcomp $(dist_noinst_DATA) \
$(dist_web2c_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \
$(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
index 0da461a43..560dbdea7 100644
--- a/source/texk/web2c/ChangeLog
+++ b/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-11 Karl Berry <karl@tug.org>
+
+ * triptest,
+ * mftraptest: complain early if trip.fmt/trap.base are not created.
+ Original report from vvv, tlbuild 14 Jun 2011 10:25:47.
+
2014-11-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* cpascal.h (makebinaryfile): Avoid gcc -Wunused-value warning.
diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
index a14a5a1c6..c69b351a8 100644
--- a/source/texk/web2c/Makefile.in
+++ b/source/texk/web2c/Makefile.in
@@ -3002,7 +3002,8 @@ libluasocket_sources = \
libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a
libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_INCLUDES)
-libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUAJIT_INCLUDES)
+libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
+ $(LUAJIT_INCLUDES) -DLuajitTeX -I$(srcdir)/luatexdir
libluamisc_a_CFLAGS = # $(WARNING_CFLAGS)
libluajitmisc_a_CFLAGS = # $(WARNING_CFLAGS)
nodist_libluamisc_a_SOURCES = $(libluamisc_sources)
@@ -3061,12 +3062,13 @@ libjitff_a_DEPENDENCIES = libunilib.a libluajitmisc.a
libff_a_postflags = -DLUA_FF_LIB=1 -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 \
-DUSE_OUR_MEMORY=1 \
-I$(top_srcdir)/w2c \
+ -I$(top_srcdir)/luatexdir \
-I$(top_srcdir)/luatexdir/unilib \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
libff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(libff_a_postflags)
-libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) $(libff_a_postflags)
+libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DLuajitTeX $(libff_a_postflags)
libff_a_CFLAGS = # $(WARNING_CFLAGS)
libjitff_a_CFLAGS = # $(WARNING_CFLAGS)
nodist_libff_a_SOURCES = $(libff_sources)
diff --git a/source/texk/web2c/luatexdir/ChangeLog b/source/texk/web2c/luatexdir/ChangeLog
index 16350bc3d..ecf25ff29 100644
--- a/source/texk/web2c/luatexdir/ChangeLog
+++ b/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,14 @@
+2014-12-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Avoid implicit function declarations.
+ * am/luafontforge.am (libjitff_a_CPPFLAGS): Add -DLuajitTeX.
+ * am/luamisc.am (libluajitmisc_a_CPPFLAGS: Add -DLuajitTeX.
+ * lua/liolibext.c, lua/lnodelib.c, luafontloader/src/luafflib.c,
+ slnunicode/slnunico.c: Include lauxlib_bridge.h for LuaJITTeX or
+ lauxlib.h for LuaTeX.
+ * luafontloader/fontforge/fontforge/fontviewbase.c:
+ Include gfile.h.
+
2014-12-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Sync with https://foundry.supelec.fr/svn/luatex/trunk/source/
diff --git a/source/texk/web2c/luatexdir/am/luafontforge.am b/source/texk/web2c/luatexdir/am/luafontforge.am
index 483745db2..e629ca200 100644
--- a/source/texk/web2c/luatexdir/am/luafontforge.am
+++ b/source/texk/web2c/luatexdir/am/luafontforge.am
@@ -16,12 +16,13 @@ $(libjitff_a_OBJECTS): $(libjitff_a_DEPENDENCIES)
libff_a_postflags = -DLUA_FF_LIB=1 -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 \
-DUSE_OUR_MEMORY=1 \
-I$(top_srcdir)/w2c \
+ -I$(top_srcdir)/luatexdir \
-I$(top_srcdir)/luatexdir/unilib \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
libff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(libff_a_postflags)
-libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) $(libff_a_postflags)
+libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DLuajitTeX $(libff_a_postflags)
libff_a_CFLAGS = # $(WARNING_CFLAGS)
libjitff_a_CFLAGS = # $(WARNING_CFLAGS)
diff --git a/source/texk/web2c/luatexdir/am/luamisc.am b/source/texk/web2c/luatexdir/am/luamisc.am
index 42f01cc5b..35fd29f9a 100644
--- a/source/texk/web2c/luatexdir/am/luamisc.am
+++ b/source/texk/web2c/luatexdir/am/luamisc.am
@@ -16,6 +16,7 @@ $(libluajitmisc_a_OBJECTS): $(libluajitmisc_a_DEPENDENCIES)
libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_INCLUDES)
libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUAJIT_INCLUDES)
+libluajitmisc_a_CPPFLAGS += -DLuajitTeX -I$(srcdir)/luatexdir
libluamisc_a_CFLAGS = # $(WARNING_CFLAGS)
libluajitmisc_a_CFLAGS = # $(WARNING_CFLAGS)
diff --git a/source/texk/web2c/luatexdir/lua/liolibext.c b/source/texk/web2c/luatexdir/lua/liolibext.c
index 763076168..65b229cba 100644
--- a/source/texk/web2c/luatexdir/lua/liolibext.c
+++ b/source/texk/web2c/luatexdir/lua/liolibext.c
@@ -26,12 +26,13 @@
#include "ptexlib.h"
#include "lua/luatex-api.h"
-#include "lauxlib.h"
-#include "lualib.h"
#ifdef LuajitTeX
-#include "lauxlib_bridge.h"
+#include "lua/lauxlib_bridge.h"
+#else
+#include "lauxlib.h"
#endif
+#include "lualib.h"
static const char _svn_version[] =
"$Id$ $URL$";
diff --git a/source/texk/web2c/luatexdir/lua/lnodelib.c b/source/texk/web2c/luatexdir/lua/lnodelib.c
index c9e0d5606..4cc337171 100644
--- a/source/texk/web2c/luatexdir/lua/lnodelib.c
+++ b/source/texk/web2c/luatexdir/lua/lnodelib.c
@@ -101,7 +101,11 @@ static const char _svn_version[] =
#include "ptexlib.h"
#include "lua/luatex-api.h"
+#ifdef LuajitTeX
#include "lua/lauxlib_bridge.h"
+#else
+#include "lauxlib.h"
+#endif
/*
diff --git a/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c b/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
index 52b290e00..24798ad09 100644
--- a/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
+++ b/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
@@ -32,6 +32,7 @@
#include <chardata.h>
#include <math.h>
#include <unistd.h>
+#include <gfile.h>
static FontViewBase *fv_list=NULL;
diff --git a/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c b/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
index 469c7bf6f..5dedce7c2 100644
--- a/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
+++ b/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
@@ -29,7 +29,11 @@
#include <stdio.h>
#include <lua.h>
+#ifdef LuajitTeX
+#include <lua/lauxlib_bridge.h>
+#else
#include <lauxlib.h>
+#endif
#include <locale.h>
static const char _svn_version[] =
diff --git a/source/texk/web2c/luatexdir/slnunicode/slnunico.c b/source/texk/web2c/luatexdir/slnunicode/slnunico.c
index 6876abd95..60ef95bac 100644
--- a/source/texk/web2c/luatexdir/slnunicode/slnunico.c
+++ b/source/texk/web2c/luatexdir/slnunicode/slnunico.c
@@ -88,7 +88,11 @@ http://www.unicode.org/Public/UNIDATA/PropList.txt
#include "lua.h"
+#ifdef LuajitTeX
+#include "lua/lauxlib_bridge.h"
+#else
#include "lauxlib.h"
+#endif
#include "lualib.h"
#ifndef SLN_UNICODENAME /* unless set it luaconf */
--
GitLab