Skip to content

Commit

Permalink
icu 76.2 (requires C++17)
Browse files Browse the repository at this point in the history
git-svn-id: svn://tug.org/texlive/trunk/Build/source@72681 c570f23f-e606-0410-a88d-b1316a301751
  • Loading branch information
kberry committed Oct 27, 2024
1 parent 82bec0c commit 0a7b90b
Show file tree
Hide file tree
Showing 1,510 changed files with 245,501 additions and 134,453 deletions.
2 changes: 1 addition & 1 deletion libs/README
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ graphite2 1.3.14 - checked 10apr20
harfbuzz 10.0.1 - checked 25sep24
https://github.com/harfbuzz/harfbuzz/releases/latest

icu 74.2 - checked 22dec23
icu 76.1 - checked 27oct24 (requires C++17, e.g., g++13)
https://github.com/unicode-org/icu/releases/

libpaper 1.1.29 - checked 07jan24
Expand Down
7 changes: 7 additions & 0 deletions libs/icu/TLpatches/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2024-10-27 Karl Berry <[email protected]>

Update for icu-72.1.

* patch-01-configure-gcc: no longer needed, now their configure
checks for cc first, which should be ok.

2023-12-22 Karl Berry <[email protected]>

* Update for icu-74.2. No changes to patches.
Expand Down
17 changes: 9 additions & 8 deletions libs/icu/TLpatches/TL-Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Changes applied to the icu tree as obtained from:
github.com/unicode-org/icu/releases/download/release-74-2/icu4c-74_2-src.tgz
github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-src.tgz

cd $Build/source/libs/icu # for whatever $Build directory
# update version.ac
Expand Down Expand Up @@ -30,8 +30,10 @@ cp -p $aux/config.guess $aux/config.sub $aux/install-sh source

# autoreconf in the TL directory (Build/source/libs/icu);
# don't run autoreconf in the icu-src/source/ directory, it fails due to
# missing pkg-config prerequisites. (Thus we patch configure, not just
# configure.ac; not worth more effort for our small change of preferring gcc.)
# missing pkg-config prerequisites.
#
# For ICU 76, C++ 17 is required. To build on an older GNU/Linux, such
# as tug.org, yum install gcc-toolset-13.
#
# rebuild; must rerun configure (not just config.status),
# so easiest is to just do a whole new build.
Expand All @@ -40,7 +42,7 @@ cp -p $aux/config.guess $aux/config.sub $aux/install-sh source
# Assuming all seems ok, reduce size of source/data/in/icudt*.dat
# to decrease data segment size, e.g., for old BSD. First, check
# that we successfully built the full .dat:
ver=74
ver=76
srcdat=$Build/source/libs/icu/icu-src/source/data/in/icudt${ver}l.dat
cd $Work/libs/icu/icu-build/data/out/build/icudt${ver}l
indat=../../tmp/icudt${ver}l.dat
Expand All @@ -62,12 +64,11 @@ $icupkg -r 'zone/*' $indat $outdat && \mv -v $outdat $indat
ls -l $indat $srcdat # indat should be about 2/3 the size
cp $indat $srcdat

# check that nothing besides backup files is left, back in the srcdir:
# check that nothing besides backup files and icu-prev is left; back in
# the srcdir:
cd $Build/source/libs/icu # for whatever $Build directory
svn status | grep -v '^[MAD]' | sort -k 2b

# In 74.2, LICENSE became a (broken) symlink; revert to file.

# if all is ok.
# update icu/ChangeLog and icu/TLpatches/ChangeLog.
# then commit.
# then commit icu and libs/README.
33 changes: 0 additions & 33 deletions libs/icu/TLpatches/patch-01-configure-gcc

This file was deleted.

20 changes: 2 additions & 18 deletions libs/icu/TLpatches/patch-13-STATIC_PREFIX
Original file line number Diff line number Diff line change
@@ -1,27 +1,11 @@
No `s' for STATIC_PREFIX.

--- source/config/Makefile.inc.in~ 2023-12-11 14:27:41.000000000 -0800
+++ source/config/Makefile.inc.in 2023-12-22 09:05:20.588268662 -0800
--- source/config/Makefile.inc.in~ 2024-10-24 11:24:00.000000000 -0700
+++ source/config/Makefile.inc.in 2024-10-27 14:32:34.140056410 -0700
@@ -47,5 +47,5 @@

# Static library prefix and file extension
-STATIC_PREFIX = s
+STATIC_PREFIX =
LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
A = a
--- source/icudefs.mk.in~ 2023-12-11 14:27:41.000000000 -0800
+++ source/icudefs.mk.in 2023-12-22 09:05:20.588268662 -0800
@@ -214,5 +214,5 @@
## If we can't use the shared libraries, use the static libraries
ifneq ($(ENABLE_SHARED),YES)
-STATIC_PREFIX_WHEN_USED = s
+STATIC_PREFIX_WHEN_USED =
else
STATIC_PREFIX_WHEN_USED =
@@ -220,5 +220,5 @@

# Static library prefix and file extension
-STATIC_PREFIX = s
+STATIC_PREFIX =
LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
A = a
20 changes: 10 additions & 10 deletions libs/icu/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.72 for icu (TeX Live) 74.2.
# Generated by GNU Autoconf 2.72 for icu (TeX Live) 76.1.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -603,8 +603,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='icu (TeX Live)'
PACKAGE_TARNAME='icu--tex-live-'
PACKAGE_VERSION='74.2'
PACKAGE_STRING='icu (TeX Live) 74.2'
PACKAGE_VERSION='76.1'
PACKAGE_STRING='icu (TeX Live) 76.1'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
'configure' configures icu (TeX Live) 74.2 to adapt to many kinds of systems.
'configure' configures icu (TeX Live) 76.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1399,7 +1399,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of icu (TeX Live) 74.2:";;
short | recursive ) echo "Configuration of icu (TeX Live) 76.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1498,7 +1498,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
icu (TeX Live) configure 74.2
icu (TeX Live) configure 76.1
generated by GNU Autoconf 2.72
Copyright (C) 2023 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1698,7 +1698,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by icu (TeX Live) $as_me 74.2, which was
It was created by icu (TeX Live) $as_me 76.1, which was
generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -4875,7 +4875,7 @@ fi

# Define the identity of the package.
PACKAGE='icu--tex-live-'
VERSION='74.2'
VERSION='76.1'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -6393,7 +6393,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by icu (TeX Live) $as_me 74.2, which was
This file was extended by icu (TeX Live) $as_me 76.1, which was
generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -6452,7 +6452,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
icu (TeX Live) config.status 74.2
icu (TeX Live) config.status 76.1
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
Expand Down
Loading

0 comments on commit 0a7b90b

Please sign in to comment.