Skip to content

Commit 7ce440a

Browse files
committed
Libuninameslist version 20240910
- Unicode 16.0 and French Unicode 15.1 - Upgraded configure.ac from 2.64 to 2.69
1 parent ecf6b02 commit 7ce440a

File tree

6 files changed

+7343
-1673
lines changed

6 files changed

+7343
-1673
lines changed

.appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ matrix:
1717
install:
1818
- call %MBASH% "pacman --noconfirm -S --needed base-devel"
1919
- call %MBASH% "pacman --noconfirm -S autoconf automake libtool"
20-
- call %MBASH% "python -m ensurepip --default-pip"
21-
- call %MBASH% "python -m pip install setuptools wheel"
20+
- call %MBASH% "python -m pip install ."
2221
build_script:
2322
- call %MBASH% "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; autoreconf -fiv && mkdir build && cd build && ../configure --enable-pylib && make check -j4 && make install"
2423
test: off

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
- 2024-Sep-10
2+
* Introducing Unicode 16.0 (libuninameslist=version1.15) and French
3+
Unicode 15.1 translation (libuninameslist-fr=version1.7).
4+
* Upgraded configure.ac from 2.64 to 2.69.
5+
16
- 2024-May-24
27
* Version 1.14, Unicode 15.1 and French version 1.7 now is at 15.1.
38

buildnameslist.c

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ static const char *lg[2] = { "", "FR" };
4040
static const char *lgb[2] = { "UNICODE_EN_BLOCK_MAX", "UNICODE_FR_BLOCK_MAX" };
4141
static const char *lgv[2] = { NL_VERSION, NFR_VERSION };
4242

43-
4443
static int printcopyright2credits(FILE *out) {
4544
fprintf( out, "; Liste des noms des caractères (version en langue française)\n\n");
4645
fprintf( out, "; Le Consortium Unicode entretient une collaboration étroite\n");
@@ -83,39 +82,43 @@ static int printcopyright2(FILE *out) {
8382
}
8483

8584
static int printcopyright1(FILE *out, int is_fr) {
86-
/* Copyright notice for unicode NamesList.txt - 2021 */
85+
/* Copyright notice for unicode NamesList.txt - 2024 */
8786
fprintf( out, "\n/*\n");
8887
fprintf( out, "The data contained in these arrays were derived from data contained in\n");
8988
fprintf( out, "NamesList.txt which came from www.unicode.org. Below is the copyright\n");
9089
fprintf( out, "notice for the information given:\n\n");
91-
fprintf( out, "Copyright © 1991-2021 Unicode®, Inc. All rights reserved.\n");
92-
fprintf( out, "Distributed under the Terms of Use in https://www.unicode.org/copyright.html.\n\n");
93-
fprintf( out, "Permission is hereby granted, free of charge, to any person obtaining\n");
94-
fprintf( out, "a copy of the Unicode data files and any associated documentation\n");
95-
fprintf( out, "(the \"Data Files\") or Unicode software and any associated documentation\n");
96-
fprintf( out, "(the \"Software\") to deal in the Data Files or Software\n");
97-
fprintf( out, "without restriction, including without limitation the rights to use,\n");
98-
fprintf( out, "copy, modify, merge, publish, distribute, and/or sell copies of\n");
99-
fprintf( out, "the Data Files or Software, and to permit persons to whom the Data Files\n");
100-
fprintf( out, "or Software are furnished to do so, provided that either\n");
101-
fprintf( out, "(a) this copyright and permission notice appear with all copies\n");
102-
fprintf( out, "of the Data Files or Software, or\n");
103-
fprintf( out, "(b) this copyright and permission notice appear in associated\n");
104-
fprintf( out, "Documentation.\n\n");
105-
fprintf( out, "THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF\n");
106-
fprintf( out, "ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n");
107-
fprintf( out, "WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n");
108-
fprintf( out, "NONINFRINGEMENT OF THIRD PARTY RIGHTS.\n");
109-
fprintf( out, "IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS\n");
110-
fprintf( out, "NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL\n");
111-
fprintf( out, "DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,\n");
112-
fprintf( out, "DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\n");
113-
fprintf( out, "TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n");
114-
fprintf( out, "PERFORMANCE OF THE DATA FILES OR SOFTWARE.\n\n");
115-
fprintf( out, "Except as contained in this notice, the name of a copyright holder\n");
116-
fprintf( out, "shall not be used in advertising or otherwise to promote the sale,\n");
117-
fprintf( out, "use or other dealings in these Data Files or Software without prior\n");
118-
fprintf( out, "written authorization of the copyright holder.\n\n");
90+
fprintf( out, "UNICODE LICENSE V3\n\n");
91+
fprintf( out, "COPYRIGHT AND PERMISSION NOTICE\n\n");
92+
fprintf( out, "Copyright © 1991-2024 Unicode, Inc.\n\n");
93+
fprintf( out, "NOTICE TO USER: Carefully read the following legal agreement. BY\n");
94+
fprintf( out, "DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR\n");
95+
fprintf( out, "SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE\n");
96+
fprintf( out, "TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT\n");
97+
fprintf( out, "DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.\n");
98+
fprintf( out, "Permission is hereby granted, free of charge, to any person obtaining a\n");
99+
fprintf( out, "copy of data files and any associated documentation (the \"Data Files\") or\n");
100+
fprintf( out, "software and any associated documentation (the \"Software\") to deal in the\n");
101+
fprintf( out, "Data Files or Software without restriction, including without limitation\n");
102+
fprintf( out, "the rights to use, copy, modify, merge, publish, distribute, and/or sell\n");
103+
fprintf( out, "copies of the Data Files or Software, and to permit persons to whom the\n");
104+
fprintf( out, "Data Files or Software are furnished to do so, provided that either (a)\n");
105+
fprintf( out, "this copyright and permission notice appear with all copies of the Data\n");
106+
fprintf( out, "Files or Software, or (b) this copyright and permission notice appear in\n");
107+
fprintf( out, "associated Documentation.\n\n");
108+
fprintf( out, "THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY\n");
109+
fprintf( out, "KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n");
110+
fprintf( out, "MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF\n");
111+
fprintf( out, "THIRD PARTY RIGHTS.\n\n");
112+
fprintf( out, "IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE\n");
113+
fprintf( out, "BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,\n");
114+
fprintf( out, "OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,\n");
115+
fprintf( out, "WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,\n");
116+
fprintf( out, "ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA\n");
117+
fprintf( out, "FILES OR SOFTWARE.\n\n");
118+
fprintf( out, "Except as contained in this notice, the name of a copyright holder shall\n");
119+
fprintf( out, "not be used in advertising or otherwise to promote the sale, use or other\n");
120+
fprintf( out, "dealings in these Data Files or Software without prior written\n");
121+
fprintf( out, "authorization of the copyright holder.\n\n");
119122
if ( is_fr<0 || is_fr==1 ) {
120123
fprintf( out, "\n");
121124
printcopyright2credits(out);

configure.ac

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# -*- Autoconf -*-
22
dnl Process this file with autoconf to produce a configure script.
3-
AC_PREREQ([2.64])
3+
AC_PREREQ([2.69])
44
#-------------------------------------------
55
# PackageTimestamp, major version, minor version, and Nameslist.txt version
66
# Libraries have a "package" version of the form major.minor.micro.
7-
m4_define([uninameslist_package_stamp], [20240524]) dnl yyyymmdd
8-
m4_define([uninameslist_major_version], [15]) dnl Nameslist.txt
9-
m4_define([uninameslist_minor_version], [1])
7+
m4_define([uninameslist_package_stamp], [20240910]) dnl yyyymmdd
8+
m4_define([uninameslist_major_version], [16]) dnl Nameslist.txt
9+
m4_define([uninameslist_minor_version], [0])
1010
m4_define([uninameslist_nameslist_ver], [uninameslist_major_version.uninameslist_minor_version])
1111
# Libraries have a "libtool" version of the form current:revision:age.
1212
m4_define([uninameslist_current], [1])
13-
m4_define([uninameslist_revision],[14])
13+
m4_define([uninameslist_revision],[15])
1414
m4_define([uninameslist_age], [0])
1515
m4_define([uninameslist_libver],
1616
[uninameslist_current:uninameslist_revision:uninameslist_age])
@@ -53,8 +53,7 @@ m4_define([uninameslist_fr_libver],
5353
m4_define([uninameslist_package_name], [libuninameslist])
5454

5555
#-------------------------------------------
56-
AC_INIT([uninameslist],[uninameslist_package_stamp],[[email protected]],
57-
[uninameslist_package_name],[https://github.com/fontforge/libuninameslist])
56+
AC_INIT([uninameslist],[uninameslist_package_stamp],[[email protected]],[uninameslist_package_name],[https://github.com/fontforge/libuninameslist])
5857
AC_CONFIG_SRCDIR([buildnameslist.c])
5958
#-------------------------------------------
6059
AC_CONFIG_MACRO_DIR([m4])
@@ -80,7 +79,15 @@ AC_CHECK_TOOL([WGET],[wget],[:])
8079
AC_CHECK_TOOL([STRIP],[strip],[:])
8180
AC_CHECK_TOOL([TOUCH],[touch],[:])
8281
AC_PROG_INSTALL
83-
AC_PROG_LIBTOOL
82+
case "$host" in
83+
*-pc-cygwin*)
84+
AC_DEFINE(__CygWin,1)
85+
LT_INIT([win32-dll])
86+
;;
87+
*)
88+
LT_INIT()
89+
;;
90+
esac
8491
AC_ENABLE_SHARED
8592

8693
#-------------------------------------------
@@ -140,14 +147,6 @@ if test x$enable_pylib = xyes ; then
140147
fi
141148
AM_CONDITIONAL([ENABLE_PYLIB],[test x"${enable_pylib}" = xyes])
142149

143-
#-------------------------------------------
144-
# Platform specific stuff, AC_CANONICAL_HOST
145-
case "$host" in
146-
*-pc-cygwin*)
147-
AC_DEFINE(__CygWin,1)
148-
AC_LIBTOOL_WIN32_DLL
149-
esac
150-
151150
#-------------------------------------------
152151
# Compiler and Linker flags to override auto
153152
# detection and insertion. Use CFLAGS if you

0 commit comments

Comments
 (0)