Hello community, here is the log from the commit of package texlive for openSUSE:Factory checked in at 2019-07-13 13:41:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive (Old) and /work/SRC/openSUSE:Factory/.texlive.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive" Sat Jul 13 13:41:54 2019 rev:54 rq:713338 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive/texlive.changes 2019-04-28 19:58:19.918975528 +0200 +++ /work/SRC/openSUSE:Factory/.texlive.new.4615/texlive.changes 2019-07-13 13:58:50.542926520 +0200 @@ -1,0 +2,80 @@ +Thu Jul 4 06:35:49 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Clean patch source.dif that is remove left over from TeXLive 2018 (boo#1140203) + +------------------------------------------------------------------- +Fri May 31 12:29:26 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Avoid error on older compiler as well as older glm on Leap 42.3 + +------------------------------------------------------------------- +Wed May 29 06:37:37 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Correct /etc/texmf/web2c/texmf.cnf (boo#1136314) + +------------------------------------------------------------------- +Mon May 20 12:31:56 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Reenable ARM_COMPLIANT=1 on ARM but fix the memory errors + +------------------------------------------------------------------- +Fri May 17 13:38:23 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Let's give ARM_COMPLIANT=0 on armv7l/aarch64 a try + +------------------------------------------------------------------- +Tue May 14 10:15:40 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Add patch source-poppler0.59.0.patch to support older systems + as well + +------------------------------------------------------------------- +Tue May 14 08:29:47 UTC 2019 - Dr. Werner Fink <[email protected]> + +- On 32bit systems disable some more biber tests with negative + values for dateformats as those will always fail + +------------------------------------------------------------------- +Mon May 13 12:38:47 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Make it build by modifying patches + * source-configure.dif + * source-fix-bool-poppler.patch + * source-fix-const-poppler0.66.0.patch + * source-poppler-fix-dict-memleak.patch + * source-poppler-use-std_string.patch + * source.dif + and the spec file by moving the code of the choice of the + poppler source below the patching area as well as build + require pkgconfig(glew), pkgconfig(glm), and pkgconfig(gsl) + for asymptote + +------------------------------------------------------------------- +Fri May 10 13:04:02 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Update to TeXLive 2019 (boo#1135744) +- Modify patches + * biber-certs.dif + * source-64.dif + * source-configure.dif + * source-dviutils.dif + * source-fix-bool-poppler.patch + * source-fix-const-poppler0.66.0.patch + * source-overflow.dif + * source-poppler-fix-dict-memleak.patch + * source-poppler-use-std_string.patch + * source-synctex-bump-soname.dif + * source-texdoc.dif + * source-warns.dif + * source.dif +- Drop obsolate patches + * freetype-use-pkg-config.patch + * source-bsc1109673.dif + * source-dvipdfm-x.dif + * source-fix-synctex-missing-header-install.dif + * source-lua-fix-bad-compare.patch + * source-m-tx-0.63a-buffer-overflow.dif + * source-patgen.dif + * source-tounicode.dif + +------------------------------------------------------------------- @@ -4,0 +85,5 @@ + +------------------------------------------------------------------- +Wed Apr 17 12:35:06 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Update to biber 2.12 Old: ---- biblatex-biber-2.11.tar.xz freetype-use-pkg-config.patch source-bsc1109673.dif source-dvipdfm-x.dif source-fix-synctex-missing-header-install.dif source-lua-fix-bad-compare.patch source-m-tx-0.63a-buffer-overflow.dif source-patgen.dif source-tounicode.dif texlive-20180414-source.tar.xz New: ---- biber-2.12.tar.xz source-poppler0.59.0.patch texlive-20190407-source.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive.spec ++++++ ++++ 1194 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive/texlive.spec ++++ and /work/SRC/openSUSE:Factory/.texlive.new.4615/texlive.spec ++++++ biblatex-biber-2.11.tar.xz -> biber-2.12.tar.xz ++++++ ++++ 11887 lines of diff (skipped) ++++++ biber-certs.dif ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.698925861 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.698925861 +0200 @@ -1,9 +1,7 @@ --- Build.PL | 1 - - META.json | 1 - - META.yml | 1 - bin/biber | 2 ++ - 4 files changed, 2 insertions(+), 3 deletions(-) + 2 files changed, 2 insertions(+), 1 deletion(-) --- Build.PL +++ Build.PL 2018-04-12 12:07:59.531719830 +0000 @@ -15,29 +13,9 @@ 'Regexp::Common' => 0, 'Log::Log4perl' => 0, 'Unicode::Collate' => '1.25', ---- META.json -+++ META.json 2018-04-12 12:08:19.691347923 +0000 -@@ -49,7 +49,6 @@ - "List::MoreUtils" : "0", - "List::MoreUtils::XS" : "0", - "Log::Log4perl" : "0", -- "Mozilla::CA" : "20160104", - "PerlIO::utf8_strict" : "0", - "Regexp::Common" : "0", - "Sort::Key" : "0", ---- META.yml -+++ META.yml 2018-04-12 12:08:45.330874919 +0000 -@@ -94,7 +94,6 @@ requires: - List::MoreUtils: '0' - List::MoreUtils::XS: '0' - Log::Log4perl: '0' -- Mozilla::CA: '20160104' - PerlIO::utf8_strict: '0' - Regexp::Common: '0' - Sort::Key: '0' --- bin/biber +++ bin/biber 2018-04-12 12:06:39.913188617 +0000 -@@ -114,6 +114,8 @@ GetOptions( +@@ -116,6 +116,8 @@ GetOptions( ) or pod2usage(-verbose => 0, -exitval => EXIT_ERROR); ++++++ source-64.dif ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.734925850 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.734925850 +0200 @@ -5,7 +5,7 @@ --- configure +++ configure 2018-04-10 08:58:00.463820598 +0000 -@@ -20730,6 +20730,10 @@ fi +@@ -20674,6 +20674,10 @@ fi # most powerpc-linux boxes support dynamic linking these days and # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. ++++++ source-configure.dif ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.750925845 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.750925845 +0200 @@ -1,12 +1,12 @@ --- - configure | 3 --- configure.ac | 3 --- - texk/dvipdfm-x/configure | 8 ++++---- + m4/kpse-setup.m4 | 3 ++- texk/dvipdfm-x/configure.ac | 2 +- - 4 files changed, 5 insertions(+), 11 deletions(-) + texk/dvisvgm/configure.ac | 1 + + 4 files changed, 4 insertions(+), 5 deletions(-) --- configure.ac -+++ configure.ac 2018-04-10 08:18:33.592283965 +0000 ++++ configure.ac 2019-05-13 10:27:04.041797653 +0000 @@ -126,9 +126,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([ if test "x$syslib_status" = xno; then AC_MSG_ERROR([some requested system libraries failed]) @@ -17,51 +17,36 @@ KPSE_RESTORE_FLAGS AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) ---- configure -+++ configure 2018-04-10 08:18:33.596283890 +0000 -@@ -22265,9 +22265,6 @@ fi - if test "x$syslib_status" = xno; then - as_fn_error $? "some requested system libraries failed" "$LINENO" 5 - fi --if test "x$syslib_used:$enable_native_texlive_build" = xyes:yes; then -- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 --fi - CPPFLAGS=$kpse_save_CPPFLAGS - LIBS=$kpse_save_LIBS - +--- m4/kpse-setup.m4 ++++ m4/kpse-setup.m4 2019-05-13 10:27:04.041797653 +0000 +@@ -30,7 +30,8 @@ AC_ARG_ENABLE([native-texlive-build], + AS_HELP_STRING([--disable-native-texlive-build], + [do not build for the TeX Live binary distribution]))[]dnl + AS_CASE([$enable_native_texlive_build], +- [yes | no], [:], ++ [yes | no], [ ++ ac_configure_args="$ac_configure_args '--enable-native-texlive-build=$enable_native_texlive_build'"], + [enable_native_texlive_build=yes + ac_configure_args="$ac_configure_args '--enable-native-texlive-build'"]) + AS_CASE([$enable_largefile], --- texk/dvipdfm-x/configure.ac -+++ texk/dvipdfm-x/configure.ac 2018-04-10 08:22:36.759724038 +0000 ++++ texk/dvipdfm-x/configure.ac 2019-05-13 10:27:04.041797653 +0000 @@ -7,7 +7,7 @@ dnl This file is free software; the co dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl --AC_INIT([dvipdfm-x (TeX Live)], [20180217], [[email protected]]) -+AC_INIT([dvipdfmx (TeX Live)], [20180217], [[email protected]]) +-AC_INIT([dvipdfm-x (TeX Live)], [20190225], [[email protected]]) ++AC_INIT([dvipdfmx (TeX Live)], [20190225], [[email protected]]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_AUX_DIR([../../build-aux]) ---- texk/dvipdfm-x/configure -+++ texk/dvipdfm-x/configure 2018-04-10 08:24:05.082067815 +0000 -@@ -588,10 +588,10 @@ MFLAGS= - MAKEFLAGS= - - # Identity of this package. --PACKAGE_NAME='dvipdfm-x (TeX Live)' --PACKAGE_TARNAME='dvipdfm-x--tex-live-' -+PACKAGE_NAME='dvipdfmx (TeX Live)' -+PACKAGE_TARNAME='dvipdfmx' - PACKAGE_VERSION='20180217' --PACKAGE_STRING='dvipdfm-x (TeX Live) 20180217' -+PACKAGE_STRING='dvipdfmx (TeX Live) 20180217' - PACKAGE_BUGREPORT='[email protected]' - PACKAGE_URL='' - -@@ -8074,7 +8074,7 @@ fi - - - # Define the identity of the package. -- PACKAGE='dvipdfm-x--tex-live-' -+ PACKAGE='dvipdfmx' - VERSION='20180217' - - +--- texk/dvisvgm/configure.ac ++++ texk/dvisvgm/configure.ac 2019-05-13 10:34:27.319097098 +0000 +@@ -59,6 +59,7 @@ if test "x$enable_native_texlive_build" + HAVE_LIBGS=0 + else + have_libgs=yes ++ HAVE_LIBGS=$have_libgs + AC_CHECK_HEADER([ghostscript/iapi.h], + [AC_CHECK_LIB(gs, gsapi_revision,, [have_libgs=no])], + [have_libgs=no]) ++++++ source-dviutils.dif ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.762925841 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.762925841 +0200 @@ -60,7 +60,7 @@ +exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2 --- texk/seetexk/configure +++ texk/seetexk/configure 2018-04-10 08:25:10.644838384 +0000 -@@ -14939,7 +14939,7 @@ elif test "x$need_kpathsea:$with_system_ +@@ -14943,7 +14943,7 @@ elif test "x$need_kpathsea:$with_system_ as_fn_error $? "did not find kpathsea" "$LINENO" 5 fi else ++++++ source-fix-bool-poppler.patch ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.770925839 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.770925839 +0200 @@ -4,137 +4,58 @@ Subject: [PATCH] Use bool instead of GBool --- - luatexdir/image/pdftoepdf.w | 12 ++++++------ - luatexdir/lua/lepdflib.cc | 20 ++++++++++---------- - pdftexdir/pdftoepdf.cc | 6 +++--- - pdftexdir/pdftosrc.cc | 4 ++-- - 4 files changed, 16 insertions(+), 16 deletions(-) + texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc | 6 +++--- + texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc | 6 +++--- + texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc | 6 +++--- + texk/web2c/pdftexdir/pdftosrc.cc | 4 ++-- + 4 files changed, 11 insertions(+), 11 deletions(-) -diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w -index 7ba2973..dedc489 100644 ---- a/texk/web2c/luatexdir/image/pdftoepdf.w -+++ b/texk/web2c/luatexdir/image/pdftoepdf.w -@@ -35,7 +35,7 @@ - - extern void md5(Guchar *msg, int msgLen, Guchar *digest); +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc 2019-05-13 08:46:30.531477531 +0000 +@@ -120,7 +120,7 @@ struct UsedEncoding { + static InObj *inObjList; + static UsedEncoding *encodingList; -static GBool isInit = gFalse; +static bool isInit = false; - /* Maintain AVL tree of all PDF files for embedding */ + // -------------------------------------------------------------------- + // Maintain list of open embedded PDF files +@@ -724,8 +724,8 @@ read_pdf_info(char *image_name, char *pa + // initialize + if (!isInit) { + globalParams = new GlobalParams(); +- globalParams->setErrQuiet(gFalse); +- isInit = gTrue; ++ globalParams->setErrQuiet(false); ++ isInit = true; + } + // open PDF file + pdf_doc = find_add_document(image_name); +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc 2019-05-13 08:46:38.347329153 +0000 +@@ -120,7 +120,7 @@ struct UsedEncoding { + + static InObj *inObjList; + static UsedEncoding *encodingList; +-static GBool isInit = gFalse; ++static bool isInit = false; -@@ -587,11 +587,11 @@ void read_pdf_info(image_dict * idict) - const PDFRectangle *pagebox; - int pdf_major_version_found, pdf_minor_version_found; - float xsize, ysize, xorig, yorig; -- if (isInit == gFalse) { -+ if (isInit == false) { - if (!(globalParams)) - globalParams = new GlobalParams(); + // -------------------------------------------------------------------- + // Maintain list of open embedded PDF files +@@ -724,8 +724,8 @@ read_pdf_info(char *image_name, char *pa + // initialize + if (!isInit) { + globalParams = new GlobalParams(); - globalParams->setErrQuiet(gFalse); - isInit = gTrue; + globalParams->setErrQuiet(false); + isInit = true; } - if (img_type(idict) == IMG_TYPE_PDF) - pdf_doc = refPdfDocument(img_filepath(idict), FE_FAIL); -@@ -966,7 +966,7 @@ void epdf_free() - if (PdfDocumentTree != NULL) - avl_destroy(PdfDocumentTree, destroyPdfDocument); - PdfDocumentTree = NULL; -- if (isInit == gTrue) -+ if (isInit == true) - delete globalParams; -- isInit = gFalse; -+ isInit = false; - } -diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc -index a16bf3b..36f1601 100644 ---- a/texk/web2c/luatexdir/lua/lepdflib.cc -+++ b/texk/web2c/luatexdir/lua/lepdflib.cc -@@ -439,7 +439,7 @@ static int l_new_Object(lua_State * L) - break; - case 1: - if (lua_isboolean (L,1)) { -- uout->d = new Object(lua_toboolean(L, 1)? gTrue : gFalse); -+ uout->d = new Object(lua_toboolean(L, 1)? true : false); - uout->atype = ALLOC_LEPDF; - uout->pc = 0; - uout->pd = NULL; -@@ -1527,9 +1527,9 @@ static int m_Object_initBool(lua_State * L) - pdfdoc_changed_error(L); - luaL_checktype(L, 2, LUA_TBOOLEAN); - if (lua_toboolean(L, 2) != 0) -- *((Object *) uin->d) = Object(gTrue); -+ *((Object *) uin->d) = Object(true); - else -- *((Object *) uin->d) = Object(gFalse); -+ *((Object *) uin->d) = Object(false); - return 0; - } - -@@ -3038,12 +3038,12 @@ m_poppler_get_BOOL(Attribute, isHidden); - - static int m_Attribute_setHidden(lua_State * L) - { -- GBool i; -+ bool i; - udstruct *uin; - uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- i = (GBool) lua_toboolean(L, 2); -+ i = lua_toboolean(L, 2); - ((Attribute *) uin->d)->setHidden(i); - return 0; - } -@@ -3180,7 +3180,7 @@ static int m_StructElement_getParentRef(lua_State * L) - // Ref is false if the C++ functione return false - static int m_StructElement_getPageRef(lua_State * L) - { -- GBool b; -+ bool b; - Ref *r; - udstruct *uin, *uout; - uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); -@@ -3226,13 +3226,13 @@ static int m_StructElement_setRevision(lua_State * L) - - static int m_StructElement_getText(lua_State * L) - { -- GBool i; -+ bool i; - const GooString *gs; - udstruct *uin; - uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- i = (GBool) lua_toboolean(L, 2); -+ i = lua_toboolean(L, 2); - gs = ((StructElement *) uin->d)->getText(i); - if (gs != NULL) - lua_pushlstring(L, gs->getCString(), gs->getLength()); -@@ -3321,7 +3321,7 @@ static int m_StructElement_findAttribute(lua_State * L) - { - Attribute::Type t; - Attribute::Owner o; -- GBool g; -+ bool g; - udstruct *uin, *uout; - const Attribute *a; - uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); -@@ -3329,7 +3329,7 @@ static int m_StructElement_findAttribute(lua_State * L) - pdfdoc_changed_error(L); - t = (Attribute::Type) luaL_checkint(L,1); - o = (Attribute::Owner) luaL_checkint(L,2); -- g = (GBool) lua_toboolean(L, 3); -+ g = lua_toboolean(L, 3); - a = ((StructElement *) uin->d)->findAttribute(t,g,o); - - if (a!=NULL){ -diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc -index 013cf13..d26ac61 100644 ---- a/texk/web2c/pdftexdir/pdftoepdf.cc -+++ b/texk/web2c/pdftexdir/pdftoepdf.cc + // open PDF file + pdf_doc = find_add_document(image_name); +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc 2019-05-13 08:46:45.075201428 +0000 @@ -120,7 +120,7 @@ struct UsedEncoding { static InObj *inObjList; @@ -144,7 +65,7 @@ // -------------------------------------------------------------------- // Maintain list of open embedded PDF files -@@ -724,8 +724,8 @@ read_pdf_info(char *image_name, char *page_name, int page_num, +@@ -724,8 +724,8 @@ read_pdf_info(char *image_name, char *pa // initialize if (!isInit) { globalParams = new GlobalParams(); @@ -157,9 +78,9 @@ pdf_doc = find_add_document(image_name); diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc index 3b1d250..7dbee00 100644 ---- a/texk/web2c/pdftexdir/pdftosrc.cc -+++ b/texk/web2c/pdftexdir/pdftosrc.cc -@@ -173,9 +173,9 @@ int main(int argc, char *argv[]) +--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc ++++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc +@@ -178,9 +178,9 @@ int main(int argc, char *argv[]) // parse the header: object numbers and offsets objStr.streamReset(); ++++++ source-fix-const-poppler0.66.0.patch ++++++ ++++ 876 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive/source-fix-const-poppler0.66.0.patch ++++ and /work/SRC/openSUSE:Factory/.texlive.new.4615/source-fix-const-poppler0.66.0.patch ++++++ source-overflow.dif ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.786925834 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.790925832 +0200 @@ -4,7 +4,7 @@ --- utils/lacheck/lacheck.test +++ utils/lacheck/lacheck.test 2018-04-10 08:57:17.672625041 +0000 -@@ -7,5 +7,6 @@ +@@ -9,5 +9,6 @@ ./lacheck $srcdir/test.tex | \ sed -e "s!$srcdir/test.tex!./test.tex!g" >test.out || exit 1 ++++++ source-poppler-fix-dict-memleak.patch ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.794925832 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.798925830 +0200 @@ -4,51 +4,70 @@ Subject: [PATCH] Avoid leaking string copy --- - luatexdir/lua/lepdflib.cc | 4 ++-- - pdftexdir/pdftoepdf.cc | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc | 2 +- + texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc | 2 +- + texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc | 2 +- + texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc | 2 +- + texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/luatexdir/lua/lepdflib.cc b/luatexdir/lua/lepdflib.cc -index 6ac6f7a..8239518 100644 ---- a/texk/web2c/luatexdir/lua/lepdflib.cc -+++ b/texk/web2c/luatexdir/lua/lepdflib.cc -@@ -1125,12 +1125,12 @@ m_poppler_get_INT(Dict, getLength); - - static int m_Dict_add(lua_State * L) - { -- char *s; -+ const char *s; - udstruct *uin, *uobj; - uin = (udstruct *) luaL_checkudata(L, 1, M_Dict); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- s = copyString(luaL_checkstring(L, 2)); -+ s = luaL_checkstring(L, 2); - uobj = (udstruct *) luaL_checkudata(L, 3, M_Object); - ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d))); - return 0; -@@ -2051,7 +2051,7 @@ static int m_Object_dictAdd(lua_State * L) - pdfdoc_changed_error(L); - if (!((Object *) uin->d)->isDict()) - luaL_error(L, "Object is not a Dict"); -- ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d))); -+ ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d))); - return 0; - } - -diff --git a/pdftexdir/pdftoepdf.cc b/pdftexdir/pdftoepdf.cc -index 98156ca..2ea5555 100644 ---- a/texk/web2c/pdftexdir/pdftoepdf.cc -+++ b/texk/web2c/pdftexdir/pdftoepdf.cc +diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc @@ -977,7 +977,7 @@ The changes below seem to work fine. } l = dic1.getLength(); for (i = 0; i < l; i++) { -- groupDict.dictAdd(copyString(dic1.getKey(i)), -+ groupDict.dictAdd(dic1.getKey(i), +- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)), ++ groupDict.dictAdd((const char *)dic1.getKey(i), dic1.getValNF(i)); } // end modification --- -2.19.2 - +diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc +@@ -977,7 +977,7 @@ The changes below seem to work fine. + } + l = dic1.getLength(); + for (i = 0; i < l; i++) { +- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)), ++ groupDict.dictAdd((const char *)dic1.getKey(i), + dic1.getValNF(i)); + } + // end modification +diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc +@@ -977,7 +977,7 @@ The changes below seem to work fine. + } + l = dic1.getLength(); + for (i = 0; i < l; i++) { +- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)), ++ groupDict.dictAdd((const char *)dic1.getKey(i), + dic1.getValNF(i)); + } + // end modification +diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc +@@ -977,7 +977,7 @@ The changes below seem to work fine. + } + l = dic1.getLength(); + for (i = 0; i < l; i++) { +- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)), ++ groupDict.dictAdd((const char *)dic1.getKey(i), + dic1.getValNF(i)); + } + // end modification +diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc +--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc +@@ -977,7 +977,7 @@ The changes below seem to work fine. + } + l = dic1.getLength(); + for (i = 0; i < l; i++) { +- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)), ++ groupDict.dictAdd((const char *)dic1.getKey(i), + dic1.getValNF(i).copy()); + } + // end modification ++++++ source-poppler-use-std_string.patch ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.802925829 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.802925829 +0200 @@ -4,155 +4,23 @@ Subject: [PATCH] std::string --- - luatexdir/image/pdftoepdf.w | 2 +- - luatexdir/lua/lepdflib.cc | 20 ++++++++++++-------- - pdftexdir/pdftoepdf.cc | 6 +++--- - pdftexdir/pdftosrc.cc | 6 +++--- - 4 files changed, 19 insertions(+), 15 deletions(-) + texk/web2c/pdftexdir/pdftosrc.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w -index dedc489..241bf1d 100644 ---- a/texk/web2c/luatexdir/image/pdftoepdf.w -+++ b/texk/web2c/luatexdir/image/pdftoepdf.w -@@ -366,7 +366,7 @@ static void copyString(PDF pdf, const GooString * string) - const char *p; - unsigned char c; - size_t i, l; -- p = string->getCString(); -+ p = string->c_str(); - l = (size_t) string->getLength(); - if (pdf->cave) - pdf_out(pdf, ' '); -diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc -index 36f1601..b816745 100644 ---- a/texk/web2c/luatexdir/lua/lepdflib.cc -+++ b/texk/web2c/luatexdir/lua/lepdflib.cc -@@ -240,7 +240,7 @@ static int l_new_Attribute(lua_State * L) - if (uobj->pd != NULL && uobj->pd->pc != uobj->pc) - pdfdoc_changed_error(L); - uout = new_Attribute_userdata(L); -- uout->d = new Attribute(n, nlen, (Object *)uobj->d); -+ uout->d = new Attribute({n, nlen}, (Object *)uobj->d); - uout->atype = ALLOC_LEPDF; - uout->pc = uobj->pc; - uout->pd = uobj->pd; -@@ -677,7 +677,7 @@ static int m_##in##_##function(lua_State * L) \ - pdfdoc_changed_error(L); \ - gs = ((in *) uin->d)->function(); \ - if (gs != NULL) \ -- lua_pushlstring(L, gs->getCString(), gs->getLength()); \ -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); \ - else \ - lua_pushnil(L); \ - return 1; \ -@@ -912,7 +912,7 @@ static int m_Array_getString(lua_State * L) - if (i > 0 && i <= len) { - gs = new GooString(); - if (((Array *) uin->d)->getString(i - 1, gs)) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - delete gs; -@@ -1064,7 +1064,7 @@ static int m_Catalog_getJS(lua_State * L) - if (i > 0 && i <= len) { - gs = ((Catalog *) uin->d)->getJS(i - 1); - if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - delete gs; -@@ -1379,7 +1379,7 @@ static int m_GooString__tostring(lua_State * L) - uin = (udstruct *) luaL_checkudata(L, 1, M_GooString); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- lua_pushlstring(L, ((GooString *) uin->d)->getCString(), -+ lua_pushlstring(L, ((GooString *) uin->d)->c_str(), - ((GooString *) uin->d)->getLength()); - return 1; - } -@@ -1815,7 +1815,7 @@ static int m_Object_getString(lua_State * L) - pdfdoc_changed_error(L); - if (((Object *) uin->d)->isString()) { - gs = ((Object *) uin->d)->getString(); -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - } else - lua_pushnil(L); - return 1; -@@ -2473,7 +2473,7 @@ static int m_PDFDoc_getFileName(lua_State * L) - pdfdoc_changed_error(L); - gs = ((PdfDocument *) uin->d)->doc->getFileName(); - if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - return 1; -@@ -2562,7 +2562,7 @@ static int m_PDFDoc_readMetadata(lua_State * L) - if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { - gs = ((PdfDocument *) uin->d)->doc->readMetadata(); - if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - } else -@@ -3239,7 +3239,7 @@ static int m_StructElement_getText(lua_State * L) - i = lua_toboolean(L, 2); - gs = ((StructElement *) uin->d)->getText(i); - if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - return 1; -diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc -index d26ac61..7c14570 100644 ---- a/texk/web2c/pdftexdir/pdftoepdf.cc -+++ b/texk/web2c/pdftexdir/pdftoepdf.cc -@@ -22,7 +22,7 @@ This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at - https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk - by Arch Linux. A little modifications are made to avoid a crash for - some kind of pdf images, such as figure_missing.pdf in gnuplot. --The poppler should be 0.59.0 or newer versions. -+The poppler should be 0.72.0 or newer versions. - POPPLER_VERSION should be defined. - */ - -@@ -427,7 +427,7 @@ static void copyFont(const char *tag, Object * fontRef) - charset = fontdesc.dictLookup("CharSet"); - if (!charset.isNull() && - charset.isString() && is_subsetable(fontmap)) -- epdf_mark_glyphs(fd, charset.getString()->getCString()); -+ epdf_mark_glyphs(fd, charset.getString()->c_str()); - else - embed_whole_font(fd); - addFontDesc(fontdescRef.getRef(), fd); -@@ -566,7 +566,7 @@ static void copyObject(Object * obj) - pdf_printf("%s", convertNumToPDF(obj->getNum())); - } else if (obj->isString()) { - s = obj->getString(); -- p = s->getCString(); -+ p = s->c_str(); - l = s->getLength(); - if (strlen(p) == (unsigned int) l) { - pdf_puts("("); diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc index 7dbee00..cc44daf 100644 ---- a/texk/web2c/pdftexdir/pdftosrc.cc -+++ b/texk/web2c/pdftexdir/pdftosrc.cc -@@ -109,7 +109,7 @@ int main(int argc, char *argv[]) +--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc ++++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc +@@ -114,7 +114,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "No SourceName found\n"); exit(1); } -- outname = srcName.getString()->getCString(); -+ outname = srcName.getString()->c_str(); +- outname = (char *)srcName.getString()->getCString(); ++ outname = (char *)srcName.getString()->c_str(); // We cannot free srcName, as objname shares its string. // srcName.free(); } else if (objnum > 0) { -@@ -118,7 +118,7 @@ int main(int argc, char *argv[]) +@@ -123,7 +123,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Not a Stream object\n"); exit(1); } @@ -161,7 +29,7 @@ if ((p = strrchr(buf, '.')) == 0) p = strchr(buf, 0); if (objgen == 0) -@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) +@@ -133,7 +133,7 @@ int main(int argc, char *argv[]) outname = buf; } else { // objnum < 0 means we are extracting the XRef table extract_xref_table = true; ++++++ source-poppler0.59.0.patch ++++++ ++++ 1120 lines (skipped) ++++++ source-synctex-bump-soname.dif ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.822925823 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.822925823 +0200 @@ -3,15 +3,14 @@ texk/web2c/synctexdir/synctex_parser_api_level | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) - --- texk/web2c/synctexdir/ac/synctex.ac -+++ texk/web2c/synctexdir/ac/synctex.ac 2018-04-23 11:57:26.371746955 +0000 -@@ -5,7 +5,7 @@ dnl You may freely use, modify and/or di - dnl ++++ texk/web2c/synctexdir/ac/synctex.ac 2019-04-18 07:52:09.402744074 +0000 +@@ -6,7 +6,7 @@ dnl dnl Additional code for synctex dnl --m4_define([synctex_version], m4_chomp(m4_include([synctexdir/synctex_parser_version.txt]))[.0]) -+m4_define([synctex_version], m4_chomp(m4_include([synctexdir/synctex_parser_api_level]))[.0]) + m4_define([synctex_version], +- m4_chomp(m4_include([synctexdir/synctex_parser_api_level.txt]))) ++ m4_chomp(m4_include([synctexdir/synctex_parser_api_level]))) AC_SUBST([SYNCTEXVERSION], [synctex_version]) KPSE_LT_VERSION([synctex]) ++++++ source-texdoc.dif ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.830925821 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.830925821 +0200 @@ -4,7 +4,7 @@ --- utils/texdoctk/texdoctk.pl +++ utils/texdoctk/texdoctk.pl 2008-09-24 14:56:14.000000000 +0000 -@@ -1461,7 +1461,7 @@ sub writerc { +@@ -1476,7 +1476,7 @@ sub writerc { mv $myrc,"$myrc.save" if (-e $myrc); open(MYRC,">$myrc"); print MYRC "# user's .texdocrc, generated by program\n @@ -13,7 +13,7 @@ # can be left empty if \$TEXMFHOME is undefined HOMEDOCPATH=$homedocpath_tmp # general viewer behaviour (y or yes to make active) -@@ -1624,9 +1624,9 @@ sub readrc { +@@ -1639,9 +1639,9 @@ sub readrc { $localdocpath="$texmflocal/$localdocpath"; } } ++++++ source-warns.dif ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.838925818 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.838925818 +0200 @@ -13,7 +13,7 @@ --- libs/gmp/Makefile.in +++ libs/gmp/Makefile.in 2016-06-07 13:29:33.925651292 +0000 -@@ -306,7 +306,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +@@ -480,7 +480,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -64,26 +64,10 @@ /* The number of units needed is ceil(DECNUMDIGITS/DECDPUN) */ #define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN) ---- libs/lua52/Makefile.in -+++ libs/lua52/Makefile.in 2016-06-07 13:29:33.925651292 +0000 -@@ -201,11 +201,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS) - LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CFLAGS) $(CFLAGS) -+ $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS) - AM_V_CC = $(am__v_CC_@AM_V@) - am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) - am__v_CC_0 = @echo " CC " $@; --- libs/lua53/Makefile.in +++ libs/lua53/Makefile.in 2016-06-07 13:29:33.925651292 +0000 -@@ -202,11 +202,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b - am__depfiles_maybe = depfiles +@@ -238,11 +238,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b + @LUA53_TREE@/src/$(DEPDIR)/lzio.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -98,7 +82,7 @@ am__v_CC_0 = @echo " CC " $@; --- libs/mpfr/Makefile.in +++ libs/mpfr/Makefile.in 2016-06-07 13:29:33.925651292 +0000 -@@ -234,7 +234,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +@@ -337,7 +337,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++++++ source.dif ++++++ --- /var/tmp/diff_new_pack.iqbJ5m/_old 2019-07-13 13:58:52.850925815 +0200 +++ /var/tmp/diff_new_pack.iqbJ5m/_new 2019-07-13 13:58:52.850925815 +0200 @@ -5,29 +5,32 @@ texk/kpathsea/c-fopen.h | 6 texk/kpathsea/c-memstr.h | 3 texk/kpathsea/cnf-to-paths.awk | 2 - texk/kpathsea/db.c | 13 - texk/kpathsea/mktex.opt | 39 ++ - texk/kpathsea/mktexlsr | 52 +++ + texk/kpathsea/db.c | 13 - + texk/kpathsea/mktex.opt | 39 ++- + texk/kpathsea/mktexlsr | 52 +++- texk/kpathsea/progname.c | 4 - texk/kpathsea/texmf.cnf | 174 +++++++----- + texk/kpathsea/texmf.cnf | 140 +++++++----- texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc | 3 - texk/ps2pk/pk2bm.c | 35 +- - texk/texlive/linked_scripts/musixtex/musixtex.lua | 17 - + texk/ps2pk/pk2bm.c | 2 + texk/texlive/linked_scripts/musixtex/musixtex.lua | 17 + texk/texlive/linked_scripts/texlive/fmtutil-sys.sh | 1 - texk/texlive/linked_scripts/texlive/fmtutil.pl | 24 + + texk/texlive/linked_scripts/texlive/fmtutil.pl | 24 +- texk/texlive/linked_scripts/texlive/updmap-sys.sh | 1 texk/texlive/tl_scripts/fmtutil.cnf | 17 - - texk/texlive/tl_scripts/texconfig-dialog.sh | 14 + texk/texlive/tl_scripts/texconfig-dialog.sh | 14 - texk/texlive/tl_scripts/texconfig-sys.sh | 1 - texk/texlive/tl_scripts/texconfig.sh | 35 -- - texk/texlive/tl_scripts/texlinks.sh | 53 ++- + texk/texlive/tl_scripts/texconfig.sh | 35 --- + texk/texlive/tl_scripts/texlinks.sh | 53 +++- texk/web2c/Makefile.in | 7 + texk/web2c/luatexdir/luapplib/ppheap.c | 61 ++--- + texk/web2c/luatexdir/luapplib/ppload.c | 4 + texk/web2c/uptexdir/tests/gkhugeng.err | 8 texk/web2c/window/regis.c | 8 texk/web2c/window/x11-Xlib.c | 8 texk/web2c/window/x11-Xt.c | 4 texk/xdvik/psgs.c | 22 + texk/xdvik/xdvi-sh.in | 19 + - 28 files changed, 383 insertions(+), 194 deletions(-) + 31 files changed, 393 insertions(+), 190 deletions(-) --- libs/icu/icu-src/source/common/Makefile.in +++ libs/icu/icu-src/source/common/Makefile.in 2018-04-10 09:02:17.774983801 +0000 @@ -338,7 +341,7 @@ --- texk/kpathsea/progname.c +++ texk/kpathsea/progname.c 2018-04-10 09:02:17.862982147 +0000 -@@ -661,9 +661,9 @@ kpathsea_set_program_name (kpathsea kpse +@@ -662,9 +662,9 @@ kpathsea_set_program_name (kpathsea kpse /* SELFAUTODIR is actually the parent of the invocation directory, and SELFAUTOPARENT the grandparent. This is how teTeX did it. */ kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir)); @@ -351,7 +354,7 @@ sdir_greatgrandparent = xdirname (sdir_grandparent); kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent)); --- texk/kpathsea/texmf.cnf -+++ texk/kpathsea/texmf.cnf 2018-04-10 09:11:07.729004411 +0000 ++++ texk/kpathsea/texmf.cnf 2019-05-29 06:12:28.489081219 +0000 @@ -61,20 +61,20 @@ TEXMFROOT = $SELFAUTOPARENT @@ -381,12 +384,12 @@ TEXMFHOME = ~/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. --TEXMFVAR = ~/.texlive2018/texmf-var +-TEXMFVAR = ~/.texlive2019/texmf-var +TEXMFVAR = ${TEXMFSYSVAR} % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. --TEXMFCONFIG = ~/.texlive2018/texmf-config -+TEXMFCONFIG = ${TEXMFSYSVAR} +-TEXMFCONFIG = ~/.texlive2019/texmf-config ++TEXMFCONFIG = ${TEXMFSYSCONFIG} % This is the value manipulated by tlmgr's auxtrees subcommand in the % root texmf.cnf. Kpathsea warns about a literally empty string for a @@ -397,12 +400,12 @@ -TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} - % Where to look for ls-R files. There need not be an ls-R in the - % directories in this path, but if there is one, Kpathsea will use it. + % Where to look for, and where mktexlsr creates, ls-R files. By default, + % this is all and only the !! elements of TEXMF, so that mktexlsr does not @@ -115,24 +115,23 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEX - % does not create ls-R files in the non-!! elements -- because if an - % ls-R is present, it will be used, and the disk will not be searched. - % This is arguably a bug in kpathsea. + % present, it will be used, and the disk will not (usually) be searched, + % regardless of !!. Although in principle a directory listed here need + % not contain an ls-R file, in practice they all should. -TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +TEXMFDBS = $TEXMF;$VARTEXFONTS;$HOMECACHE @@ -444,120 +447,57 @@ -WEB2C = $TEXMF/web2c +WEB2C = ${TEXMFHOME}/web2c;${TEXMFSYSCONFIG}/web2c;${TEXMFSYSVAR}/web2c;$TEXMF/web2c - % TEXINPUTS is for TeX input files -- i.e., anything to be found by \input - % or \openin, including .sty, .eps, etc. We specify paths for all known -@@ -192,18 +192,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{ - TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// - - % pdfTeX. --TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// --TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}// --TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}// --TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}// --TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}// --TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}// --TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// --TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// -+TEXINPUTS.pdfcslatex = .;$TEXMF/{pdftex,tex}/{cslatex,csplain,latex,generic,}// -+TEXINPUTS.pdfcsplain = .;$TEXMF/{pdftex,tex}/{csplain,plain,generic,}// -+TEXINPUTS.pdflatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}// -+TEXINPUTS.pdfmex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}// -+TEXINPUTS.utf8mex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}// -+TEXINPUTS.pdftex = .;$TEXMF/{pdftex,tex}/{plain,generic,}// -+TEXINPUTS.pdftexinfo = .;$TEXMF/{pdftex,tex}/{texinfo,plain,generic,}// -+TEXINPUTS.pdfamstex = .;$TEXMF/{pdftex,tex}/{amstex,plain,generic,}// - - % pdfeTeX. --TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// --TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// -+TEXINPUTS.pdfelatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}// -+TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}// - - % LuaTeX. - TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// -@@ -256,18 +256,18 @@ BSTINPUTS.upbibtex = .;$TEXMF/{upbi - TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// - - % jadetex. --TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// --TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// -+TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,xmltex,latex,plain,generic,}// -+TEXINPUTS.pdfjadetex = .;$TEXMF/{pdftex,tex}/{jadetex,xmltex,latex,plain,generic,}// - - % XMLTeX. --TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// --TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// -+TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,plain,generic,}// -+TEXINPUTS.pdfxmltex = .;$TEXMF/{pdftex,tex}/{xmltex,latex,plain,generic,}// - - % Miscellany, no longer built. - TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}// - TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}// --TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}// --TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}// -+TEXINPUTS.frpdflatex = .;$TEXMF/{pdftex,tex}/{french,latex,generic,}// -+TEXINPUTS.frpdftex = .;$TEXMF/{pdftex,tex}/{french,plain,generic,}// - - % Earlier entries override later ones, so put this generic one last. - TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// -@@ -276,7 +276,7 @@ TEXINPUTS = .;$TEXMF/tex/{ - TTF2TFMINPUTS = .;$TEXMF/ttf2pk// + % This variable exists only to be redefined; it is used in nearly all + % search paths. If a document has source files not only in the current +@@ -285,7 +285,7 @@ TEXINPUTS = $TEXMFDOTDIR;$ + TTF2TFMINPUTS = $TEXMFDOTDIR;$TEXMF/ttf2pk// % Metafont, MetaPost inputs. --MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// -+MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/source// - MPINPUTS = .;$TEXMF/metapost// +-MFINPUTS = $TEXMFDOTDIR;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// ++MFINPUTS = $TEXMFDOTDIR;$TEXMF/metafont//;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/source// + MPINPUTS = $TEXMFDOTDIR;$TEXMF/metapost// % Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. -@@ -286,31 +286,31 @@ MPINPUTS = .;$TEXMF/metapost// +@@ -295,31 +295,31 @@ MPINPUTS = $TEXMFDOTDIR;$TEXMF/metapost/ % We repeat the same definition three times because of the way fmtutil % is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats % will not be found. --TEXFORMATS = .;$TEXMF/web2c{/$engine,} --MFBASES = .;$TEXMF/web2c{/$engine,} --MPMEMS = .;$TEXMF/web2c{/$engine,} -+TEXFORMATS = .;$WEB2C/{$engine,}// -+MFBASES = .;$WEB2C/{$engine,}// -+MPMEMS = .;$WEB2C/{$engine,}// +-TEXFORMATS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,} +-MFBASES = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,} +-MPMEMS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,} ++TEXFORMATS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}// ++MFBASES = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}// ++MPMEMS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}// % % As of 2008, pool files don't exist any more (the strings are compiled % into the binaries), but just in case something expects to find these: --TEXPOOL = .;$TEXMF/web2c -+TEXPOOL = .;$WEB2C +-TEXPOOL = $TEXMFDOTDIR;$TEXMF/web2c ++TEXPOOL = $TEXMFDOTDIR;$WEB2C MFPOOL = ${TEXPOOL} MPPOOL = ${TEXPOOL} % support the original xdvi. Must come before the generic settings. --PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}// -+PKFONTS.XDvi = .;$TEXMF/%s;{$HOMECACHE,$VARTEXFONTS}/pk/{%m,modeless}// - VFFONTS.XDvi = .;$TEXMF/%s - PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}// - TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}// +-PKFONTS.XDvi = $TEXMFDOTDIR;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}// ++PKFONTS.XDvi = $TEXMFDOTDIR;$TEXMF/%s;{$HOMECACHE,$VARTEXFONTS}/pk/{%m,modeless}// + VFFONTS.XDvi = $TEXMFDOTDIR;$TEXMF/%s + PSHEADERS.XDvi = $TEXMFDOTDIR;$TEXMF/%q{dvips,fonts/type1}// + TEXPICTS.XDvi = $TEXMFDOTDIR;$TEXMF/%q{dvips,tex}// % Device-independent font metric files. - VFFONTS = .;$TEXMF/fonts/vf// --TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm// -+TFMFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/tfm// + VFFONTS = $TEXMFDOTDIR;$TEXMF/fonts/vf// +-TFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/tfm// ++TFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/tfm// % The $MAKETEX_MODE below means the drivers will not use a cx font when % the mode is ricoh. If no mode is explicitly specified, kpse_prog_init % sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual. % The modeless part guarantees that bitmaps for PostScript fonts are found. --PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// -+PKFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// +-PKFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// ++PKFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// % Similarly for the GF format, which only remains in existence because % Metafont outputs it (and MF isn't going to change). -@@ -320,7 +320,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD - GLYPHFONTS = .;$TEXMF/fonts - - % A place to puth everything that doesn't fit the other font categories. --MISCFONTS = .;$TEXMF/fonts/misc// -+MISCFONTS = .;$TEXMF/fonts/misc//;$TEXMF/fonts/hbf// - - % font name map files. This isn't just fonts/map// because ConTeXt - % wants support for having files with the same name in the different -@@ -406,8 +406,8 @@ MPSUPPORT = .;$TEXMF/metapost/support +@@ -415,8 +415,8 @@ MPSUPPORT = $TEXMFDOTDIR;$TEXMF/metapost % For xdvi to find mime.types and .mailcap, if they do not exist in % ~. These are single directories, not paths. % (But the default mime.types, at least, may well suffice.) @@ -568,22 +508,22 @@ % Default settings for the fontconfig library as used by the Windows % versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. -@@ -426,10 +426,10 @@ WEBINPUTS = .;$TEXMF/web// - CWEBINPUTS = .;$TEXMF/cweb// +@@ -440,10 +440,10 @@ WEBINPUTS = $TEXMFDOTDIR;$TEXMF/web// + CWEBINPUTS = $TEXMFDOTDIR;$TEXMF/cweb// % Omega-related fonts and other files. --OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}// --OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl// --OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}// --OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp// -+OFMFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ofm,tfm}// -+OPLFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/opl// -+OVFFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ovf,vf}// -+OVPFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/ovp// - OTPINPUTS = .;$TEXMF/omega/otp// - OCPINPUTS = .;$TEXMF/omega/ocp// +-OFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}// +-OPLFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/opl// +-OVFFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}// +-OVPFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/ovp// ++OFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ofm,tfm}// ++OPLFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/opl// ++OVFFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ovf,vf}// ++OVPFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/ovp// + OTPINPUTS = $TEXMFDOTDIR;$TEXMF/omega/otp// + OCPINPUTS = $TEXMFDOTDIR;$TEXMF/omega/ocp// -@@ -512,32 +512,38 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna +@@ -526,32 +526,38 @@ RUBYINPUTS = $TEXMFDOTDIR;$TEXMF/scrip % explicitly list every directory. Arguably more understandable anyway. % TEXMFCNF = {\ @@ -647,7 +587,7 @@ % % For reference, here is the old brace-using definition: %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} -@@ -821,3 +827,33 @@ max_cols.gftype = 8191 +@@ -836,3 +842,33 @@ max_cols.gftype = 8191 % Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? % Default is 1, to guess. Used on Windows only. guess_input_kanji_encoding = 1 @@ -695,67 +635,7 @@ #define VERSION_OPT 301 --- texk/ps2pk/pk2bm.c +++ texk/ps2pk/pk2bm.c 2018-04-10 09:02:17.862982147 +0000 -@@ -45,7 +45,6 @@ - - static quarterword lsbf(quarterword u); - static void dots(quarterword u, int n); --static int atoo(char *oct); - - int main(int argc, char *argv[]) - { -@@ -54,7 +53,7 @@ int main(int argc, char *argv[]) - halfword *word; - chardesc cd; - const char *myname = "pk2bm"; -- char *pkname; -+ char *pkname, *endptr; - - while (--argc > 0 && (*++argv)[0] == '-') { - done=0; -@@ -62,26 +61,36 @@ int main(int argc, char *argv[]) - switch (c) { - case 'c': - if (*++argv[0] == '\0') { -- argc--; argv++; -+ if (--argc == 0) { -+err: -+ printf("%s: illegal value for option %c\n", myname, c); -+ exit(1); -+ } -+ argv++; - } - C = *argv[0]; - done = 1; break; - case 'o': - if (*++argv[0] == '\0') { -- argc--; ++argv; -+ if (--argc == 0) goto err; -+ ++argv; - } -- C = atoo(argv[0]); -+ C = strtol(argv[0], &endptr, 8); -+ if (endptr==argv[0] || *endptr) goto err; - done = 1; break; - case 'H': - if (*++argv[0] == '\0') { -- argc--; argv++; -+ if (--argc == 0) goto err; -+ argv++; - } -- h = atoi(argv[0]); -+ h = strtol(argv[0], &endptr, 10); -+ if (endptr==argv[0] || *endptr) goto err; - done=1; - break; - case 'W': - if (*++argv[0] == '\0') { -- argc--; argv++; -+ if (--argc == 0) goto err; -+ argv++; - } - w = atoi(argv[0]); - done=1; -@@ -98,7 +107,7 @@ int main(int argc, char *argv[]) +@@ -103,7 +102,7 @@ int main(int argc, char *argv[]) } } @@ -764,21 +644,9 @@ msg ("pk2bm (ps2pk) version " PACKAGE_VERSION "\n"); printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname); exit(1); -@@ -216,11 +225,3 @@ dots(quarterword u, int n) - bit>>=1; - } - } -- --static int --atoo(char *oct) --{ -- int octal = 0; -- while (*oct != '\0') octal = 8*octal + (*oct++) - '0'; -- return octal; --} --- texk/texlive/linked_scripts/musixtex/musixtex.lua +++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2018-04-10 09:12:50.395048030 +0000 -@@ -192,15 +192,26 @@ end +@@ -200,15 +200,26 @@ end -- possible by exploiting the the fact that Lua has two false values. -- dvi == nil "do not produce a DVI file" (but maybe PDF) -- dvi == false "do not process the DVI file" (but stop after TeX) @@ -914,7 +782,7 @@ # # from cslatex: cslatex pdftex - -etex cslatex.ini -@@ -65,8 +66,8 @@ pdfcsplain luatex - -etex csplain.ini +@@ -66,8 +67,8 @@ pdfcsplain luatex - -etex csplain.ini eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini # # from jadetex: @@ -925,7 +793,7 @@ # # from latex-bin: latex pdftex language.dat -translate-file=cp227.tcx *latex.ini -@@ -131,5 +132,5 @@ xetex xetex language.def -etex xetex.ini +@@ -132,5 +133,5 @@ xetex xetex language.def -etex xetex.ini xelatex xetex language.dat -etex xelatex.ini # # from xmltex: @@ -1137,7 +1005,7 @@ case $unlink in --- texk/web2c/Makefile.in +++ texk/web2c/Makefile.in 2018-04-10 09:02:17.870981997 +0000 -@@ -4117,7 +4117,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m +@@ -4947,7 +4947,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m md5main_CPPFLAGS = -I$(srcdir)/libmd5 md5main_SOURCES = libmd5/md5main.c md5main_LDADD = libmd5.a @@ -1146,7 +1014,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -@@ -4164,6 +4164,11 @@ w2c/c-auto.h: w2c/stamp-h1 +@@ -4994,6 +4994,11 @@ w2c/c-auto.h: w2c/stamp-h1 w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status @rm -f w2c/stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h @@ -1158,6 +1026,177 @@ $(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f w2c/stamp-h1 +--- texk/web2c/luatexdir/luapplib/ppheap.c ++++ texk/web2c/luatexdir/luapplib/ppheap.c 2019-05-20 12:04:35.067508800 +0000 +@@ -101,21 +101,25 @@ + #endif + + typedef struct _simplereg { +- size_t bucket_pos; ++ int heap_instance; ++ int bucket_pos; + size_t bucket_size; +- size_t heap_instance; +- aligned_data **align_data_set ; +-} simplereg; ++ union { ++ void *_area; ++ aligned_data **_set; ++ } align_data __attribute__ ((aligned(__alignof__(void*)))); ++} simplereg __attribute__ ((aligned(__alignof__(void*)))); + + /* By default static vars are initialized to NULL, but to be clear.. */ + static simplereg *align_set = NULL ; + + static void align_init_set(void){ + size_t size ; ++ int p; + + if (align_set) { + align_set->heap_instance++; +- return ; ++ return; + } + + align_set = malloc(sizeof(simplereg)); +@@ -125,8 +129,8 @@ + } + + size = SIZE_OF_POINTER*ALIGN_BUFF_BUCKET_SIZE; +- align_set->align_data_set = malloc(size); +- if (!align_set->align_data_set) { ++ align_set->align_data._area = malloc(size); ++ if (!align_set->align_data._area) { + fprintf(stderr,"! fatal error: unable to setup register for aligned pointers\n"); + exit(EXIT_FAILURE); + } +@@ -134,37 +138,40 @@ + align_set->bucket_pos = 0; + align_set->bucket_size = ALIGN_BUFF_BUCKET_SIZE; + align_set->heap_instance = 1; +- memset(align_set->align_data_set, 0UL,size); ++ memset(align_set->align_data._area, 0, size); ++ p = align_set->bucket_size; ++ while (p-- > 0){ ++ align_set->align_data._set[p] = NULL; ++ } + } + + static void align_save_into_set(aligned_data *p){ + if (align_set->bucket_pos >= align_set->bucket_size) { + size_t new_size; +- aligned_data **align_data_set_new; ++ void *align_data_area_new; + +- if(!align_set->align_data_set){ ++ if(!align_set->align_data._area){ + fprintf(stderr,"! fatal error: unable to save aligned pointer,corrupted set\n"); + exit(EXIT_FAILURE); + } + new_size = (ALIGN_BUFF_BUCKET_SIZE+align_set->bucket_size)*SIZE_OF_POINTER; +- align_data_set_new = malloc(new_size); +- if (!align_data_set_new) { ++ align_data_area_new = malloc(new_size); ++ if (!align_data_area_new) { + fprintf(stderr,"! fatal error: unable to save aligned pointer\n"); + exit(EXIT_FAILURE); + } +- memset(align_data_set_new,0,new_size); +- memcpy(align_data_set_new, align_set->align_data_set, align_set->bucket_size*SIZE_OF_POINTER); +- free(align_set->align_data_set); +- align_set->align_data_set = align_data_set_new ; ++ memset(align_data_area_new,0,new_size); ++ memcpy(align_data_area_new, align_set->align_data._area, align_set->bucket_size*SIZE_OF_POINTER); ++ free(align_set->align_data._area); ++ align_set->align_data._area = align_data_area_new ; + align_set->bucket_size += ALIGN_BUFF_BUCKET_SIZE; + } + if (align_set->bucket_pos>align_set->bucket_size){ + fprintf(stderr,"! fatal error: unable to save aligned pointer, wrong position\n"); + exit(EXIT_FAILURE); + } +- align_set->align_data_set[align_set->bucket_pos] = p ; ++ align_set->align_data._set[align_set->bucket_pos] = p ; + align_set->bucket_pos++; +- + } + + static void align_free_set(void){ +@@ -174,15 +181,16 @@ + if (align_set->heap_instance>1) { + align_set->heap_instance--; + } else if (align_set->heap_instance ==1) { +- if (align_set->align_data_set){ +- size_t p; +- for(p=1;p<align_set->bucket_pos;p++){ +- if (align_set->align_data_set[p]) { +- free(align_set->align_data_set[p]); ++ if (align_set->align_data._area){ ++ int p = align_set->bucket_pos; ++ while (p-- > 0){ ++ if (align_set->align_data._set[p]) { ++ free(align_set->align_data._set[p]); ++ align_set->align_data._set[p] = NULL; + } + } +- free(align_set->align_data_set); +- align_set->align_data_set = NULL; ++ free(align_set->align_data._area); ++ align_set->align_data._area = NULL; + } + align_set->heap_instance=0; + free(align_set); +@@ -225,7 +233,6 @@ + #ifdef PPHEAP_NEED_ALIGNMENT + align_free_set(); + #endif +- + } + + void ppheap_renew (ppheap *heap) +@@ -415,7 +422,7 @@ + // iof_close(O); + #ifdef PPHEAP_NEED_ALIGNMENT + /* Todo: only if data%sizeof(aligned_data) != 0 */ +- p_aligned_data = malloc(size); ++ p_aligned_data = (aligned_data*)malloc(size); + if (!p_aligned_data) { + fprintf(stderr,"! fatal error: unable to setup aligned pointer for ppheap_flush\n"); + exit(EXIT_FAILURE); +--- texk/web2c/luatexdir/luapplib/ppload.c ++++ texk/web2c/luatexdir/luapplib/ppload.c 2019-05-20 11:59:47.417508800 +0000 +@@ -60,7 +60,7 @@ + ghost->size = siz - sizeof(_ppname) - 1, \ + (ppname)(ghost + 1)) + +-#if ARM_COMPLAINT ++#if ARM_COMPLIANT + #define ppname_flush_with_ego(O, ghost, siz, flgs) \ + (iof_put(O, '\0'), \ + pad=(O->pos - pos_begin)%(sizeof(ppname*)), \ +@@ -270,7 +270,7 @@ + + + +-#if ARM_COMPLIANT ++#if 0 // ARM_COMPLIANT /* Invalid write of size 8 */ + #define ppstring_set_alter_ego(string, ghost, ego) do{ \ + size_t t = ((ghost)->size + 1); \ + t = (t%sizeof(ppstring *))==0?t: (t/sizeof(ppstring *)+1)*sizeof(ppstring *); \ +--- texk/web2c/uptexdir/tests/gkhugeng.err ++++ texk/web2c/uptexdir/tests/gkhugeng.err 2019-05-13 11:22:35.158192154 +0000 +@@ -1,3 +1,11 @@ ++warning: kpathsea: /etc/texmf/ls-R: No usable entries in ls-R. ++warning: kpathsea: See the manual for how to generate ls-R. ++warning: kpathsea: /var/lib/texmf/ls-R: No usable entries in ls-R. ++warning: kpathsea: See the manual for how to generate ls-R. ++warning: kpathsea: /usr/share/texmf/ls-R: No usable entries in ls-R. ++warning: kpathsea: See the manual for how to generate ls-R. ++warning: kpathsea: /var/cache/texmf/fonts/ls-R: No usable entries in ls-R. ++warning: kpathsea: See the manual for how to generate ls-R. + Input file is in YOKO-kumi kanji tfm format. + The fifth byte of the input file exceeds 127! + Sorry, but I can't go on; are you sure this is a TFM? --- texk/web2c/window/regis.c +++ texk/web2c/window/regis.c 2018-04-10 09:02:17.870981997 +0000 @@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol ++++++ texlive-20180414-source.tar.xz -> texlive-20190407-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive/texlive-20180414-source.tar.xz /work/SRC/openSUSE:Factory/.texlive.new.4615/texlive-20190407-source.tar.xz differ: char 26, line 1
