openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-13 20:59:03 +00:00
Code Issues Projects Releases Wiki Activity

Update to encodings 1.1.0

Browse Source 
the ISO8859-14 encodings had already been added locally.
This commit is contained in:
matthieu
2024-04-28 13:05:39 +00:00
parent 57c856990b
commit f64dfb694e
11 changed files with 1177 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
font/encodings/ChangeLog
View File

@@ -1,3 +1,35 @@
commit a7e63704951b95351096c1d96808d48d0fb7e0a8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 2 13:06:10 2024 -0800
font-encodings 1.1.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c9411b1271ab87bd7004ed461f2021e8bc87ca2f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 6 14:01:20 2023 -0800
Add a meson build system
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
commit 4d05dc49a1d96dd1f0d1c36e34554f7c55b3f9bd
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Mon May 8 12:08:16 2023 +0200
Add the ISO8859-14 encoding
Source: https://en.wikipedia.org/wiki/ISO/IEC_8859-14
This allows legacy applications (xcalc for instance) to work without
the: "Warning: missing charsets in String to FontSet conversion"
message on systems with only ISO8859-1 and UTF-8 encoded fonts
installed.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit 61b7e8126a5f57bf4649ce128c78b1266bd5ce3c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Feb 27 16:14:27 2023 -0800
@@ -541,7 +573,7 @@ Date: Fri Jul 29 21:22:48 2005 +0000
- Update modular Xorg version
commit c9b1f243c82c35f5a01b4f930afd149236ad387d
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 12 21:03:09 2005 +0000
Move encodings here.

8
font/encodings/Makefile.am
View File

@@ -38,7 +38,13 @@ ENCODING_FILES = \
tis620-2.enc \
viscii1.1-1.enc
EXTRA_DIST = $(ENCODING_FILES) README.md
EXTRA_DIST = \
$(ENCODING_FILES) \
large/meson.build \
meson.build \
meson_options.txt \
mkencodingsdir.in \
README.md
MAINTAINERCLEANFILES = ChangeLog INSTALL

9
font/encodings/Makefile.in
View File

@@ -316,7 +316,14 @@ ENCODING_FILES = \
tis620-2.enc \
viscii1.1-1.enc
EXTRA_DIST = $(ENCODING_FILES) README.md
EXTRA_DIST = \
$(ENCODING_FILES) \
large/meson.build \
meson.build \
meson_options.txt \
mkencodingsdir.in \
README.md
MAINTAINERCLEANFILES = ChangeLog INSTALL
COMPRESSED = $(ENCODING_FILES:%=%.gz)
CLEANFILES = encodings.dir $(am__append_1)

4
font/encodings/aclocal.m4 vendored
View File

@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
[m4_warning([this file was generated for autoconf 2.71.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])

1357
font/encodings/configure vendored
View File

File diff suppressed because it is too large Load Diff

2
font/encodings/configure.ac
View File

@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
AC_INIT([encodings], [1.0.7],
AC_INIT([encodings], [1.1.0],
[https://gitlab.freedesktop.org/xorg/font/encodings/-/issues])
AM_INIT_AUTOMAKE([foreign dist-xz])

414
font/encodings/install-sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2011-11-20.07; # UTC
scriptversion=2020-11-14.01; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
# This script is compatible with the BSD install script, but was written
# from scratch.
tab=' '
nl='
'
IFS=" "" $nl"
IFS=" $tab$nl"
# set DOITPROG to echo to test this script
# Set DOITPROG to "echo" to test this script.
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
doit_exec=$doit
fi
doit_exec=${doit:-exec}
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
@@ -68,22 +64,16 @@ mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
posix_glob='?'
initialize_posix_glob='
test "$posix_glob" != "?" || {
if (set -f) 2>/dev/null; then
posix_glob=
else
posix_glob=:
fi
}
'
posix_mkdir=
# Desired mode of installed file.
mode=0755
# Create dirs (including intermediate dirs) using mode 755.
# This is like GNU 'install' as of coreutils 8.32 (2020).
mkdir_umask=22
backupsuffix=
chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
@@ -97,7 +87,7 @@ dir_arg=
dst_arg=
copy_on_change=false
no_target_directory=
is_target_a_directory=possibly
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -114,18 +104,28 @@ Options:
--version display version info and exit.
-c (ignored)
-C install only if different (preserve the last data modification time)
-C install only if different (preserve data modification time)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
-p pass -p to $cpprog.
-s $stripprog installed files.
-S SUFFIX attempt to back up existing files, with suffix SUFFIX.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
RMPROG STRIPPROG
By default, rm is invoked with -f; when overridden with RMPROG,
it's up to you to specify -f if you want it.
If -S is not specified, no backups are attempted.
Email bug reports to bug-automake@gnu.org.
Automake home page: https://www.gnu.org/software/automake/
"
while test $# -ne 0; do
@@ -137,46 +137,62 @@ while test $# -ne 0; do
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
shift;;
shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
shift;;
case $mode in
*' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
shift;;
-o) chowncmd="$chownprog $2"
shift;;
shift;;
-p) cpprog="$cpprog -p";;
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;;
-S) backupsuffix="$2"
shift;;
-T) no_target_directory=true;;
-t)
is_target_a_directory=always
dst_arg=$2
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;;
-T) is_target_a_directory=never;;
--version) echo "$0 $scriptversion"; exit $?;;
--) shift
break;;
--) shift
break;;
-*) echo "$0: invalid option: $1" >&2
exit 1;;
-*) echo "$0: invalid option: $1" >&2
exit 1;;
*) break;;
esac
shift
done
# We allow the use of options -d and -T together, by making -d
# take the precedence; this is for compatibility with GNU install.
if test -n "$dir_arg"; then
if test -n "$dst_arg"; then
echo "$0: target directory not allowed when installing a directory." >&2
exit 1
fi
fi
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
@@ -207,6 +223,15 @@ if test $# -eq 0; then
exit 0
fi
if test -z "$dir_arg"; then
if test $# -gt 1 || test "$is_target_a_directory" = always; then
if test ! -d "$dst_arg"; then
echo "$0: $dst_arg: Is not a directory." >&2
exit 1
fi
fi
fi
if test -z "$dir_arg"; then
do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
@@ -223,16 +248,16 @@ if test -z "$dir_arg"; then
*[0-7])
if test -z "$stripcmd"; then
u_plus_rw=
u_plus_rw=
else
u_plus_rw='% 200'
u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
u_plus_rw=
u_plus_rw=
else
u_plus_rw=,u+rw
u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
@@ -250,6 +275,10 @@ do
dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
# Don't chown directories that already exist.
if test $dstdir_status = 0; then
chowncmd=""
fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -266,178 +295,148 @@ do
fi
dst=$dst_arg
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
# If destination is a directory, append the input filename.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
dst=$dstdir/`basename "$src"`
dstbase=`basename "$src"`
case $dst in
*/) dst=$dst$dstbase;;
*) dst=$dst/$dstbase;;
esac
dstdir_status=0
else
# Prefer dirname, but fall back on a substitute if dirname fails.
dstdir=`
(dirname "$dst") 2>/dev/null ||
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$dst" : 'X\(//\)[^/]' \| \
X"$dst" : 'X\(//\)$' \| \
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$dst" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
}
/^X\(\/\/\)[^/].*/{
s//\1/
q
}
/^X\(\/\/\)$/{
s//\1/
q
}
/^X\(\/\).*/{
s//\1/
q
}
s/.*/./; q'
`
dstdir=`dirname "$dst"`
test -d "$dstdir"
dstdir_status=$?
fi
fi
case $dstdir in
*/) dstdirslash=$dstdir;;
*) dstdirslash=$dstdir/;;
esac
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
# Create intermediate dirs using mode 755 as modified by the umask.
# This is like FreeBSD 'install' as of 1997-10-28.
umask=`umask`
case $stripcmd.$umask in
# Optimize common cases.
*[2367][2367]) mkdir_umask=$umask;;
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
mkdir_mode=-m$mode
else
mkdir_mode=
fi
*[0-7])
mkdir_umask=`expr $umask + 22 \
- $umask % 100 % 40 + $umask % 20 \
- $umask % 10 % 4 + $umask % 2
`;;
*) mkdir_umask=$umask,go-w;;
esac
posix_mkdir=false
# The $RANDOM variable is not portable (e.g., dash). Use it
# here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
mkdir_mode=-m$mode
trap '
ret=$?
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
exit $ret
' 0
# Because "mkdir -p" follows existing symlinks and we likely work
# directly in world-writeable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p'.
if (umask $mkdir_umask &&
$mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
test_tmpdir="$tmpdir/a"
ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
$mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
mkdir_mode=
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
posix_mkdir=false
case $umask in
*[123567][0-7][0-7])
# POSIX mkdir -p sets u+wx bits regardless of umask, which
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
if (umask $mkdir_umask &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
rmdir "$tmpdir/d" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
fi
trap '' 0;;
esac;;
trap '' 0;;
esac
if
$posix_mkdir && (
umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
# The umask is ridiculous, or mkdir does not conform to POSIX,
# mkdir does not conform to POSIX,
# or it failed possibly due to a race condition. Create the
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
/*) prefix='/';;
[-=\(\)!]*) prefix='./';;
*) prefix='';;
/*) prefix='/';;
[-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
$posix_glob set -f
set -f
set fnord $dstdir
shift
$posix_glob set +f
set +f
IFS=$oIFS
prefixes=
for d
do
test X"$d" = X && continue
test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
prefixes=
else
if $posix_mkdir; then
(umask=$mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
else
case $prefix in
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
*) qprefix=$prefix;;
esac
prefixes="$prefixes '$qprefix'"
fi
fi
prefix=$prefix/
prefix=$prefix$d
if test -d "$prefix"; then
prefixes=
else
if $posix_mkdir; then
(umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
else
case $prefix in
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
*) qprefix=$prefix;;
esac
prefixes="$prefixes '$qprefix'"
fi
fi
prefix=$prefix/
done
if test -n "$prefixes"; then
# Don't fail if two instances are running concurrently.
(umask $mkdir_umask &&
eval "\$doit_exec \$mkdirprog $prefixes") ||
test -d "$dstdir" || exit 1
obsolete_mkdir_used=true
# Don't fail if two instances are running concurrently.
(umask $mkdir_umask &&
eval "\$doit_exec \$mkdirprog $prefixes") ||
test -d "$dstdir" || exit 1
obsolete_mkdir_used=true
fi
fi
fi
@@ -450,14 +449,25 @@ do
else
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
rmtmp=$dstdir/_rm.$$_
dsttmp=${dstdirslash}_inst.$$_
rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
(umask $cp_umask &&
{ test -z "$stripcmd" || {
# Create $dsttmp read-write so that cp doesn't create it read-only,
# which would cause strip to fail.
if test -z "$doit"; then
: >"$dsttmp" # No need to fork-exec 'touch'.
else
$doit touch "$dsttmp"
fi
}
} &&
$doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -472,20 +482,24 @@ do
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
eval "$initialize_posix_glob" &&
$posix_glob set -f &&
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
$posix_glob set +f &&
set +f &&
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
rm -f "$dsttmp"
else
# If $backupsuffix is set, and the file being installed
# already exists, attempt a backup. Don't worry if it fails,
# e.g., if mv doesn't support -f.
if test -n "$backupsuffix" && test -f "$dst"; then
$doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
fi
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
@@ -493,24 +507,24 @@ do
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
{
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
test ! -f "$dst" ||
$doit $rmcmd -f "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
} &&
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
test ! -f "$dst" ||
$doit $rmcmd "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
{ $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
} &&
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dst"
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1
@@ -519,9 +533,9 @@ do
done
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:

36
font/encodings/large/meson.build Normal file
View File

@@ -0,0 +1,36 @@
largeencodingsdir = encodingsdir / 'large'
large_encoding_files = [
'big5.eten-0.enc',
'big5hkscs-0.enc',
'cns11643-1.enc',
'cns11643-2.enc',
'cns11643-3.enc',
'gb18030-0.enc',
'gb18030.2000-0.enc',
'gb18030.2000-1.enc',
'gb2312.1980-0.enc',
'gbk-0.enc',
'jisx0201.1976-0.enc',
'jisx0208.1990-0.enc',
'jisx0212.1990-0.enc',
'ksc5601.1987-0.enc',
'ksc5601.1992-3.enc',
'sun.unicode.india-0.enc'
]
if get_option('gzip-large-encodings')
foreach large_encoding_input : large_encoding_files
large_encoding_output = large_encoding_input + '.gz'
custom_target(large_encoding_output,
input: large_encoding_input,
output: large_encoding_output,
command: [gzip, '-c', '-n', '@INPUT@'],
capture: true, # capture output from stdout
install: true,
install_dir: largeencodingsdir)
endforeach
else
install_data(large_encoding_files, install_dir: largeencodingsdir)
endif

94
font/encodings/meson.build Normal file
View File

@@ -0,0 +1,94 @@
project('encodings',
version: '1.1.0',
meson_version: '>= 0.58.0',
license: 'MIT'
)
mkfontscale = find_program('mkfontscale', required: true, native: true)
if get_option('gzip-small-encodings') or get_option('gzip-large-encodings')
gzip = find_program('gzip', required: true, native: true)
endif
encodingsdir = get_option('encodingsdir')
if encodingsdir == ''
fontrootdir = get_option('fontrootdir')
if fontrootdir == ''
fontutil = dependency('fontutil', required: false, version: '>= 1.1.0')
if fontutil.found()
fontrootdir = fontutil.get_variable('fontrootdir')
endif
if fontrootdir == ''
fontrootdir = get_option('datadir') / 'fonts' / 'X11'
endif
endif
encodingsdir = fontrootdir / 'encodings'
endif
small_encoding_files = [
'adobe-dingbats.enc',
'adobe-standard.enc',
'adobe-symbol.enc',
'armscii-8.enc',
'ascii-0.enc',
'dec-special.enc',
'ibm-cp437.enc',
'ibm-cp850.enc',
'ibm-cp852.enc',
'ibm-cp866.enc',
'iso8859-11.enc',
'iso8859-13.enc',
'iso8859-14.enc',
'iso8859-16.enc',
'iso8859-6.16.enc',
'iso8859-6.8x.enc',
'microsoft-cp1250.enc',
'microsoft-cp1251.enc',
'microsoft-cp1252.enc',
'microsoft-cp1253.enc',
'microsoft-cp1254.enc',
'microsoft-cp1255.enc',
'microsoft-cp1256.enc',
'microsoft-cp1257.enc',
'microsoft-cp1258.enc',
'microsoft-win3.1.enc',
'mulearabic-0.enc',
'mulearabic-1.enc',
'mulearabic-2.enc',
'mulelao-1.enc',
'suneu-greek.enc',
'tcvn-0.enc',
'tis620-2.enc',
'viscii1.1-1.enc'
]
if get_option('gzip-small-encodings')
foreach small_encoding_input : small_encoding_files
small_encoding_output = small_encoding_input + '.gz'
custom_target(small_encoding_output,
input: small_encoding_input,
output: small_encoding_output,
command: [gzip, '-c', '-n', '@INPUT@'],
capture: true, # capture output from stdout
install: true,
install_dir: encodingsdir)
endforeach
else
install_data(small_encoding_files, install_dir: encodingsdir)
endif
subdir('large')
conf_data = configuration_data({
'mkfontscale': mkfontscale.full_path(),
'encodingsdir': encodingsdir
})
mkencodingsdir = configure_file(input : 'mkencodingsdir.in',
output : 'mkencodingsdir',
configuration : conf_data)
meson.add_install_script(mkencodingsdir)
summary({'encodingsdir': encodingsdir,
'gzip-small-encodings': get_option('gzip-small-encodings'),
'gzip-large-encodings': get_option('gzip-large-encodings'),
'mkfontscale': mkfontscale})

10
font/encodings/meson_options.txt Normal file
View File

@@ -0,0 +1,10 @@
# Choose whether or not to compress encodings - default is to compress all
option('gzip-small-encodings', type: 'boolean', value: true,
description: 'gzip small encoding files')
option('gzip-large-encodings', type: 'boolean', value: true,
description: 'gzip large encoding files')
# options for setting the installation path
option('fontrootdir', type: 'string',
description: 'Path to root directory for font files')
option('encodingsdir', type: 'string',
description: 'Path to directory for encodings files')

10
font/encodings/mkencodingsdir.in Normal file
View File

@@ -0,0 +1,10 @@
#! /bin/sh
if [ -z ${MESON_INSTALL_QUIET+x} ]; then
set -x
fi
cd ${DESTDIR}@encodingsdir@
@mkfontscale@ -b -s -l -n -r -p @encodingsdir@ -e . -e large .
cd large
@mkfontscale@ -b -s -l -n -r -p @encodingsdir@/large -e . .