From 9265f153a9e4c6c04e0a6010206d8d8514b5ba6d Mon Sep 17 00:00:00 2001 From: Luigi Scarso <luigi.scarso@gmail.com> Date: Sun, 26 Apr 2020 22:23:38 +0000 Subject: [PATCH] update with upstream. --- source/texk/web2c/Makefile.in | 14 ++++++-------- source/texk/web2c/xetexdir/am/xetex.am | 15 ++++++--------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index 0ee5f6d6c..0e90b896a 100644 --- a/source/texk/web2c/Makefile.in +++ b/source/texk/web2c/Makefile.in @@ -4638,24 +4638,22 @@ xe_tangle = WEBINPUTS=.:$(srcdir)/xetexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh libxetex = libxetex.a xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \ - $(GRAPHITE2_INCLUDES) $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) \ - $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_109) \ + $(GRAPHITE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) \ + $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_109) \ $(am__append_111) xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \ - $(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(POPPLER_LIBS) \ - $(LIBPNG_LIBS) $(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a \ + $(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(LIBPNG_LIBS) \ + $(FREETYPE2_LIBS) $(ZLIB_LIBS) $(PPLIB_LIBS) libmd5.a \ $(am__append_112) xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \ $(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \ - $(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \ - $(ZLIB_DEPEND) libmd5.a + $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) \ + $(PPLIB_DEPEND) libmd5.a @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_151) xetex_CFLAGS = $(WARNING_CFLAGS) xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) - -# We must create libxetex.a etc before building the xetex_OBJECTS xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c diff --git a/source/texk/web2c/xetexdir/am/xetex.am b/source/texk/web2c/xetexdir/am/xetex.am index 6a73fe1f8..ebba594c5 100644 --- a/source/texk/web2c/xetexdir/am/xetex.am +++ b/source/texk/web2c/xetexdir/am/xetex.am @@ -1,7 +1,7 @@ -## $Id: xetex.am 51510 2019-06-30 13:42:49Z hironobu $ +## $Id: xetex.am 54889 2020-04-26 17:49:07Z karl $ ## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX. ## -## Copyright 2017 Karl Berry <tex-live@tug.org> +## Copyright 2017-2020 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -28,19 +28,19 @@ xetex_cppflags += $(FREETYPE2_INCLUDES) xetex_cppflags += $(TECKIT_INCLUDES) xetex_cppflags += $(HARFBUZZ_INCLUDES) xetex_cppflags += $(GRAPHITE2_INCLUDES) -xetex_cppflags += $(POPPLER_INCLUDES) xetex_cppflags += $(LIBPNG_INCLUDES) xetex_cppflags += $(ZLIB_INCLUDES) +xetex_cppflags += $(PPLIB_INCLUDES) xetex_cppflags += -I$(srcdir)/libmd5 xetex_ldadd = $(libxetex) xetex_ldadd += $(HARFBUZZ_LIBS) xetex_ldadd += $(GRAPHITE2_LIBS) xetex_ldadd += $(ICU_LIBS) $(ICU_LIBS_EXTRA) xetex_ldadd += $(TECKIT_LIBS) -xetex_ldadd += $(POPPLER_LIBS) xetex_ldadd += $(LIBPNG_LIBS) xetex_ldadd += $(FREETYPE2_LIBS) xetex_ldadd += $(ZLIB_LIBS) +xetex_ldadd += $(PPLIB_LIBS) xetex_ldadd += libmd5.a xetex_dependencies = $(proglib) xetex_dependencies += $(KPATHSEA_DEPEND) @@ -48,26 +48,23 @@ xetex_dependencies += $(ICU_DEPEND) xetex_dependencies += $(TECKIT_DEPEND) xetex_dependencies += $(HARFBUZZ_DEPEND) xetex_dependencies += $(GRAPHITE2_DEPEND) -xetex_dependencies += $(POPPLER_DEPEND) xetex_dependencies += $(LIBPNG_DEPEND) xetex_dependencies += $(FREETYPE2_DEPEND) xetex_dependencies += $(ZLIB_DEPEND) +xetex_dependencies += $(PPLIB_DEPEND) xetex_dependencies += libmd5.a if XETEX_MACOSX - xetex_cppflags += -DXETEX_MAC xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa OBJCXXFLAGS += -std=c++11 else !XETEX_MACOSX - xetex_cppflags += $(FONTCONFIG_INCLUDES) xetex_ldadd += $(FONTCONFIG_LIBS) endif !XETEX_MACOSX - xetex_CPPFLAGS = $(xetex_cppflags) xetex_CFLAGS = $(WARNING_CFLAGS) xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) @@ -75,7 +72,7 @@ xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) ## With --enable-ipc, XeTeX may need to link with -lsocket. xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) -# We must create libxetex.a etc before building the xetex_OBJECTS +## We must create libxetex.a etc before building the xetex_OBJECTS xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h $(xetex_OBJECTS): $(xetex_prereq) -- GitLab