Re: LuaTeX 1.0.0?
On Fri, Jan 06, 2017 at 08:38:42PM +0900, Norbert Preining wrote:
> > Just a thought - I wonder whether anyone has considered contacting the
> > teckit developers? It is only this one pair of files
>
> FOr now I have contacted Karl already, we will see what he answers,
> since this is also a problem of TeX Live itself.
A super-helpful response from the TECkit upstream at
https://github.com/silnrsi/teckit/issues/1
The whole SFconv directory is only for building the sfconv binary,
which is not used in XeTeX, so a DFSG version could be created by
simply removing the whole directory.
I've just successfully built a version of texlive-bin with this
directory removed; the whole necessary additional patch against the
orig.tar.gz (removing all of the sfconv mentions from the Makefiles
and configure.ac) is attached, which I guess could be done as either a
debian patch or as a patch for the orig.tar.gz.
Unrelatedly, there are some very easy lintian warnings to fix:
* adresses is misspelled in the current changelog entry
* the five manpage section mismatches (usr/share/man/man1/detex.1.gz
etc) can be fixed by changing "1L" to "1" in the first line of
detex.man, and inserting a "1" after the name in the first line of
the ofm2opl etc. files, so they become something like this instead:
.TH OFM2OPL 1 "14 April 2016" "Web2C @VERSION@"
And one oops: I'm sure the texlive-binaries package shouldn't be
shipping /usr/bin/teckit_compile!
Best wishes,
Julian
diff -Nru texlive-bin-2016.20160513.41080/libs/teckit/TECkit-src/bin/Makefile.am texlive-bin-2016.20160513.41080.dfsg.org/libs/teckit/TECkit-src/bin/Makefile.am
--- texlive-bin-2016.20160513.41080/libs/teckit/TECkit-src/bin/Makefile.am 2016-02-25 06:52:46.000000000 +0000
+++ texlive-bin-2016.20160513.41080.dfsg.org/libs/teckit/TECkit-src/bin/Makefile.am 2017-01-07 23:38:47.122495944 +0000
@@ -1,51 +1,24 @@
AUTOMAKE_OPTIONS = -Wno-portability
-bin_PROGRAMS = teckit_compile txtconv sfconv
+bin_PROGRAMS = teckit_compile txtconv
AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers
-expatdir = $(top_srcdir)/SFconv/expat
tool_src = $(top_srcdir)/source/Sample-tools
-if SYSTEM_EXPAT
-EXPAT_CFLAGS = -DXML_DTD @expat_CFLAGS@
-else
-EXPAT_CFLAGS = -DXML_DTD -I$(expatdir)/xmlparse -I$(expatdir)/xmltok
-noinst_LIBRARIES = libexpat.a
-libexpat_a_SOURCES = @top_builddir@/SFconv/expat/xmlparse/xmlparse.c
-libexpat_a_SOURCES += @top_builddir@/SFconv/expat/xmlparse/hashtable.c
-libexpat_a_SOURCES += @top_builddir@/SFconv/expat/xmltok/xmlrole.c
-libexpat_a_SOURCES += @top_builddir@/SFconv/expat/xmltok/xmltok.c
-libexpat_a_CFLAGS = $(AM_CPPFLAGS) $(EXPAT_CFLAGS)
-$(am_libexpat_a_OBJECTS): CFLAGS := $(filter-out -Wextra, $(CFLAGS))
-endif
-
-# AM_CPPFLAGS += $(EXPAT_CFLAGS)
AM_CFLAGS = $(AM_CPPFLAGS)
teckit_compile_SOURCES = @top_builddir@/source/Sample-tools/TECkit_Compile.cpp
txtconv_SOURCES = @top_builddir@/source/Sample-tools/TxtConv.cpp
-sfconv_SOURCES = @top_builddir@/SFconv/SFconv.cpp
-sfconv_SOURCES += @top_builddir@/SFconv/ConvertUTF.c
-sfconv_CPPFLAGS = $(AM_CPPFLAGS) $(EXPAT_CFLAGS)
-sfconv_CFLAGS = $(AM_CPPFLAGS) $(EXPAT_CFLAGS)
-sfconv_SOURCES += @top_builddir@/SFconv/sfReader.h
-sfconv_SOURCES += @top_builddir@/SFconv/ConvertUTF.h
-sfconv_SOURCES += @top_builddir@/SFconv/Debug_Prefix.h
-sfconv_SOURCES += @top_builddir@/SFconv/Final_Prefix.h
-sfconv_SOURCES += @top_builddir@/SFconv/ushort_chartraits.h
if OLD_LIB_NAMES
teckit_compile_LDADD = $(top_builddir)/lib/TECkit_Compiler_x86.la
txtconv_LDADD = $(top_builddir)/lib/TECkit_x86.la
-sfconv_LDADD = $(top_builddir)/lib/TECkit_x86.la @expat_LIBS@
else
teckit_compile_LDADD = $(top_builddir)/lib/libTECkit_Compiler.la
txtconv_LDADD = $(top_builddir)/lib/libTECkit.la
-sfconv_LDADD = $(top_builddir)/lib/libTECkit.la @expat_LIBS@
endif
-sfconv_LDADD += $(noinst_LIBRARIES)
# --> RC Support
if OLD_LIB_NAMES
@@ -59,8 +32,4 @@
TxtConv_ver.o: $(tool_src)/TxtConv_ver.rc
$(RC) $(AM_RCFLAGS) $(RCFLAGS) -o $@ $<
-sfconv_DEPENDENCIES = SFconv_ver.o
-sfconv_LDFLAGS = -Wl,SFconv_ver.o
-SFconv_ver.o: $(top_srcdir)/SFconv/SFconv_ver.rc
- $(RC) $(AM_RCFLAGS) $(RCFLAGS) -I$(tool_src) -o $@ $<
endif
diff -Nru texlive-bin-2016.20160513.41080/libs/teckit/TECkit-src/configure.ac texlive-bin-2016.20160513.41080.dfsg.org/libs/teckit/TECkit-src/configure.ac
--- texlive-bin-2016.20160513.41080/libs/teckit/TECkit-src/configure.ac 2016-02-25 06:52:46.000000000 +0000
+++ texlive-bin-2016.20160513.41080.dfsg.org/libs/teckit/TECkit-src/configure.ac 2017-01-07 23:39:26.945680749 +0000
@@ -105,19 +105,6 @@
LIBS="$LIBS -g -finstrument-functions -lfnccheck "
fi
-# We only want expat for sfconv, so remember the libs setting without it
-# (this seems really hacky, but I don't know the proper way....!)
-noexpat_CFLAGS="$CFLAGS"
-noexpat_LIBS="$LIBS"
-AC_CHECK_LIB(expat, XML_ExpatVersion)
-AM_CONDITIONAL(SYSTEM_EXPAT, test x$ac_cv_lib_expat_XML_ExpatVersion = xyes)
-expat_CFLAGS="$CFLAGS"
-expat_LIBS="$LIBS"
-CFLAGS="$noexpat_CFLAGS"
-LIBS="$noexpat_LIBS"
-AC_SUBST(expat_CFLAGS)
-AC_SUBST(expat_LIBS)
-
AC_CONFIG_FILES([ Makefile \
teckit.pc:installed-top.pc.in:teckit.pc.in \
teckit-uninstalled.pc:uninstalled-top.pc.in:teckit.pc.in \
Reply to: