Skip to content

Commit e50722a

Browse files
committed
Libuninameslist version 20250909
- Unicode 17.0 and French Unicode 16.0 - fix debian bug 989173: runs okay with CFLAGS="-g -O0" ./configure - Lintian tag: shared-library-lacks-prerequisite libuninameslist-fr - fix .github/workflows/main.yml for churn in github 2024->2025 and .appveyor.yml for similar churn due to python2->python3
1 parent e92a444 commit e50722a

File tree

12 files changed

+319
-297
lines changed

12 files changed

+319
-297
lines changed

.appveyor.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ matrix:
1616

1717
install:
1818
- call %MBASH% "pacman --noconfirm -S --needed base-devel"
19-
- call %MBASH% "pacman --noconfirm -S autoconf automake libtool python-setuptools"
19+
- call %MBASH% "pacman --noconfirm -S autoconf automake libtool python-setuptools python-pip-tools python-wheel"
2020
- call %MBASH% "python --version"
21-
- call %MBASH% "python -m ensurepip --default-pip"
22-
- call %MBASH% "pip --version"
23-
- call %MBASH% "python -m pip install ."
2421
build_script:
2522
- call %MBASH% "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; autoreconf -fiv && mkdir build && cd build && ../configure --enable-pylib && make check -j4 && make install"
2623
test: off

.github/workflows/main.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ jobs:
4848
run: make check
4949
windows:
5050
runs-on: windows-latest
51+
env:
52+
PYTHON: python3
5153
strategy:
5254
matrix:
5355
include: [
5456
{ msystem: MINGW64, tools: mingw-w64-x86_64 },
55-
{ msystem: MINGW32, tools: mingw-w64-i686 },
5657
{ msystem: UCRT64, tools: mingw-w64-ucrt-x86_64 },
5758
{ msystem: CLANG64, tools: mingw-w64-clang-x86_64 },
5859
]
@@ -61,18 +62,15 @@ jobs:
6162
run:
6263
shell: msys2 {0}
6364
steps:
64-
- uses: actions/checkout@v3
65+
- uses: actions/checkout@v4
6566
- uses: msys2/setup-msys2@v2
6667
with:
6768
msystem: ${{ matrix.msystem }}
6869
update: true
69-
install: autotools base-devel git ${{matrix.tools}}-toolchain ${{matrix.tools}}-python-setuptools
70+
install: autotools base-devel git ${{matrix.tools}}-toolchain ${{matrix.tools}}-python-setuptools ${{matrix.tools}}-python-pip-tools ${{matrix.tools}}-python-wheel
7071
- name: Create configure
7172
run: |
7273
python --version
73-
python -m ensurepip --default-pip
74-
pip --version
75-
pip install setuptools wheel build
7674
autoreconf -i
7775
automake
7876
- name: Choose configure

ChangeLog

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
1+
- 2025-Sep-09
2+
* libuninameslist updated to Unicode.org NamesList.txt version 17.0
3+
as libuninameslist-1.16 and French Unicode ListeDesNoms.txt is at
4+
version 16.0 as libuninameslist-fr-1.8.
5+
* Lintian tag: shared-library-lacks-prerequisite libuninameslist-fr
6+
* workflows/main.yml update and edite due to churn from 2024...2025
7+
18
- 2025-Jul-14
29
* Unicode 17.0_Beta, this is a preview Beta version for anybody who
310
is interested in trying it before an official 17.0 is available.
411
NOTE: This version shows as 16.9b to maintain versions sorting.
512
* Updated French Unicode to 16.0 (libuninameslist-fr = version1.8).
13+
* fix debian bug 989173: runs okay with CFLAGS="-g -O0" ./configure
614

715
- 2024-Sep-10
816
* Introducing Unicode 16.0 (libuninameslist=version1.15) and French
917
Unicode 15.1 translation (libuninameslist-fr=version1.7).
10-
* Upgraded configure.ac from 2.64 to 2.69.
18+
* Upgraded configure.ac from 2.64 to 2.69 to avoid problems with
19+
newer autoconf having problems with the older 2.64 configure.ac
1120

1221
- 2024-May-24
1322
* Version 1.14, Unicode 15.1 and French version 1.7 now is at 15.1.

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ libtool: $(LIBTOOL_DEPS)
7373
$(SHELL) ./config.status libtool
7474

7575
NamesList.txt:
76-
$(WGET) "https://www.unicode.org/Public/draft/ucd/NamesList.txt" -O NamesList.txt
76+
$(WGET) "https://www.unicode.org/Public/17.0.0/ucd/NamesList.txt" -O NamesList.txt
7777

7878
ListeDesNoms.txt:
7979
$(WGET) "https://hapax.qc.ca/ListeNoms-16.0.0.txt" -O ListeDesNoms.txt

README

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Building and Installing LibUniNamesList
6060
Read INSTALL for details on building LibUniNamesList using this package.
6161
This package contains 2 libraries, but only 1 is built by default:
6262
1) libuninameslist - holds NamesList.txt data from www.unicode.org
63-
2) libuninameslist-fr - currently holds French 13.0 NamesList.txt
63+
2) libuninameslist-fr - holds French ListeNoms.txt (NamesList.txt)
6464
If you need the libuninameslist-fr library then you will also need to enable
6565
building it since the current default is not to build it. This will also be
6666
recognized in functions 16..26 listed above as lang=1 (English=default=0).
@@ -81,8 +81,13 @@ Building and Installing LibUniNamesList and LibUniNamesList-fr
8181
The French library was built with the intention of maintaining backwards
8282
compatibility with older programs (like FontForge 20120731), so it is a
8383
separate library, but in this case, it is also linked to the base library.
84+
This allows modern programs to link to libuninameslist which then also
85+
links to libuninameslist-fr, and you can query information through the
86+
main libuninameslist.
8487
If you ran 'configure' and 'make' earlier, you need to run 'make clean'
8588
to remove the earlier libuninameslist (which won't link to this library).
89+
NOTE: libuninameslist is built differently here so that it also links to
90+
libuninameslist-fr
8691

8792
NOTE: You may need to run 'make clean' if you ran "./configure; make" earlier.
8893
$ ./configure --enable-frenchlib
@@ -309,4 +314,4 @@ Please report any bugs, patches and/or improvements to:
309314
310315

311316
This file was last updated:
312-
2021-Jun-26, by Joe Da Silva
317+
2025-Sep-09, by Joe Da Silva

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ libuninameslist – A Library of Unicode names and annotation data
1212
Description
1313
-----------
1414

15-
This library is updated for Nameslist.txt ver17.0_Beta and ListeDesNoms.txt ver16.0
15+
This library is updated for Nameslist.txt ver17.0 and ListeDesNoms.txt ver16.0
1616
and includes python wrapper 'uninameslist.py'
1717

1818
For latest release, see: https://github.com/fontforge/libuninameslist/releases
@@ -30,7 +30,8 @@ quickly and easily.
3030
ListeDesNoms.txt
3131
Is a seperate file which is translated from Nameslist.txt and was outdated for
3232
a period of time but was recently updated by a group of developers who have
33-
updated it up to version 14. Contributors to that file are listed in that file.
33+
updated it up to version 16. This requires a large amount of work by them and
34+
the Contributors to that file are listed in that file.
3435

3536
These libraries contain very large (sparse) arrays with one entry for each
3637
unicode code point (U+0000–U+10FFFF). Each entry contains two strings, a name
@@ -127,8 +128,8 @@ This library will also be linked to the main libuninameslist so that it can
127128
be used through the main library (as lang=1) for functions 16 to 26.
128129

129130
NOTE: If you ran 'make' after running './configure' earlier, you may need to
130-
run 'make clean' to clear-out the earlier libuninameslist library, which is
131-
built without knowledge of the additional library.
131+
run 'make clean' to clear-out the earlier 'libuninameslist' library, which is
132+
built differently without knowledge of the additional library.
132133
```c
133134
$ make clean
134135
$ make

buildnameslist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static int ReadNamesList(void) {
175175
int i, j;
176176
static char *nameslistfiles[] = { "NamesList.txt", "ListeDesNoms.txt", NULL };
177177
static char *nameslistlocs[] = {
178-
"https://www.unicode.org/Public/draft/ucd/NamesList.txt",
178+
"https://www.unicode.org/Public/17.0.0/ucd/NamesList.txt",
179179
"https://hapax.qc.ca/ListeNoms-16.0.0.txt (charset=UTF-8)"
180180
};
181181

configure.ac

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ 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], [20250714]) dnl yyyymmdd
8-
m4_define([uninameslist_major_version], [16]) dnl Nameslist.txt
9-
m4_define([uninameslist_minor_version], [9])
7+
m4_define([uninameslist_package_stamp], [20250909]) dnl yyyymmdd
8+
m4_define([uninameslist_major_version], [17]) 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],[15])
13+
m4_define([uninameslist_revision],[16])
1414
m4_define([uninameslist_age], [0])
1515
m4_define([uninameslist_libver],
1616
[uninameslist_current:uninameslist_revision:uninameslist_age])
@@ -77,6 +77,8 @@ AC_PROG_LN_S
7777
AC_PROG_MKDIR_P
7878
AC_PROG_MAKE_SET
7979
AC_PROG_SED
80+
AC_CHECK_TOOL([PYTHON2],[python2],[:])
81+
AC_CHECK_TOOL([PYTHON3],[python3],[:])
8082
AC_CHECK_TOOL([WGET],[wget],[:])
8183
AC_CHECK_TOOL([STRIP],[strip],[:])
8284
AC_CHECK_TOOL([TOUCH],[touch],[:])
@@ -117,25 +119,31 @@ fi
117119

118120
#-------------------------------------------
119121
# Python lib building - as installable wheel
122+
# default is Python3 (otherwise try Python2)
120123
AC_ARG_ENABLE([pylib],
121124
[AS_HELP_STRING([--enable-pylib],
122125
[Build the python module as an installable wheel.])],
123126
[enable_pylib=yes], [enable_pylib=no])
127+
PYTHONx="no python"
124128
if test x$enable_pylib = xyes ; then
125-
AC_ARG_VAR([PYTHON],[Python to use to build the python wheel.])
126-
if test x"${PYTHON}" = x; then
127-
PYTHON=python3
128-
fi
129-
AC_CHECK_PROG([PYTHONFOUND],[${PYTHON}],[yes])
130-
if test x"${PYTHONFOUND}" != xyes; then
131-
AC_MSG_ERROR([${PYTHON} was not found])
129+
# AC_ARG_VAR([PYTHON],[Python to use to build the python wheel.])
130+
PYTHONx=python3
131+
if test x"${PYTHON3}" = "x:"; then
132+
PYTHONx=python2
133+
if test x"${PYTHON2}" = "x:"; then
134+
PYTHONx=
132135
fi
136+
fi
137+
AC_CHECK_PROG([PYTHONFOUND],[${PYTHONx}],[yes])
138+
if test x"${PYTHONFOUND}" != xyes; then
139+
AC_MSG_ERROR([Python was not found. Please install Python3 (or Python2)])
140+
fi
133141

134-
PKGS=$(${PYTHON} -c 'import wheel; import pip' 2>/dev/null)
135-
if test $? != 0; then
136-
AC_MSG_ERROR([${PYTHON} does not have 'pip', 'setuptools' and 'wheel' installed])
137-
fi
138-
AC_SUBST(PYTHON, "${PYTHON}")
142+
PKGS=$(${PYTHONx} -c 'import wheel; import pip' 2>/dev/null)
143+
if test $? != 0; then
144+
AC_MSG_ERROR([${PYTHONx} does not have 'pip', 'setuptools' and 'wheel' installed])
145+
fi
146+
AC_SUBST(PYTHONx, "${PYTHONx}")
139147
fi
140148
AM_CONDITIONAL([ENABLE_PYLIB],[test x"${enable_pylib}" = xyes])
141149

@@ -201,11 +209,15 @@ AC_DEFINE([LFR_VERSION_MN],[uninameslist_fr_revision])
201209

202210
#-------------------------------------------
203211
# Pass variables to build libuninameslist.pc
212+
rm -f libuninameslist.pc
204213
uninameslist_libs="-luninameslist"
205-
dnl if test x"${frenchlib}" = xtrue; then
206-
dnl uninameslist_libs="${uninameslist_libs} -luninameslist-fr"
207-
dnl fi
214+
uninameslist_libs_private=
215+
if test x"${frenchlib}" = xyes; then
216+
uninameslist_libs="-luninameslist -luninameslist-fr"
217+
uninameslist_libs_private="-luninameslist-fr"
218+
fi
208219
AC_SUBST([LIBUNINAMESLIST_PKGCONFIG_LIBS],["${uninameslist_libs}"])
220+
AC_SUBST([LIBUNINAMESLIST_PKGCONFIG_LIBS_PRIVATE],["${uninameslist_libs_private}"])
209221

210222
#-------------------------------------------
211223
# Pass variables to MAKEFILE.AM
@@ -256,5 +268,5 @@ Configuration:
256268
Optional:
257269
Include French C lib ${frenchlib}
258270
Build Python wheels ${enable_pylib}
259-
271+
Build wheels using ${PYTHONx}
260272
])

libuninameslist.pc.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ datarootdir=@datarootdir@
66
mandir=@mandir@
77

88
Name: libuninameslist
9-
Description: Unicode Names and Annotations List Library (NamesList.txt=@NL_VERSION@)
9+
Description: Unicode Names and Annotations List Library
1010
URL: https://github.com/fontforge/libuninameslist/releases
1111
Version: @VERSION@
1212
Libs: -L${libdir} @LIBUNINAMESLIST_PKGCONFIG_LIBS@
13+
Libs.private: @LIBUNINAMESLIST_PKGCONFIG_LIBS_PRIVATE@
1314
Cflags: -I${includedir}
1415

0 commit comments

Comments
 (0)