Merge branch 'master' into build/work000 r76950 #158

Author: t-tk

source/Build

@@ -165,6 +165,9 @@ if test -d "$bindir"; then
   if test "$count" -gt 0; then
     echo
     echo "$0: $count executables in $bindir."
+    echo "$0: These binaries do not constitute a directly usable system."
+    echo "$0: If you're trying to create a runnable TeX, please see:"
+    echo "$0: https://tug.org/texinfohtml/tlbuild.html#Installing"
   else
     echo "$0: Build failed, no executables under $bindir."
     echo "$0: Full log in: `pwd`/build.log"
@@ -175,7 +178,7 @@ if test -d "$bindir"; then
 fi
 
 status=`cat exitstatus.txt`
-if echo "$status" | egrep '^[0-9]+$' >/dev/null; then :; else
+if echo "$status" | grep '^[0-9][0-9]*$' >/dev/null; then :; else
   echo "$0: exitstatus.txt does not contain a number; disk full?" >&2
   status=1
 fi

source/ChangeLog

@@ -1,3 +1,9 @@
+2025-10-16  Karl Berry  <[email protected]>
+
+	* Build (status): avoid using egrep.
+	Report from Jan Kasprzak,
+	https://tug.org/pipermail/tex-k/2025-October/004217.html.
+
 2025-09-07  Karl Berry  <[email protected]>
 
 	* Makefile.am (install_target): new variable, install-strip by default.

source/README

@@ -6,20 +6,25 @@ http://tug.org/texlive/build.html.  In brief:
 
 - To configure and make the source tree, run ./Build.
   This builds in subdirectory Work/, and installs into subdirectory inst/.
+  (Nearly everything the Build script does can be overridden via
+   environment variables; just take a look at the script for the details.)
 
 - To build (mostly) without optimization, run ./Build --debug.
 
 - If the make fails and you want to rebuild without starting from scratch:
   cd Work/whatever/subdir && make
 
-Email [email protected] if problems.
+- The result of make install is not a working TeX system, unfortunately.
+  Much more needs to be done afterwards.  For a starting point, see
+  the "Installing" chapter in the ./doc/tlbuild* document, online at
+  https://tug.org/texinfohtml/tlbuild.html#Installing.  Looking at how
+  various distros handle TeX can also be useful.
 
-(Nearly everything the Build script does can be overridden via
-environment variables; just take a look to see the names.)
+Email [email protected] if problems with the build.
 
 Many more details about the TL build system, such as configuring to work
 on a single program, adding new programs or libraries, documentation
-about the many pieces of the system, etc., are in the doc/tlbuild*
+about the many pieces of the system, etc., are in the ./doc/tlbuild*
 document and the sibling README* files here (which are generated from
 that document).
 

source/build-aux/texinfo.tex

@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2025-07-31.19}
+\def\texinfoversion{2025-11-25.17}
 %
 % Copyright 1985, 1986, 1988, 1990-2025 Free Software Foundation, Inc.
 %
@@ -5783,9 +5783,10 @@
     \def\indexrbrace{\}}%
     \def\indexbackslash{\realbackslash}%
     \def\indexatchar{\@}%
-    \writetocentry{idxinitial}{\asis #1}{IDX\the\idxinitialno}%
+    \writetocentry{idxinitial}{\asis #1\empty}{IDX\the\idxinitialno}%
     % The @asis removes a pair of braces around e.g. {@indexatchar} that
-    % are output by texindex.
+    % are output by texindex.  \empty is an argument to \asis in case #1
+    % is empty.
     %
     \pdfmkdest{idx.\asis #1.IDX\the\idxinitialno}%
   \fi
@@ -9952,7 +9953,7 @@
         % node and anchor labels.  And \xrdef uses it to construct the
         % lists of floats.
         %
-        \edef\tmp{\noexpand\setref{\floatlabel}{Yfloat}%
+        \edef\tmp{\noexpand\setref{\noexpand\floatlabel}{Yfloat}%
                   {\floatmagic=\safefloattype}}%
         \tmp
       }%

source/configure

@@ -5864,6 +5864,7 @@ case $enable_hitex in #(
 esac
 
 test "x$enable_web2c:$enable_hitex" = xyes:yes && {
+  need_harfbuzz=yes
   need_zlib=yes
 }
 # Check whether --enable-pdftex was given.
@@ -6194,6 +6195,7 @@ then :
   enableval=$enable_synctex;
 fi
 
+# end texk/web2c/ac/web2c.ac.
 
 ## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
 ## configure options and TL libraries required for afm2pl

source/libs/README

@@ -28,7 +28,7 @@ graphite2 1.3.14 - checked 10apr20
   https://sourceforge.net/projects/silgraphite/files/graphite2/
   (requires C++11)
 
-harfbuzz 12.1.0 - checked 01oct25
+harfbuzz 12.2.0 - checked 05nov25
   https://github.com/harfbuzz/harfbuzz/releases/latest
 
 icu 76.1 - checked 27oct24 (requires C++17, e.g., g++13)
@@ -37,7 +37,7 @@ icu 76.1 - checked 27oct24 (requires C++17, e.g., g++13)
 libpaper 1.1.29 - checked 07jan24
   https://ftp.debian.org/debian/pool/main/libp/libpaper/
 
-libpng 1.6.50 - checked 04jul25
+libpng 1.6.51 - checked 24nov25
   https://sourceforge.net/projects/libpng/files/ - used by many
 
 lua 5.3.6 - checked 04oct20

source/libs/configure

@@ -4986,6 +4986,7 @@ case $enable_hitex in #(
 esac
 
 test "x$enable_web2c:$enable_hitex" = xyes:yes && {
+  need_harfbuzz=yes
   need_zlib=yes
 }
 # Check whether --enable-pdftex was given.
@@ -5316,6 +5317,7 @@ then :
   enableval=$enable_synctex;
 fi
 
+# end texk/web2c/ac/web2c.ac.
 
 ## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
 ## configure options and TL libraries required for afm2pl

source/libs/libpng/ChangeLog

@@ -1,3 +1,8 @@
+2025-11-24 Akira Kakuto  <[email protected]>
+
+	Import libpng-1.6.51.
+	* version.ac: Adjust.
+
 2025-07-04 Akira Kakuto  <[email protected]>
 
 	Import libpng-1.6.50.

source/libs/libpng/README

@@ -1,4 +1,4 @@
-	Building libpng-1.6.50 as part of the TL tree
+	Building libpng-1.6.51 as part of the TL tree
 	=============================================
 
 This directory libs/libpng/ uses a proxy Makefile.am to build the libpng library
@@ -14,4 +14,4 @@ copied to libs/libpng/configure.ac.
 =============================
 
 2009-07-23	Peter Breitenlohner <[email protected]>
-2025-07-04	Akira Kakuto <[email protected]>
+2025-11-24	Akira Kakuto <[email protected]>

source/libs/libpng/TLpatches/ChangeLog

@@ -1,3 +1,7 @@
+2025-11-24  Akira Kakuto <[email protected]>
+
+	Import libpng-1.6.51.
+
 2025-07-04  Akira Kakuto <[email protected]>
 
 	Import libpng-1.6.50.