diff --git a/0001-Fix-missing-mplib.h-while-building.patch b/0001-Fix-missing-mplib.h-while-building.patch new file mode 100644 index 0000000000000000000000000000000000000000..5f3d4f0c0ae4fccec190feccb18a26ebdeca8752 --- /dev/null +++ b/0001-Fix-missing-mplib.h-while-building.patch @@ -0,0 +1,24 @@ +From 89d96c3614a76a9f537a50477fa333f3c71475b4 Mon Sep 17 00:00:00 2001 +From: misaka00251 +Date: Wed, 25 Dec 2024 15:39:25 +0800 +Subject: [PATCH] Fix missing mplib.h while building + + +diff --git a/texlive-20210325-source/texk/web2c/mplibdir/am/libmplib.am b/texlive-20210325-source/texk/web2c/mplibdir/am/libmplib.am +index 4b0fc7fd..f29af438 100644 +--- a/texlive-20210325-source/texk/web2c/mplibdir/am/libmplib.am ++++ b/texlive-20210325-source/texk/web2c/mplibdir/am/libmplib.am +@@ -91,8 +91,8 @@ libmplib_web += mplibdir/mpmathdouble.w mplibdir/mpstrings.w mplibdir/tfmin.w + $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h) + + $(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) +-$(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND) +-$(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) ++$(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND) mplib.h ++$(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) mplib.h + + + EXTRA_DIST += $(libmplib_web) +-- +2.47.1 + diff --git a/0002-dropped-usage-of-gs_error_names.patch b/0002-dropped-usage-of-gs_error_names.patch new file mode 100644 index 0000000000000000000000000000000000000000..586f97778bb2f9741caaaee5d96018bca7d0e314 --- /dev/null +++ b/0002-dropped-usage-of-gs_error_names.patch @@ -0,0 +1,35 @@ +From fbf9ef554303ddf99c5c6e4327dac6eb6671e837 Mon Sep 17 00:00:00 2001 +From: misaka00251 +Date: Wed, 25 Dec 2024 16:49:36 +0800 +Subject: [PATCH] dropped usage of gs_error_names() + +It's no longer accessible as of GS 10.0.0 + +diff --git a/texlive-20210325-source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp b/texlive-20210325-source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp +index bef8a68b..1753eb77 100644 +--- a/texlive-20210325-source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp ++++ b/texlive-20210325-source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp +@@ -375,19 +375,9 @@ const char* Ghostscript::error_name (int code) { + if (code < 0) + code = -code; + const char *error_names[] = { ERROR_NAMES }; +- if (code == 0 || (size_t)code > sizeof(error_names)/sizeof(error_names[0])) ++ if (code == 0 || size_t(code) > sizeof(error_names)/sizeof(error_names[0])) + return nullptr; +-#if defined(HAVE_LIBGS) +- // use array defined in libgs to avoid linking the error strings into the binary +- return gs_error_names[code-1]; +-#elif defined(_WIN32) +- // gs_error_names is private in the Ghostscript DLL so we can't access it here + return error_names[code-1]; +-#else +- if (auto error_names = loadSymbol("gs_error_names")) +- return error_names[code-1]; +- return nullptr; +-#endif + } + + #endif // !DISABLE_GS +-- +2.47.1 + diff --git a/texlive-base.spec b/texlive-base.spec index 429e9ea6acdfa1a462cfa980ddf898498ffedc0d..9357ad4fac82abed8d69693d0c54df419d8a46d6 100644 --- a/texlive-base.spec +++ b/texlive-base.spec @@ -4,7 +4,7 @@ Name: texlive-base Version: 20210325 -Release: 9 +Release: 10 Epoch: 9 Summary: TeX formatting system License: ASL 2.0 and LGPL-2.1-only and Zlib and OFL-1.1 and Public Domain and LGPL-2.0-only and GPLv2+ and MPL-1.1 and Libpng and LGPL-3.0-only and BSL-1.0 and GPLv2 and GPLv3 and CPL-1.0 and IJG and MIT and LPPL-1.3c and ICU and psutils @@ -431,6 +431,9 @@ Patch0034: CVE-2023-32700.patch Patch0035: CVE-2023-46048.patch Patch0036: CVE-2023-46051.patch +Patch0040: 0001-Fix-missing-mplib.h-while-building.patch +Patch0041: 0002-dropped-usage-of-gs_error_names.patch + BuildRequires: xz libXaw-devel libXi-devel ncurses-devel bison flex file perl(Digest::MD5) texinfo gcc-c++ BuildRequires: gd-devel freetype-devel libpng-devel zlib-devel potrace-devel BuildRequires: zziplib-devel libicu-devel cairo-devel harfbuzz-devel perl-generators pixman-devel graphite2-devel @@ -8621,6 +8624,9 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || : %doc %{_datadir}/texlive/texmf-dist/doc/latex/yplan/ %changelog +* Wed Dec 25 2024 misaka00251 - 9:20210325-10 +- Fix texlive-dvisvgm install error & Fix build error + * Wed Aug 21 2024 xu_ping <707078654@qq.com> - 9:20210325-9 - License compliance rectification.