diff options
Diffstat (limited to 'source/x')
463 files changed, 6920 insertions, 3227 deletions
diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog index 51d321af9..056948557 100644 --- a/source/x/FTBFSlog +++ b/source/x/FTBFSlog @@ -1,35 +1,19 @@ -Tue Apr 6 18:07:59 UTC 2021 - fcitx: Remove -fPIC to fix build (it uses it anyway). Thanks to nobodino. - fcitx-configtool: Remove -fPIC to fix build. Thanks to nobodino. +Mon May 22 17:50:35 UTC 2023 +fcitx5: Fix build against recent fmt. Thanks to lucabon. +--------------------------+ -Sat Jan 30 02:44:45 UTC 2021 - fcitx-libpinyin: fix building against libpinyin-2.6.0 with upstream patch. - Thanks to nobodino for the report. - Copy data/table.conf into the ../data directory to fix make install. +Thu Apr 13 19:25:28 UTC 2023 +mesa: fix build by removing deprecated rust-bindgen option. Thanks to lucabon. +--------------------------+ -Sat Jan 16 18:43:10 UTC 2021 - freeglut: add -fcommon to CFLAGS. Thanks to nobodino. - x11: add -fcommon to CFLAGS. Thanks to nobodino. - x11/pixman: Don't use icecream. +Tue Feb 14 20:48:58 UTC 2023 +vulkan-sdk: Patched VulkanTools to fix warning/error about uninitialized +variables. Thanks to lucabon. +--------------------------+ -Sat Oct 12 17:04:36 UTC 2019 - xorg-server: patched to build with libglvnd >= 1.2.0. Thanks to bartgymnast. +Sat Oct 15 19:21:06 UTC 2022 +x11/xdm: Fixed the arc4random patch. Thanks to nobodino. +--------------------------+ -Sun May 26 19:04:04 UTC 2019 - igt-gpu-tools: Added -Wno-error=array-bounds to CFLAGS. - Thanks to ponce and nobodino. +Wed Mar 2 01:27:59 UTC 2022 +x11/igt-gpu-tools: Patched for new meson. Thanks to nobodino. +--------------------------+ -Sun Mar 11 19:26:12 UTC 2018 - xpyb: patched to fix build with xcbproto-1.13. +Mon Feb 7 20:57:55 UTC 2022 + All packages tested and found to compile properly. +--------------------------+ -Thu Mar 1 20:16:21 UTC 2018 - motif: touch AUTHORS and NEWS, or automake-1.16 will fail with an error -+--------------------------+ -Mon Feb 12 20:46:07 UTC 2018 - Fix all packages that fail to build from source: - libxshmfence: patch to handle memfd_create() properly for glibc-2.27+ -+--------------------------+ -Thu Feb 1 00:46:34 UTC 2018 - Fix all packages that fail to build from source: - scim: Add to CXXFLAGS: -fpermissive -fno-delete-null-pointer-checks -std=gnu++98 - scim-anthy: Add to CXXFLAGS: -fpermissive -fno-delete-null-pointer-checks -std=gnu++98 diff --git a/source/x/OpenCC/OpenCC.SlackBuild b/source/x/OpenCC/OpenCC.SlackBuild index 98272cfad..da26ff8ff 100755 --- a/source/x/OpenCC/OpenCC.SlackBuild +++ b/source/x/OpenCC/OpenCC.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for OpenCC # Copyright 2017-2018 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2017-2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017-2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -92,6 +92,7 @@ cd build -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DUSE_SYSTEM_MARISA=ON \ .. make $NUMJOBS || make || exit 1 diff --git a/source/x/anthy/anthy.SlackBuild b/source/x/anthy-unicode/anthy-unicode.SlackBuild index 9ba974ff5..af7fa15fe 100755 --- a/source/x/anthy/anthy.SlackBuild +++ b/source/x/anthy-unicode/anthy-unicode.SlackBuild @@ -21,22 +21,12 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# ----------------------------------------------------------------------------- -# -# Slackware SlackBuild script -# =========================== -# By: Eric Hameleers <alien@slackware.com> -# For: anthy -# Descr: a system for Japanese input method -# URL: http://anthy.sourceforge.jp/ -# -# ----------------------------------------------------------------------------- cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=anthy +PKGNAM=anthy-unicode VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -109,6 +99,9 @@ make DESTDIR=$PKG install || exit 1 # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# Don't clobber config files +mv $PKG/etc/anthy-unicode.conf $PKG/etc/anthy-unicode.conf.new + # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ @@ -116,30 +109,14 @@ cp -a \ $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \+ -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -# Compress the man page(s): -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -fi - # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # Add a package description: mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc -if [ -f $CWD/doinst.sh ]; then - cat $CWD/doinst.sh >> $PKG/install/doinst.sh -fi # Build the package: cd $PKG diff --git a/source/x/anthy-unicode/anthy-unicode.url b/source/x/anthy-unicode/anthy-unicode.url new file mode 100644 index 000000000..633181be3 --- /dev/null +++ b/source/x/anthy-unicode/anthy-unicode.url @@ -0,0 +1 @@ +https://github.com/fujiwarat/anthy-unicode/releases diff --git a/source/x/anthy-unicode/doinst.sh b/source/x/anthy-unicode/doinst.sh new file mode 100644 index 000000000..cc7172dad --- /dev/null +++ b/source/x/anthy-unicode/doinst.sh @@ -0,0 +1,15 @@ +#!/bin/sh +config() { + NEW="$1" + OLD="`dirname $NEW`/`basename $NEW .new`" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/anthy-unicode.conf.new + diff --git a/source/x/anthy-unicode/slack-desc b/source/x/anthy-unicode/slack-desc new file mode 100644 index 000000000..d6e0741bb --- /dev/null +++ b/source/x/anthy-unicode/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +anthy-unicode: anthy-unicode (A library for Japanese text input) +anthy-unicode: +anthy-unicode: Anthy is a library for Japanese text input. It converts Hiragana text +anthy-unicode: to Kana Kanji mixed text. +anthy-unicode: +anthy-unicode: Homepage: https://github.com/fujiwarat/anthy-unicode +anthy-unicode: +anthy-unicode: +anthy-unicode: +anthy-unicode: +anthy-unicode: diff --git a/source/x/anthy/slack-desc b/source/x/anthy/slack-desc deleted file mode 100644 index 1de00da2a..000000000 --- a/source/x/anthy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -anthy: anthy (a system for Japanese input method) -anthy: -anthy: Anthy is a library for Japanese text input. It converts Hiragana text -anthy: to Kana Kanji mixed text. -anthy: -anthy: anthy home: http://anthy.sourceforge.jp/ -anthy: -anthy: -anthy: -anthy: -anthy: diff --git a/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild b/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild index 4a0df793a..b5466f188 100755 --- a/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild +++ b/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cldr-emoji-annotation VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -85,8 +85,9 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README \ +cp -a AUTHORS* ChangeLog INSTALL* NEWS* README* \ $PKG/usr/doc/$PKGNAM-$VERSION +cp -a $(readlink -f COPYING) $PKG/usr/doc/$PKGNAM-$VERSION/COPYING mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/compiz/175.patch b/source/x/compiz/175.patch new file mode 100644 index 000000000..46eb4533f --- /dev/null +++ b/source/x/compiz/175.patch @@ -0,0 +1,55 @@ +From ea7b3731b1a8a0f2fb7aa765a84374658b67b1b7 Mon Sep 17 00:00:00 2001 +From: Sixu Hu <husixu1@hotmail.com> +Date: Wed, 22 Nov 2023 00:54:10 +0800 +Subject: [PATCH] Fix compatibility with libxml 2.12 + +--- + src/main.c | 6 ++++-- + src/metadata.c | 7 +++++-- + 2 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 26b4c512..7182b75b 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -271,8 +271,10 @@ readCoreXmlCallback (void *context, + i += compReadXmlChunk ("</screen></core></compiz>", &offset, buffer + i, + length - i); + +- if (!offset && length > i) +- buffer[i++] = '\0'; ++ if (!offset && length > i) { ++ // buffer[i] = '\0'; ++ ctx->offset += 1; ++ } + + ctx->offset += i; + +diff --git a/src/metadata.c b/src/metadata.c +index 3c1fa9ff..559734aa 100644 +--- a/src/metadata.c ++++ b/src/metadata.c +@@ -30,6 +30,7 @@ + #include <libxml/xpath.h> + #include <libxml/xpathInternals.h> + #include <locale.h> ++#include <stdlib.h> + + #include <compiz-core.h> + +@@ -285,8 +286,10 @@ readPluginXmlCallback (void *context, + i += compReadXmlChunk ("</plugin></compiz>", &offset, buffer + i, + length - i); + +- if (!offset && length > i) +- buffer[i++] = '\0'; ++ if (!offset && length > i) { ++ // buffer[i] = '\0'; ++ ctx->offset += 1; ++ } + + ctx->offset += i; + +-- +GitLab + diff --git a/source/x/compiz/compiz.SlackBuild b/source/x/compiz/compiz.SlackBuild index a10752c9f..9e34a28ac 100755 --- a/source/x/compiz/compiz.SlackBuild +++ b/source/x/compiz/compiz.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2019, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,13 +24,13 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=compiz VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac @@ -85,6 +85,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix for libxml2-2.12: +zcat $CWD/175.patch.gz | patch -p1 --verbose || exit 1 + if [ ! -r configure ]; then NOCONFIGURE=1 ./autogen.sh fi diff --git a/source/x/egl-wayland/egl-wayland.SlackBuild b/source/x/egl-wayland/egl-wayland.SlackBuild index 4448e0f84..6f6bce353 100755 --- a/source/x/egl-wayland/egl-wayland.SlackBuild +++ b/source/x/egl-wayland/egl-wayland.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=egl-wayland VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -99,7 +99,7 @@ meson setup \ cd .. # Install the NVidia ICD file: -mkdir $PKG/usr/share/egl/egl_external_platform.d/ +mkdir -p $PKG/usr/share/egl/egl_external_platform.d/ cp -a $CWD/10_nvidia_wayland.json $PKG/usr/share/egl/egl_external_platform.d/ chown root:root $PKG/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json chmod 644 $PKG/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json diff --git a/source/x/fcitx-configtool/fcitx-configtool.url b/source/x/fcitx-configtool/fcitx-configtool.url deleted file mode 100644 index 34012df2a..000000000 --- a/source/x/fcitx-configtool/fcitx-configtool.url +++ /dev/null @@ -1 +0,0 @@ -https://download.fcitx-im.org/fcitx-configtool diff --git a/source/x/fcitx-configtool/slack-desc b/source/x/fcitx-configtool/slack-desc deleted file mode 100644 index 88e431f67..000000000 --- a/source/x/fcitx-configtool/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx-configtool: fcitx-configtool (GTK based config tool for Fcitx) -fcitx-configtool: -fcitx-configtool: fcitx-configtool is a GTK3 based configuration tool for Fcitx. -fcitx-configtool: -fcitx-configtool: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: -fcitx-configtool: diff --git a/source/x/fcitx-libpinyin/fcitx-libpinyin.SlackBuild b/source/x/fcitx-libpinyin/fcitx-libpinyin.SlackBuild deleted file mode 100755 index 88a02b5d3..000000000 --- a/source/x/fcitx-libpinyin/fcitx-libpinyin.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/bash - -# Slackware build script for fcitx-libpinyin - -# Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2017, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=fcitx-libpinyin -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-libpinyin - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf fcitx-libpinyin-$VERSION -tar xvf $CWD/fcitx-libpinyin-$VERSION.tar.?z* || exit 1 -cd fcitx-libpinyin-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -# Extract model.text.* from the dict tarball: -( cd $TMP - tar xf $CWD/dict/*.tar.* $(tar tf $CWD/dict/*.tar.* | grep model.text) -) - -mkdir cmake-build -cd cmake-build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIBPINYIN_PKGDATADIR=/usr/share/fcitx/libpinyin/zhuyin_data \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DENABLE_QT=OFF \ - .. - - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd .. - -# Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fcitx-libpinyin/slack-desc b/source/x/fcitx-libpinyin/slack-desc deleted file mode 100644 index 6f55e6dec..000000000 --- a/source/x/fcitx-libpinyin/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx-libpinyin: fcitx-libpinyin (libpinyin wrapper for Fcitx) -fcitx-libpinyin: -fcitx-libpinyin: libpinyin wrapper for Fcitx. -fcitx-libpinyin: -fcitx-libpinyin: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: -fcitx-libpinyin: diff --git a/source/x/fcitx-sayura/fcitx-sayura.SlackBuild b/source/x/fcitx-sayura/fcitx-sayura.SlackBuild deleted file mode 100755 index 687785c36..000000000 --- a/source/x/fcitx-sayura/fcitx-sayura.SlackBuild +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# Slackware build script for fcitx-sayura - -# Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=fcitx-sayura -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-sayura - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf fcitx-sayura-$VERSION -tar xvf $CWD/fcitx-sayura-$VERSION.tar.?z || exit 1 -cd fcitx-sayura-$VERSION || exit 1 -chown -R root:root . - -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -mkdir build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - .. - - make $NUMJOBS || make || exit 1 - make install/strip DESTDIR=$PKG || exit 1 -cd .. - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a README.md $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fcitx-sayura/slack-desc b/source/x/fcitx-sayura/slack-desc deleted file mode 100644 index 5a277c9a6..000000000 --- a/source/x/fcitx-sayura/slack-desc +++ /dev/null @@ -1,18 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx-sayura: fcitx-sayura (Sinhala input method for fcitx) -fcitx-sayura: -fcitx-sayura: Fcitx-Sayura is a Sinhala input method for Fcitx. -fcitx-sayura: -fcitx-sayura: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-sayura: -fcitx-sayura: -fcitx-sayura: -fcitx-sayura: -fcitx-sayura: diff --git a/source/x/fcitx-table-extra/slack-desc b/source/x/fcitx-table-extra/slack-desc deleted file mode 100644 index a7dcf89f2..000000000 --- a/source/x/fcitx-table-extra/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx-table-extra: fcitx-table-extra (extra tables for fcitx) -fcitx-table-extra: -fcitx-table-extra: fcitx-table-extra provides extra tables for Fcitx, including Boshiamy, -fcitx-table-extra: Zhengma, Cangjie, and Quick. -fcitx-table-extra: -fcitx-table-extra: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-table-extra: -fcitx-table-extra: -fcitx-table-extra: -fcitx-table-extra: -fcitx-table-extra: diff --git a/source/x/fcitx-table-other/fcitx-table-other.SlackBuild b/source/x/fcitx-table-other/fcitx-table-other.SlackBuild deleted file mode 100755 index 03e90bc42..000000000 --- a/source/x/fcitx-table-other/fcitx-table-other.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -# Slackware build script for fcitx-table-other - -# Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=fcitx-table-other -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-table-other - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf fcitx-table-other-$VERSION -tar xvf $CWD/fcitx-table-other-$VERSION.tar.?z || exit 1 -cd fcitx-table-other-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - . - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fcitx-table-other/slack-desc b/source/x/fcitx-table-other/slack-desc deleted file mode 100644 index 3c50ceab1..000000000 --- a/source/x/fcitx-table-other/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx-table-other: fcitx-table-other (other tables for fcitx) -fcitx-table-other: -fcitx-table-other: fcitx-table-other provides some other tables for Fcitx, forked from -fcitx-table-other: ibus-table-others and scim-tables. -fcitx-table-other: -fcitx-table-other: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-table-other: -fcitx-table-other: -fcitx-table-other: -fcitx-table-other: -fcitx-table-other: diff --git a/source/x/fcitx-unikey/fcitx-unikey.SlackBuild b/source/x/fcitx-unikey/fcitx-unikey.SlackBuild deleted file mode 100755 index b212a4f13..000000000 --- a/source/x/fcitx-unikey/fcitx-unikey.SlackBuild +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# Slackware build script for fcitx-unikey - -# Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=fcitx-unikey -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-unikey - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf fcitx-unikey-$VERSION -tar xvf $CWD/fcitx-unikey-$VERSION.tar.?z || exit 1 -cd fcitx-unikey-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -mkdir build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - .. - - make $NUMJOBS || make || exit 1 - make install/strip DESTDIR=$PKG || exit 1 -cd .. - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fcitx-unikey/slack-desc b/source/x/fcitx-unikey/slack-desc deleted file mode 100644 index 9a805566e..000000000 --- a/source/x/fcitx-unikey/slack-desc +++ /dev/null @@ -1,18 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx-unikey: fcitx-unikey (Vietnamese input support for fcitx) -fcitx-unikey: -fcitx-unikey: Unikey (Vietnamese Input Method) engine support for Fcitx. -fcitx-unikey: -fcitx-unikey: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-unikey: -fcitx-unikey: -fcitx-unikey: -fcitx-unikey: -fcitx-unikey: diff --git a/source/x/fcitx/fcitx-autostart.patch b/source/x/fcitx/fcitx-autostart.patch deleted file mode 100644 index 10924fbeb..000000000 --- a/source/x/fcitx/fcitx-autostart.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- fcitx-autostart.orig 2017-03-26 17:58:45.586105103 +0200 -+++ fcitx-autostart 2017-03-26 17:59:09.693105345 +0200 -@@ -1,4 +1,26 @@ --#!/bin/sh -+#!/bin/bash -+ -+START="no" -+ -+if [ "$XIM" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$XIM_PROGRAM" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$GTK_IM_MODULE" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$QT_IM_MODULE" = "fcitx" ]; then -+ START="yes" -+fi -+ -+if [ "$START" = "no" ]; then -+ exit 0 -+fi - - # sleep for a little while to avoid duplicate startup - sleep 2 diff --git a/source/x/fcitx/slack-desc b/source/x/fcitx/slack-desc deleted file mode 100644 index c64bd1b50..000000000 --- a/source/x/fcitx/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx: fcitx (Input Method Framework) -fcitx: -fcitx: Fcitx is an input method framework with extension support. Currently -fcitx: it supports Linux and Unix systems like freebsd. It has three built- -fcitx: in Input Method Engine, Pinyin, QuWei and Table-based input methods. -fcitx: Fcitx tries to provide a native feeling under all desktop as well as -fcitx: a light weight core. You can easily customize it to fit your -fcitx: requirements. -fcitx: -fcitx: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx: diff --git a/source/x/fcitx5-anthy/fcitx5-anthy-5.1.4.tar.zst b/source/x/fcitx5-anthy/fcitx5-anthy-5.1.4.tar.zst Binary files differnew file mode 100644 index 000000000..02230d755 --- /dev/null +++ b/source/x/fcitx5-anthy/fcitx5-anthy-5.1.4.tar.zst diff --git a/source/x/fcitx-anthy/fcitx-anthy.SlackBuild b/source/x/fcitx5-anthy/fcitx5-anthy.SlackBuild index 6c60c2043..906a9ad3f 100755 --- a/source/x/fcitx-anthy/fcitx-anthy.SlackBuild +++ b/source/x/fcitx5-anthy/fcitx5-anthy.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for fcitx-anthy - # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=fcitx-anthy -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +PKGNAM=fcitx5-anthy +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -69,14 +67,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-anthy +PKG=$TMP/package-fcitx5-anthy rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf fcitx-anthy-$VERSION -tar xvf $CWD/fcitx-anthy-$VERSION.tar.?z || exit 1 -cd fcitx-anthy-$VERSION || exit 1 +rm -rf fcitx5-anthy-$VERSION +tar xvf $CWD/fcitx5-anthy-$VERSION.tar.zst || exit 1 +cd fcitx5-anthy-$VERSION || exit 1 chown -R root:root . find . \ @@ -91,7 +89,7 @@ cd build -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ .. make $NUMJOBS || make || exit 1 @@ -99,7 +97,7 @@ cd build cd .. mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/fcitx5-anthy/fcitx5-anthy.url b/source/x/fcitx5-anthy/fcitx5-anthy.url new file mode 100644 index 000000000..40e9a2745 --- /dev/null +++ b/source/x/fcitx5-anthy/fcitx5-anthy.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-anthy/ diff --git a/source/x/fcitx-hangul/slack-desc b/source/x/fcitx5-anthy/slack-desc index 8ad9742b3..227b4d7ba 100644 --- a/source/x/fcitx-hangul/slack-desc +++ b/source/x/fcitx5-anthy/slack-desc @@ -6,13 +6,13 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fcitx-hangul: fcitx-hangul (Hangul wrapper for fcitx) -fcitx-hangul: -fcitx-hangul: Hangul Wrapper for Fcitx. -fcitx-hangul: -fcitx-hangul: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-hangul: -fcitx-hangul: -fcitx-hangul: -fcitx-hangul: -fcitx-hangul: +fcitx5-anthy: fcitx5-anthy (Anthy wrapper for fcitx5) +fcitx5-anthy: +fcitx5-anthy: Anthy Wrapper for Fcitx5. +fcitx5-anthy: +fcitx5-anthy: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-anthy: +fcitx5-anthy: +fcitx5-anthy: +fcitx5-anthy: +fcitx5-anthy: diff --git a/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.5_dict.tar.zst b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.5_dict.tar.zst Binary files differnew file mode 100644 index 000000000..2bf0bda2d --- /dev/null +++ b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.5_dict.tar.zst diff --git a/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild new file mode 100755 index 000000000..efd277d58 --- /dev/null +++ b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild @@ -0,0 +1,107 @@ +#!/bin/bash + +# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=fcitx5-chinese-addons +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | cut -f 2- -d _ | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-fcitx5-chinese-addons + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf fcitx5-chinese-addons-$VERSION +tar xvf $CWD/fcitx5-chinese-addons-${VERSION}_dict.tar.zst || exit 1 +cd fcitx5-chinese-addons-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir build +cd build + cmake \ + -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DUSE_QT6=Off \ + .. + + make $NUMJOBS || make || exit 1 + make install/strip DESTDIR=$PKG || exit 1 +cd .. + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.url b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.url new file mode 100644 index 000000000..7107fba1e --- /dev/null +++ b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/ diff --git a/source/x/fcitx5-chinese-addons/slack-desc b/source/x/fcitx5-chinese-addons/slack-desc new file mode 100644 index 000000000..ad83f8c6b --- /dev/null +++ b/source/x/fcitx5-chinese-addons/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fcitx5-chinese-addons: fcitx5-chinese-addons (Chinese related addon for fcitx5) +fcitx5-chinese-addons: +fcitx5-chinese-addons: This provides pinyin and table input method support for fcitx5. +fcitx5-chinese-addons: +fcitx5-chinese-addons: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-chinese-addons: +fcitx5-chinese-addons: +fcitx5-chinese-addons: +fcitx5-chinese-addons: +fcitx5-chinese-addons: +fcitx5-chinese-addons: diff --git a/source/x/fcitx5-gtk/doinst.sh b/source/x/fcitx5-gtk/doinst.sh new file mode 100644 index 000000000..0e1409968 --- /dev/null +++ b/source/x/fcitx5-gtk/doinst.sh @@ -0,0 +1,4 @@ +if [ -x usr/bin/update-gtk-immodules ]; then + chroot . /usr/bin/update-gtk-immodules --verbose 1>/dev/null +fi + diff --git a/source/x/fcitx5-gtk/fcitx5-gtk-5.1.3.tar.zst b/source/x/fcitx5-gtk/fcitx5-gtk-5.1.3.tar.zst Binary files differnew file mode 100644 index 000000000..09108d813 --- /dev/null +++ b/source/x/fcitx5-gtk/fcitx5-gtk-5.1.3.tar.zst diff --git a/source/x/fcitx5-gtk/fcitx5-gtk.SlackBuild b/source/x/fcitx5-gtk/fcitx5-gtk.SlackBuild new file mode 100755 index 000000000..b08edfe65 --- /dev/null +++ b/source/x/fcitx5-gtk/fcitx5-gtk.SlackBuild @@ -0,0 +1,107 @@ +#!/bin/bash + +# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=fcitx5-gtk +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-fcitx5-gtk + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf fcitx5-gtk-$VERSION +tar xvf $CWD/fcitx5-gtk-$VERSION.tar.zst || exit 1 +cd fcitx5-gtk-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir build +cd build + cmake \ + -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + .. + + make $NUMJOBS || make || exit 1 + make install/strip DESTDIR=$PKG || exit 1 +cd .. + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fcitx5-gtk/fcitx5-gtk.url b/source/x/fcitx5-gtk/fcitx5-gtk.url new file mode 100644 index 000000000..6f7fa1f12 --- /dev/null +++ b/source/x/fcitx5-gtk/fcitx5-gtk.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-gtk/ diff --git a/source/x/fcitx-m17n/slack-desc b/source/x/fcitx5-gtk/slack-desc index 0a362c7fc..8d3ae5613 100644 --- a/source/x/fcitx-m17n/slack-desc +++ b/source/x/fcitx5-gtk/slack-desc @@ -6,13 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fcitx-m17n: fcitx-m17n (m17n input method engine wrapper for fcitx) -fcitx-m17n: -fcitx-m17n: Fcitx wrapper for the m17n input method engine. -fcitx-m17n: -fcitx-m17n: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-m17n: -fcitx-m17n: -fcitx-m17n: -fcitx-m17n: -fcitx-m17n: +fcitx5-gtk: fcitx5-gtk (Gtk IM Module for Fcitx5) +fcitx5-gtk: +fcitx5-gtk: Gtk IM module for fcitx5 and glib based dbus client library. +fcitx5-gtk: +fcitx5-gtk: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-gtk: +fcitx5-gtk: +fcitx5-gtk: +fcitx5-gtk: +fcitx5-gtk: +fcitx5-gtk: diff --git a/source/x/fcitx5-hangul/fcitx5-hangul-5.1.3.tar.zst b/source/x/fcitx5-hangul/fcitx5-hangul-5.1.3.tar.zst Binary files differnew file mode 100644 index 000000000..ebd3371af --- /dev/null +++ b/source/x/fcitx5-hangul/fcitx5-hangul-5.1.3.tar.zst diff --git a/source/x/fcitx-qt5/fcitx-qt5.SlackBuild b/source/x/fcitx5-hangul/fcitx5-hangul.SlackBuild index 90aa739a2..4609107ce 100755 --- a/source/x/fcitx-qt5/fcitx-qt5.SlackBuild +++ b/source/x/fcitx5-hangul/fcitx5-hangul.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for fcitx-qt5 - # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=fcitx-qt5 -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +PKGNAM=fcitx5-hangul +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -69,14 +67,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-qt5 +PKG=$TMP/package-fcitx5-hangul rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf fcitx-qt5-$VERSION -tar xvf $CWD/fcitx-qt5-$VERSION.tar.?z || exit 1 -cd fcitx-qt5-$VERSION || exit 1 +rm -rf fcitx5-hangul-$VERSION +tar xvf $CWD/fcitx5-hangul-$VERSION.tar.zst || exit 1 +cd fcitx5-hangul-$VERSION || exit 1 chown -R root:root . find . \ @@ -91,7 +89,7 @@ cd build -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ .. make $NUMJOBS || make || exit 1 @@ -99,7 +97,7 @@ cd build cd .. mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING README $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/fcitx5-hangul/fcitx5-hangul.url b/source/x/fcitx5-hangul/fcitx5-hangul.url new file mode 100644 index 000000000..9a03e340d --- /dev/null +++ b/source/x/fcitx5-hangul/fcitx5-hangul.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-hangul/ diff --git a/source/x/fcitx5-hangul/slack-desc b/source/x/fcitx5-hangul/slack-desc new file mode 100644 index 000000000..d03dc299e --- /dev/null +++ b/source/x/fcitx5-hangul/slack-desc @@ -0,0 +1,18 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fcitx5-hangul: fcitx5-hangul (Hangul wrapper for fcitx5) +fcitx5-hangul: +fcitx5-hangul: Hangul Wrapper for Fcitx. +fcitx5-hangul: +fcitx5-hangul: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-hangul: +fcitx5-hangul: +fcitx5-hangul: +fcitx5-hangul: +fcitx5-hangul: diff --git a/source/x/fcitx5-kkc/fcitx5-kkc-5.1.3.tar.zst b/source/x/fcitx5-kkc/fcitx5-kkc-5.1.3.tar.zst Binary files differnew file mode 100644 index 000000000..f12b63e70 --- /dev/null +++ b/source/x/fcitx5-kkc/fcitx5-kkc-5.1.3.tar.zst diff --git a/source/x/fcitx-kkc/fcitx-kkc.SlackBuild b/source/x/fcitx5-kkc/fcitx5-kkc.SlackBuild index f317e3919..8929b98ed 100755 --- a/source/x/fcitx-kkc/fcitx-kkc.SlackBuild +++ b/source/x/fcitx5-kkc/fcitx5-kkc.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for fcitx-kkc - # Copyright 2015-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=fcitx-kkc -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} +PKGNAM=fcitx5-kkc +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -69,14 +67,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-kkc +PKG=$TMP/package-fcitx5-kkc rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf fcitx-kkc-$VERSION -tar xvf $CWD/fcitx-kkc-$VERSION.tar.?z || exit 1 -cd fcitx-kkc-$VERSION || exit 1 +rm -rf fcitx5-kkc-$VERSION +tar xvf $CWD/fcitx5-kkc-$VERSION.tar.zst || exit 1 +cd fcitx5-kkc-$VERSION || exit 1 chown -R root:root . find . \ @@ -91,7 +89,8 @@ cd build -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DUSE_QT6=Off \ .. make $NUMJOBS || make || exit 1 @@ -99,7 +98,7 @@ cd build cd .. mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/fcitx5-kkc/fcitx5-kkc.url b/source/x/fcitx5-kkc/fcitx5-kkc.url new file mode 100644 index 000000000..0cbf46e16 --- /dev/null +++ b/source/x/fcitx5-kkc/fcitx5-kkc.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-kkc/ diff --git a/source/x/fcitx5-kkc/slack-desc b/source/x/fcitx5-kkc/slack-desc new file mode 100644 index 000000000..abe90ce0b --- /dev/null +++ b/source/x/fcitx5-kkc/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fcitx5-kkc: fcitx5-kkc (Japanese Kana Kanji Engine for Fcitx5) +fcitx5-kkc: +fcitx5-kkc: Fcitx-kkc is a Kana Kanji engine for Fcitx. It provides Japanese +fcitx5-kkc: input method using libkkc. +fcitx5-kkc: +fcitx5-kkc: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-kkc: +fcitx5-kkc: +fcitx5-kkc: +fcitx5-kkc: +fcitx5-kkc: diff --git a/source/x/fcitx5-m17n/fcitx5-m17n-5.1.1.tar.zst b/source/x/fcitx5-m17n/fcitx5-m17n-5.1.1.tar.zst Binary files differnew file mode 100644 index 000000000..a2215d104 --- /dev/null +++ b/source/x/fcitx5-m17n/fcitx5-m17n-5.1.1.tar.zst diff --git a/source/x/fcitx-m17n/fcitx-m17n.SlackBuild b/source/x/fcitx5-m17n/fcitx5-m17n.SlackBuild index 78f838e1a..3d387deb2 100755 --- a/source/x/fcitx-m17n/fcitx-m17n.SlackBuild +++ b/source/x/fcitx5-m17n/fcitx5-m17n.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for fcitx-m17n - # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=fcitx-m17n -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} +PKGNAM=fcitx5-m17n +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -69,14 +67,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-m17n +PKG=$TMP/package-fcitx5-m17n rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf fcitx-m17n-$VERSION -tar xvf $CWD/fcitx-m17n-$VERSION.tar.?z || exit 1 -cd fcitx-m17n-$VERSION || exit 1 +rm -rf fcitx5-m17n-$VERSION +tar xvf $CWD/fcitx5-m17n-$VERSION.tar.zst || exit 1 +cd fcitx5-m17n-$VERSION || exit 1 chown -R root:root . find . \ @@ -91,7 +89,7 @@ cd build -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ .. make $NUMJOBS || make || exit 1 @@ -99,7 +97,7 @@ cd build cd .. mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/fcitx5-m17n/fcitx5-m17n.url b/source/x/fcitx5-m17n/fcitx5-m17n.url new file mode 100644 index 000000000..cb69b0b72 --- /dev/null +++ b/source/x/fcitx5-m17n/fcitx5-m17n.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-m17n/ diff --git a/source/x/fcitx-anthy/slack-desc b/source/x/fcitx5-m17n/slack-desc index 3bce31908..b727059e2 100644 --- a/source/x/fcitx-anthy/slack-desc +++ b/source/x/fcitx5-m17n/slack-desc @@ -6,13 +6,13 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fcitx-anthy: fcitx-anthy (Anthy wrapper for fcitx) -fcitx-anthy: -fcitx-anthy: Anthy Wrapper for Fcitx. -fcitx-anthy: -fcitx-anthy: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-anthy: -fcitx-anthy: -fcitx-anthy: -fcitx-anthy: -fcitx-anthy: +fcitx5-m17n: fcitx5-m17n (m17n input method engine wrapper for fcitx5) +fcitx5-m17n: +fcitx5-m17n: Fcitx wrapper for the m17n input method engine. +fcitx5-m17n: +fcitx5-m17n: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-m17n: +fcitx5-m17n: +fcitx5-m17n: +fcitx5-m17n: +fcitx5-m17n: diff --git a/source/x/fcitx5-qt/fcitx5-qt-5.1.6.tar.zst b/source/x/fcitx5-qt/fcitx5-qt-5.1.6.tar.zst Binary files differnew file mode 100644 index 000000000..4a90e4dcb --- /dev/null +++ b/source/x/fcitx5-qt/fcitx5-qt-5.1.6.tar.zst diff --git a/source/x/fcitx-hangul/fcitx-hangul.SlackBuild b/source/x/fcitx5-qt/fcitx5-qt.SlackBuild index 0c1ec73b0..6130a2679 100755 --- a/source/x/fcitx-hangul/fcitx-hangul.SlackBuild +++ b/source/x/fcitx5-qt/fcitx5-qt.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for fcitx-hangul - # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=fcitx-hangul -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} +PKGNAM=fcitx5-qt +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -69,14 +67,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-hangul +PKG=$TMP/package-fcitx5-qt rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf fcitx-hangul-$VERSION -tar xvf $CWD/fcitx-hangul-$VERSION.tar.?z || exit 1 -cd fcitx-hangul-$VERSION || exit 1 +rm -rf fcitx5-qt-$VERSION +tar xvf $CWD/fcitx5-qt-$VERSION.tar.zst || exit 1 +cd fcitx5-qt-$VERSION || exit 1 chown -R root:root . find . \ @@ -91,7 +89,8 @@ cd build -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DENABLE_QT4="Off" \ .. make $NUMJOBS || make || exit 1 @@ -99,7 +98,7 @@ cd build cd .. mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/fcitx5-qt/fcitx5-qt.url b/source/x/fcitx5-qt/fcitx5-qt.url new file mode 100644 index 000000000..639c96e36 --- /dev/null +++ b/source/x/fcitx5-qt/fcitx5-qt.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-qt/ diff --git a/source/x/fcitx-qt5/slack-desc b/source/x/fcitx5-qt/slack-desc index 0b4a02036..53a5ceadb 100644 --- a/source/x/fcitx-qt5/slack-desc +++ b/source/x/fcitx5-qt/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fcitx-qt5: fcitx-qt5 (Qt5 IM Module for Fcitx) -fcitx-qt5: -fcitx-qt5: Qt5 IM Module for Fcitx. -fcitx-qt5: -fcitx-qt5: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: -fcitx-qt5: +fcitx5-qt: fcitx5-qt (Qt IM Module for Fcitx5) +fcitx5-qt: +fcitx5-qt: Qt IM Module for Fcitx5. +fcitx5-qt: +fcitx5-qt: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-qt: +fcitx5-qt: +fcitx5-qt: +fcitx5-qt: +fcitx5-qt: +fcitx5-qt: diff --git a/source/x/fcitx5-sayura/fcitx5-sayura-5.1.2.tar.zst b/source/x/fcitx5-sayura/fcitx5-sayura-5.1.2.tar.zst Binary files differnew file mode 100644 index 000000000..c19058275 --- /dev/null +++ b/source/x/fcitx5-sayura/fcitx5-sayura-5.1.2.tar.zst diff --git a/source/x/fcitx5-sayura/fcitx5-sayura.SlackBuild b/source/x/fcitx5-sayura/fcitx5-sayura.SlackBuild new file mode 100755 index 000000000..dcfe1859d --- /dev/null +++ b/source/x/fcitx5-sayura/fcitx5-sayura.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/bash + +# Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=fcitx5-sayura +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-fcitx5-sayura + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf fcitx5-sayura-$VERSION +tar xvf $CWD/fcitx5-sayura-$VERSION.tar.zst || exit 1 +cd fcitx5-sayura-$VERSION || exit 1 +chown -R root:root . + +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir build +cd build + cmake \ + -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + .. + + make $NUMJOBS || make || exit 1 + make install/strip DESTDIR=$PKG || exit 1 +cd .. + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fcitx5-sayura/fcitx5-sayura.url b/source/x/fcitx5-sayura/fcitx5-sayura.url new file mode 100644 index 000000000..d54c7c64f --- /dev/null +++ b/source/x/fcitx5-sayura/fcitx5-sayura.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-sayura/ diff --git a/source/x/fcitx5-sayura/slack-desc b/source/x/fcitx5-sayura/slack-desc new file mode 100644 index 000000000..40aeb4407 --- /dev/null +++ b/source/x/fcitx5-sayura/slack-desc @@ -0,0 +1,18 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fcitx5-sayura: fcitx5-sayura (Sinhala input method for fcitx5) +fcitx5-sayura: +fcitx5-sayura: Fcitx-Sayura is a Sinhala input method for Fcitx. +fcitx5-sayura: +fcitx5-sayura: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-sayura: +fcitx5-sayura: +fcitx5-sayura: +fcitx5-sayura: +fcitx5-sayura: diff --git a/source/x/fcitx5-table-extra/fcitx5-table-extra-5.1.5.tar.zst b/source/x/fcitx5-table-extra/fcitx5-table-extra-5.1.5.tar.zst Binary files differnew file mode 100644 index 000000000..388fbe905 --- /dev/null +++ b/source/x/fcitx5-table-extra/fcitx5-table-extra-5.1.5.tar.zst diff --git a/source/x/fcitx-table-extra/fcitx-table-extra.SlackBuild b/source/x/fcitx5-table-extra/fcitx5-table-extra.SlackBuild index affe67266..51f5c4199 100755 --- a/source/x/fcitx-table-extra/fcitx-table-extra.SlackBuild +++ b/source/x/fcitx5-table-extra/fcitx5-table-extra.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for fcitx-table-extra - # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=fcitx-table-extra -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} +PKGNAM=fcitx5-table-extra +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -69,14 +67,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx-table-extra +PKG=$TMP/package-fcitx5-table-extra rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf fcitx-table-extra-$VERSION -tar xvf $CWD/fcitx-table-extra-$VERSION.tar.?z || exit 1 -cd fcitx-table-extra-$VERSION || exit 1 +rm -rf fcitx5-table-extra-$VERSION +tar xvf $CWD/fcitx5-table-extra-$VERSION.tar.zst || exit 1 +cd fcitx5-table-extra-$VERSION || exit 1 chown -R root:root . find . \ @@ -91,7 +89,7 @@ cd build -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ .. make $NUMJOBS || make || exit 1 @@ -99,7 +97,7 @@ cd build cd .. mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/fcitx5-table-extra/fcitx5-table-extra.url b/source/x/fcitx5-table-extra/fcitx5-table-extra.url new file mode 100644 index 000000000..231faaf67 --- /dev/null +++ b/source/x/fcitx5-table-extra/fcitx5-table-extra.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/ diff --git a/source/x/fcitx5-table-extra/slack-desc b/source/x/fcitx5-table-extra/slack-desc new file mode 100644 index 000000000..a887dcd18 --- /dev/null +++ b/source/x/fcitx5-table-extra/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fcitx5-table-extra: fcitx5-table-extra (Extra tables for fcitx5) +fcitx5-table-extra: +fcitx5-table-extra: fcitx5-table-extra provides extra tables for Fcitx, including Boshiamy, +fcitx5-table-extra: Zhengma, Cangjie, and Quick. +fcitx5-table-extra: +fcitx5-table-extra: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-table-extra: +fcitx5-table-extra: +fcitx5-table-extra: +fcitx5-table-extra: +fcitx5-table-extra: diff --git a/source/x/fcitx5-table-other/fcitx5-table-other-5.1.2.tar.zst b/source/x/fcitx5-table-other/fcitx5-table-other-5.1.2.tar.zst Binary files differnew file mode 100644 index 000000000..4268d71d5 --- /dev/null +++ b/source/x/fcitx5-table-other/fcitx5-table-other-5.1.2.tar.zst diff --git a/source/x/fcitx5-table-other/fcitx5-table-other.SlackBuild b/source/x/fcitx5-table-other/fcitx5-table-other.SlackBuild new file mode 100755 index 000000000..819dce74e --- /dev/null +++ b/source/x/fcitx5-table-other/fcitx5-table-other.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/bash + +# Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=fcitx5-table-other +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-fcitx5-table-other + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf fcitx5-table-other-$VERSION +tar xvf $CWD/fcitx5-table-other-$VERSION.tar.zst || exit 1 +cd fcitx5-table-other-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir build +cd build + cmake \ + -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fcitx5-table-other/fcitx5-table-other.url b/source/x/fcitx5-table-other/fcitx5-table-other.url new file mode 100644 index 000000000..55a62542d --- /dev/null +++ b/source/x/fcitx5-table-other/fcitx5-table-other.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-table-other/ diff --git a/source/x/fcitx5-table-other/slack-desc b/source/x/fcitx5-table-other/slack-desc new file mode 100644 index 000000000..2b6224637 --- /dev/null +++ b/source/x/fcitx5-table-other/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fcitx5-table-other: fcitx5-table-other (Other tables for fcitx5) +fcitx5-table-other: +fcitx5-table-other: fcitx5-table-other provides some other tables for Fcitx, forked from +fcitx5-table-other: ibus-table-others and scim-tables. +fcitx5-table-other: +fcitx5-table-other: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-table-other: +fcitx5-table-other: +fcitx5-table-other: +fcitx5-table-other: +fcitx5-table-other: diff --git a/source/x/fcitx5-unikey/fcitx5-unikey-5.1.4.tar.zst b/source/x/fcitx5-unikey/fcitx5-unikey-5.1.4.tar.zst Binary files differnew file mode 100644 index 000000000..7741f3e0a --- /dev/null +++ b/source/x/fcitx5-unikey/fcitx5-unikey-5.1.4.tar.zst diff --git a/source/x/fcitx5-unikey/fcitx5-unikey.SlackBuild b/source/x/fcitx5-unikey/fcitx5-unikey.SlackBuild new file mode 100755 index 000000000..128a78b9c --- /dev/null +++ b/source/x/fcitx5-unikey/fcitx5-unikey.SlackBuild @@ -0,0 +1,107 @@ +#!/bin/bash + +# Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=fcitx5-unikey +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-fcitx5-unikey + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf fcitx5-unikey-$VERSION +tar xvf $CWD/fcitx5-unikey-$VERSION.tar.zst || exit 1 +cd fcitx5-unikey-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir build +cd build + cmake \ + -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DUSE_QT6=Off \ + .. + + make $NUMJOBS || make || exit 1 + make install/strip DESTDIR=$PKG || exit 1 +cd .. + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fcitx5-unikey/fcitx5-unikey.url b/source/x/fcitx5-unikey/fcitx5-unikey.url new file mode 100644 index 000000000..0bbe733e9 --- /dev/null +++ b/source/x/fcitx5-unikey/fcitx5-unikey.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5-unikey/ diff --git a/source/x/fcitx-kkc/slack-desc b/source/x/fcitx5-unikey/slack-desc index 3121c890c..6c92149ab 100644 --- a/source/x/fcitx-kkc/slack-desc +++ b/source/x/fcitx5-unikey/slack-desc @@ -5,15 +5,14 @@ # You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. - |-----handy-ruler------------------------------------------------------| -fcitx-kkc: fcitx-kkc (Japanese Kana Kanji Engine for Fcitx) -fcitx-kkc: -fcitx-kkc: Fcitx-kkc is a Kana Kanji engine for Fcitx. It provides Japanese -fcitx-kkc: input method using libkkc. -fcitx-kkc: -fcitx-kkc: Homepage: https://fcitx-im.org/wiki/Fcitx -fcitx-kkc: -fcitx-kkc: -fcitx-kkc: -fcitx-kkc: -fcitx-kkc: + |-----handy-ruler------------------------------------------------------| +fcitx5-unikey: fcitx5-unikey (Vietnamese input support for fcitx5) +fcitx5-unikey: +fcitx5-unikey: Unikey (Vietnamese Input Method) engine support for Fcitx. +fcitx5-unikey: +fcitx5-unikey: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5-unikey: +fcitx5-unikey: +fcitx5-unikey: +fcitx5-unikey: +fcitx5-unikey: diff --git a/source/x/fcitx/doinst.sh b/source/x/fcitx5/doinst.sh index c9d0cf4d7..e4e645983 100644 --- a/source/x/fcitx/doinst.sh +++ b/source/x/fcitx5/doinst.sh @@ -6,7 +6,3 @@ if [ -x /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 fi -if [ -x usr/bin/update-gtk-immodules ]; then - chroot . /usr/bin/update-gtk-immodules --verbose 1>/dev/null -fi - diff --git a/source/x/fcitx5/fcitx5-5.1.9_dict.tar.zst b/source/x/fcitx5/fcitx5-5.1.9_dict.tar.zst Binary files differnew file mode 100644 index 000000000..06c48916f --- /dev/null +++ b/source/x/fcitx5/fcitx5-5.1.9_dict.tar.zst diff --git a/source/x/fcitx5/fcitx5-autostart b/source/x/fcitx5/fcitx5-autostart new file mode 100755 index 000000000..22d8c056d --- /dev/null +++ b/source/x/fcitx5/fcitx5-autostart @@ -0,0 +1,36 @@ +#!/bin/bash + +START="no" + +if [ "$XIM" = "fcitx" ]; then + START="yes" +fi + +if [ "$XIM_PROGRAM" = "fcitx" ]; then + START="yes" +fi + +if [ "$GTK_IM_MODULE" = "fcitx" ]; then + START="yes" +fi + +if [ "$QT_IM_MODULE" = "fcitx" ]; then + START="yes" +fi + +if [ "$START" = "no" ]; then + exit 0 +fi + +# sleep for a little while to avoid duplicate startup +sleep 2 + +# Test whether fcitx is running correctly with dbus... +fcitx5-remote > /dev/null 2>&1 + +if [ $? = "1" ]; then + echo "Fcitx seems is not running" + fcitx5 +else + echo "Fcitx is running correctly." +fi diff --git a/source/x/fcitx/fcitx.SlackBuild b/source/x/fcitx5/fcitx5.SlackBuild index ddbcc2c96..8bdd73def 100755 --- a/source/x/fcitx/fcitx.SlackBuild +++ b/source/x/fcitx5/fcitx5.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for fcitx. - # Copyright 2012 vvoody <vvoodywang@gmail.com> -# Copyright 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2018, 2020, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # # All rights reserved. # @@ -26,9 +24,9 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=fcitx -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | cut -f 2- -d _ | rev)} -BUILD=${BUILD:-3} +PKGNAM=fcitx5 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d - | cut -f 2- -d _ | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -73,14 +71,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx +PKG=$TMP/package-fcitx5 rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf fcitx-$VERSION -tar xvf $CWD/fcitx-${VERSION}.tar.?z || exit 1 -cd fcitx-$VERSION || exit 1 +rm -rf fcitx5-$VERSION +tar xvf $CWD/fcitx5-${VERSION}_dict.tar.zst || exit 1 +cd fcitx5-$VERSION || exit 1 chown -R root:root . find . \ @@ -89,35 +87,29 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Patch fcitx-autostart to only start when fcitx is the configured input method -zcat $CWD/fcitx-autostart.patch.gz | patch -p0 --verbose -d data/script/ - mkdir build cd build cmake \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ + -DCMAKE_C_FLAGS:STRING="${SLKCFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${SLKCFLAGS}" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONFDIR=/etc \ - -DENABLE_GTK2_IM_MODULE=On \ - -DENABLE_GTK3_IM_MODULE=On \ - -DENABLE_QT=Off \ - -DENABLE_QT_IM_MODULE=Off \ - -DENABLE_QT_GUI=Off \ - -DENABLE_OPENCC=On \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_MANDIR=man \ + -DCMAKE_INSTALL_DOCDIR=doc/$PKGNAM-$VERSION \ + -DCMAKE_INSTALL_SYSCONFDIR=etc \ + -DENABLE_DOC="On" \ .. make $NUMJOBS || make || exit 1 make install/strip DESTDIR=$PKG || exit 1 cd .. -find $PKG/usr/man -type f -exec gzip -9 {} \; +# Use our own autostart script to autostart fcitx5 +install -m 755 $CWD/fcitx5-autostart $PKG/usr/bin/ +sed -i "s|Exec=/usr/bin/fcitx5|Exec=/usr/bin/fcitx5-autostart|" \ + $PKG/etc/xdg/autostart/org.fcitx.Fcitx5.desktop -mv $PKG/usr/share/doc $PKG/usr -mv $PKG/usr/doc/$PKGNAM $PKG/usr/doc/$PKGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL README THANKS TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSES/* README* $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/x/fcitx5/fcitx5.url b/source/x/fcitx5/fcitx5.url new file mode 100644 index 000000000..5bd658bf4 --- /dev/null +++ b/source/x/fcitx5/fcitx5.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/fcitx5/ diff --git a/source/x/fcitx5/slack-desc b/source/x/fcitx5/slack-desc new file mode 100644 index 000000000..eaccae799 --- /dev/null +++ b/source/x/fcitx5/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fcitx5: fcitx5 (Input Method Framework) +fcitx5: +fcitx5: Fcitx is an input method framework with extension support. Currently +fcitx5: it supports Linux and Unix systems like freebsd. It has three built- +fcitx5: in Input Method Engine, Pinyin, QuWei and Table-based input methods. +fcitx5: Fcitx tries to provide a native feeling under all desktop as well as +fcitx5: a light weight core. You can easily customize it to fit your +fcitx5: requirements. +fcitx5: +fcitx5: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +fcitx5: diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild index 3c6b6a0c1..4de47d9fb 100755 --- a/source/x/freeglut/freeglut.SlackBuild +++ b/source/x/freeglut/freeglut.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2012 Robby Workman, Northport, Alabama, USA -# Copyright 2016, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2018, 2019, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=freeglut VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -79,13 +79,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html -cp -a \ - AUTHORS COPYING* INSTALL NEWS README TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION -cp -a doc/*.{html,png} $PKG/usr/doc/$PKGNAM-$VERSION/html -find $PKG/usr/doc -type f -exec chmod 0644 {} \+ - mkdir -p build cd build CFLAGS="$SLKCFLAGS" \ @@ -119,6 +112,24 @@ make install DESTDIR=$PKG || exit 1 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +cd .. +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html +cp -a \ + AUTHORS* COPYING* ChangeLog INSTALL* NEWS* README* TODO* \ + $PKG/usr/doc/$PKGNAM-$VERSION +cp -a doc/*.{html,png} $PKG/usr/doc/$PKGNAM-$VERSION/html +find $PKG/usr/doc -type f -exec chmod 0644 {} \+ +# In case this is empty: +rmdir $PKG/usr/doc/$PKGNAM-$VERSION/html 2> /dev/null + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/glu/glu.SlackBuild b/source/x/glu/glu.SlackBuild index 05a1dbc5e..73e07bb71 100755 --- a/source/x/glu/glu.SlackBuild +++ b/source/x/glu/glu.SlackBuild @@ -1,8 +1,7 @@ #!/bin/bash -# Slackware build script for glu - # Copyright 2012 Robby Workman, Northport, Alabama, USA +# Copyright 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -76,21 +75,31 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --disable-static \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + --buildtype=release \ + -Dgl_provider=glvnd \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# No static library: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/source/x/hack-fonts-ttf/hack-fonts-ttf.SlackBuild b/source/x/hack-fonts-ttf/hack-fonts-ttf.SlackBuild index 2d06626fb..55d1a4cda 100755 --- a/source/x/hack-fonts-ttf/hack-fonts-ttf.SlackBuild +++ b/source/x/hack-fonts-ttf/hack-fonts-ttf.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/x/ibus-anthy/ibus-anthy.SlackBuild b/source/x/ibus-anthy/ibus-anthy.SlackBuild index a414c40eb..58b642e53 100755 --- a/source/x/ibus-anthy/ibus-anthy.SlackBuild +++ b/source/x/ibus-anthy/ibus-anthy.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ibus-anthy VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/ibus-hangul/ibus-hangul.SlackBuild b/source/x/ibus-hangul/ibus-hangul.SlackBuild index 837ef5f4c..318c1e45e 100755 --- a/source/x/ibus-hangul/ibus-hangul.SlackBuild +++ b/source/x/ibus-hangul/ibus-hangul.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ibus-hangul VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild index 3bfad788a..10a4378d4 100755 --- a/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild +++ b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for ibus-libpinyin - # Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2017, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/source/x/ibus-libpinyin/ibus-libpinyin.url b/source/x/ibus-libpinyin/ibus-libpinyin.url new file mode 100644 index 000000000..0a431dd89 --- /dev/null +++ b/source/x/ibus-libpinyin/ibus-libpinyin.url @@ -0,0 +1,2 @@ +https://github.com/libpinyin/ibus-libpinyin +https://github.com/libpinyin/ibus-libpinyin/releases/download/1.15.7/ibus-libpinyin-1.15.7.tar.gz diff --git a/source/x/ibus-table/ibus-table.SlackBuild b/source/x/ibus-table/ibus-table.SlackBuild index 08ca1dc1d..d2b813197 100755 --- a/source/x/ibus-table/ibus-table.SlackBuild +++ b/source/x/ibus-table/ibus-table.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ibus-table VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/ibus/Blocks.txt b/source/x/ibus/Blocks.txt index 56877db10..8fa3eaad0 100644 --- a/source/x/ibus/Blocks.txt +++ b/source/x/ibus/Blocks.txt @@ -1,10 +1,10 @@ -# Blocks-13.0.0.txt -# Date: 2019-07-10, 19:06:00 GMT [KW] -# © 2019 Unicode®, Inc. -# For terms of use, see http://www.unicode.org/terms_of_use.html +# Blocks-15.1.0.txt +# Date: 2023-07-28, 15:47:20 GMT +# © 2023 Unicode®, Inc. +# For terms of use, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database -# For documentation, see http://www.unicode.org/reports/tr44/ +# For documentation, see https://www.unicode.org/reports/tr44/ # # Format: # Start Code..End Code; Block Name @@ -15,7 +15,7 @@ # and underbars are ignored. # For example, "Latin Extended-A" and "latin extended a" are equivalent. # For more information on the comparison of property values, -# see UAX #44: http://www.unicode.org/reports/tr44/ +# see UAX #44: https://www.unicode.org/reports/tr44/ # # All block ranges start with a value where (cp MOD 16) = 0, # and end with a value where (cp MOD 16) = 15. In other words, @@ -52,6 +52,7 @@ 0800..083F; Samaritan 0840..085F; Mandaic 0860..086F; Syriac Supplement +0870..089F; Arabic Extended-B 08A0..08FF; Arabic Extended-A 0900..097F; Devanagari 0980..09FF; Bengali @@ -215,7 +216,9 @@ FFF0..FFFF; Specials 104B0..104FF; Osage 10500..1052F; Elbasan 10530..1056F; Caucasian Albanian +10570..105BF; Vithkuqi 10600..1077F; Linear A +10780..107BF; Latin Extended-F 10800..1083F; Cypriot Syllabary 10840..1085F; Imperial Aramaic 10860..1087F; Palmyrene @@ -238,8 +241,10 @@ FFF0..FFFF; Specials 10D00..10D3F; Hanifi Rohingya 10E60..10E7F; Rumi Numeral Symbols 10E80..10EBF; Yezidi +10EC0..10EFF; Arabic Extended-C 10F00..10F2F; Old Sogdian 10F30..10F6F; Sogdian +10F70..10FAF; Old Uyghur 10FB0..10FDF; Chorasmian 10FE0..10FFF; Elymaic 11000..1107F; Brahmi @@ -259,29 +264,34 @@ FFF0..FFFF; Specials 11600..1165F; Modi 11660..1167F; Mongolian Supplement 11680..116CF; Takri -11700..1173F; Ahom +11700..1174F; Ahom 11800..1184F; Dogra 118A0..118FF; Warang Citi 11900..1195F; Dives Akuru 119A0..119FF; Nandinagari 11A00..11A4F; Zanabazar Square 11A50..11AAF; Soyombo +11AB0..11ABF; Unified Canadian Aboriginal Syllabics Extended-A 11AC0..11AFF; Pau Cin Hau +11B00..11B5F; Devanagari Extended-A 11C00..11C6F; Bhaiksuki 11C70..11CBF; Marchen 11D00..11D5F; Masaram Gondi 11D60..11DAF; Gunjala Gondi 11EE0..11EFF; Makasar +11F00..11F5F; Kawi 11FB0..11FBF; Lisu Supplement 11FC0..11FFF; Tamil Supplement 12000..123FF; Cuneiform 12400..1247F; Cuneiform Numbers and Punctuation 12480..1254F; Early Dynastic Cuneiform +12F90..12FFF; Cypro-Minoan 13000..1342F; Egyptian Hieroglyphs -13430..1343F; Egyptian Hieroglyph Format Controls +13430..1345F; Egyptian Hieroglyph Format Controls 14400..1467F; Anatolian Hieroglyphs 16800..16A3F; Bamum Supplement 16A40..16A6F; Mro +16A70..16ACF; Tangsa 16AD0..16AFF; Bassa Vah 16B00..16B8F; Pahawh Hmong 16E40..16E9F; Medefaidrin @@ -290,24 +300,32 @@ FFF0..FFFF; Specials 17000..187FF; Tangut 18800..18AFF; Tangut Components 18B00..18CFF; Khitan Small Script -18D00..18D8F; Tangut Supplement +18D00..18D7F; Tangut Supplement +1AFF0..1AFFF; Kana Extended-B 1B000..1B0FF; Kana Supplement 1B100..1B12F; Kana Extended-A 1B130..1B16F; Small Kana Extension 1B170..1B2FF; Nushu 1BC00..1BC9F; Duployan 1BCA0..1BCAF; Shorthand Format Controls +1CF00..1CFCF; Znamenny Musical Notation 1D000..1D0FF; Byzantine Musical Symbols 1D100..1D1FF; Musical Symbols 1D200..1D24F; Ancient Greek Musical Notation +1D2C0..1D2DF; Kaktovik Numerals 1D2E0..1D2FF; Mayan Numerals 1D300..1D35F; Tai Xuan Jing Symbols 1D360..1D37F; Counting Rod Numerals 1D400..1D7FF; Mathematical Alphanumeric Symbols 1D800..1DAAF; Sutton SignWriting +1DF00..1DFFF; Latin Extended-G 1E000..1E02F; Glagolitic Supplement +1E030..1E08F; Cyrillic Extended-D 1E100..1E14F; Nyiakeng Puachue Hmong +1E290..1E2BF; Toto 1E2C0..1E2FF; Wancho +1E4D0..1E4FF; Nag Mundari +1E7E0..1E7FF; Ethiopic Extended-B 1E800..1E8DF; Mende Kikakui 1E900..1E95F; Adlam 1EC70..1ECBF; Indic Siyaq Numbers @@ -334,8 +352,10 @@ FFF0..FFFF; Specials 2B740..2B81F; CJK Unified Ideographs Extension D 2B820..2CEAF; CJK Unified Ideographs Extension E 2CEB0..2EBEF; CJK Unified Ideographs Extension F +2EBF0..2EE5F; CJK Unified Ideographs Extension I 2F800..2FA1F; CJK Compatibility Ideographs Supplement 30000..3134F; CJK Unified Ideographs Extension G +31350..323AF; CJK Unified Ideographs Extension H E0000..E007F; Tags E0100..E01EF; Variation Selectors Supplement F0000..FFFFF; Supplementary Private Use Area-A diff --git a/source/x/ibus/NamesList.txt b/source/x/ibus/NamesList.txt index 9a046745a..4dd0fb39d 100644 --- a/source/x/ibus/NamesList.txt +++ b/source/x/ibus/NamesList.txt @@ -1,15 +1,15 @@ ; charset=UTF-8 -@@@ The Unicode Standard 13.0.0 -@@@+ U13M200203.lst - Unicode 13.0.0 final names list. +@@@ The Unicode Standard 15.1.0 +@@@+ U15M230728.lst + Unicode 15.1.0 final names list. This file is semi-automatically derived from UnicodeData.txt and a set of manually created annotations using a script to select or suppress information from the data file. The rules used for this process are aimed at readability for the human reader, at the expense of some details; therefore, this file should not be parsed for machine-readable information. -@+ © 2020 Unicode®, Inc. - For terms of use, see http://www.unicode.org/terms_of_use.html +@+ © 2023 Unicode®, Inc. + For terms of use, see https://www.unicode.org/terms_of_use.html @@ 0000 C0 Controls and Basic Latin (Basic Latin) 007F @@+ @ C0 controls @@ -99,6 +99,9 @@ x (zero width space - 200B) x (narrow no-break space - 202F) x (word joiner - 2060) + x (symbol for space - 2420) + x (blank symbol - 2422) + x (open box - 2423) x (ideographic space - 3000) x (zero width no-break space - FEFF) 0021 EXCLAMATION MARK @@ -108,27 +111,42 @@ x (latin letter retroflex click - 01C3) x (double exclamation mark - 203C) x (interrobang - 203D) + x (warning sign - 26A0) + x (heavy exclamation mark symbol - 2757) x (heavy exclamation mark ornament - 2762) + x (medieval exclamation mark - 2E53) + x (modifier letter raised exclamation mark - A71D) 0022 QUOTATION MARK + = double quote * neutral (vertical), used as opening or closing quotation mark * preferred characters in English for paired quotation marks are 201C & 201D * 05F4 is preferred for gershayim when writing Hebrew x (modifier letter double prime - 02BA) + x (double acute accent - 02DD) + x (modifier letter double apostrophe - 02EE) x (combining double acute accent - 030B) x (combining double vertical line above - 030E) x (hebrew punctuation gershayim - 05F4) + x (left double quotation mark - 201C) + x (right double quotation mark - 201D) x (double prime - 2033) x (ditto mark - 3003) 0023 NUMBER SIGN - = pound sign, hash, crosshatch, octothorpe + = pound sign (weight) + = hashtag, hash + = crosshatch, octothorpe + * for denoting musical sharp 266F is preferred x (l b bar symbol - 2114) + x (numero sign - 2116) x (viewdata square - 2317) x (music sharp sign - 266F) + x (equals sign and slanted parallel - 29E3) 0024 DOLLAR SIGN = milréis, escudo * used for many peso currencies in Latin America and elsewhere * glyph may have one or two vertical bars * other currency symbol characters start at 20A0 + x (cent sign - 00A2) x (currency sign - 00A4) x (peso sign - 20B1) x (heavy dollar sign - 1F4B2) @@ -138,11 +156,14 @@ x (per ten thousand sign - 2031) x (commercial minus sign - 2052) 0026 AMPERSAND + = and + * originally derived from a ligature of 'e' and 't' x (tironian sign et - 204A) x (turned ampersand - 214B) x (heavy ampersand ornament - 1F674) 0027 APOSTROPHE = apostrophe-quote (1.0) + = single quote = APL quote * neutral (vertical) glyph with mixed usage * 2019 is preferred for apostrophe @@ -152,7 +173,10 @@ x (modifier letter apostrophe - 02BC) x (modifier letter vertical line - 02C8) x (combining acute accent - 0301) + x (combining vertical line above - 030D) x (hebrew punctuation geresh - 05F3) + x (left single quotation mark - 2018) + x (right single quotation mark - 2019) x (prime - 2032) x (latin small letter saltillo - A78C) 0028 LEFT PARENTHESIS @@ -161,105 +185,169 @@ = closing parenthesis (1.0) * see discussion on semantics of paired bracketing characters 002A ASTERISK - = star (on phone keypads) + = star + * can have five or six spokes x (arabic five pointed star - 066D) + x (reference mark - 203B) + x (asterism - 2042) x (low asterisk - 204E) + x (two asterisks aligned vertically - 2051) + x (combining asterisk above - 20F0) x (asterisk operator - 2217) x (sextile - 26B9) x (heavy asterisk - 2731) + x (slavonic asterisk - A673) + x (medium six spoked asterisk - 1F7B6) +@ ASCII math operator 002B PLUS SIGN + x (modifier letter plus sign - 02D6) + x (minus sign - 2212) x (heavy plus sign - 2795) + x (hebrew letter alternative plus sign - FB29) + x (light greek cross - 1F7A2) +@ ASCII punctuation 002C COMMA - = decimal separator + = the use as decimal or thousands separator is locale dependent x (arabic comma - 060C) + x (arabic decimal separator - 066B) x (single low-9 quotation mark - 201A) + x (hypodiastole - 2E12) x (reversed comma - 2E41) x (medieval comma - 2E4C) x (ideographic comma - 3001) 002D HYPHEN-MINUS - = hyphen or minus sign - * used for either hyphen or minus sign + = hyphen, dash + = minus sign + * used generically for hyphen, minus sign or en dash, all of which have dedicated alternatives + x (soft hyphen - 00AD) + x (modifier letter minus sign - 02D7) x (hyphen - 2010) x (non-breaking hyphen - 2011) x (figure dash - 2012) x (en dash - 2013) + x (hyphenation point - 2027) x (hyphen bullet - 2043) x (minus sign - 2212) x (roman uncia sign - 10191) 002E FULL STOP = period, dot, decimal point + * the use as decimal point is locale dependent * may be rendered as a raised decimal point in old style numbers + x (middle dot - 00B7) x (arabic full stop - 06D4) + x (one dot leader - 2024) + x (horizontal ellipsis - 2026) + x (raised dot - 2E33) x (stenographic full stop - 2E3C) x (ideographic full stop - 3002) 002F SOLIDUS - = slash, virgule - x (latin letter dental click - 01C0) + = slash, forward slash, virgule x (combining long solidus overlay - 0338) x (fraction slash - 2044) x (division slash - 2215) + x (mathematical rising diagonal - 27CB) + x (big solidus - 29F8) x (dotted solidus - 2E4A) @ ASCII digits 0030 DIGIT ZERO ~ 0030 FE00 short diagonal stroke form 0031 DIGIT ONE 0032 DIGIT TWO + x (latin letter two with stroke - 01BB) + x (turned digit two - 218A) 0033 DIGIT THREE + x (turned digit three - 218B) + x (latin capital letter reversed open e - A7AB) 0034 DIGIT FOUR + x (latin capital letter cuatrillo - A72C) 0035 DIGIT FIVE + x (latin capital letter tone five - 01BC) 0036 DIGIT SIX 0037 DIGIT SEVEN 0038 DIGIT EIGHT 0039 DIGIT NINE -@ ASCII punctuation and symbols +@ ASCII punctuation 003A COLON * also used to denote division or scale; for that mathematical use 2236 is preferred + * in Finnish and Swedish, also used as intra-word punctation (abbreviation mark) + x (modifier letter triangular colon - 02D0) + x (modifier letter raised colon - 02F8) x (armenian full stop - 0589) x (hebrew punctuation sof pasuq - 05C3) + x (ethiopic wordspace - 1361) + x (ethiopic colon - 1365) + x (two dot punctuation - 205A) + x (tricolon - 205D) x (ratio - 2236) x (modifier letter colon - A789) + x (presentation form for vertical two dot leader - FE30) 003B SEMICOLON * this, and not 037E, is the preferred character for 'Greek question mark' x (greek question mark - 037E) x (arabic semicolon - 061B) x (reversed semicolon - 204F) + x (turned semicolon - 2E35) +@ ASCII mathematical operators +@+ Other mathematical operators start at 2200. 003C LESS-THAN SIGN + * paired with 003E for ASCII-based angle bracket markup conventions + x (modifier letter left arrowhead - 02C2) x (single left-pointing angle quotation mark - 2039) x (left-pointing angle bracket - 2329) x (mathematical left angle bracket - 27E8) x (left angle bracket - 3008) 003D EQUALS SIGN * other related characters: 2241-2263 + x (canadian syllabics hyphen - 1400) + x (almost equal to - 2248) x (not equal to - 2260) x (identical to - 2261) + x (double hyphen - 2E40) + x (katakana-hiragana double hyphen - 30A0) x (modifier letter short equals sign - A78A) + x (small equals sign - FE66) x (roman sextans sign - 10190) + x (heavy equals sign - 1F7F0) 003E GREATER-THAN SIGN + x (modifier letter right arrowhead - 02C3) x (single right-pointing angle quotation mark - 203A) x (right-pointing angle bracket - 232A) x (mathematical right angle bracket - 27E9) x (right angle bracket - 3009) +@ ASCII punctuation 003F QUESTION MARK x (inverted question mark - 00BF) x (greek question mark - 037E) x (arabic question mark - 061F) x (interrobang - 203D) - x (question exclamation mark - 2048) - x (exclamation question mark - 2049) + x (double question mark - 2047) + x (black question mark ornament - 2753) + x (uncertainty sign - 2BD1) + x (reversed question mark - 2E2E) + x (medieval question mark - 2E54) + x (replacement character - FFFD) 0040 COMMERCIAL AT = at sign + = arroba (old Spanish unit of weight) + x (circled latin small letter a - 24D0) @ Uppercase Latin alphabet 0041 LATIN CAPITAL LETTER A 0042 LATIN CAPITAL LETTER B x (script capital b - 212C) 0043 LATIN CAPITAL LETTER C + x (greek capital lunate sigma symbol - 03F9) x (double-struck capital c - 2102) + x (degree celsius - 2103) x (black-letter capital c - 212D) + x (roman numeral one hundred - 216D) 0044 LATIN CAPITAL LETTER D + x (roman numeral five hundred - 216E) 0045 LATIN CAPITAL LETTER E + x (latin capital letter open e - 0190) x (euler constant - 2107) x (script capital e - 2130) 0046 LATIN CAPITAL LETTER F + x (degree fahrenheit - 2109) x (script capital f - 2131) x (turned capital f - 2132) 0047 LATIN CAPITAL LETTER G @@ -270,8 +358,6 @@ 0049 LATIN CAPITAL LETTER I * Turkish and Azerbaijani use 0131 for lowercase x (latin capital letter i with dot above - 0130) - x (cyrillic capital letter byelorussian-ukrainian i - 0406) - x (cyrillic letter palochka - 04C0) x (script capital i - 2110) x (black-letter capital i - 2111) x (roman numeral one - 2160) @@ -282,13 +368,17 @@ x (script capital l - 2112) 004D LATIN CAPITAL LETTER M x (script capital m - 2133) + x (roman numeral one thousand - 216F) 004E LATIN CAPITAL LETTER N x (double-struck capital n - 2115) 004F LATIN CAPITAL LETTER O 0050 LATIN CAPITAL LETTER P + x (script capital p - 2118) x (double-struck capital p - 2119) 0051 LATIN CAPITAL LETTER Q + x (cyrillic capital letter qa - 051A) x (double-struck capital q - 211A) + x (rotated capital q - 213A) 0052 LATIN CAPITAL LETTER R x (script capital r - 211B) x (black-letter capital r - 211C) @@ -299,7 +389,9 @@ 0056 LATIN CAPITAL LETTER V x (roman numeral five - 2164) 0057 LATIN CAPITAL LETTER W + x (cyrillic capital letter we - 051C) 0058 LATIN CAPITAL LETTER X + x (roman numeral ten - 2169) 0059 LATIN CAPITAL LETTER Y 005A LATIN CAPITAL LETTER Z x (double-struck capital z - 2124) @@ -312,36 +404,54 @@ = backslash x (combining reverse solidus overlay - 20E5) x (set minus - 2216) + x (mathematical falling diagonal - 27CD) + x (big reverse solidus - 29F9) 005D RIGHT SQUARE BRACKET = closing square bracket (1.0) 005E CIRCUMFLEX ACCENT * this is a spacing character + * used in ASCII-based representation of exponentiation x (modifier letter up arrowhead - 02C4) x (modifier letter circumflex accent - 02C6) x (combining circumflex accent - 0302) x (caret - 2038) + x (logical and - 2227) x (up arrowhead - 2303) 005F LOW LINE = spacing underscore (1.0) * this is a spacing character + * joins with adjacent instances of itself x (modifier letter low macron - 02CD) x (combining macron below - 0331) x (combining low line - 0332) x (double low line - 2017) + x (combining conjoining macron below - FE2D) 0060 GRAVE ACCENT + = backtick, backquote * this is a spacing character + * in some technical contexts functions as opening quote, paired with apostrophe + x (acute accent - 00B4) x (modifier letter grave accent - 02CB) x (combining grave accent - 0300) + x (greek varia - 1FEF) + x (left single quotation mark - 2018) x (reversed prime - 2035) @ Lowercase Latin alphabet 0061 LATIN SMALL LETTER A + x (latin small letter alpha - 0251) 0062 LATIN SMALL LETTER B 0063 LATIN SMALL LETTER C + x (greek lunate sigma symbol - 03F2) + x (latin letter small capital c - 1D04) 0064 LATIN SMALL LETTER D + x (cyrillic small letter komi de - 0501) 0065 LATIN SMALL LETTER E x (estimated symbol - 212E) x (script small e - 212F) + x (latin small letter blackletter e - AB32) 0066 LATIN SMALL LETTER F + x (latin small letter f with hook - 0192) + x (latin small letter lenis f - AB35) 0067 LATIN SMALL LETTER G x (latin small letter script g - 0261) x (script small g - 210A) @@ -351,9 +461,11 @@ 0069 LATIN SMALL LETTER I * Turkish and Azerbaijani use 0130 for uppercase x (latin small letter dotless i - 0131) + x (superscript latin small letter i - 2071) x (mathematical italic small dotless i - 1D6A4) 006A LATIN SMALL LETTER J x (latin small letter dotless j - 0237) + x (greek letter yot - 03F3) x (mathematical italic small dotless j - 1D6A5) 006B LATIN SMALL LETTER K 006C LATIN SMALL LETTER L @@ -363,28 +475,41 @@ 006E LATIN SMALL LETTER N x (superscript latin small letter n - 207F) 006F LATIN SMALL LETTER O + x (latin letter small capital o - 1D0F) x (script small o - 2134) + x (latin small letter blackletter o - AB3D) 0070 LATIN SMALL LETTER P 0071 LATIN SMALL LETTER Q + x (cyrillic small letter qa - 051B) 0072 LATIN SMALL LETTER R 0073 LATIN SMALL LETTER S + x (latin small letter long s - 017F) + x (latin letter small capital s - A731) 0074 LATIN SMALL LETTER T 0075 LATIN SMALL LETTER U 0076 LATIN SMALL LETTER V 0077 LATIN SMALL LETTER W + x (cyrillic small letter we - 051D) + x (latin letter small capital w - 1D21) 0078 LATIN SMALL LETTER X + x (multiplication sign - 00D7) 0079 LATIN SMALL LETTER Y 007A LATIN SMALL LETTER Z x (latin small letter z with stroke - 01B6) + x (latin letter small capital z - 1D22) @ ASCII punctuation and symbols 007B LEFT CURLY BRACKET = opening curly bracket (1.0) = left brace 007C VERTICAL LINE - = vertical bar + = vertical bar, pipe * used in pairs to indicate absolute value + * also used as an unpaired separator or as a fence + x (broken bar - 00A6) x (latin letter dental click - 01C0) x (hebrew punctuation paseq - 05C0) + x (devanagari danda - 0964) + x (combining long vertical line overlay - 20D2) x (divides - 2223) x (light vertical bar - 2758) 007D RIGHT CURLY BRACKET @@ -394,8 +519,12 @@ * this is a spacing character x (small tilde - 02DC) x (combining tilde - 0303) + x (combining tilde overlay - 0334) x (swung dash - 2053) x (tilde operator - 223C) + x (tilde with ring above - 2E1B) + x (vertical tilde - 2E2F) + x (wave dash - 301C) x (fullwidth tilde - FF5E) @ Control character 007F <control> @@ -475,30 +604,45 @@ x (figure space - 2007) x (narrow no-break space - 202F) x (word joiner - 2060) + x (shouldered open box - 237D) x (zero width no-break space - FEFF) # <noBreak> 0020 00A1 INVERTED EXCLAMATION MARK * Spanish, Asturian, Galician + * used in extended IPA to represent sublaminal lower alveolar percussive x (exclamation mark - 0021) + x (modifier letter raised inverted exclamation mark - A71E) 00A2 CENT SIGN + x (latin small letter c with stroke - 023C) + x (mill sign - 20A5) + x (cedi sign - 20B5) + x (musical symbol cut time - 1D135) 00A3 POUND SIGN - = pound sterling, Irish punt, Italian lira, Turkish lira, etc. + = pound sterling, Irish punt, lira, etc. + * not to be confused with the unit of weight + * glyph may have one or two crossbars, in distinction from 20A4 x (lira sign - 20A4) x (turkish lira sign - 20BA) x (roman semuncia sign - 10192) 00A4 CURRENCY SIGN - * other currency symbol characters: 20A0-20BF + * generic or unknown currency + * other currency symbol characters start at 20A0 x (dollar sign - 0024) 00A5 YEN SIGN - = yuan sign + = yuan sign (renminbi) * glyph may have one or two crossbars, but the official symbol in Japan and China has two + * in native context, specific ideographs may be used for units of these currencies + x (latin capital letter y with stroke - 024E) + x (cyrillic capital letter straight u with stroke - 04B0) x 5143 x 5186 00A6 BROKEN BAR = broken vertical bar (1.0) = parted rule (in typography) + x (vertical line - 007C) 00A7 SECTION SIGN - * paragraph sign in some European usage + * used in referencing numbered sections or paragraphs + x (top half section sign - 2E39) 00A8 DIAERESIS * this is a spacing character x (combining diaeresis - 0308) @@ -510,6 +654,7 @@ x (mask work symbol - 1F1AD) 00AA FEMININE ORDINAL INDICATOR * Spanish + x (modifier letter small a - 1D43) # <super> 0061 00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK = left guillemet @@ -520,26 +665,37 @@ 00AC NOT SIGN = angled dash (in typography) x (reversed not sign - 2310) + x (turned not sign - 2319) 00AD SOFT HYPHEN = discretionary hyphen * commonly abbreviated as SHY + * an invisible format character indicating a possible hyphenation location 00AE REGISTERED SIGN = registered trade mark sign (1.0) + x (trade mark sign - 2122) x (circled latin capital letter r - 24C7) + x (raised md sign - 1F16B) + x (raised mr sign - 1F16C) 00AF MACRON = overline, APL overbar * this is a spacing character + * unlike 203E, adjacent instances of this character do not join x (modifier letter macron - 02C9) x (combining macron - 0304) x (combining overline - 0305) + x (overline - 203E) + x (combining conjoining macron - FE26) # 0020 0304 00B0 DEGREE SIGN * this is a spacing character x (ring above - 02DA) x (combining ring above - 030A) x (superscript zero - 2070) + x (degree celsius - 2103) + x (degree fahrenheit - 2109) x (ring operator - 2218) 00B1 PLUS-MINUS SIGN + = biquintile (astrological aspect: 144°) x (minus-or-plus sign - 2213) 00B2 SUPERSCRIPT TWO = squared @@ -552,9 +708,13 @@ # <super> 0033 00B4 ACUTE ACCENT * this is a spacing character + x (grave accent - 0060) x (modifier letter prime - 02B9) x (modifier letter acute accent - 02CA) + x (double acute accent - 02DD) x (combining acute accent - 0301) + x (greek tonos - 0384) + x (greek oxia - 1FFD) x (prime - 2032) # 0020 0301 00B5 MICRO SIGN @@ -570,8 +730,9 @@ = Georgian comma = Greek middle dot (ano teleia) * also used as a raised decimal point or to denote multiplication; for multiplication 22C5 is preferred + x (full stop - 002E) + x (dot above - 02D9) x (greek ano teleia - 0387) - x (runic single punctuation - 16EB) x (bullet - 2022) x (one dot leader - 2024) x (hyphenation point - 2027) @@ -589,9 +750,13 @@ 00B9 SUPERSCRIPT ONE x (superscript two - 00B2) x (superscript three - 00B3) + x (superscript zero - 2070) # <super> 0031 00BA MASCULINE ORDINAL INDICATOR * Spanish + x (modifier letter small o - 1D52) + x (superscript zero - 2070) + x (numero sign - 2116) # <super> 006F 00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK = right guillemet @@ -611,8 +776,9 @@ = turned question mark * Spanish x (question mark - 003F) + x (inverted interrobang - 2E18) x (reversed question mark - 2E2E) -@ Letters +@ Uppercase letters 00C0 LATIN CAPITAL LETTER A WITH GRAVE : 0041 0300 00C1 LATIN CAPITAL LETTER A WITH ACUTE @@ -628,6 +794,7 @@ : 0041 030A 00C6 LATIN CAPITAL LETTER AE = latin capital ligature ae (1.1) + x (cyrillic capital ligature a ie - 04D4) 00C7 LATIN CAPITAL LETTER C WITH CEDILLA : 0043 0327 00C8 LATIN CAPITAL LETTER E WITH GRAVE @@ -650,6 +817,7 @@ * lowercase is 00F0 x (latin capital letter d with stroke - 0110) x (latin capital letter african d - 0189) + x (latin capital letter d with short stroke overlay - A7C7) 00D1 LATIN CAPITAL LETTER N WITH TILDE : 004E 0303 00D2 LATIN CAPITAL LETTER O WITH GRAVE @@ -665,13 +833,20 @@ @ Mathematical operator 00D7 MULTIPLICATION SIGN = z notation Cartesian product + x (latin small letter x - 0078) + x (saltire - 2613) x (multiplication x - 2715) + x (heavy ballot x - 2718) x (cross mark - 274C) x (vector or cross product - 2A2F) -@ Letters + x (cancellation x - 1F5D9) + x (light saltire - 1F7A9) +@ Uppercase letters 00D8 LATIN CAPITAL LETTER O WITH STROKE = o slash + x (latin capital letter o with middle tilde - 019F) x (empty set - 2205) + x (latin capital letter o with long stroke overlay - A74A) 00D9 LATIN CAPITAL LETTER U WITH GRAVE : 0055 0300 00DA LATIN CAPITAL LETTER U WITH ACUTE @@ -683,13 +858,19 @@ 00DD LATIN CAPITAL LETTER Y WITH ACUTE : 0059 0301 00DE LATIN CAPITAL LETTER THORN +@ Lowercase letters 00DF LATIN SMALL LETTER SHARP S = Eszett * German * not used in Swiss High German - * uppercase is "SS" or 1E9E + * uppercase is "SS" (standard case mapping), alternatively 1E9E * typographically the glyph for this character can be based on a ligature of 017F with either 0073 or with an old-style glyph for 007A (the latter similar in appearance to 0292). Both forms exist interchangeably today. + x (latin small letter long s - 017F) + x (latin small letter ezh - 0292) x (greek small letter beta - 03B2) + x (latin capital letter sharp s - 1E9E) + x (latin small letter beta - A7B5) + x (latin small letter middle scots s - A7D7) 00E0 LATIN SMALL LETTER A WITH GRAVE : 0061 0300 00E1 LATIN SMALL LETTER A WITH ACUTE @@ -710,6 +891,8 @@ * Danish, Norwegian, Icelandic, Faroese, Old English, French, IPA x (latin small ligature oe - 0153) x (cyrillic small ligature a ie - 04D5) + x (latin small letter turned ae - 1D02) + x (latin small letter a reversed-schwa - AB31) 00E7 LATIN SMALL LETTER C WITH CEDILLA : 0063 0327 00E8 LATIN SMALL LETTER E WITH GRAVE @@ -732,8 +915,11 @@ 00F0 LATIN SMALL LETTER ETH * Icelandic, Faroese, Old English, IPA * uppercase is 00D0 + x (latin small letter d with stroke - 0111) x (greek small letter delta - 03B4) + x (latin small letter delta - 1E9F) x (partial differential - 2202) + x (latin small letter insular d - A77A) 00F1 LATIN SMALL LETTER N WITH TILDE : 006E 0303 00F2 LATIN SMALL LETTER O WITH GRAVE @@ -750,20 +936,25 @@ @ Mathematical operator 00F7 DIVISION SIGN = obelus - * occasionally used as an alternate, more visually distinct version of 2212 or 2011 in some contexts + * occasionally used as an alternate, more visually distinct shape for a hyphen in some contexts * historically used as a punctuation mark to denote questionable passages in manuscripts x (syriac harklean obelus - 070B) x (commercial minus sign - 2052) - x (minus sign - 2212) x (division slash - 2215) x (divides - 2223) x (ratio - 2236) x (heavy division sign - 2797) -@ Letters + x (long division - 27CC) + x (dotted obelos - 2E13) +@ Lowercase letters 00F8 LATIN SMALL LETTER O WITH STROKE = o slash * Danish, Norwegian, Faroese, IPA + x (latin small letter barred o - 0275) x (diameter sign - 2300) + x (latin small letter o with long stroke overlay - A74B) + x (latin small letter old polish o - A7C1) + x (latin small letter blackletter o with stroke - AB3E) 00F9 LATIN SMALL LETTER U WITH GRAVE * French, Italian : 0075 0300 @@ -779,7 +970,10 @@ 00FE LATIN SMALL LETTER THORN * Icelandic, Old English, phonetics * Runic letter borrowed into Latin script + * replaced by "th" in modern English + x (greek small letter sho - 03F8) x (runic letter thurisaz thurs thorn - 16A6) + x (latin small letter double thorn - A7D3) 00FF LATIN SMALL LETTER Y WITH DIAERESIS * French, medieval Hungarian orthography * uppercase is 0178 @@ -831,13 +1025,16 @@ : 0064 030C 0110 LATIN CAPITAL LETTER D WITH STROKE x (latin capital letter eth - 00D0) - x (latin small letter d with stroke - 0111) x (latin capital letter african d - 0189) + x (latin capital letter d with short stroke overlay - A7C7) 0111 LATIN SMALL LETTER D WITH STROKE - * Croatian, Serbian, Vietnamese, Sami + * Croatian, Serbian, Vietnamese, Sami, Moro * an alternate glyph with the stroke through the bowl is used in Americanist orthographies - x (latin capital letter d with stroke - 0110) + x (latin small letter eth - 00F0) x (cyrillic small letter dje - 0452) + x (latin small letter d with middle tilde - 1D6D) + x (dong sign - 20AB) + x (latin small letter d with short stroke overlay - A7C8) 0112 LATIN CAPITAL LETTER E WITH MACRON : 0045 0304 0113 LATIN SMALL LETTER E WITH MACRON @@ -892,6 +1089,7 @@ * Esperanto : 0068 0302 0126 LATIN CAPITAL LETTER H WITH STROKE + x (modifier letter capital h with stroke - A7F8) 0127 LATIN SMALL LETTER H WITH STROKE * Maltese, IPA, ... x (cyrillic small letter tshe - 045B) @@ -926,6 +1124,10 @@ * Turkish, Azerbaijani * uppercase is 0049 x (latin small letter i - 0069) + x (latin small letter iota - 0269) + x (latin letter small capital i - 026A) + x (cyrillic small letter byelorussian-ukrainian i - 0456) + x (mathematical italic small dotless i - 1D6A4) 0132 LATIN CAPITAL LIGATURE IJ # 0049 004A 0133 LATIN SMALL LIGATURE IJ @@ -943,6 +1145,8 @@ : 006B 0327 0138 LATIN SMALL LETTER KRA * Greenlandic (old orthography), Labrador Inuttut + x (cyrillic small letter ka - 043A) + x (latin letter small capital k - 1D0B) 0139 LATIN CAPITAL LETTER L WITH ACUTE : 004C 0301 013A LATIN SMALL LETTER L WITH ACUTE @@ -964,14 +1168,19 @@ * some fonts show the middle dot inside the L, but the preferred form has the dot following the L # 004C 00B7 0140 LATIN SMALL LETTER L WITH MIDDLE DOT - # 006C 00B7 -@+ * Catalan legacy compatibility character for ISO/IEC 6937 + * Catalan legacy compatibility character for ISO/IEC 6937 * preferred representation for Catalan: 006C 00B7 + # 006C 00B7 0141 LATIN CAPITAL LETTER L WITH STROKE x (latin capital letter l with bar - 023D) + x (latin letter small capital l with stroke - 1D0C) + x (latin capital letter l with middle tilde - 2C62) + x (latin capital letter l with high stroke - A748) 0142 LATIN SMALL LETTER L WITH STROKE - * Polish, ... + * Polish, Sorbian, Iñupiaq, ... + * also used for Latin-based orthographies for Belarusian and Ukrainian x (latin small letter l with bar - 019A) + x (latin small letter l with middle tilde - 026B) 0143 LATIN CAPITAL LETTER N WITH ACUTE : 004E 0301 0144 LATIN SMALL LETTER N WITH ACUTE @@ -992,15 +1201,21 @@ = latin small letter apostrophe n (1.0) * this character is deprecated and its use is strongly discouraged * Afrikaans - # 02BC 006E -@+ * legacy compatibility character for ISO/IEC 6937 + * legacy compatibility character for ISO/IEC 6937 * uppercase is 02BC 004E + # 02BC 006E @ European Latin 014A LATIN CAPITAL LETTER ENG * glyph may also have appearance of large form of the small letter + x (latin capital letter n with long right leg - 0220) + x (latin capital letter n with descender - A790) 014B LATIN SMALL LETTER ENG = engma, angma * Sami, Mende, IPA, ... + * velar nasal, nasalization + x (latin small letter n with long right leg - 019E) + x (latin small letter n with palatal hook - 1D87) + x (latin small letter n with descender - A791) 014C LATIN CAPITAL LETTER O WITH MACRON : 004F 0304 014D LATIN SMALL LETTER O WITH MACRON @@ -1022,6 +1237,10 @@ * French, IPA, Old Icelandic, Old English, ... x (latin small letter ae - 00E6) x (latin letter small capital oe - 0276) + x (latin small letter turned oe - 1D14) + x (modifier letter small ligature oe - A7F9) + x (latin small letter inverted oe - AB40) + x (latin small letter open oe - AB62) 0154 LATIN CAPITAL LETTER R WITH ACUTE : 0052 0301 0155 LATIN SMALL LETTER R WITH ACUTE @@ -1076,6 +1295,7 @@ 0166 LATIN CAPITAL LETTER T WITH STROKE 0167 LATIN SMALL LETTER T WITH STROKE * Sami + x (latin small letter t with middle tilde - 1D75) 0168 LATIN CAPITAL LETTER U WITH TILDE : 0055 0303 0169 LATIN SMALL LETTER U WITH TILDE @@ -1138,24 +1358,29 @@ 017F LATIN SMALL LETTER LONG S * in common use in Roman types until the 18th century * in current use in Fraktur and Gaelic types + x (latin small letter sharp s - 00DF) + x (latin small ligature long s t - FB05) # 0073 latin small letter s @@ 0180 Latin Extended-B 024F @ Non-European and historic Latin 0180 LATIN SMALL LETTER B WITH STROKE * Americanist and Indo-Europeanist usage for phonetic beta * Americanist orthographies use an alternate glyph with the stroke through the bowl - * Old Saxon + * also used in Old Saxon manuscripts * uppercase is 0243 x (greek small letter beta - 03B2) + x (latin small letter b with middle tilde - 1D6C) x (blank symbol - 2422) 0181 LATIN CAPITAL LETTER B WITH HOOK - * Zulu, Pan-Nigerian alphabet + * African languages * lowercase is 0253 0182 LATIN CAPITAL LETTER B WITH TOPBAR + x (cyrillic capital letter be - 0411) 0183 LATIN SMALL LETTER B WITH TOPBAR * Zhuang (old orthography) * former Soviet minority language scripts - x (cyrillic capital letter be - 0411) + x (latin small letter b with hook - 0253) + x (cyrillic small letter be - 0431) 0184 LATIN CAPITAL LETTER TONE SIX 0185 LATIN SMALL LETTER TONE SIX * Zhuang (old orthography) @@ -1168,8 +1393,10 @@ x (cyrillic small letter soft sign - 044C) 0186 LATIN CAPITAL LETTER OPEN O * typographically a turned C - * African + * African languages * lowercase is 0254 + x (latin letter small capital open o - 1D10) + x (roman numeral reversed one hundred - 2183) 0187 LATIN CAPITAL LETTER C WITH HOOK 0188 LATIN SMALL LETTER C WITH HOOK * African @@ -1190,19 +1417,23 @@ * archaic phonetic for labialized alveolar fricative * recommended spellings 007A 02B7 or 007A 032B 018E LATIN CAPITAL LETTER REVERSED E - = turned e + = turned capital e * Pan-Nigerian alphabet * lowercase is 01DD + x (there exists - 2203) + x (latin letter small capital turned e - 2C7B) 018F LATIN CAPITAL LETTER SCHWA * Azerbaijani, ... * lowercase is 0259 x (cyrillic capital letter schwa - 04D8) 0190 LATIN CAPITAL LETTER OPEN E - = epsilon - * African + = capital epsilon + * African languages * lowercase is 025B + * not to be confused with glyph variants of capital E x (euler constant - 2107) x (turned digit three - 218B) + x (latin capital letter tresillo - A72A) 0191 LATIN CAPITAL LETTER F WITH HOOK * African x (latin capital letter f with stroke - A798) @@ -1218,43 +1449,56 @@ * African * lowercase is 0263 0195 LATIN SMALL LETTER HV + = hwair * Gothic transliteration * uppercase is 01F6 + x (gothic letter hwair - 10348) 0196 LATIN CAPITAL LETTER IOTA - * African + * African languages * lowercase is 0269 + x (cyrillic capital letter iota - A646) 0197 LATIN CAPITAL LETTER I WITH STROKE = barred i, i bar - * African + * African languages * lowercase is 0268 * ISO 6438 gives lowercase as 026A, not 0268 x (latin letter small capital i - 026A) + x (latin small capital letter i with stroke - 1D7B) 0198 LATIN CAPITAL LETTER K WITH HOOK 0199 LATIN SMALL LETTER K WITH HOOK * Hausa, Pan-Nigerian alphabet 019A LATIN SMALL LETTER L WITH BAR = barred l - * Americanist phonetic usage for 026C + * Americanist phonetic usage for IPA ɬ * uppercase is 023D x (latin small letter l with stroke - 0142) + x (latin small letter l with belt - 026C) + x (latin small letter l with double bar - 2C61) + x (latin small letter l with high stroke - A749) 019B LATIN SMALL LETTER LAMBDA WITH STROKE = barred lambda, lambda bar - * Americanist phonetic usage + * Americanist phonetic usage for IPA tɬ + x (greek small letter lamda - 03BB) 019C LATIN CAPITAL LETTER TURNED M * Zhuang (old orthography) * lowercase is 026F + x (latin letter small capital turned m - A7FA) + x (latin epigraphic letter inverted m - A7FD) 019D LATIN CAPITAL LETTER N WITH LEFT HOOK * African * lowercase is 0272 019E LATIN SMALL LETTER N WITH LONG RIGHT LEG * archaic phonetic for Japanese 3093 * recommended spelling for syllabic n is 006E 0329 - * Lakota (indicates nasalization of vowel) + * Lakota (indicates nasalization of vowel), superseded by 014B * uppercase is 0220 + x (latin small letter eng - 014B) + x (hiragana letter n - 3093) 019F LATIN CAPITAL LETTER O WITH MIDDLE TILDE = barred o, o bar + * African languages + * the formal name does not describe the glyph * lowercase is 0275 - * African x (cyrillic capital letter barred o - 04E8) 01A0 LATIN CAPITAL LETTER O WITH HORN : 004F 031B @@ -1271,17 +1515,22 @@ * African 01A6 LATIN LETTER YR * Old Norse -@+ * from German Standard DIN 31624 and ISO 5426-2 + * from German Standard DIN 31624 and ISO 5426-2 * lowercase is 0280 01A7 LATIN CAPITAL LETTER TONE TWO + x (latin letter voiced laryngeal spirant - 1D24) + x (cyrillic capital letter reversed dze - A644) + x (roman sextula sign - 10193) 01A8 LATIN SMALL LETTER TONE TWO * Zhuang (old orthography) * typographically a reversed S x (latin small letter tone six - 0185) + x (cyrillic small letter reversed dze - A645) 01A9 LATIN CAPITAL LETTER ESH - * African + * African languages * lowercase is 0283 x (greek capital letter sigma - 03A3) + x (n-ary summation - 2211) 01AA LATIN LETTER REVERSED ESH LOOP * archaic phonetic for labialized palatoalveolar or palatal fricative * Twi @@ -1292,9 +1541,9 @@ 01AC LATIN CAPITAL LETTER T WITH HOOK * a glyph variant with hook at the right also occurs 01AD LATIN SMALL LETTER T WITH HOOK - * African + * African languages 01AE LATIN CAPITAL LETTER T WITH RETROFLEX HOOK - * African + * African languages * lowercase is 0288 01AF LATIN CAPITAL LETTER U WITH HORN : 0055 031B @@ -1302,8 +1551,8 @@ * Vietnamese : 0075 031B 01B1 LATIN CAPITAL LETTER UPSILON - * African - * typographically based on turned capital Greek omega + * African languages + * typographically, turned capital Greek omega 03A9 * lowercase is 028A x (inverted ohm sign - 2127) 01B2 LATIN CAPITAL LETTER V WITH HOOK @@ -1318,18 +1567,22 @@ 01B6 LATIN SMALL LETTER Z WITH STROKE = barred z, z bar * Pan-Turkic Latin orthography - * handwritten variant of Latin "z" + * also a handwritten variant of Latin "z" x (latin small letter z - 007A) + x (latin small letter z with middle tilde - 1D76) 01B7 LATIN CAPITAL LETTER EZH * African, Skolt Sami * lowercase is 0292 x (latin capital letter yogh - 021C) x (cyrillic capital letter abkhasian dze - 04E0) + x (latin letter small capital ezh - 1D23) + x (latin capital letter reversed open e - A7AB) 01B8 LATIN CAPITAL LETTER EZH REVERSED + x (latin capital letter open e - 0190) 01B9 LATIN SMALL LETTER EZH REVERSED * archaic phonetic for voiced pharyngeal fricative - * sometimes typographically rendered with a turned digit 3 - * recommended spelling 0295 + * sometimes typographically rendered as a turned digit 3 + * recommended spelling is 0295 x (latin letter pharyngeal voiced fricative - 0295) x (arabic letter ain - 0639) 01BA LATIN SMALL LETTER EZH WITH TAIL @@ -1339,6 +1592,7 @@ 01BB LATIN LETTER TWO WITH STROKE * archaic phonetic for [dz] affricate * recommended spellings 0292 or 0064 007A + x (latin capital letter tone two - 01A7) 01BC LATIN CAPITAL LETTER TONE FIVE 01BD LATIN SMALL LETTER TONE FIVE * Zhuang (old orthography) @@ -1347,6 +1601,8 @@ * archaic phonetic for [ts] affricate * recommended spelling 0074 0073 * letter form is actually derived from ligation of ts, rather than inverted glottal stop + x (latin letter inverted glottal stop - 0296) + x (latin small letter ts digraph - 02A6) 01BF LATIN LETTER WYNN = wen * Runic letter borrowed into Latin script @@ -1354,9 +1610,9 @@ * uppercase is 01F7 x (runic letter wunjo wynn w - 16B9) @ African letters for clicks +@+ These click letters are from the Khoisan tradition. See also the bilabial click 0298 and the velar click 029E. 01C0 LATIN LETTER DENTAL CLICK = pipe - * Khoisan tradition * "c" in Zulu orthography x (solidus - 002F) x (vertical line - 007C) @@ -1364,22 +1620,22 @@ x (divides - 2223) 01C1 LATIN LETTER LATERAL CLICK = double pipe - * Khoisan tradition * "x" in Zulu orthography x (latin letter inverted glottal stop - 0296) + x (double vertical line - 2016) x (parallel to - 2225) 01C2 LATIN LETTER ALVEOLAR CLICK = double-barred pipe - = palatoalveolar click (IPA) - * Khoisan tradition + * palatoalveolar click (IPA) x (not equal to - 2260) + x (thermodynamic - 29E7) 01C3 LATIN LETTER RETROFLEX CLICK = latin letter exclamation mark (1.0) - = (post)alveolar click (IPA) - * Khoisan tradition + * (post)alveolar click (IPA) * "q" in Zulu orthography x (exclamation mark - 0021) x (latin letter stretched c - 0297) + x (latin letter retroflex click with retroflex hook - 1DF0A) @ Latin digraphs matching Serbian Cyrillic letters @+ These digraphs are for Gaj's Latin alphabet, used in writing Bosnian, Croatian, Serbian, and Montenegrin. 01C4 LATIN CAPITAL LETTER DZ WITH CARON @@ -1510,6 +1766,8 @@ : 0067 0301 01F6 LATIN CAPITAL LETTER HWAIR * lowercase is 0195 + x (cyrillic capital letter komi nje - 050A) + x (gothic letter hwair - 10348) 01F7 LATIN CAPITAL LETTER WYNN = wen * lowercase is 01BF @@ -1530,7 +1788,7 @@ : 00D8 0301 01FF LATIN SMALL LETTER O WITH STROKE AND ACUTE : 00F8 0301 -@ Additions for Slovenian and Croatian +@ Additions for Slovenian 0200 LATIN CAPITAL LETTER A WITH DOUBLE GRAVE : 0041 030F 0201 LATIN SMALL LETTER A WITH DOUBLE GRAVE @@ -1593,25 +1851,31 @@ @ Miscellaneous additions 021C LATIN CAPITAL LETTER YOGH x (latin capital letter ezh - 01B7) + x (cyrillic capital letter ze - 0417) + x (latin capital letter reversed open e - A7AB) 021D LATIN SMALL LETTER YOGH * Middle English, Scots x (latin small letter ezh - 0292) x (latin small letter insular g - 1D79) + x (latin small letter et - A76B) 021E LATIN CAPITAL LETTER H WITH CARON : 0048 030C 021F LATIN SMALL LETTER H WITH CARON * Finnish Romany : 0068 030C 0220 LATIN CAPITAL LETTER N WITH LONG RIGHT LEG - * Lakota + * Lakota (nasalization), superseded by 014A * lowercase is 019E + x (latin capital letter eng - 014A) 0221 LATIN SMALL LETTER D WITH CURL * phonetic use in Sinology 0222 LATIN CAPITAL LETTER OU + x (latin letter small capital ou - 1D15) 0223 LATIN SMALL LETTER OU * Algonquin, Huron x (digit eight - 0038) 0224 LATIN CAPITAL LETTER Z WITH HOOK + x (latin capital letter z with descender - 2C6B) 0225 LATIN SMALL LETTER Z WITH HOOK * Middle High German 0226 LATIN CAPITAL LETTER A WITH DOT ABOVE @@ -1651,6 +1915,9 @@ 0236 LATIN SMALL LETTER T WITH CURL @ Miscellaneous addition 0237 LATIN SMALL LETTER DOTLESS J + * this is a non-casing letter + x (greek letter yot - 03F3) + x (cyrillic small letter je - 0458) x (mathematical italic small dotless j - 1D6A5) @ Additions for Africanist linguistics 0238 LATIN SMALL LETTER DB DIGRAPH @@ -1659,10 +1926,16 @@ 023A LATIN CAPITAL LETTER A WITH STROKE * lowercase is 2C65 023B LATIN CAPITAL LETTER C WITH STROKE + x (cedi sign - 20B5) 023C LATIN SMALL LETTER C WITH STROKE * also used in Americanist linguistics + x (cent sign - 00A2) 023D LATIN CAPITAL LETTER L WITH BAR * lowercase is 019A + x (latin capital letter l with stroke - 0141) + x (latin capital letter l with double bar - 2C60) + x (latin capital letter l with middle tilde - 2C62) + x (latin capital letter l with high stroke - A748) 023E LATIN CAPITAL LETTER T WITH DIAGONAL STROKE * lowercase is 2C66 @ Additions for Africanist linguistics @@ -1683,10 +1956,12 @@ x (modifier letter glottal stop - 02C0) 0243 LATIN CAPITAL LETTER B WITH STROKE * lowercase is 0180 + x (latin letter small capital barred b - 1D03) 0244 LATIN CAPITAL LETTER U BAR * lowercase is 0289 0245 LATIN CAPITAL LETTER TURNED V * lowercase is 028C + x (greek capital letter lamda - 039B) 0246 LATIN CAPITAL LETTER E WITH STROKE 0247 LATIN SMALL LETTER E WITH STROKE 0248 LATIN CAPITAL LETTER J WITH STROKE @@ -1695,6 +1970,7 @@ 024B LATIN SMALL LETTER Q WITH HOOK TAIL 024C LATIN CAPITAL LETTER R WITH STROKE 024D LATIN SMALL LETTER R WITH STROKE + x (latin small letter r with middle tilde - 1D72) 024E LATIN CAPITAL LETTER Y WITH STROKE 024F LATIN SMALL LETTER Y WITH STROKE @@ 0250 IPA Extensions 02AF @@ -1711,12 +1987,14 @@ x (greek small letter theta - 03B8) x (greek small letter lamda - 03BB) x (greek small letter chi - 03C7) +@+ Many of the IPA characters in this block are also used in significant orthographies, such as those for African languages. 0250 LATIN SMALL LETTER TURNED A * low central unrounded vowel * uppercase is 2C6F 0251 LATIN SMALL LETTER ALPHA = latin small letter script a (1.0) * low back unrounded vowel + * the representative glyph appears like an allograph of Latin "a", but sometimes the character is rendered more like a Greek "α" * uppercase is 2C6D x (greek small letter alpha - 03B1) 0252 LATIN SMALL LETTER TURNED ALPHA @@ -1725,13 +2003,15 @@ x (latin small letter inverted alpha - AB64) 0253 LATIN SMALL LETTER B WITH HOOK * implosive bilabial stop - * Pan-Nigerian alphabet * uppercase is 0181 + x (cyrillic small letter be - 0431) 0254 LATIN SMALL LETTER OPEN O * typographically a turned c * lower-mid back rounded vowel - * in older Danish usage "0254:" means "that is" + * in older Danish usage "0254:" stands for "that is" * uppercase is 0186 + x (latin letter small capital open o - 1D10) + x (latin small letter reversed c - 2184) 0255 LATIN SMALL LETTER C WITH CURL * voiceless alveolo-palatal laminal fricative * used in transcription of Mandarin Chinese @@ -1759,14 +2039,19 @@ * lower-mid front unrounded vowel * uppercase is 0190 x (greek small letter epsilon - 03B5) + x (cyrillic small letter reversed ze - 0511) 025C LATIN SMALL LETTER REVERSED OPEN E + = reversed epsilon * lower-mid central unrounded vowel * uppercase is A7AB + x (cyrillic small letter ze - 0437) + x (latin small letter turned open e - 1D08) 025D LATIN SMALL LETTER REVERSED OPEN E WITH HOOK * rhotacized lower-mid central vowel 025E LATIN SMALL LETTER CLOSED REVERSED OPEN E = closed reversed epsilon * lower-mid central rounded vowel + x (latin small letter closed open e - 029A) 025F LATIN SMALL LETTER DOTLESS J WITH STROKE * voiced palatal stop * typographically a turned f, but better thought of as a form of j @@ -1779,6 +2064,7 @@ * voiced velar stop * uppercase is A7AC x (latin small letter g - 0067) + x (script small g - 210A) 0262 LATIN LETTER SMALL CAPITAL G * voiced uvular stop 0263 LATIN SMALL LETTER GAMMA @@ -1799,41 +2085,55 @@ 0267 LATIN SMALL LETTER HENG WITH HOOK * voiceless coarticulated velar and palatoalveolar fricative * "sj" in some Swedish dialects + x (latin small letter heng - A727) 0268 LATIN SMALL LETTER I WITH STROKE = barred i, i bar * high central unrounded vowel * uppercase is 0197 -@+ * ISO 6438 gives lowercase of 0197 as 026A, not 0268 + * ISO 6438 gives lowercase of 0197 as 026A, not 0268 + x (latin small capital letter i with stroke - 1D7B) 0269 LATIN SMALL LETTER IOTA * semi-high front unrounded vowel @+ * obsoleted by IPA in 1989 * preferred use is 026A latin letter small capital i * uppercase is 0196 + x (latin small letter dotless i - 0131) x (greek small letter iota - 03B9) + x (cyrillic small letter iota - A647) + x (mathematical italic small dotless i - 1D6A4) 026A LATIN LETTER SMALL CAPITAL I * semi-high front unrounded vowel * preferred IPA alternate for 0269 * uppercase is A7AE + * ISO 6438 gives this as lowercase of 0197 instead of 0268 * glyph should have top and bottom serifs even in sans serif IPA font designs, to avoid confusion with lowercase l + x (latin small letter dotless i - 0131) 026B LATIN SMALL LETTER L WITH MIDDLE TILDE * velarized voiced alveolar lateral approximant * uppercase is 2C62 + x (latin small letter l with stroke - 0142) + x (latin small letter l with inverted lazy s - AB37) + x (latin small letter l with double middle tilde - AB38) 026C LATIN SMALL LETTER L WITH BELT * voiceless alveolar lateral fricative * uppercase is A7AD + x (latin small letter l with bar - 019A) 026D LATIN SMALL LETTER L WITH RETROFLEX HOOK * voiced retroflex lateral + x (latin small letter l with retroflex hook and belt - A78E) 026E LATIN SMALL LETTER LEZH * voiced lateral fricative * "dhl" in Zulu orthography 026F LATIN SMALL LETTER TURNED M * high back unrounded vowel * uppercase is 019C + x (latin letter small capital turned m - A7FA) 0270 LATIN SMALL LETTER TURNED M WITH LONG LEG * voiced velar approximant 0271 LATIN SMALL LETTER M WITH HOOK * voiced labiodental nasal * uppercase is 2C6E + x (latin small letter m with palatal hook - 1D86) 0272 LATIN SMALL LETTER N WITH LEFT HOOK * voiced palatal nasal * uppercase is 019D @@ -1852,13 +2152,17 @@ * low front rounded vowel x (latin small ligature oe - 0153) 0277 LATIN SMALL LETTER CLOSED OMEGA - * semi-high back rounded vowel + * near-close near-back rounded vowel @+ * obsoleted by IPA in 1989 * preferred use is 028A latin small letter upsilon + x (latin small letter omega - A7B7) x (greek letter small capital omega - AB65) 0278 LATIN SMALL LETTER PHI * voiceless bilabial fricative + * this is a non-casing letter x (greek small letter phi - 03C6) + x (greek phi symbol - 03D5) + x (latin small letter tailless phi - 2C77) 0279 LATIN SMALL LETTER TURNED R * voiced alveolar approximant x (modifier letter small turned r - 02B4) @@ -1870,14 +2174,18 @@ 027C LATIN SMALL LETTER R WITH LONG LEG * voiced strident apico-alveolar trill @+ * obsoleted by IPA in 1989 - * sound spelled with 0159 in Czech + * this sound is spelled with 0159 in Czech * preferred phonetic representation for Czech is 0072 031D * in current use in Gaelic types (as glyph variant of 0072) + x (latin small letter insular r - A783) + x (latin small letter insular s - A785) 027D LATIN SMALL LETTER R WITH TAIL * voiced retroflex flap * uppercase is 2C64 + x (latin small letter turned r with tail - 2C79) 027E LATIN SMALL LETTER R WITH FISHHOOK * voiced alveolar flap or tap + x (latin small letter long s - 017F) 027F LATIN SMALL LETTER REVERSED R WITH FISHHOOK = long leg turned iota (a misnomer) * apical dental vowel @@ -1898,6 +2206,7 @@ * voiceless postalveolar fricative * uppercase is 01A9 x (integral - 222B) + x (latin small letter baseline esh - AB4D) 0284 LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK * implosive palatal stop * typographically based on 025F, not on 0283 @@ -1917,12 +2226,15 @@ 0288 LATIN SMALL LETTER T WITH RETROFLEX HOOK * voiceless retroflex stop * uppercase is 01AE + x (latin small letter t with hook - 01AD) + x (latin small letter t with hook and retroflex hook - 1DF09) 0289 LATIN SMALL LETTER U BAR * high central rounded vowel * uppercase is 0244 x (latin small capital letter u with stroke - 1D7E) 028A LATIN SMALL LETTER UPSILON - * semi-high back rounded vowel + * near-close near-back rounded vowel + * typographically, a turned Greek small capital omega AB65 * preferred IPA alternate to 0277 * uppercase is 01B1 x (greek small letter upsilon - 03C5) @@ -1936,7 +2248,7 @@ * lower-mid back unrounded vowel * uppercase is 0245 x (greek capital letter lamda - 039B) - x (caret - 2038) + x (greek letter small capital lamda - 1D27) x (logical and - 2227) 028D LATIN SMALL LETTER TURNED W * voiceless rounded labiovelar approximant @@ -1951,7 +2263,7 @@ * voiced alveolo-palatal laminal fricative * sound spelled with 017A in Polish 0292 LATIN SMALL LETTER EZH - = dram + = dram sign * voiced postalveolar fricative * mistakenly named yogh in Unicode 1.0 * uppercase is 01B7 @@ -1960,6 +2272,7 @@ x (cyrillic small letter abkhasian dze - 04E1) x (ounce sign - 2125) x (alchemical symbol for half dram - 1F772) + x 2CF01 0293 LATIN SMALL LETTER EZH WITH CURL * palatalized voiced postalveolar fricative 0294 LATIN LETTER GLOTTAL STOP @@ -1982,17 +2295,22 @@ x (complement - 2201) 0298 LATIN LETTER BILABIAL CLICK = bullseye + * this is a non-casing letter x (circled dot operator - 2299) + x (cyrillic capital letter monocular o - A668) 0299 LATIN LETTER SMALL CAPITAL B * bilabial trill + x (cyrillic small letter ve - 0432) 029A LATIN SMALL LETTER CLOSED OPEN E = closed epsilon * lower-mid front rounded vowel * non-IPA alternate for the preferred 0153 + x (latin small letter closed reversed open e - 025E) 029B LATIN LETTER SMALL CAPITAL G WITH HOOK * voiced uvular implosive 029C LATIN LETTER SMALL CAPITAL H * voiceless epiglottal fricative + x (cyrillic small letter en - 043D) x (modifier letter capital h - 1D34) x (modifier letter capital h with stroke - A7F8) 029D LATIN SMALL LETTER J WITH CROSSED-TAIL @@ -2002,6 +2320,7 @@ * proposed for velar click * uppercase is A7B0 @+ * withdrawn by IPA in 1970 + x (latin letter small capital turned k - 1DF10) 029F LATIN LETTER SMALL CAPITAL L * velar lateral approximant 02A0 LATIN SMALL LETTER Q WITH HOOK @@ -2019,9 +2338,11 @@ * voiced alveolo-palatal affricate 02A6 LATIN SMALL LETTER TS DIGRAPH * voiceless dental affricate + x (latin letter inverted glottal stop with stroke - 01BE) x (latin small letter ts digraph with retroflex hook - AB67) 02A7 LATIN SMALL LETTER TESH DIGRAPH * voiceless postalveolar affricate + x (latin small letter tz - A729) 02A8 LATIN SMALL LETTER TC DIGRAPH WITH CURL * voiceless alveolo-palatal affricate @ IPA characters for disordered speech @@ -2077,7 +2398,7 @@ # <super> 0079 @ Miscellaneous phonetic modifiers 02B9 MODIFIER LETTER PRIME - * primary stress, emphasis + * stress, emphasis * transliteration of mjagkij znak (Cyrillic soft sign: palatalization) * transliteration of Hebrew geresh x (apostrophe - 0027) @@ -2105,7 +2426,9 @@ = apostrophe * glottal stop, glottalization, ejective * many languages use this as a letter of their alphabets - * used as a tone marker in Bodo, Dogri, and Maithili + * used as a tone marker in Bodo and Dogri + * indicates vowel elongation, or various truncations and ellipsis in Maithili + * used as a modifier letter in the Lisu script * 2019 is the preferred character for a punctuation apostrophe x (apostrophe - 0027) x (combining comma above - 0313) @@ -2191,6 +2514,7 @@ x (combining vertical line below - 0329) 02CD MODIFIER LETTER LOW MACRON * low level tone + * used as a modifier letter in the Lisu script x (low line - 005F) x (combining macron below - 0331) 02CE MODIFIER LETTER LOW GRAVE ACCENT @@ -2276,6 +2600,7 @@ @ IPA modifiers 02EC MODIFIER LETTER VOICING 02ED MODIFIER LETTER UNASPIRATED + x (modifier letter short equals sign - A78A) @ Other modifier letter 02EE MODIFIER LETTER DOUBLE APOSTROPHE * Nenets @@ -2418,6 +2743,7 @@ 031F COMBINING PLUS SIGN BELOW * IPA: advanced or fronted articulation x (modifier letter plus sign - 02D6) + x (combining plus sign above - 1AC8) 0320 COMBINING MINUS SIGN BELOW * IPA: retracted or backed articulation * glyph may have small end-serifs @@ -2464,6 +2790,7 @@ 032B COMBINING INVERTED DOUBLE ARCH BELOW * IPA: labialization x (modifier letter small w - 02B7) + x (combining inverted double arch above - 1AC7) 032C COMBINING CARON BELOW * IPA: voiced 032D COMBINING CIRCUMFLEX ACCENT BELOW @@ -2948,6 +3275,7 @@ 0416 CYRILLIC CAPITAL LETTER ZHE 0417 CYRILLIC CAPITAL LETTER ZE 0418 CYRILLIC CAPITAL LETTER I +@+ This letter is also used to represent electrolarynx phonation in the Voice Quality Symbols for extended IPA. 0419 CYRILLIC CAPITAL LETTER SHORT I : 0418 0306 041A CYRILLIC CAPITAL LETTER KA @@ -3352,6 +3680,7 @@ 04FF CYRILLIC SMALL LETTER HA WITH STROKE @@ 0500 Cyrillic Supplement 052F @ Komi letters +@+ These letters are for the obsolete Molodtsov alphabet, used in the 1920s. 0500 CYRILLIC CAPITAL LETTER KOMI DE 0501 CYRILLIC SMALL LETTER KOMI DE 0502 CYRILLIC CAPITAL LETTER KOMI DJE @@ -3414,9 +3743,10 @@ 0528 CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK 0529 CYRILLIC SMALL LETTER EN WITH LEFT HOOK @ Komi letters +@+ These are obsolete letters attested in a 19th century grammar of Komi. 052A CYRILLIC CAPITAL LETTER DZZHE 052B CYRILLIC SMALL LETTER DZZHE - * also used for Ossetian +@+ * also used for Ossetian until 1924 052C CYRILLIC CAPITAL LETTER DCHE 052D CYRILLIC SMALL LETTER DCHE @ Khanty letters @@ -3728,18 +4058,22 @@ * represents sallallahu alayhe wasallam "may God's peace and blessings be upon him" 0611 ARABIC SIGN ALAYHE ASSALLAM * represents alayhe assalam "upon him be peace" + x (arabic ligature alayhi as-salaam - FD47) 0612 ARABIC SIGN RAHMATULLAH ALAYHE * represents rahmatullah alayhe "may God have mercy upon him" + x (arabic ligature rahimahu allaah - FD40) 0613 ARABIC SIGN RADI ALLAHOU ANHU * represents radi allahu 'anhu "may God be pleased with him" + x (arabic ligature radi allaahu anh - FD41) 0614 ARABIC SIGN TAKHALLUS * sign placed over the name or nom-de-plume of a poet, or in some writings used to mark all proper names @ Quranic annotation sign 0615 ARABIC SMALL HIGH TAH - * marks a recommended pause position in some Korans published in Iran and Pakistan + * marks a recommended pause position in some Qurans published in Iran and Pakistan * should not be confused with the small TAH sign used as a diacritic for some letters such as 0679 @ Extended Arabic mark 0616 ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH + % ARABIC SMALL HIGH LIGATURE ALEF WITH YEH BARREE * early Persian @ Quranic annotation signs 0617 ARABIC SMALL HIGH ZAIN @@ -3760,6 +4094,7 @@ * commonly abbreviated ALM x (right-to-left mark - 200F) @ Punctuation +061D ARABIC END OF TEXT MARK 061E ARABIC TRIPLE DOT PUNCTUATION MARK 061F ARABIC QUESTION MARK * also used with Thaana and Syriac in modern text @@ -3780,6 +4115,7 @@ 0625 ARABIC LETTER ALEF WITH HAMZA BELOW : 0627 0655 0626 ARABIC LETTER YEH WITH HAMZA ABOVE + * in Kyrgyz the hamza is consistently positioned to the top right in isolate and final forms : 064A 0654 0627 ARABIC LETTER ALEF 0628 ARABIC LETTER BEH @@ -3820,6 +4156,7 @@ 0643 ARABIC LETTER KAF 0644 ARABIC LETTER LAM 0645 ARABIC LETTER MEEM + * Sindhi uses a shape with a short tail 0646 ARABIC LETTER NOON 0647 ARABIC LETTER HEH 0648 ARABIC LETTER WAW @@ -3842,11 +4179,15 @@ 0651 ARABIC SHADDA 0652 ARABIC SUKUN * marks absence of a vowel after the base consonant - * used in some Korans to mark a long vowel as ignored + * used in some Qurans to mark a long vowel as ignored * can have a variety of shapes, including a circular one and a shape that looks like '06E1' x (arabic small high dotless head of khah - 06E1) @ Combining maddah and hamza 0653 ARABIC MADDAH ABOVE + * used for madd jaa'iz in South Asian and Indonesian orthographies + x (arabic madda waajib - 089C) + x (arabic doubled madda - 089E) + x (arabic half madda over madda - 089F) 0654 ARABIC HAMZA ABOVE * restricted to hamza and ezafe semantics * is not used as a diacritic to form new letters @@ -3912,22 +4253,25 @@ * Kashmiri * this character is deprecated and its use is strongly discouraged * use the sequence 0627 065F instead -@ Extended Arabic letters +@ High hamza 0674 ARABIC LETTER HIGH HAMZA - * Kazakh + * Kazakh, Jawi * forms digraphs +@ Digraphic letters for Kazakh +@+ These characters were encoded for Kazakh digraphs, but their compatibility decompositions do not reflect the preferred order of representation. Accordingly, the representation of these Kazakh digraphs should instead use the preferred two-character spellings with the correct order of elements. 0675 ARABIC LETTER HIGH HAMZA ALEF - * Kazakh + * preferred spelling is 0674 0627 # 0627 0674 0676 ARABIC LETTER HIGH HAMZA WAW - * Kazakh + * preferred spelling is 0674 0648 # 0648 0674 0677 ARABIC LETTER U WITH HAMZA ABOVE - * Kazakh + * preferred spelling is 0674 06C7 # 06C7 0674 0678 ARABIC LETTER HIGH HAMZA YEH - * Kazakh + * preferred spelling is 0674 0649 # 064A 0674 +@ Extended Arabic letters 0679 ARABIC LETTER TTEH * Urdu 067A ARABIC LETTER TTEHEH @@ -4026,7 +4370,7 @@ 06A6 ARABIC LETTER PEHEH * Sindhi 06A7 ARABIC LETTER QAF WITH DOT ABOVE - * Maghrib Arabic, Uighur + * Maghrib Arabic, Uyghur 06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE * Tunisian Arabic 06A9 ARABIC LETTER KEHEH @@ -4041,9 +4385,10 @@ * use for the Jawi gaf is not recommended, although it may be found in some existing text data; recommended character for Jawi gaf is 0762 x (arabic letter keheh with dot above - 0762) 06AD ARABIC LETTER NG - * Uighur, Kazakh, Moroccan Arabic, early Jawi, early Persian, ... + * Uyghur, Kazakh, Moroccan Arabic, early Jawi, early Persian, ... 06AE ARABIC LETTER KAF WITH THREE DOTS BELOW * Berber, early Persian + * Pegon alternative for 08B4 06AF ARABIC LETTER GAF * Persian, Urdu, ... 06B0 ARABIC LETTER GAF WITH RING @@ -4075,7 +4420,7 @@ * Jawi 06BE ARABIC LETTER HEH DOACHASHMEE * forms aspirate digraphs in Urdu and other languages of South Asia - * represents the glottal fricative /h/ in Uighur + * represents the glottal fricative /h/ in Uyghur 06BF ARABIC LETTER TCHEH WITH DOT ABOVE 06C0 ARABIC LETTER HEH WITH YEH ABOVE = arabic letter hamzah on ha (1.0) @@ -4093,22 +4438,24 @@ 06C4 ARABIC LETTER WAW WITH RING * Kashmiri 06C5 ARABIC LETTER KIRGHIZ OE - * Kirghiz + * Kyrgyz + * a glyph variant occurs which replaces the looped tail with a horizontal bar through the tail 06C6 ARABIC LETTER OE - * Uighur, Kurdish, Kazakh, Azerbaijani, Bosnian + * Uyghur, Kurdish, Kazakh, Azerbaijani, Bosnian 06C7 ARABIC LETTER U - * Kirghiz, Azerbaijani + * Azerbaijani, Kazakh, Kyrgyz, Uyghur 06C8 ARABIC LETTER YU - * Uighur + * Uyghur 06C9 ARABIC LETTER KIRGHIZ YU - * Kazakh, Kirghiz, Bosnian + * Kazakh, Kyrgyz, Bosnian 06CA ARABIC LETTER WAW WITH TWO DOTS ABOVE * Kurdish 06CB ARABIC LETTER VE - * Uighur, Kazakh + * Uyghur, Kazakh 06CC ARABIC LETTER FARSI YEH * Arabic, Persian, Urdu, Kashmiri, ... - * initial and medial forms of this letter have dots + * initial and medial forms of this letter have two horizontal dots below + * retains its dots in initial and medial forms when used in combination with 0654 x (arabic letter alef maksura - 0649) x (arabic letter yeh - 064A) 06CD ARABIC LETTER YEH WITH TAIL @@ -4117,7 +4464,7 @@ * Kurdish 06CF ARABIC LETTER WAW WITH DOT ABOVE 06D0 ARABIC LETTER E - * Pashto, Uighur + * Pashto, Uyghur * used as the letter bbeh in Sindhi 06D1 ARABIC LETTER YEH WITH THREE DOTS BELOW * Mende languages, Hausa @@ -4132,7 +4479,7 @@ * Urdu @ Extended Arabic letter 06D5 ARABIC LETTER AE - * Uighur, Kazakh, Kirghiz + * Uyghur, Kazakh, Kyrgyz @ Quranic annotation signs 06D6 ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA 06D7 ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA @@ -4143,13 +4490,16 @@ 06DC ARABIC SMALL HIGH SEEN 06DD ARABIC END OF AYAH 06DE ARABIC START OF RUB EL HIZB + * indicates boundaries of parts of sections + * typically depicted as an eight-sided symbol, which may or may not appear starlike 06DF ARABIC SMALL HIGH ROUNDED ZERO * smaller than the typical circular shape used for 0652 06E0 ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO + * the term "rectangular zero" is a translation of the Arabic name of this sign 06E1 ARABIC SMALL HIGH DOTLESS HEAD OF KHAH = Arabic jazm * presentation form of 0652, using font technology to select the variant is preferred - * used in some Korans to mark absence of a vowel + * used in some Qurans to mark absence of a vowel x (arabic sukun - 0652) 06E2 ARABIC SMALL HIGH MEEM ISOLATED FORM 06E3 ARABIC SMALL LOW SEEN @@ -4179,13 +4529,12 @@ 06F2 EXTENDED ARABIC-INDIC DIGIT TWO 06F3 EXTENDED ARABIC-INDIC DIGIT THREE 06F4 EXTENDED ARABIC-INDIC DIGIT FOUR - * Persian has a different glyph than Sindhi and Urdu + * Urdu and Kashmiri have a different glyph than Persian 06F5 EXTENDED ARABIC-INDIC DIGIT FIVE - * Persian, Sindhi, and Urdu share glyph different from Arabic 06F6 EXTENDED ARABIC-INDIC DIGIT SIX - * Persian, Sindhi, and Urdu have glyphs different from Arabic + * Sindhi, Urdu, and Kashmiri have a different glyph than Persian 06F7 EXTENDED ARABIC-INDIC DIGIT SEVEN - * Urdu and Sindhi have glyphs different from Arabic + * Sindhi, Urdu, and Kashmiri have a different glyph than Persian 06F8 EXTENDED ARABIC-INDIC DIGIT EIGHT 06F9 EXTENDED ARABIC-INDIC DIGIT NINE @ Extended Arabic letters @@ -4295,6 +4644,7 @@ @ Syriac marks 0740 SYRIAC FEMININE DOT * feminine marker used with the Taw feminine suffix + x (combining dot above left - 1DF8) 0741 SYRIAC QUSHSHAYA * indicates a plosive pronunciation 0742 SYRIAC RUKKAKHA @@ -4688,6 +5038,63 @@ x (malayalam letter llla - 0D34) 086A SYRIAC LETTER MALAYALAM SSA x (malayalam letter ssa - 0D37) +@@ 0870 Arabic Extended-B 089F +@ Additions for Quranic orthographies +0870 ARABIC LETTER ALEF WITH ATTACHED FATHA +0871 ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA +0872 ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE +0873 ARABIC LETTER ALEF WITH LEFT MIDDLE STROKE +0874 ARABIC LETTER ALEF WITH ATTACHED KASRA +0875 ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA +0876 ARABIC LETTER ALEF WITH ATTACHED ROUND DOT ABOVE +0877 ARABIC LETTER ALEF WITH ATTACHED RIGHT ROUND DOT +0878 ARABIC LETTER ALEF WITH ATTACHED LEFT ROUND DOT +0879 ARABIC LETTER ALEF WITH ATTACHED ROUND DOT BELOW +087A ARABIC LETTER ALEF WITH DOT ABOVE +087B ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA AND DOT ABOVE +087C ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE AND DOT ABOVE +087D ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA AND DOT ABOVE +087E ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA AND LEFT RING +087F ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE AND LEFT RING +0880 ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA AND LEFT RING +0881 ARABIC LETTER ALEF WITH ATTACHED RIGHT HAMZA +0882 ARABIC LETTER ALEF WITH ATTACHED LEFT HAMZA +0883 ARABIC TATWEEL WITH OVERSTRUCK HAMZA +0884 ARABIC TATWEEL WITH OVERSTRUCK WAW +0885 ARABIC TATWEEL WITH TWO DOTS BELOW +0886 ARABIC LETTER THIN YEH + * no final or isolated forms are attested +0887 ARABIC BASELINE ROUND DOT +0888 ARABIC RAISED ROUND DOT +@ Additions for Bosnian orthographies +0889 ARABIC LETTER NOON WITH INVERTED SMALL V +088A ARABIC LETTER HAH WITH INVERTED SMALL V BELOW +@ Additions for Pegon orthographies +088B ARABIC LETTER TAH WITH DOT BELOW + * Pegon, Malagasy +088C ARABIC LETTER TAH WITH THREE DOTS BELOW + * Pegon alternative for 088B +088D ARABIC LETTER KEHEH WITH TWO DOTS VERTICALLY BELOW + * Sundanese Pegon +@ Abbreviation mark +088E ARABIC VERTICAL TAIL + * mark used to indicate abbreviations in early movable type texts from Iran + * only attested in final form +@ Supertending currency symbols +0890 ARABIC POUND MARK ABOVE + * Egyptian pound +0891 ARABIC PIASTRE MARK ABOVE + * Egyptian piastre +@ Additions for Quranic orthographies +0898 ARABIC SMALL HIGH WORD AL-JUZ +0899 ARABIC SMALL LOW WORD ISHMAAM +089A ARABIC SMALL LOW WORD IMAALA +089B ARABIC SMALL LOW WORD TASHEEL +089C ARABIC MADDA WAAJIB + x (arabic maddah above - 0653) +089D ARABIC SUPERSCRIPT ALEF MOKHASSAS +089E ARABIC DOUBLED MADDA +089F ARABIC HALF MADDA OVER MADDA @@ 08A0 Arabic Extended-A 08FF @ Arabic letters for African languages 08A0 ARABIC LETTER BEH WITH SMALL V BELOW @@ -4733,6 +5140,10 @@ @ Arabic letters for Arwi 08B3 ARABIC LETTER AIN WITH THREE DOTS BELOW 08B4 ARABIC LETTER KAF WITH DOT BELOW + * also used in Pegon + x (arabic letter kaf with three dots below - 06AE) +@ Early Arabic letter +08B5 ARABIC LETTER QAF WITH DOT BELOW AND NO DOTS ABOVE @ Arabic letters for Bravanese 08B6 ARABIC LETTER BEH WITH SMALL MEEM ABOVE 08B7 ARABIC LETTER PEH WITH SMALL MEEM ABOVE @@ -4769,6 +5180,20 @@ 08C6 ARABIC LETTER JEEM WITH THREE DOTS BELOW @ Arabic letter for Punjabi 08C7 ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE +@ Arabic letter for Balti +08C8 ARABIC LETTER GRAF +@ Additions for Quranic orthographies +08C9 ARABIC SMALL FARSI YEH +08CA ARABIC SMALL HIGH FARSI YEH +08CB ARABIC SMALL HIGH YEH BARREE WITH TWO DOTS BELOW +08CC ARABIC SMALL HIGH WORD SAH + = sign of waqf +08CD ARABIC SMALL HIGH ZAH +08CE ARABIC LARGE ROUND DOT ABOVE +08CF ARABIC LARGE ROUND DOT BELOW +08D0 ARABIC SUKUN BELOW +08D1 ARABIC LARGE CIRCLE BELOW +08D2 ARABIC LARGE ROUND DOT INSIDE CIRCLE BELOW @ Quranic annotation signs 08D3 ARABIC SMALL LOW WAW 08D4 ARABIC SMALL HIGH WORD AR-RUB @@ -4781,6 +5206,7 @@ 08DB ARABIC SMALL HIGH WORD AS-SAJDA 08DC ARABIC SMALL HIGH WORD AN-NISF 08DD ARABIC SMALL HIGH WORD SAKTA + x (arabic small low word sakta - 10EFD) 08DE ARABIC SMALL HIGH WORD QIF 08DF ARABIC SMALL HIGH WORD WAQFA 08E0 ARABIC SMALL HIGH FOOTNOTE MARKER @@ -4821,8 +5247,8 @@ 08F9 ARABIC LEFT ARROWHEAD BELOW 08FA ARABIC RIGHT ARROWHEAD BELOW 08FB ARABIC DOUBLE RIGHT ARROWHEAD ABOVE -08FC ARABIC DOUBLE RIGHT ARROWHEAD ABOVE WITH DOT * also used in Quranic text in African and other orthographies to represent dammatan +08FC ARABIC DOUBLE RIGHT ARROWHEAD ABOVE WITH DOT 08FD ARABIC RIGHT ARROWHEAD ABOVE WITH DOT @ Extended vowel signs 08FE ARABIC DAMMA WITH DOT @@ -5779,6 +6205,10 @@ 0C37 TELUGU LETTER SSA 0C38 TELUGU LETTER SA 0C39 TELUGU LETTER HA +@ Sign +0C3C TELUGU SIGN NUKTA + * used for Tamil transliteration and Perso-Arabic phonemes + * can also appear as a large dot, should be placed sufficiently below the baseline of a consonant to avoid confusion/collision with the aspiration marker @ Addition for Sanskrit 0C3D TELUGU SIGN AVAGRAHA @ Dependent vowel signs @@ -5807,6 +6237,11 @@ 0C59 TELUGU LETTER DZA 0C5A TELUGU LETTER RRRA * letter for an alveolar consonant whose exact phonetic value is not known +@ Consonant +0C5D TELUGU LETTER NAKAARA POLLU + * vowelless form of na + x (kannada letter nakaara pollu - 0CDD) + x (malayalam letter chillu n - 0D7B) @ Additional vowels for Sanskrit 0C60 TELUGU LETTER VOCALIC RR 0C61 TELUGU LETTER VOCALIC LL @@ -5850,6 +6285,7 @@ 0C80 KANNADA SIGN SPACING CANDRABINDU 0C81 KANNADA SIGN CANDRABINDU 0C82 KANNADA SIGN ANUSVARA + * used in Konkani, Havyaka Kannada (Havigannada) and Awadhi texts to indicate regular anusvara 0C83 KANNADA SIGN VISARGA 0C84 KANNADA SIGN SIDDHAM = siddhirastu @@ -5936,6 +6372,10 @@ 0CD5 KANNADA LENGTH MARK 0CD6 KANNADA AI LENGTH MARK @ Additional consonants +0CDD KANNADA LETTER NAKAARA POLLU + * vowelless form of na + x (telugu letter nakaara pollu - 0C5D) + x (malayalam letter chillu n - 0D7B) 0CDE KANNADA LETTER FA % KANNADA LETTER LLLA * obsolete historic letter @@ -5968,6 +6408,8 @@ x (vedic sign jihvamuliya - 1CF5) 0CF2 KANNADA SIGN UPADHMANIYA x (vedic sign upadhmaniya - 1CF6) +0CF3 KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT + * used in Konkani, Havyaka Kannada (Havigannada) and Awadhi texts to indicate anunāsikā @@ 0D00 Malayalam 0D7F @ Various signs 0D00 MALAYALAM SIGN COMBINING ANUSVARA ABOVE @@ -6474,6 +6916,7 @@ = nikkhahit * final nasal 0E4E THAI CHARACTER YAMAKKAN + x (lao yamakkan - 0ECE) 0E4F THAI CHARACTER FONGMAN * used as a bullet x (khmer sign phnaek muan - 17D9) @@ -6617,6 +7060,9 @@ 0ECC LAO CANCELLATION MARK 0ECD LAO NIGGAHITA * final nasal or long o vowel +0ECE LAO YAMAKKAN + * marks a consonant that is simultaneously a part of two consonant clusters in Pali text + x (thai character yamakkan - 0E4E) @ Digits 0ED0 LAO DIGIT ZERO 0ED1 LAO DIGIT ONE @@ -7746,9 +8192,12 @@ 1247 ETHIOPIC SYLLABLE QOA 1248 ETHIOPIC SYLLABLE QWA 124A ETHIOPIC SYLLABLE QWI + x (ethiopic syllable gurage qwi - 1E7F0) 124B ETHIOPIC SYLLABLE QWAA 124C ETHIOPIC SYLLABLE QWEE + x (ethiopic syllable gurage qwee - 1E7F1) 124D ETHIOPIC SYLLABLE QWE + x (ethiopic syllable gurage qwe - 1E7F2) 1250 ETHIOPIC SYLLABLE QHA 1251 ETHIOPIC SYLLABLE QHU 1252 ETHIOPIC SYLLABLE QHI @@ -7840,9 +8289,12 @@ 12AF ETHIOPIC SYLLABLE KOA 12B0 ETHIOPIC SYLLABLE KWA 12B2 ETHIOPIC SYLLABLE KWI + x (ethiopic syllable gurage kwi - 1E7F5) 12B3 ETHIOPIC SYLLABLE KWAA 12B4 ETHIOPIC SYLLABLE KWEE + x (ethiopic syllable gurage kwee - 1E7F6) 12B5 ETHIOPIC SYLLABLE KWE + x (ethiopic syllable gurage kwe - 1E7F7) 12B8 ETHIOPIC SYLLABLE KXA 12B9 ETHIOPIC SYLLABLE KXU 12BA ETHIOPIC SYLLABLE KXI @@ -7851,10 +8303,14 @@ 12BD ETHIOPIC SYLLABLE KXE 12BE ETHIOPIC SYLLABLE KXO 12C0 ETHIOPIC SYLLABLE KXWA + x (ethiopic syllable gurage hhwa - 1E7E8) 12C2 ETHIOPIC SYLLABLE KXWI + x (ethiopic syllable hhwi - 1E7E9) 12C3 ETHIOPIC SYLLABLE KXWAA 12C4 ETHIOPIC SYLLABLE KXWEE + x (ethiopic syllable hhwee - 1E7EA) 12C5 ETHIOPIC SYLLABLE KXWE + x (ethiopic syllable hhwe - 1E7EB) 12C8 ETHIOPIC SYLLABLE WA 12C9 ETHIOPIC SYLLABLE WU 12CA ETHIOPIC SYLLABLE WI @@ -7928,9 +8384,12 @@ 130F ETHIOPIC SYLLABLE GOA 1310 ETHIOPIC SYLLABLE GWA 1312 ETHIOPIC SYLLABLE GWI + x (ethiopic syllable gurage gwi - 1E7F8) 1313 ETHIOPIC SYLLABLE GWAA 1314 ETHIOPIC SYLLABLE GWEE + x (ethiopic syllable gurage gwee - 1E7F9) 1315 ETHIOPIC SYLLABLE GWE + x (ethiopic syllable gurage gwe - 1E7FA) 1318 ETHIOPIC SYLLABLE GGA 1319 ETHIOPIC SYLLABLE GGU 131A ETHIOPIC SYLLABLE GGI @@ -8037,22 +8496,30 @@ 137B ETHIOPIC NUMBER HUNDRED 137C ETHIOPIC NUMBER TEN THOUSAND @@ 1380 Ethiopic Supplement 139F -@ Syllables for Sebatbeit +@ Syllables for Gurage 1380 ETHIOPIC SYLLABLE SEBATBEIT MWA 1381 ETHIOPIC SYLLABLE MWI + x (ethiopic syllable gurage mwi - 1E7ED) 1382 ETHIOPIC SYLLABLE MWEE + x (ethiopic syllable gurage mwee - 1E7EE) 1383 ETHIOPIC SYLLABLE MWE 1384 ETHIOPIC SYLLABLE SEBATBEIT BWA 1385 ETHIOPIC SYLLABLE BWI + x (ethiopic syllable gurage bwi - 1E7F3) 1386 ETHIOPIC SYLLABLE BWEE + x (ethiopic syllable gurage bwee - 1E7F4) 1387 ETHIOPIC SYLLABLE BWE 1388 ETHIOPIC SYLLABLE SEBATBEIT FWA 1389 ETHIOPIC SYLLABLE FWI + x (ethiopic syllable gurage fwi - 1E7FB) 138A ETHIOPIC SYLLABLE FWEE + x (ethiopic syllable gurage fwee - 1E7FC) 138B ETHIOPIC SYLLABLE FWE 138C ETHIOPIC SYLLABLE SEBATBEIT PWA 138D ETHIOPIC SYLLABLE PWI + x (ethiopic syllable gurage pwi - 1E7FD) 138E ETHIOPIC SYLLABLE PWEE + x (ethiopic syllable gurage pwee - 1E7FE) 138F ETHIOPIC SYLLABLE PWE @ Tonal marks @+ Intended for use with a multiline scored layout @@ -8732,6 +9199,7 @@ 15C2 CANADIAN SYLLABICS SAYISI HO * Sayisi (HU) 15C3 CANADIAN SYLLABICS SAYISI HA +@ Syllables for Carrier 15C4 CANADIAN SYLLABICS CARRIER GHU 15C5 CANADIAN SYLLABICS CARRIER GHO 15C6 CANADIAN SYLLABICS CARRIER GHE @@ -9088,6 +9556,8 @@ 170A TAGALOG LETTER BA 170B TAGALOG LETTER MA 170C TAGALOG LETTER YA +170D TAGALOG LETTER RA + * modern adaptation, not found in Old Tagalog 170E TAGALOG LETTER LA 170F TAGALOG LETTER WA 1710 TAGALOG LETTER SA @@ -9095,8 +9565,14 @@ @ Dependent vowel signs 1712 TAGALOG VOWEL SIGN I 1713 TAGALOG VOWEL SIGN U -@ Virama +@ Viramas 1714 TAGALOG SIGN VIRAMA +1715 TAGALOG SIGN PAMUDPOD + x (hanunoo sign pamudpod - 1734) +@ Archaic letter +171F TAGALOG LETTER ARCHAIC RA + = Zambales ra + * modern adaptation, not found in Old Tagalog @@ 1720 Hanunoo 173F @ Independent vowels 1720 HANUNOO LETTER A @@ -9123,6 +9599,7 @@ 1733 HANUNOO VOWEL SIGN U @ Virama 1734 HANUNOO SIGN PAMUDPOD + x (tagalog sign pamudpod - 1715) @ Generic punctuation for Philippine scripts 1735 PHILIPPINE SINGLE PUNCTUATION x (devanagari danda - 0964) @@ -9411,6 +9888,8 @@ * abbreviated FVS3 180E MONGOLIAN VOWEL SEPARATOR * abbreviated MVS +180F MONGOLIAN FREE VARIATION SELECTOR FOUR + * abbreviated FVS4 @ Digits 1810 MONGOLIAN DIGIT ZERO 1811 MONGOLIAN DIGIT ONE @@ -9856,18 +10335,22 @@ 19AA NEW TAI LUE LETTER HIGH SUA 19AB NEW TAI LUE LETTER LOW SUA * a labialized consonant cluster -@ Vowel signs +@ Vowels 19B0 NEW TAI LUE VOWEL SIGN VOWEL SHORTENER 19B1 NEW TAI LUE VOWEL SIGN AA 19B2 NEW TAI LUE VOWEL SIGN II 19B3 NEW TAI LUE VOWEL SIGN U 19B4 NEW TAI LUE VOWEL SIGN UU 19B5 NEW TAI LUE VOWEL SIGN E + * precedes consonant in visual order 19B6 NEW TAI LUE VOWEL SIGN AE + * precedes consonant in visual order 19B7 NEW TAI LUE VOWEL SIGN O + * precedes consonant in visual order 19B8 NEW TAI LUE VOWEL SIGN OA 19B9 NEW TAI LUE VOWEL SIGN UE 19BA NEW TAI LUE VOWEL SIGN AY + * precedes consonant in visual order 19BB NEW TAI LUE VOWEL SIGN AAY 19BC NEW TAI LUE VOWEL SIGN UY 19BD NEW TAI LUE VOWEL SIGN OY @@ -10137,7 +10620,8 @@ * used in combinations with other punctuation marks at ends of sections 1AAD TAI THAM SIGN CAANG @@ 1AB0 Combining Diacritical Marks Extended 1AFF -@ Used for German dialectology +@+ This block contains many specialized combining marks, often derived from European dialectology transcriptional conventions. +@ Used in German dialectology 1AB0 COMBINING DOUBLED CIRCUMFLEX ACCENT 1AB1 COMBINING DIAERESIS-RING 1AB2 COMBINING INFINITY @@ -10151,6 +10635,8 @@ 1AB8 COMBINING DOUBLE OPEN MARK BELOW 1AB9 COMBINING LIGHT CENTRALIZATION STROKE BELOW 1ABA COMBINING STRONG CENTRALIZATION STROKE BELOW +@ Marks surrounding other diacritics or letters +@+ These marks are often intended to indicate partial or uncertain applicability of another diacritic. 1ABB COMBINING PARENTHESES ABOVE * intended to surround a diacritic above 1ABC COMBINING DOUBLE PARENTHESES ABOVE @@ -10159,11 +10645,39 @@ 1ABE COMBINING PARENTHESES OVERLAY * intended to surround a base letter * exact placement is font dependent -@ Used for Scots dialectology +@ Used in Scots dialectology 1ABF COMBINING LATIN SMALL LETTER W BELOW * indicates voiced labialization + x (modifier letter small w - 02B7) 1AC0 COMBINING LATIN SMALL LETTER TURNED W BELOW * indicates voiceless labialization +@ Marks next to or surrounding other diacritics +@+ The left or right parentheses marks are used in extended IPA in combination with voicing or devoicing diacritics to indicate initial or final partial applicability. +1AC1 COMBINING LEFT PARENTHESIS ABOVE LEFT +1AC2 COMBINING RIGHT PARENTHESIS ABOVE RIGHT +1AC3 COMBINING LEFT PARENTHESIS BELOW LEFT +1AC4 COMBINING RIGHT PARENTHESIS BELOW RIGHT +1AC5 COMBINING SQUARE BRACKETS ABOVE + * intended to surround a diacritic above + * used to indicate cancellation of an accent in Japanese transliteration +@ Phonetic sign +1AC6 COMBINING NUMBER SIGN ABOVE + = superscript octothorp + * used extensively in J.P. Harrington's transcriptional notation +@ Used in extended IPA +1AC7 COMBINING INVERTED DOUBLE ARCH ABOVE + x (combining inverted double arch below - 032B) + x (combining latin small letter w - 1DF1) +1AC8 COMBINING PLUS SIGN ABOVE + x (combining plus sign below - 031F) +1AC9 COMBINING DOUBLE PLUS SIGN ABOVE +1ACA COMBINING DOUBLE PLUS SIGN BELOW +@ Used in Middle English Ormulum +1ACB COMBINING TRIPLE ACUTE ACCENT + x (combining double acute accent - 030B) +1ACC COMBINING LATIN SMALL LETTER INSULAR G +1ACD COMBINING LATIN SMALL LETTER INSULAR R +1ACE COMBINING LATIN SMALL LETTER INSULAR T @@ 1B00 Balinese 1B7F @ Various signs 1B00 BALINESE SIGN ULU RICEM @@ -10173,7 +10687,9 @@ 1B02 BALINESE SIGN CECEK = anusvara 1B03 BALINESE SIGN SURANG - = repha + = final r + * also used for repha in transliteration of Kawi + x (javanese sign layar - A982) 1B04 BALINESE SIGN BISAH = visarga @ Independent vowels @@ -10310,6 +10826,9 @@ 1B49 BALINESE LETTER VE SASAK 1B4A BALINESE LETTER ZAL SASAK 1B4B BALINESE LETTER ASYURA SASAK +1B4C BALINESE LETTER ARCHAIC JNYA + * used in older texts in place of the ja + nya conjunct + x (javanese letter nya murda - A998) @ Digits 1B50 BALINESE DIGIT ZERO 1B51 BALINESE DIGIT ONE @@ -10369,12 +10888,17 @@ 1B7A BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLAK 1B7B BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLUK 1B7C BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING +@ Punctuation +1B7D BALINESE PANTI LANTANG + = end of text +1B7E BALINESE PAMADA LANTANG + = end of text @@ 1B80 Sundanese 1BBF @ Various signs 1B80 SUNDANESE SIGN PANYECEK = anusvara 1B81 SUNDANESE SIGN PANGLAYAR - = repha + = final r 1B82 SUNDANESE SIGN PANGWISAD = visarga @ Vowels @@ -10456,14 +10980,19 @@ 1BB9 SUNDANESE DIGIT NINE @ Sign 1BBA SUNDANESE AVAGRAHA + = gemination mark @ Historic letters 1BBB SUNDANESE LETTER REU * vocalic r 1BBC SUNDANESE LETTER LEU * vocalic l 1BBD SUNDANESE LETTER BHA + % SUNDANESE LETTER ARCHAIC I + * character was originally misidentified, so its name is a misnomer 1BBE SUNDANESE LETTER FINAL K 1BBF SUNDANESE LETTER FINAL M + * used in a 21st century document + * for actual final m, use the sequence 1B99 1BAA @@ 1BC0 Batak 1BFF @ Letters @+ Annotations for letters indicate different usage among the various alphabets sharing the Batak script. @@ -10903,19 +11432,28 @@ 1D02 LATIN SMALL LETTER TURNED AE * glyph can also have sideways orientation 1D03 LATIN LETTER SMALL CAPITAL BARRED B + x (latin capital letter b with stroke - 0243) 1D04 LATIN LETTER SMALL CAPITAL C 1D05 LATIN LETTER SMALL CAPITAL D 1D06 LATIN LETTER SMALL CAPITAL ETH 1D07 LATIN LETTER SMALL CAPITAL E 1D08 LATIN SMALL LETTER TURNED OPEN E + x (latin small letter reversed open e - 025C) + x (modifier letter small turned open e - 1D4C) 1D09 LATIN SMALL LETTER TURNED I 1D0A LATIN LETTER SMALL CAPITAL J 1D0B LATIN LETTER SMALL CAPITAL K + x (latin small letter kra - 0138) + x (cyrillic small letter ka - 043A) 1D0C LATIN LETTER SMALL CAPITAL L WITH STROKE 1D0D LATIN LETTER SMALL CAPITAL M 1D0E LATIN LETTER SMALL CAPITAL REVERSED N + x (cyrillic small letter i - 0438) + x (modifier letter capital reversed n - 1D3B) 1D0F LATIN LETTER SMALL CAPITAL O 1D10 LATIN LETTER SMALL CAPITAL OPEN O + x (latin small letter open o - 0254) + x (latin small letter reversed c - 2184) 1D11 LATIN SMALL LETTER SIDEWAYS O 1D12 LATIN SMALL LETTER SIDEWAYS OPEN O 1D13 LATIN SMALL LETTER SIDEWAYS O WITH STROKE @@ -10926,9 +11464,11 @@ 1D17 LATIN SMALL LETTER BOTTOM HALF O 1D18 LATIN LETTER SMALL CAPITAL P * represents a semi-voiced [p] + x (greek letter small capital rho - 1D29) 1D19 LATIN LETTER SMALL CAPITAL REVERSED R 1D1A LATIN LETTER SMALL CAPITAL TURNED R 1D1B LATIN LETTER SMALL CAPITAL T + x (cyrillic small letter te - 0442) 1D1C LATIN LETTER SMALL CAPITAL U 1D1D LATIN SMALL LETTER SIDEWAYS U 1D1E LATIN SMALL LETTER SIDEWAYS DIAERESIZED U @@ -10938,14 +11478,19 @@ 1D21 LATIN LETTER SMALL CAPITAL W 1D22 LATIN LETTER SMALL CAPITAL Z 1D23 LATIN LETTER SMALL CAPITAL EZH + x (cyrillic small letter abkhasian dze - 04E1) 1D24 LATIN LETTER VOICED LARYNGEAL SPIRANT 1D25 LATIN LETTER AIN + x (arabic letter ain - 0639) + x (latin small letter egyptological ain - A725) @ Greek letters +@+ An additional Greek small capital letter is at AB65. 1D26 GREEK LETTER SMALL CAPITAL GAMMA 1D27 GREEK LETTER SMALL CAPITAL LAMDA 1D28 GREEK LETTER SMALL CAPITAL PI 1D29 GREEK LETTER SMALL CAPITAL RHO * represents a voiceless uvular trill + x (latin letter small capital p - 1D18) 1D2A GREEK LETTER SMALL CAPITAL PSI @ Cyrillic letter 1D2B CYRILLIC LETTER SMALL CAPITAL EL @@ -10969,9 +11514,11 @@ 1D33 MODIFIER LETTER CAPITAL G # <super> 0047 1D34 MODIFIER LETTER CAPITAL H + # <super> 0048 +@+ A typographical distinction between a capital form and a small capital form is not distinctive for this character in IPA usage. + * voiceless epiglottalized release (extended IPA) x (latin letter small capital h - 029C) x (modifier letter cyrillic en - 1D78) - # <super> 0048 1D35 MODIFIER LETTER CAPITAL I # <super> 0049 1D36 MODIFIER LETTER CAPITAL J @@ -11050,6 +11597,7 @@ 1D5B MODIFIER LETTER SMALL V # <super> 0076 1D5C MODIFIER LETTER SMALL AIN + x (latin small letter egyptological ain - A725) # <super> 1D25 @ Greek superscript modifier letters 1D5D MODIFIER LETTER SMALL BETA @@ -11082,7 +11630,7 @@ # <sub> 03C6 1D6A GREEK SUBSCRIPT SMALL LETTER CHI # <sub> 03C7 -@ Latin letter +@ Latin letter for American lexicography 1D6B LATIN SMALL LETTER UE @ Latin letters with middle tilde @+ Additional letters with middle tilde are found in other blocks. @@ -11099,11 +11647,12 @@ 1D74 LATIN SMALL LETTER S WITH MIDDLE TILDE 1D75 LATIN SMALL LETTER T WITH MIDDLE TILDE 1D76 LATIN SMALL LETTER Z WITH MIDDLE TILDE -@ Caucasian linguistics +@ Letters for Caucasian linguistics 1D77 LATIN SMALL LETTER TURNED G * Georgian transcription x (georgian letter turned gan - 10F9) 1D78 MODIFIER LETTER CYRILLIC EN + * sometimes substituted for 1D34 in extended IPA x (modifier letter capital h - 1D34) # <super> 043D @ Other phonetic symbols @@ -11114,11 +11663,13 @@ x (latin small letter yogh - 021D) x (latin small letter script g - 0261) x (latin small letter gamma - 0263) + x (latin small letter closed insular g - A7D1) 1D7A LATIN SMALL LETTER TH WITH STRIKETHROUGH * American dictionary usage x (greek small letter theta - 03B8) 1D7B LATIN SMALL CAPITAL LETTER I WITH STROKE * used with different meanings by Americanists and Oxford dictionaries + x (latin capital letter i with stroke - 0197) 1D7C LATIN SMALL LETTER IOTA WITH STROKE * used by Russianists 1D7D LATIN SMALL LETTER P WITH STROKE @@ -11140,7 +11691,9 @@ 1D84 LATIN SMALL LETTER K WITH PALATAL HOOK 1D85 LATIN SMALL LETTER L WITH PALATAL HOOK 1D86 LATIN SMALL LETTER M WITH PALATAL HOOK + x (latin small letter m with hook - 0271) 1D87 LATIN SMALL LETTER N WITH PALATAL HOOK + x (latin small letter eng - 014B) 1D88 LATIN SMALL LETTER P WITH PALATAL HOOK 1D89 LATIN SMALL LETTER R WITH PALATAL HOOK 1D8A LATIN SMALL LETTER S WITH PALATAL HOOK @@ -11149,6 +11702,7 @@ 1D8D LATIN SMALL LETTER X WITH PALATAL HOOK 1D8E LATIN SMALL LETTER Z WITH PALATAL HOOK * uppercase is A7C6 + x (latin small letter z with hook - 0225) @ Latin letters with retroflex hook @+ IPA recommends transcribing vowels with r-coloring (rhoticity) with the rhotic hook instead. x (modifier letter rhotic hook - 02DE) @@ -11332,6 +11886,8 @@ 1DEF COMBINING LATIN SMALL LETTER ESH 1DF0 COMBINING LATIN SMALL LETTER U WITH LIGHT CENTRALIZATION STROKE 1DF1 COMBINING LATIN SMALL LETTER W + x (combining latin small letter w below - 1ABF) + x (combining inverted double arch above - 1AC7) 1DF2 COMBINING LATIN SMALL LETTER A WITH DIAERESIS 1DF3 COMBINING LATIN SMALL LETTER O WITH DIAERESIS 1DF4 COMBINING LATIN SMALL LETTER U WITH DIAERESIS @@ -11346,9 +11902,12 @@ * used in Syriac as a disambiguation dot * used in Typicon Cyrillic, where the dot may have a square appearance x (combining dot above right - 0358) + x (syriac feminine dot - 0740) 1DF9 COMBINING WIDE INVERTED BRIDGE BELOW * used as a Typicon mark x (combining inverted bridge below - 033A) +1DFA COMBINING DOT BELOW LEFT + * used in Syriac as a disambiguation dot 1DFB COMBINING DELETION MARK * used for "mhusaa" in Newa scribal tradition @ Double diacritic mark for UPA @@ -11483,9 +12042,9 @@ : 004C 0323 1E37 LATIN SMALL LETTER L WITH DOT BELOW * Indic transliteration - : 006C 0323 -@+ * see ISO 15919 on the use of dot below versus ring below in Indic transliteration + * see ISO 15919 on the use of dot below versus ring below in Indic transliteration x (combining ring below - 0325) + : 006C 0323 1E38 LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON : 1E36 0304 1E39 LATIN SMALL LETTER L WITH DOT BELOW AND MACRON @@ -11566,9 +12125,9 @@ : 0052 0323 1E5B LATIN SMALL LETTER R WITH DOT BELOW * Indic transliteration - : 0072 0323 -@+ * see ISO 15919 on the use of dot below versus ring below in Indic transliteration + * see ISO 15919 on the use of dot below versus ring below in Indic transliteration x (combining ring below - 0325) + : 0072 0323 1E5C LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON : 1E5A 0304 1E5D LATIN SMALL LETTER R WITH DOT BELOW AND MACRON @@ -11725,8 +12284,11 @@ * not used in Swiss High German * lowercase is 00DF x (latin small letter sharp s - 00DF) + x (latin capital letter middle scots s - A7D6) @ Medievalist addition 1E9F LATIN SMALL LETTER DELTA + * this is a non-casing letter + x (greek small letter delta - 03B4) @ Latin extensions for Vietnamese 1EA0 LATIN CAPITAL LETTER A WITH DOT BELOW : 0041 0323 @@ -12620,7 +13182,7 @@ = Japanese kome = Urdu paragraph separator x (tibetan ku ru kha bzhi mig can - 0FBF) - x (cjk unified ideograph-200AD - 200AD) + x 200AD @ Double punctuation for vertical text 203C DOUBLE EXCLAMATION MARK x (exclamation mark - 0021) @@ -12654,6 +13216,7 @@ @ Brackets 2045 LEFT SQUARE BRACKET WITH QUILL x (left vertical bar with quill - 2E20) + x (left square bracket with stroke - 2E55) 2046 RIGHT SQUARE BRACKET WITH QUILL @ Double punctuation for vertical text 2047 DOUBLE QUESTION MARK @@ -12677,7 +13240,7 @@ x (asterisk - 002A) x (combining asterisk below - 0359) 204F REVERSED SEMICOLON - * also used in Sindhi + * used occasionally in Sindhi when Sindhi is written in the Arabic script x (semicolon - 003B) x (arabic semicolon - 061B) 2050 CLOSE UP @@ -12882,10 +13445,10 @@ x (thai currency symbol baht - 0E3F) x (khmer currency symbol riel - 17DB) x (script capital m - 2133) - x (cjk unified ideograph-5143 - 5143) - x (cjk unified ideograph-5186 - 5186) - x (cjk unified ideograph-5706 - 5706) - x (cjk unified ideograph-5713 - 5713) + x 5143 + x 5186 + x 5706 + x 5713 x (rial sign - FDFC) x (wancho ngun sign - 1E2FF) 20A0 EURO-CURRENCY SIGN @@ -12898,6 +13461,7 @@ * Brazil 20A3 FRENCH FRANC SIGN * France + x (latin capital letter f with stroke - A798) 20A4 LIRA SIGN * intended for lira, but not widely used * preferred character for lira is 00A3 @@ -12978,6 +13542,8 @@ * Georgia 20BF BITCOIN SIGN * a cryptocurrency +20C0 SOM SIGN + * Kyrgyzstan @@ 20D0 Combining Diacritical Marks for Symbols 20FF @ Combining diacritical marks for symbols 20D0 COMBINING LEFT HARPOON ABOVE @@ -13030,6 +13596,9 @@ 20E6 COMBINING DOUBLE VERTICAL STROKE OVERLAY = z notation finite function diacritic x (double vertical line - 2016) + x (rightwards arrow with double vertical stroke - 21FB) + x (rightwards two-headed arrow with double vertical stroke - 2901) + x (rightwards arrow with tail with double vertical stroke - 2915) 20E7 COMBINING ANNUITY SYMBOL = actuarial bend x (right ceiling - 2309) @@ -13060,7 +13629,7 @@ = the set of complex numbers # <font> 0043 latin capital letter c 2103 DEGREE CELSIUS - = degrees Centigrade + = degrees centigrade # 00B0 0043 2104 CENTRE LINE SYMBOL = clone @@ -13080,6 +13649,8 @@ # <font> 0067 latin small letter g 210B SCRIPT CAPITAL H = Hamiltonian operator + ~ 210B FE00 chancery style + ~ 210B FE01 roundhand style # <font> 0048 latin capital letter h 210C BLACK-LETTER CAPITAL H = Hilbert space @@ -13095,12 +13666,16 @@ x (cyrillic small letter tshe - 045B) # <font> 0127 latin small letter h with stroke 2110 SCRIPT CAPITAL I + ~ 2110 FE00 chancery style + ~ 2110 FE01 roundhand style # <font> 0049 latin capital letter i 2111 BLACK-LETTER CAPITAL I = imaginary part # <font> 0049 latin capital letter i 2112 SCRIPT CAPITAL L = Laplace transform + ~ 2112 FE00 chancery style + ~ 2112 FE01 roundhand style # <font> 004C latin capital letter l 2113 SCRIPT SMALL L = mathematical symbol 'ell' @@ -13135,6 +13710,8 @@ # <font> 0051 latin capital letter q 211B SCRIPT CAPITAL R = Riemann Integral + ~ 211B FE00 chancery style + ~ 211B FE01 roundhand style # <font> 0052 latin capital letter r 211C BLACK-LETTER CAPITAL R = real part @@ -13164,6 +13741,7 @@ 2125 OUNCE SIGN x (latin small letter ezh - 0292) x (alchemical symbol for half ounce - 1F773) + x 2CF04 2126 OHM SIGN * SI unit of resistance, named after G. S. Ohm, German physicist * preferred representation is 03A9 @@ -13189,6 +13767,8 @@ : 00C5 latin capital letter a with ring above 212C SCRIPT CAPITAL B = Bernoulli function + ~ 212C FE00 chancery style + ~ 212C FE01 roundhand style # <font> 0042 latin capital letter b 212D BLACK-LETTER CAPITAL C # <font> 0043 latin capital letter c @@ -13201,9 +13781,13 @@ # <font> 0065 latin small letter e 2130 SCRIPT CAPITAL E = emf (electromotive force) + ~ 2130 FE00 chancery style + ~ 2130 FE01 roundhand style # <font> 0045 latin capital letter e 2131 SCRIPT CAPITAL F = Fourier transform + ~ 2131 FE00 chancery style + ~ 2131 FE01 roundhand style # <font> 0046 latin capital letter f 2132 TURNED CAPITAL F = Claudian digamma inversum @@ -13215,6 +13799,8 @@ = German Mark currency symbol, before WWII * when used for the Mark symbol, the range of glyph variation is restricted x (nordic mark sign - 20BB) + ~ 2133 FE00 chancery style + ~ 2133 FE01 roundhand style # <font> 004D latin capital letter m 2134 SCRIPT SMALL O = order, of inferior order to @@ -13298,6 +13884,7 @@ x (greek small letter digamma - 03DD) @ Biblical editorial symbol 214F SYMBOL FOR SAMARITAN SOURCE +@~ Standardized Variation Sequences @@ 2150 Number Forms 218F @ Fractions @+ Other fraction number forms are found in the Latin-1 Supplement block. @@ -13877,12 +14464,16 @@ : 2261 0338 2263 STRICTLY EQUIVALENT TO 2264 LESS-THAN OR EQUAL TO + x (less-than sign - 003C) 2265 GREATER-THAN OR EQUAL TO + x (greater-than sign - 003E) 2266 LESS-THAN OVER EQUAL TO 2267 GREATER-THAN OVER EQUAL TO 2268 LESS-THAN BUT NOT EQUAL TO + x (less-than and single-line not equal to - 2A87) ~ 2268 FE00 with vertical stroke 2269 GREATER-THAN BUT NOT EQUAL TO + x (greater-than and single-line not equal to - 2A88) ~ 2269 FE00 with vertical stroke 226A MUCH LESS-THAN x (left-pointing double angle quotation mark - 00AB) @@ -13984,6 +14575,7 @@ x (circled crossing lanes - 26D2) x (n-ary circled times operator - 2A02) x (circled x - 2BBE) + x (lot of fortune - 1F774) ~ 2297 FE00 with white rim 2298 CIRCLED DIVISION SLASH 2299 CIRCLED DOT OPERATOR @@ -14097,6 +14689,9 @@ x (black star - 2605) x (white medium star - 2B50) 22C7 DIVISION TIMES + x (multiplication sign - 00D7) + x (division sign - 00F7) + x (multiplication x - 2715) @ Relation 22C8 BOWTIE x (ocr bow tie - 2445) @@ -14187,7 +14782,7 @@ x (latin small letter o with stroke - 00F8) x (empty set - 2205) 2301 ELECTRIC ARROW -@+ * from ISO 2047 + * from ISO 2047 * symbol for End of Transmission 2302 HOUSE 2303 UP ARROWHEAD @@ -14258,7 +14853,7 @@ 231B HOURGLASS = alchemical symbol for hour @ Quine corners -@+ These form a set of four quine corners, for quincuncial arrangement. They are also used in upper and lower pairs in mathematic, or more rarely in editorial usage as alternatives to half brackets. +@+ These form a set of four quine corners, for quincuncial arrangement. They are also used in upper and lower pairs in mathematics, or more rarely in editorial usage as alternatives to half brackets. 231C TOP LEFT CORNER x (right angle substitution marker - 2E00) x (top left half bracket - 2E22) @@ -14351,7 +14946,7 @@ x (reversed empty set - 29B0) 234A APL FUNCTIONAL SYMBOL DOWN TACK UNDERBAR = up tack underbar -@+ * preferred naming for APL tack symbols now follows the London Convention in ISO/IEC 13751:2000 (APL Extended) + * preferred naming for APL tack symbols now follows the London Convention in ISO/IEC 13751:2000 (APL Extended) x (up tack - 22A5) 234B APL FUNCTIONAL SYMBOL DELTA STILE 234C APL FUNCTIONAL SYMBOL QUAD DOWN CARET @@ -14419,19 +15014,19 @@ 237A APL FUNCTIONAL SYMBOL ALPHA @ Graphics for control codes 237B NOT CHECK MARK -@+ * from ISO 2047 + * from ISO 2047 * symbol for Negative Acknowledge @ Miscellaneous technical 237C RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW @ Graphics for control codes 237D SHOULDERED OPEN BOX -@+ * from ISO 9995-7 + * from ISO 9995-7 * keyboard symbol for No Break Space x (open box - 2423) 237E BELL SYMBOL -@+ * from ISO 2047 + * from ISO 2047 237F VERTICAL LINE WITH MIDDLE DOT -@+ * from ISO 2047 + * from ISO 2047 * symbol for End of Medium @ Keyboard symbols from ISO 9995-7 2380 INSERTION SYMBOL @@ -14661,10 +15256,10 @@ x (large red circle - 1F534) @ Power symbols from ISO 7000:2012 23FB POWER SYMBOL -@+ * IEC 5009 standby symbol -@+ * IEEE 1621 power symbol + * IEC 5009 standby symbol + * IEEE 1621 power symbol 23FC POWER ON-OFF SYMBOL -@+ * IEC 5010 power on-off symbol + * IEC 5010 power on-off symbol 23FD POWER ON SYMBOL * use 2B58 for power off symbol x (heavy circle - 2B58) @@ -14721,11 +15316,11 @@ 2424 SYMBOL FOR NEWLINE @ Keyboard symbol 2425 SYMBOL FOR DELETE FORM TWO -@+ * from ISO 9995-7 + * from ISO 9995-7 * keyboard symbol for undoable delete @ Specific symbol for control code 2426 SYMBOL FOR SUBSTITUTE FORM TWO -@+ * from ISO 2047 + * from ISO 2047 x (arabic question mark - 061F) @@ 2440 Optical Character Recognition 245F @ OCR-A @@ -15527,7 +16122,9 @@ x (alchemical symbol for purify - 1F763) 260C CONJUNCTION = alchemical symbol for day + x (occultation - 1F775) 260D OPPOSITION + x (lunar eclipse - 1F776) @ Miscellaneous symbols 260E BLACK TELEPHONE x (telephone sign - 2121) @@ -15613,6 +16210,7 @@ 262C ADI SHAKTI = khanda * Sikh religious symbol + x (khanda - 1FAAF) 262D HAMMER AND SICKLE 262E PEACE SYMBOL 262F YIN YANG @@ -15891,7 +16489,7 @@ = heterosexuality 26A5 MALE AND FEMALE SIGN = intersex, androgynous - = hermaphrodite (in entomology) + = hermaphroditic (in botany) 26A6 MALE WITH STROKE SIGN = transgender = alchemical symbol for iron or crocus of iron @@ -18262,6 +18860,8 @@ 2C2C GLAGOLITIC CAPITAL LETTER SHTAPIC 2C2D GLAGOLITIC CAPITAL LETTER TROKUTASTI A 2C2E GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE +2C2F GLAGOLITIC CAPITAL LETTER CAUDATE CHRIVI +@+ This is used as an alternative to Glagolitic letter chrivi, combined with 0303 combining tilde or with 0483 combining Cyrillic titlo as an et cetera sign. @ Small letters 2C30 GLAGOLITIC SMALL LETTER AZU 2C31 GLAGOLITIC SMALL LETTER BUKY @@ -18311,12 +18911,17 @@ 2C5C GLAGOLITIC SMALL LETTER SHTAPIC 2C5D GLAGOLITIC SMALL LETTER TROKUTASTI A 2C5E GLAGOLITIC SMALL LETTER LATINATE MYSLITE +2C5F GLAGOLITIC SMALL LETTER CAUDATE CHRIVI @@ 2C60 Latin Extended-C 2C7F @ Orthographic Latin additions 2C60 LATIN CAPITAL LETTER L WITH DOUBLE BAR + x (latin capital letter l with bar - 023D) 2C61 LATIN SMALL LETTER L WITH DOUBLE BAR + x (latin small letter l with bar - 019A) + x (latin small letter l with double middle tilde - AB38) 2C62 LATIN CAPITAL LETTER L WITH MIDDLE TILDE * lowercase is 026B + x (latin capital letter l with stroke - 0141) 2C63 LATIN CAPITAL LETTER P WITH STROKE * lowercase is 1D7D 2C64 LATIN CAPITAL LETTER R WITH TAIL @@ -18325,20 +18930,25 @@ * uppercase is 023A 2C66 LATIN SMALL LETTER T WITH DIAGONAL STROKE * uppercase is 023E -@ Additions for Uighur +@ Additions for Uyghur 2C67 LATIN CAPITAL LETTER H WITH DESCENDER + x (cyrillic capital letter en with descender - 04A2) 2C68 LATIN SMALL LETTER H WITH DESCENDER 2C69 LATIN CAPITAL LETTER K WITH DESCENDER + x (cyrillic capital letter ka with descender - 049A) 2C6A LATIN SMALL LETTER K WITH DESCENDER 2C6B LATIN CAPITAL LETTER Z WITH DESCENDER + x (latin capital letter z with hook - 0224) 2C6C LATIN SMALL LETTER Z WITH DESCENDER @ Miscellaneous additions 2C6D LATIN CAPITAL LETTER ALPHA + = capital script a * lowercase is 0251 2C6E LATIN CAPITAL LETTER M WITH HOOK * lowercase is 0271 2C6F LATIN CAPITAL LETTER TURNED A * lowercase is 0250 + x (for all - 2200) 2C70 LATIN CAPITAL LETTER TURNED ALPHA * lowercase is 0252 2C71 LATIN SMALL LETTER V WITH RIGHT HOOK @@ -18355,13 +18965,16 @@ x (latin capital letter reversed half h - A7F5) 2C76 LATIN SMALL LETTER HALF H x (greek small letter heta - 0371) + x (latin small letter reversed half h - A7F6) @ Additions for UPA 2C77 LATIN SMALL LETTER TAILLESS PHI * medium rounded o + x (greek small letter phi - 03C6) 2C78 LATIN SMALL LETTER E WITH NOTCH 2C79 LATIN SMALL LETTER TURNED R WITH TAIL 2C7A LATIN SMALL LETTER O WITH LOW RING INSIDE 2C7B LATIN LETTER SMALL CAPITAL TURNED E + x (latin capital letter reversed e - 018E) 2C7C LATIN SUBSCRIPT SMALL LETTER J # <sub> 006A 2C7D MODIFIER LETTER CAPITAL V @@ -18369,6 +18982,7 @@ @ Additions for Shona 2C7E LATIN CAPITAL LETTER S WITH SWASH TAIL * lowercase is 023F + x (latin capital letter s with hook - A7C5) 2C7F LATIN CAPITAL LETTER Z WITH SWASH TAIL * lowercase is 0240 @@ 2C80 Coptic 2CFF @@ -18692,7 +19306,7 @@ 2DBC ETHIOPIC SYLLABLE CCHEE 2DBD ETHIOPIC SYLLABLE CCHE 2DBE ETHIOPIC SYLLABLE CCHO -@ Syllables for Sebatbeit +@ Syllables for Gurage 2DC0 ETHIOPIC SYLLABLE QYA 2DC1 ETHIOPIC SYLLABLE QYU 2DC2 ETHIOPIC SYLLABLE QYI @@ -18708,12 +19322,19 @@ 2DCD ETHIOPIC SYLLABLE KYE 2DCE ETHIOPIC SYLLABLE KYO 2DD0 ETHIOPIC SYLLABLE XYA + x (ethiopic syllable hhya - 1E7E0) 2DD1 ETHIOPIC SYLLABLE XYU + x (ethiopic syllable hhyu - 1E7E1) 2DD2 ETHIOPIC SYLLABLE XYI + x (ethiopic syllable hhyi - 1E7E2) 2DD3 ETHIOPIC SYLLABLE XYAA + x (ethiopic syllable hhyaa - 1E7E3) 2DD4 ETHIOPIC SYLLABLE XYEE + x (ethiopic syllable hhyee - 1E7E4) 2DD5 ETHIOPIC SYLLABLE XYE + x (ethiopic syllable hhye - 1E7E5) 2DD6 ETHIOPIC SYLLABLE XYO + x (ethiopic syllable hhyo - 1E7E6) 2DD8 ETHIOPIC SYLLABLE GYA 2DD9 ETHIOPIC SYLLABLE GYU 2DDA ETHIOPIC SYLLABLE GYI @@ -18808,6 +19429,7 @@ x (equals sign - 003D) x (hyphen - 2010) x (double hyphen - 2E40) + x (oblique hyphen - 2E5D) @ General punctuation 2E18 INVERTED INTERROBANG = gnaborretni @@ -18899,8 +19521,10 @@ * indicates pronunciation on one side of the mouth only x (section sign - 00A7) @ Dashes +@+ These long dashes are shown in the code charts inside dashed square boxes because of their width. In production fonts they would simply display as extra-wide dashes. 2E3A TWO-EM DASH = omission dash + * may be used in Chinese for abrupt change of thought, inserting new content, or continuation of tone or sound x (em dash - 2014) 2E3B THREE-EM DASH @ Alternate forms of punctuation @@ -18928,7 +19552,8 @@ x (modifier letter short equals sign - A78A) @ Reversed punctuation 2E41 REVERSED COMMA - * also used in Sindhi + * Old Hungarian + * used occasionally in Sindhi when Sindhi is written in the Arabic script x (comma - 002C) x (arabic comma - 060C) 2E42 DOUBLE LOW-REVERSED-9 QUOTATION MARK @@ -18965,734 +19590,1094 @@ x (paragraphos - 2E0F) x (capitulum - 2E3F) 2E4E PUNCTUS ELEVATUS MARK - * indicates a major medial pause where the sense is complete but the meaning is not +@+ * This mark indicates a major intermediate pause where the sensus is complete but the sentence is not; this is similar in some regards to the modern use of a semicolon. 2E4F CORNISH VERSE DIVIDER 2E50 CROSS PATTY WITH RIGHT CROSSBAR x (maltese cross - 2720) + x (latin capital letter half h - 2C75) 2E51 CROSS PATTY WITH LEFT CROSSBAR + x (latin capital letter reversed half h - A7F5) 2E52 TIRONIAN SIGN CAPITAL ET x (tironian sign et - 204A) +2E53 MEDIEVAL EXCLAMATION MARK +2E54 MEDIEVAL QUESTION MARK +@ Brackets +@+ These brackets indicate ellipsis in certain conventions for Japanese transliteration. +2E55 LEFT SQUARE BRACKET WITH STROKE + * optional ellipsis + x (left square bracket with quill - 2045) +2E56 RIGHT SQUARE BRACKET WITH STROKE +2E57 LEFT SQUARE BRACKET WITH DOUBLE STROKE + * obligatory ellipsis +2E58 RIGHT SQUARE BRACKET WITH DOUBLE STROKE +@ Parentheses top and bottom halves +@+ These are used in pairs in extended IPA to indicate dubious phonemes or questionable presence of a sound. +2E59 TOP HALF LEFT PARENTHESIS +2E5A TOP HALF RIGHT PARENTHESIS +2E5B BOTTOM HALF LEFT PARENTHESIS +2E5C BOTTOM HALF RIGHT PARENTHESIS +@ Oblique hyphen +@+ The oblique hyphen is historic punctuation seen in some medieval and Renaissance manuscripts. In some modern lexicography an oblique hyphen is used distinctly to indicate hyphenation which is retained when a word is not broken at a line boundary. +2E5D OBLIQUE HYPHEN + x (hyphen - 2010) + x (double oblique hyphen - 2E17) @@ 2E80 CJK Radicals Supplement 2EFF @+ For the characters in this block whose representative glyph takes up only a portion of the em-box, the placement relative to the em-box is either centered or respects prototypical usage. The placement of the representative glyph is for informational purposes only, and should not be considered a recommendation for implementations. @ CJK radicals supplement 2E80 CJK RADICAL REPEAT + * variant of Kangxi Radical 3 2E81 CJK RADICAL CLIFF + * variant of Kangxi Radical 27 x 5382 x 20086 2E82 CJK RADICAL SECOND ONE + * variant of Kangxi Radical 5 x 4E5B 2E83 CJK RADICAL SECOND TWO + * variant of Kangxi Radical 5 x 4E5A 2E84 CJK RADICAL SECOND THREE + * variant of Kangxi Radical 5 x 4E59 2E85 CJK RADICAL PERSON + * variant of Kangxi Radical 9 * form used on left side x 4EBB 2E86 CJK RADICAL BOX + * variant of Kangxi Radical 13 x 5182 2E87 CJK RADICAL TABLE + * variant of Kangxi Radical 16 x 51E0 x 20628 2E88 CJK RADICAL KNIFE ONE + * variant of Kangxi Radical 18 * form used at top x 5200 x 2008A 2E89 CJK RADICAL KNIFE TWO + * variant of Kangxi Radical 18 * form used on right side x 5202 2E8A CJK RADICAL DIVINATION + * variant of Kangxi Radical 25 * form used at top x 535C 2E8B CJK RADICAL SEAL + * variant of Kangxi Radical 26 * form used at bottom x 353E 2E8C CJK RADICAL SMALL ONE + * variant of Kangxi Radical 42 * form used at top x 5C0F 2E8D CJK RADICAL SMALL TWO + * variant of Kangxi Radical 42 * form used at top x 5C0F x 2D544 2E8E CJK RADICAL LAME ONE + * variant of Kangxi Radical 43 x 5C22 x 5140 2E8F CJK RADICAL LAME TWO + * variant of Kangxi Radical 43 x 5C23 2E90 CJK RADICAL LAME THREE + * variant of Kangxi Radical 43 x 5C22 2E91 CJK RADICAL LAME FOUR + * variant of Kangxi Radical 43 x 5C23 x 21BC2 2E92 CJK RADICAL SNAKE + * variant of Kangxi Radical 49 x 5DF3 2E93 CJK RADICAL THREAD + * variant of Kangxi Radical 52 x 5E7A 2E94 CJK RADICAL SNOUT ONE + * variant of Kangxi Radical 58 x 5F51 2E95 CJK RADICAL SNOUT TWO + * variant of Kangxi Radical 58 + * actually a form of the radical for hand, despite its resemblance in shape to the radical for snout x 5F50 + x 2B739 2E96 CJK RADICAL HEART ONE + * variant of Kangxi Radical 61 * form used on left side x 5FC4 2E97 CJK RADICAL HEART TWO + * variant of Kangxi Radical 61 * form used at bottom x 38FA x 5FC3 2E98 CJK RADICAL HAND + * variant of Kangxi Radical 64 * form used on left side x 624C 2E99 CJK RADICAL RAP + * variant of Kangxi Radical 66 * form used on right side x 6535 +2E9A <reserved> + x (kangxi radical not - 2F46) 2E9B CJK RADICAL CHOKE + * variant of Kangxi Radical 71 x 65E1 2E9C CJK RADICAL SUN + * variant of Kangxi Radical 72 * actually a form of the radical for hat, despite its resemblance in shape to the radical for sun x 5183 x 65E5 2E9D CJK RADICAL MOON + * variant of Kangxi Radical 74 x 6708 2E9E CJK RADICAL DEATH + * variant of Kangxi Radical 78 x 6B7A 2E9F CJK RADICAL MOTHER + * variant of Kangxi Radical 80 # 6BCD 2EA0 CJK RADICAL CIVILIAN + * variant of Kangxi Radical 83 x 6C11 2EA1 CJK RADICAL WATER ONE + * variant of Kangxi Radical 85 * form used on left side x 6C35 2EA2 CJK RADICAL WATER TWO + * variant of Kangxi Radical 85 * form used (rarely) at bottom x 6C3A 2EA3 CJK RADICAL FIRE + * variant of Kangxi Radical 86 * form used at bottom x 706C 2EA4 CJK RADICAL PAW ONE + * variant of Kangxi Radical 87 * form used at top x 722B 2EA5 CJK RADICAL PAW TWO + * variant of Kangxi Radical 87 * form used at top x 722B 2EA6 CJK RADICAL SIMPLIFIED HALF TREE TRUNK + * simplified variant of Kangxi Radical 90 x 4E2C 2EA7 CJK RADICAL COW + * variant of Kangxi Radical 93 x 725B + x 20092 2EA8 CJK RADICAL DOG + * variant of Kangxi Radical 94 * form used on left side x 72AD 2EA9 CJK RADICAL JADE + * variant of Kangxi Radical 96 * form used on left side x 738B x 248E9 2EAA CJK RADICAL BOLT OF CLOTH + * variant of Kangxi Radical 103 * form used on left side x 758B x 24D14 2EAB CJK RADICAL EYE + * variant of Kangxi Radical 109 + * variant of Kangxi Radical 122 * form used at top x (cjk radical net two - 2EB2) x 76EE x 7F52 2EAC CJK RADICAL SPIRIT ONE + * variant of Kangxi Radical 113 x 793A 2EAD CJK RADICAL SPIRIT TWO + * variant of Kangxi Radical 113 x 793B 2EAE CJK RADICAL BAMBOO + * variant of Kangxi Radical 118 x 7AF9 x 25AD7 2EAF CJK RADICAL SILK + * variant of Kangxi Radical 120 * form used on left side x 7CF9 2EB0 CJK RADICAL C-SIMPLIFIED SILK + * simplified Chinese variant of Kangxi Radical 120 * form used on left side x 7E9F 2EB1 CJK RADICAL NET ONE + * variant of Kangxi Radical 122 x 7F53 2EB2 CJK RADICAL NET TWO + * variant of Kangxi Radical 109 + * variant of Kangxi Radical 122 x (cjk radical eye - 2EAB) x 7F52 x 26270 2EB3 CJK RADICAL NET THREE + * variant of Kangxi Radical 122 x 34C1 x 7F51 2EB4 CJK RADICAL NET FOUR + * variant of Kangxi Radical 122 x 34C1 x 7F51 2EB5 CJK RADICAL MESH + * variant of Kangxi Radical 122 x 2626B 2EB6 CJK RADICAL SHEEP + * variant of Kangxi Radical 123 * form used on left side x 7F8A 2EB7 CJK RADICAL RAM + * variant of Kangxi Radical 123 * form used at top x 7F8A x 2634C 2EB8 CJK RADICAL EWE + * variant of Kangxi Radical 123 x 7F8B x 2634B 2EB9 CJK RADICAL OLD + * variant of Kangxi Radical 125 x 8002 2EBA CJK RADICAL BRUSH ONE + * variant of Kangxi Radical 129 x 8080 2EBB CJK RADICAL BRUSH TWO + * variant of Kangxi Radical 129 x 807F 2EBC CJK RADICAL MEAT + * variant of Kangxi Radical 130 x 8089 2EBD CJK RADICAL MORTAR + * variant of Kangxi Radical 134 x 81FC x 26951 2EBE CJK RADICAL GRASS ONE + * simplified variant of Kangxi Radical 140 x 8279 2EBF CJK RADICAL GRASS TWO + * variant of Kangxi Radical 140 x 8279 2EC0 CJK RADICAL GRASS THREE + * variant of Kangxi Radical 140 x 8279 2EC1 CJK RADICAL TIGER + * variant of Kangxi Radical 141 x 864E 2EC2 CJK RADICAL CLOTHES + * variant of Kangxi Radical 145 * form used on left side x 8864 2EC3 CJK RADICAL WEST ONE + * variant of Kangxi Radical 146 * form used at top x 8980 2EC4 CJK RADICAL WEST TWO + * variant of Kangxi Radical 146 * form used on left side x 897F 2EC5 CJK RADICAL C-SIMPLIFIED SEE + * simplified Chinese variant of Kangxi Radical 147 x 89C1 2EC6 CJK RADICAL SIMPLIFIED HORN + * simplified Chinese variant of Kangxi Radical 148 x 89D2 2EC7 CJK RADICAL HORN + * variant of Kangxi Radical 148 x 278B2 2EC8 CJK RADICAL C-SIMPLIFIED SPEECH + * simplified Chinese variant of Kangxi Radical 149 x 8BA0 2EC9 CJK RADICAL C-SIMPLIFIED SHELL + * simplified Chinese variant of Kangxi Radical 154 x 8D1D 2ECA CJK RADICAL FOOT + * variant of Kangxi Radical 157 * form used on left side x 8DB3 x 27FB7 2ECB CJK RADICAL C-SIMPLIFIED CART + * simplified Chinese variant of Kangxi Radical 159 x 8F66 2ECC CJK RADICAL SIMPLIFIED WALK + * simplified variant of Kangxi Radical 162 x 8FB6 2ECD CJK RADICAL WALK ONE + * variant of Kangxi Radical 162 x 8FB6 2ECE CJK RADICAL WALK TWO + * variant of Kangxi Radical 162 x 8FB6 2ECF CJK RADICAL CITY + * variant of Kangxi Radical 163 * form used on right side x 9091 2ED0 CJK RADICAL C-SIMPLIFIED GOLD + * simplified Chinese variant of Kangxi Radical 167 x 9485 2ED1 CJK RADICAL LONG ONE + * variant of Kangxi Radical 168 x 9577 2ED2 CJK RADICAL LONG TWO + * variant of Kangxi Radical 168 * form used on left side x 9578 2ED3 CJK RADICAL C-SIMPLIFIED LONG + * simplified Chinese variant of Kangxi Radical 168 x 957F 2ED4 CJK RADICAL C-SIMPLIFIED GATE + * simplified Chinese variant of Kangxi Radical 169 x 95E8 2ED5 CJK RADICAL MOUND ONE + * variant of Kangxi Radical 170 x 961C x 28E0F 2ED6 CJK RADICAL MOUND TWO + * variant of Kangxi Radical 170 * form used on left side x 961D 2ED7 CJK RADICAL RAIN + * variant of Kangxi Radical 173 x 96E8 2ED8 CJK RADICAL BLUE + * variant of Kangxi Radical 174 x 9752 2ED9 CJK RADICAL C-SIMPLIFIED TANNED LEATHER + * simplified Chinese variant of Kangxi Radical 178 x 97E6 2EDA CJK RADICAL C-SIMPLIFIED LEAF + * simplified Chinese variant of Kangxi Radical 181 x 9875 2EDB CJK RADICAL C-SIMPLIFIED WIND + * simplified Chinese variant of Kangxi Radical 182 x 98CE 2EDC CJK RADICAL C-SIMPLIFIED FLY + * simplified Chinese variant of Kangxi Radical 183 x 98DE 2EDD CJK RADICAL EAT ONE + * variant of Kangxi Radical 184 * form used at bottom x 98DF 2EDE CJK RADICAL EAT TWO + * variant of Kangxi Radical 184 * form used on left side x 2967F 2EDF CJK RADICAL EAT THREE + * variant of Kangxi Radical 184 * form used on left side x 98E0 2EE0 CJK RADICAL C-SIMPLIFIED EAT + * simplified Chinese variant of Kangxi Radical 184 * form used on left side x 9963 2EE1 CJK RADICAL HEAD + * variant of Kangxi Radical 185 x 29810 2EE2 CJK RADICAL C-SIMPLIFIED HORSE + * simplified Chinese variant of Kangxi Radical 187 x 9A6C 2EE3 CJK RADICAL BONE + * simplified Chinese variant of Kangxi Radical 188 x 9AA8 2EE4 CJK RADICAL GHOST + * variant of Kangxi Radical 194 x 9B3C 2EE5 CJK RADICAL C-SIMPLIFIED FISH + * simplified Chinese variant of Kangxi Radical 195 x 9C7C 2EE6 CJK RADICAL C-SIMPLIFIED BIRD + * simplified Chinese variant of Kangxi Radical 196 x 9E1F 2EE7 CJK RADICAL C-SIMPLIFIED SALT + * simplified Chinese variant of Kangxi Radical 197 x 5364 2EE8 CJK RADICAL SIMPLIFIED WHEAT + * simplified variant of Kangxi Radical 199 x 9EA6 2EE9 CJK RADICAL SIMPLIFIED YELLOW + * simplified variant of Kangxi Radical 201 x 9EC4 2EEA CJK RADICAL C-SIMPLIFIED FROG + * simplified Chinese variant of Kangxi Radical 205 x 9EFE 2EEB CJK RADICAL J-SIMPLIFIED EVEN + * simplified Japanese variant of Kangxi Radical 210 x 6589 2EEC CJK RADICAL C-SIMPLIFIED EVEN + * simplified Chinese variant of Kangxi Radical 210 x 9F50 2EED CJK RADICAL J-SIMPLIFIED TOOTH + * simplified Japanese variant of Kangxi Radical 211 x 6B6F 2EEE CJK RADICAL C-SIMPLIFIED TOOTH + * simplified Chinese variant of Kangxi Radical 211 x 9F7F 2EEF CJK RADICAL J-SIMPLIFIED DRAGON + * simplified Japanese variant of Kangxi Radical 212 x 7ADC x 9F8D 2EF0 CJK RADICAL C-SIMPLIFIED DRAGON + * simplified Chinese variant of Kangxi Radical 212 x 9F99 2EF1 CJK RADICAL TURTLE + * variant of Kangxi Radical 213 x 9F9C 2EF2 CJK RADICAL J-SIMPLIFIED TURTLE + * simplified Japanese variant of Kangxi Radical 213 x 4E80 2EF3 CJK RADICAL C-SIMPLIFIED TURTLE + * simplified Chinese variant of Kangxi Radical 213 # 9F9F @@ 2F00 Kangxi Radicals 2FDF @ Kangxi radicals 2F00 KANGXI RADICAL ONE + * Kangxi Radical 1 # 4E00 2F01 KANGXI RADICAL LINE + * Kangxi Radical 2 # 4E28 2F02 KANGXI RADICAL DOT + * Kangxi Radical 3 # 4E36 2F03 KANGXI RADICAL SLASH + * Kangxi Radical 4 # 4E3F 2F04 KANGXI RADICAL SECOND + * Kangxi Radical 5 # 4E59 2F05 KANGXI RADICAL HOOK + * Kangxi Radical 6 # 4E85 2F06 KANGXI RADICAL TWO + * Kangxi Radical 7 # 4E8C 2F07 KANGXI RADICAL LID + * Kangxi Radical 8 # 4EA0 2F08 KANGXI RADICAL MAN + * Kangxi Radical 9 # 4EBA 2F09 KANGXI RADICAL LEGS + * Kangxi Radical 10 # 513F 2F0A KANGXI RADICAL ENTER + * Kangxi Radical 11 # 5165 2F0B KANGXI RADICAL EIGHT + * Kangxi Radical 12 # 516B 2F0C KANGXI RADICAL DOWN BOX + * Kangxi Radical 13 # 5182 2F0D KANGXI RADICAL COVER + * Kangxi Radical 14 # 5196 2F0E KANGXI RADICAL ICE + * Kangxi Radical 15 # 51AB 2F0F KANGXI RADICAL TABLE + * Kangxi Radical 16 # 51E0 2F10 KANGXI RADICAL OPEN BOX + * Kangxi Radical 17 # 51F5 2F11 KANGXI RADICAL KNIFE + * Kangxi Radical 18 # 5200 2F12 KANGXI RADICAL POWER + * Kangxi Radical 19 # 529B 2F13 KANGXI RADICAL WRAP + * Kangxi Radical 20 # 52F9 2F14 KANGXI RADICAL SPOON + * Kangxi Radical 21 # 5315 2F15 KANGXI RADICAL RIGHT OPEN BOX + * Kangxi Radical 22 # 531A 2F16 KANGXI RADICAL HIDING ENCLOSURE + * Kangxi Radical 23 # 5338 2F17 KANGXI RADICAL TEN + * Kangxi Radical 24 # 5341 2F18 KANGXI RADICAL DIVINATION + * Kangxi Radical 25 # 535C 2F19 KANGXI RADICAL SEAL + * Kangxi Radical 26 # 5369 2F1A KANGXI RADICAL CLIFF + * Kangxi Radical 27 # 5382 2F1B KANGXI RADICAL PRIVATE + * Kangxi Radical 28 # 53B6 2F1C KANGXI RADICAL AGAIN + * Kangxi Radical 29 # 53C8 2F1D KANGXI RADICAL MOUTH + * Kangxi Radical 30 # 53E3 2F1E KANGXI RADICAL ENCLOSURE + * Kangxi Radical 31 # 56D7 2F1F KANGXI RADICAL EARTH + * Kangxi Radical 32 # 571F 2F20 KANGXI RADICAL SCHOLAR + * Kangxi Radical 33 # 58EB 2F21 KANGXI RADICAL GO + * Kangxi Radical 34 # 5902 2F22 KANGXI RADICAL GO SLOWLY + * Kangxi Radical 35 # 590A 2F23 KANGXI RADICAL EVENING + * Kangxi Radical 36 # 5915 2F24 KANGXI RADICAL BIG + * Kangxi Radical 37 # 5927 2F25 KANGXI RADICAL WOMAN + * Kangxi Radical 38 # 5973 2F26 KANGXI RADICAL CHILD + * Kangxi Radical 39 # 5B50 2F27 KANGXI RADICAL ROOF + * Kangxi Radical 40 # 5B80 2F28 KANGXI RADICAL INCH + * Kangxi Radical 41 # 5BF8 2F29 KANGXI RADICAL SMALL + * Kangxi Radical 42 # 5C0F 2F2A KANGXI RADICAL LAME + * Kangxi Radical 43 x 21BC1 # 5C22 2F2B KANGXI RADICAL CORPSE + * Kangxi Radical 44 # 5C38 2F2C KANGXI RADICAL SPROUT + * Kangxi Radical 45 # 5C6E 2F2D KANGXI RADICAL MOUNTAIN + * Kangxi Radical 46 # 5C71 2F2E KANGXI RADICAL RIVER + * Kangxi Radical 47 # 5DDB 2F2F KANGXI RADICAL WORK + * Kangxi Radical 48 # 5DE5 2F30 KANGXI RADICAL ONESELF + * Kangxi Radical 49 # 5DF1 2F31 KANGXI RADICAL TURBAN + * Kangxi Radical 50 # 5DFE 2F32 KANGXI RADICAL DRY + * Kangxi Radical 51 # 5E72 2F33 KANGXI RADICAL SHORT THREAD + * Kangxi Radical 52 # 5E7A 2F34 KANGXI RADICAL DOTTED CLIFF + * Kangxi Radical 53 # 5E7F 2F35 KANGXI RADICAL LONG STRIDE + * Kangxi Radical 54 # 5EF4 2F36 KANGXI RADICAL TWO HANDS + * Kangxi Radical 55 # 5EFE 2F37 KANGXI RADICAL SHOOT + * Kangxi Radical 56 # 5F0B 2F38 KANGXI RADICAL BOW + * Kangxi Radical 57 # 5F13 2F39 KANGXI RADICAL SNOUT + * Kangxi Radical 58 # 5F50 2F3A KANGXI RADICAL BRISTLE + * Kangxi Radical 59 # 5F61 2F3B KANGXI RADICAL STEP + * Kangxi Radical 60 # 5F73 2F3C KANGXI RADICAL HEART + * Kangxi Radical 61 # 5FC3 2F3D KANGXI RADICAL HALBERD + * Kangxi Radical 62 # 6208 2F3E KANGXI RADICAL DOOR + * Kangxi Radical 63 # 6236 2F3F KANGXI RADICAL HAND + * Kangxi Radical 64 # 624B 2F40 KANGXI RADICAL BRANCH + * Kangxi Radical 65 # 652F 2F41 KANGXI RADICAL RAP + * Kangxi Radical 66 # 6534 2F42 KANGXI RADICAL SCRIPT + * Kangxi Radical 67 # 6587 2F43 KANGXI RADICAL DIPPER + * Kangxi Radical 68 # 6597 2F44 KANGXI RADICAL AXE + * Kangxi Radical 69 # 65A4 2F45 KANGXI RADICAL SQUARE + * Kangxi Radical 70 # 65B9 2F46 KANGXI RADICAL NOT + * Kangxi Radical 71 # 65E0 2F47 KANGXI RADICAL SUN + * Kangxi Radical 72 # 65E5 2F48 KANGXI RADICAL SAY + * Kangxi Radical 73 # 66F0 2F49 KANGXI RADICAL MOON + * Kangxi Radical 74 # 6708 2F4A KANGXI RADICAL TREE + * Kangxi Radical 75 # 6728 2F4B KANGXI RADICAL LACK + * Kangxi Radical 76 # 6B20 2F4C KANGXI RADICAL STOP + * Kangxi Radical 77 # 6B62 2F4D KANGXI RADICAL DEATH + * Kangxi Radical 78 # 6B79 2F4E KANGXI RADICAL WEAPON + * Kangxi Radical 79 # 6BB3 2F4F KANGXI RADICAL DO NOT + * Kangxi Radical 80 # 6BCB 2F50 KANGXI RADICAL COMPARE + * Kangxi Radical 81 # 6BD4 2F51 KANGXI RADICAL FUR + * Kangxi Radical 82 # 6BDB 2F52 KANGXI RADICAL CLAN + * Kangxi Radical 83 # 6C0F 2F53 KANGXI RADICAL STEAM + * Kangxi Radical 84 # 6C14 2F54 KANGXI RADICAL WATER + * Kangxi Radical 85 # 6C34 2F55 KANGXI RADICAL FIRE + * Kangxi Radical 86 # 706B 2F56 KANGXI RADICAL CLAW + * Kangxi Radical 87 # 722A 2F57 KANGXI RADICAL FATHER + * Kangxi Radical 88 # 7236 2F58 KANGXI RADICAL DOUBLE X + * Kangxi Radical 89 # 723B 2F59 KANGXI RADICAL HALF TREE TRUNK + * Kangxi Radical 90 # 723F 2F5A KANGXI RADICAL SLICE + * Kangxi Radical 91 # 7247 2F5B KANGXI RADICAL FANG + * Kangxi Radical 92 # 7259 2F5C KANGXI RADICAL COW + * Kangxi Radical 93 # 725B 2F5D KANGXI RADICAL DOG + * Kangxi Radical 94 # 72AC 2F5E KANGXI RADICAL PROFOUND + * Kangxi Radical 95 # 7384 2F5F KANGXI RADICAL JADE + * Kangxi Radical 96 # 7389 2F60 KANGXI RADICAL MELON + * Kangxi Radical 97 # 74DC 2F61 KANGXI RADICAL TILE + * Kangxi Radical 98 # 74E6 2F62 KANGXI RADICAL SWEET + * Kangxi Radical 99 # 7518 2F63 KANGXI RADICAL LIFE + * Kangxi Radical 100 # 751F 2F64 KANGXI RADICAL USE + * Kangxi Radical 101 # 7528 2F65 KANGXI RADICAL FIELD + * Kangxi Radical 102 # 7530 2F66 KANGXI RADICAL BOLT OF CLOTH + * Kangxi Radical 103 # 758B 2F67 KANGXI RADICAL SICKNESS + * Kangxi Radical 104 # 7592 2F68 KANGXI RADICAL DOTTED TENT + * Kangxi Radical 105 # 7676 2F69 KANGXI RADICAL WHITE + * Kangxi Radical 106 # 767D 2F6A KANGXI RADICAL SKIN + * Kangxi Radical 107 # 76AE 2F6B KANGXI RADICAL DISH + * Kangxi Radical 108 # 76BF 2F6C KANGXI RADICAL EYE + * Kangxi Radical 109 # 76EE 2F6D KANGXI RADICAL SPEAR + * Kangxi Radical 110 # 77DB 2F6E KANGXI RADICAL ARROW + * Kangxi Radical 111 # 77E2 2F6F KANGXI RADICAL STONE + * Kangxi Radical 112 # 77F3 2F70 KANGXI RADICAL SPIRIT + * Kangxi Radical 113 # 793A 2F71 KANGXI RADICAL TRACK + * Kangxi Radical 114 # 79B8 2F72 KANGXI RADICAL GRAIN + * Kangxi Radical 115 # 79BE 2F73 KANGXI RADICAL CAVE + * Kangxi Radical 116 # 7A74 2F74 KANGXI RADICAL STAND + * Kangxi Radical 117 # 7ACB 2F75 KANGXI RADICAL BAMBOO + * Kangxi Radical 118 # 7AF9 2F76 KANGXI RADICAL RICE + * Kangxi Radical 119 # 7C73 2F77 KANGXI RADICAL SILK + * Kangxi Radical 120 # 7CF8 2F78 KANGXI RADICAL JAR + * Kangxi Radical 121 # 7F36 2F79 KANGXI RADICAL NET + * Kangxi Radical 122 # 7F51 2F7A KANGXI RADICAL SHEEP + * Kangxi Radical 123 # 7F8A 2F7B KANGXI RADICAL FEATHER + * Kangxi Radical 124 # 7FBD 2F7C KANGXI RADICAL OLD + * Kangxi Radical 125 # 8001 2F7D KANGXI RADICAL AND + * Kangxi Radical 126 # 800C 2F7E KANGXI RADICAL PLOW + * Kangxi Radical 127 # 8012 2F7F KANGXI RADICAL EAR + * Kangxi Radical 128 # 8033 2F80 KANGXI RADICAL BRUSH + * Kangxi Radical 129 # 807F 2F81 KANGXI RADICAL MEAT + * Kangxi Radical 130 # 8089 2F82 KANGXI RADICAL MINISTER + * Kangxi Radical 131 # 81E3 2F83 KANGXI RADICAL SELF + * Kangxi Radical 132 # 81EA 2F84 KANGXI RADICAL ARRIVE + * Kangxi Radical 133 # 81F3 2F85 KANGXI RADICAL MORTAR + * Kangxi Radical 134 # 81FC 2F86 KANGXI RADICAL TONGUE + * Kangxi Radical 135 # 820C 2F87 KANGXI RADICAL OPPOSE + * Kangxi Radical 136 # 821B 2F88 KANGXI RADICAL BOAT + * Kangxi Radical 137 # 821F 2F89 KANGXI RADICAL STOPPING + * Kangxi Radical 138 # 826E 2F8A KANGXI RADICAL COLOR + * Kangxi Radical 139 # 8272 2F8B KANGXI RADICAL GRASS + * Kangxi Radical 140 # 8278 2F8C KANGXI RADICAL TIGER + * Kangxi Radical 141 # 864D 2F8D KANGXI RADICAL INSECT + * Kangxi Radical 142 # 866B 2F8E KANGXI RADICAL BLOOD + * Kangxi Radical 143 # 8840 2F8F KANGXI RADICAL WALK ENCLOSURE + * Kangxi Radical 144 # 884C 2F90 KANGXI RADICAL CLOTHES + * Kangxi Radical 145 # 8863 2F91 KANGXI RADICAL WEST + * Kangxi Radical 146 # 897E 2F92 KANGXI RADICAL SEE + * Kangxi Radical 147 # 898B 2F93 KANGXI RADICAL HORN + * Kangxi Radical 148 # 89D2 2F94 KANGXI RADICAL SPEECH + * Kangxi Radical 149 # 8A00 2F95 KANGXI RADICAL VALLEY + * Kangxi Radical 150 # 8C37 2F96 KANGXI RADICAL BEAN + * Kangxi Radical 151 # 8C46 2F97 KANGXI RADICAL PIG + * Kangxi Radical 152 # 8C55 2F98 KANGXI RADICAL BADGER + * Kangxi Radical 153 # 8C78 2F99 KANGXI RADICAL SHELL + * Kangxi Radical 154 # 8C9D 2F9A KANGXI RADICAL RED + * Kangxi Radical 155 # 8D64 2F9B KANGXI RADICAL RUN + * Kangxi Radical 156 # 8D70 2F9C KANGXI RADICAL FOOT + * Kangxi Radical 157 # 8DB3 2F9D KANGXI RADICAL BODY + * Kangxi Radical 158 # 8EAB 2F9E KANGXI RADICAL CART + * Kangxi Radical 159 # 8ECA 2F9F KANGXI RADICAL BITTER + * Kangxi Radical 160 # 8F9B 2FA0 KANGXI RADICAL MORNING + * Kangxi Radical 161 # 8FB0 2FA1 KANGXI RADICAL WALK + * Kangxi Radical 162 # 8FB5 2FA2 KANGXI RADICAL CITY + * Kangxi Radical 163 # 9091 2FA3 KANGXI RADICAL WINE + * Kangxi Radical 164 # 9149 2FA4 KANGXI RADICAL DISTINGUISH + * Kangxi Radical 165 # 91C6 2FA5 KANGXI RADICAL VILLAGE + * Kangxi Radical 166 # 91CC 2FA6 KANGXI RADICAL GOLD + * Kangxi Radical 167 # 91D1 2FA7 KANGXI RADICAL LONG + * Kangxi Radical 168 # 9577 2FA8 KANGXI RADICAL GATE + * Kangxi Radical 169 # 9580 2FA9 KANGXI RADICAL MOUND + * Kangxi Radical 170 # 961C 2FAA KANGXI RADICAL SLAVE + * Kangxi Radical 171 # 96B6 2FAB KANGXI RADICAL SHORT TAILED BIRD + * Kangxi Radical 172 # 96B9 2FAC KANGXI RADICAL RAIN + * Kangxi Radical 173 # 96E8 2FAD KANGXI RADICAL BLUE + * Kangxi Radical 174 # 9751 2FAE KANGXI RADICAL WRONG + * Kangxi Radical 175 # 975E 2FAF KANGXI RADICAL FACE + * Kangxi Radical 176 # 9762 2FB0 KANGXI RADICAL LEATHER + * Kangxi Radical 177 # 9769 2FB1 KANGXI RADICAL TANNED LEATHER + * Kangxi Radical 178 # 97CB 2FB2 KANGXI RADICAL LEEK + * Kangxi Radical 179 # 97ED 2FB3 KANGXI RADICAL SOUND + * Kangxi Radical 180 # 97F3 2FB4 KANGXI RADICAL LEAF + * Kangxi Radical 181 # 9801 2FB5 KANGXI RADICAL WIND + * Kangxi Radical 182 # 98A8 2FB6 KANGXI RADICAL FLY + * Kangxi Radical 183 # 98DB 2FB7 KANGXI RADICAL EAT + * Kangxi Radical 184 # 98DF 2FB8 KANGXI RADICAL HEAD + * Kangxi Radical 185 # 9996 2FB9 KANGXI RADICAL FRAGRANT + * Kangxi Radical 186 # 9999 2FBA KANGXI RADICAL HORSE + * Kangxi Radical 187 # 99AC 2FBB KANGXI RADICAL BONE + * Kangxi Radical 188 # 9AA8 2FBC KANGXI RADICAL TALL + * Kangxi Radical 189 # 9AD8 2FBD KANGXI RADICAL HAIR + * Kangxi Radical 190 # 9ADF 2FBE KANGXI RADICAL FIGHT + * Kangxi Radical 191 # 9B25 2FBF KANGXI RADICAL SACRIFICIAL WINE + * Kangxi Radical 192 # 9B2F 2FC0 KANGXI RADICAL CAULDRON + * Kangxi Radical 193 # 9B32 2FC1 KANGXI RADICAL GHOST + * Kangxi Radical 194 # 9B3C 2FC2 KANGXI RADICAL FISH + * Kangxi Radical 195 # 9B5A 2FC3 KANGXI RADICAL BIRD + * Kangxi Radical 196 # 9CE5 2FC4 KANGXI RADICAL SALT + * Kangxi Radical 197 # 9E75 2FC5 KANGXI RADICAL DEER + * Kangxi Radical 198 # 9E7F 2FC6 KANGXI RADICAL WHEAT + * Kangxi Radical 199 # 9EA5 2FC7 KANGXI RADICAL HEMP + * Kangxi Radical 200 # 9EBB 2FC8 KANGXI RADICAL YELLOW + * Kangxi Radical 201 # 9EC3 2FC9 KANGXI RADICAL MILLET + * Kangxi Radical 202 # 9ECD 2FCA KANGXI RADICAL BLACK + * Kangxi Radical 203 # 9ED1 2FCB KANGXI RADICAL EMBROIDERY + * Kangxi Radical 204 # 9EF9 2FCC KANGXI RADICAL FROG + * Kangxi Radical 205 # 9EFD 2FCD KANGXI RADICAL TRIPOD + * Kangxi Radical 206 # 9F0E 2FCE KANGXI RADICAL DRUM + * Kangxi Radical 207 # 9F13 2FCF KANGXI RADICAL RAT + * Kangxi Radical 208 # 9F20 2FD0 KANGXI RADICAL NOSE + * Kangxi Radical 209 # 9F3B 2FD1 KANGXI RADICAL EVEN + * Kangxi Radical 210 # 9F4A 2FD2 KANGXI RADICAL TOOTH + * Kangxi Radical 211 # 9F52 2FD3 KANGXI RADICAL DRAGON + * Kangxi Radical 212 # 9F8D 2FD4 KANGXI RADICAL TURTLE + * Kangxi Radical 213 # 9F9C 2FD5 KANGXI RADICAL FLUTE + * Kangxi Radical 214 # 9FA0 @@ 2FF0 Ideographic Description Characters 2FFF @ Ideographic description characters @@ -19709,6 +20694,10 @@ 2FF9 IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT 2FFA IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT 2FFB IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID +2FFC IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM RIGHT +2FFD IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER RIGHT +2FFE IDEOGRAPHIC DESCRIPTION CHARACTER HORIZONTAL REFLECTION +2FFF IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION @@ 3000 CJK Symbols and Punctuation 303F @@+ @ CJK symbols and punctuation @@ -19777,6 +20766,7 @@ * substitute for ideograph not in font * editorial convention to represent ideographic lacuna x (white square - 25A1) + x (heavy equals sign - 1F7F0) @ CJK brackets 3014 LEFT TORTOISE SHELL BRACKET 3015 RIGHT TORTOISE SHELL BRACKET @@ -20574,6 +21564,10 @@ * 1st stroke of 4E44 31E3 CJK STROKE Q * 6th stroke of 3514 +@ Ideographic description character +@+ This is a visibly displayed graphic character, not an invisible composition control. It is used with other characters from the Ideographic Description Characters block. +31EF IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION + * used to describe a character with a stroke removed @@ 31F0 Katakana Phonetic Extensions 31FF @ Phonetic extensions for Ainu 31F0 KATAKANA LETTER SMALL KU @@ -21681,6 +22675,7 @@ 33D6 SQUARE MOL # <square> 006D 006F 006C 33D7 SQUARE PH + * casing inconsistency in the compatibility decomposition is a known anomaly dating from glyph presentations in very early versions of the standard # <square> 0050 0048 33D8 SQUARE PM # <square> 0070 002E 006D 002E @@ -21831,7 +22826,7 @@ 4DFD HEXAGRAM FOR SMALL PREPONDERANCE 4DFE HEXAGRAM FOR AFTER COMPLETION 4DFF HEXAGRAM FOR BEFORE COMPLETION -@@ 4E00 CJK Unified Ideographs 9FFC +@@ 4E00 CJK Unified Ideographs 9FFF @@ A000 Yi Syllables A48F @@+ @ Syllables @@ -23109,6 +24104,9 @@ A4F5 LISU LETTER UE A4F6 LISU LETTER UH A4F7 LISU LETTER OE @ Tones +@+ The script also uses modifier letters in the Spacing Modifier Letters block. + x (modifier letter apostrophe - 02BC) + x (modifier letter low macron - 02CD) A4F8 LISU LETTER TONE MYA TI A4F9 LISU LETTER TONE NA PO A4FA LISU LETTER TONE MYA CYA @@ -23756,28 +24754,49 @@ A721 MODIFIER LETTER STRESS AND LOW TONE @ Egyptological additions A722 LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF A723 LATIN SMALL LETTER EGYPTOLOGICAL ALEF + x (hebrew letter alef - 05D0) + x (arabic letter alef with hamza above - 0623) A724 LATIN CAPITAL LETTER EGYPTOLOGICAL AIN A725 LATIN SMALL LETTER EGYPTOLOGICAL AIN - * this is a case pair + x (modifier letter left half ring - 02BF) + x (hebrew letter ayin - 05E2) + x (arabic letter ain - 0639) x (latin letter ain - 1D25) x (modifier letter small ain - 1D5C) x (latin small letter glottal i - A7BD) @ Mayanist additions +@+ These are used for Mayan orthographies of the colonial period. A726 LATIN CAPITAL LETTER HENG + x (cyrillic capital letter en with hook - 04C7) + x (latin capital letter h with descender - 2C67) A727 LATIN SMALL LETTER HENG + * uvular fricative, see 0281 + * also used in Bantu linguistics for the voiced alveolar lateral fricative, see 026E + x (latin small letter heng with hook - 0267) + x (latin small letter h with palatal hook - A795) + x (modifier letter small heng - AB5C) A728 LATIN CAPITAL LETTER TZ A729 LATIN SMALL LETTER TZ + = tezh digraph + * palatoalveolar affricate [ts] + x (latin small letter ts digraph - 02A6) + x (latin small letter tesh digraph - 02A7) A72A LATIN CAPITAL LETTER TRESILLO A72B LATIN SMALL LETTER TRESILLO + * uvular ejective stop [qʼ] x (turned digit three - 218B) A72C LATIN CAPITAL LETTER CUATRILLO A72D LATIN SMALL LETTER CUATRILLO + * velar ejective stop [kʼ] + x (digit four - 0034) A72E LATIN CAPITAL LETTER CUATRILLO WITH COMMA A72F LATIN SMALL LETTER CUATRILLO WITH COMMA + * alveolar ejective affricate [tsʼ] @ Medievalist additions A730 LATIN LETTER SMALL CAPITAL F A731 LATIN LETTER SMALL CAPITAL S A732 LATIN CAPITAL LETTER AA + x (modifier letter small capital aa - 10780) A733 LATIN SMALL LETTER AA A734 LATIN CAPITAL LETTER AO A735 LATIN SMALL LETTER AO @@ -23790,7 +24809,9 @@ A73B LATIN SMALL LETTER AV WITH HORIZONTAL BAR A73C LATIN CAPITAL LETTER AY A73D LATIN SMALL LETTER AY A73E LATIN CAPITAL LETTER REVERSED C WITH DOT + x (greek capital reversed dotted lunate sigma symbol - 03FF) A73F LATIN SMALL LETTER REVERSED C WITH DOT + x (greek small reversed dotted lunate sigma symbol - 037D) A740 LATIN CAPITAL LETTER K WITH STROKE A741 LATIN SMALL LETTER K WITH STROKE A742 LATIN CAPITAL LETTER K WITH DIAGONAL STROKE @@ -23800,15 +24821,24 @@ A745 LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE A746 LATIN CAPITAL LETTER BROKEN L A747 LATIN SMALL LETTER BROKEN L A748 LATIN CAPITAL LETTER L WITH HIGH STROKE + x (latin capital letter l with bar - 023D) A749 LATIN SMALL LETTER L WITH HIGH STROKE + x (latin small letter l with bar - 019A) A74A LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY + x (latin capital letter o with middle tilde - 019F) A74B LATIN SMALL LETTER O WITH LONG STROKE OVERLAY + x (latin small letter o with stroke - 00F8) + x (latin small letter barred o - 0275) A74C LATIN CAPITAL LETTER O WITH LOOP A74D LATIN SMALL LETTER O WITH LOOP A74E LATIN CAPITAL LETTER OO A74F LATIN SMALL LETTER OO + x (cyrillic small letter double o - A699) A750 LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER + x (ruble sign - 20BD) A751 LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER + x (greek rho with stroke symbol - 03FC) + x (latin small letter p with middle tilde - 1D71) A752 LATIN CAPITAL LETTER P WITH FLOURISH A753 LATIN SMALL LETTER P WITH FLOURISH A754 LATIN CAPITAL LETTER P WITH SQUIRREL TAIL @@ -23827,6 +24857,7 @@ A760 LATIN CAPITAL LETTER VY A761 LATIN SMALL LETTER VY A762 LATIN CAPITAL LETTER VISIGOTHIC Z A763 LATIN SMALL LETTER VISIGOTHIC Z + x (latin small letter c with cedilla - 00E7) A764 LATIN CAPITAL LETTER THORN WITH STROKE A765 LATIN SMALL LETTER THORN WITH STROKE * Old English, Old Norse @@ -23837,12 +24868,16 @@ A767 LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER A768 LATIN CAPITAL LETTER VEND A769 LATIN SMALL LETTER VEND A76A LATIN CAPITAL LETTER ET + x (latin capital letter reversed open e - A7AB) A76B LATIN SMALL LETTER ET + x (latin small letter yogh - 021D) A76C LATIN CAPITAL LETTER IS A76D LATIN SMALL LETTER IS A76E LATIN CAPITAL LETTER CON + x (digit nine - 0039) A76F LATIN SMALL LETTER CON A770 MODIFIER LETTER US + x (superscript nine - 2079) # <super> A76F A771 LATIN SMALL LETTER DUM A772 LATIN SMALL LETTER LUM @@ -23853,34 +24888,52 @@ A776 LATIN LETTER SMALL CAPITAL RUM A777 LATIN SMALL LETTER TUM A778 LATIN SMALL LETTER UM @ Insular and Celticist letters +@+ These letters are meant for transcriptions of medieval manuscripts, or for modern phonetic notations, for cases where the letters contrast with their Carolingian forms. For representing whole texts in an Insular style, one should use the regular Latin letters and display them with an Insular typeface. A779 LATIN CAPITAL LETTER INSULAR D A77A LATIN SMALL LETTER INSULAR D + * dental fricative [ð] + x (latin small letter eth - 00F0) + x (latin small letter delta - 1E9F) A77B LATIN CAPITAL LETTER INSULAR F A77C LATIN SMALL LETTER INSULAR F A77D LATIN CAPITAL LETTER INSULAR G * lowercase is 1D79 + x (latin capital letter closed insular g - A7D0) A77E LATIN CAPITAL LETTER TURNED INSULAR G A77F LATIN SMALL LETTER TURNED INSULAR G + * velar nasal [ŋ] + x (latin small letter turned g - 1D77) A780 LATIN CAPITAL LETTER TURNED L A781 LATIN SMALL LETTER TURNED L + * voiceless alveolar lateral fricative [ɬ] A782 LATIN CAPITAL LETTER INSULAR R A783 LATIN SMALL LETTER INSULAR R + x (latin small letter r with long leg - 027C) A784 LATIN CAPITAL LETTER INSULAR S A785 LATIN SMALL LETTER INSULAR S + x (latin small letter long s - 017F) A786 LATIN CAPITAL LETTER INSULAR T A787 LATIN SMALL LETTER INSULAR T + * voiceless dental fricative [θ] @ Modifier letters A788 MODIFIER LETTER LOW CIRCUMFLEX ACCENT + * used as a tone letter for Lahu and Akha x (modifier letter circumflex accent - 02C6) + x (modifier letter low up arrowhead - 02F0) x (caret - 2038) A789 MODIFIER LETTER COLON * used as a tone letter in some orthographies - * Budu (Congo), Sabaot (Kenya), and several Papua New Guinea languages + * Budu (Congo), Sabaot (Kenya), Grebo (Liberia), and several Papua New Guinea languages x (colon - 003A) + x (modifier letter triangular colon - 02D0) + x (modifier letter raised colon - 02F8) + x (lisu letter tone mya jeu - A4FD) A78A MODIFIER LETTER SHORT EQUALS SIGN - * used as a tone letter in some orthographies - * Budu (Congo) + * used as a tone letter for Budu x (equals sign - 003D) + x (modifier letter unaspirated - 02ED) + x (double hyphen - 2E40) + x (small equals sign - FE66) @ Orthographic letters for glottals A78B LATIN CAPITAL LETTER SALTILLO * Me'phaa (Mexico) @@ -23895,23 +24948,34 @@ A78C LATIN SMALL LETTER SALTILLO @ Additional letter A78D LATIN CAPITAL LETTER TURNED H * used in the Dan/Gio orthography in Liberia + * also historically used in Latin-based orthographies for Abaza and Abkhaz * lowercase is 0265 + x (cyrillic capital letter che - 0427) @ Phonetic symbol A78E LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT * voiceless lateral retroflex fricative * used to transcribe Toda -@ Transliteration letter + x (latin small letter l with belt - 026C) +@ Transliteration letter for sinology A78F LATIN LETTER SINOLOGICAL DOT * used in transliteration of Phags-Pa and in phonetic transcription of Tangut x (middle dot - 00B7) + x (bullet - 2022) @ Additional letters A790 LATIN CAPITAL LETTER N WITH DESCENDER A791 LATIN SMALL LETTER N WITH DESCENDER - * Janalif + * velar nasal [ŋ] + * Yañalif + x (latin small letter eng - 014B) + x (latin small letter n with long right leg - 019E) + x (cyrillic small letter en with descender - 04A3) A792 LATIN CAPITAL LETTER C WITH BAR = Cambrian symbol + x (euro sign - 20AC) A793 LATIN SMALL LETTER C WITH BAR - * Nanai + * voiceless postalveolar affricate [tʃ] + * Nanai, ... + x (cyrillic small letter ukrainian ie - 0454) @ Additions for Lithuanian dialectology A794 LATIN SMALL LETTER C WITH PALATAL HOOK * uppercase is A7C4 @@ -23923,9 +24987,10 @@ A797 LATIN SMALL LETTER B WITH FLOURISH @ Archaic letters for Ewe A798 LATIN CAPITAL LETTER F WITH STROKE x (latin capital letter f with hook - 0191) + x (french franc sign - 20A3) A799 LATIN SMALL LETTER F WITH STROKE * old Ewe orthography - * also used in German dialectology + * also used in the Anthropos phonetic alphabet @ Archaic letters for Volapük A79A LATIN CAPITAL LETTER VOLAPUK AE A79B LATIN SMALL LETTER VOLAPUK AE @@ -23946,23 +25011,32 @@ A7A8 LATIN CAPITAL LETTER S WITH OBLIQUE STROKE A7A9 LATIN SMALL LETTER S WITH OBLIQUE STROKE * also used in pre-1950 Lower Sorbian orthography x (latin small letter long s with diagonal stroke - 1E9C) + x (latin small letter s with short stroke overlay - A7CA) @ Additional letters A7AA LATIN CAPITAL LETTER H WITH HOOK * lowercase is 0266 * used in Chad A7AB LATIN CAPITAL LETTER REVERSED OPEN E * lowercase is 025C + x (latin capital letter ezh - 01B7) + x (latin capital letter yogh - 021C) + x (cyrillic capital letter ze - 0417) A7AC LATIN CAPITAL LETTER SCRIPT G * lowercase is 0261 A7AD LATIN CAPITAL LETTER L WITH BELT * lowercase is 026C + x (latin capital letter l with bar - 023D) + x (latin letter small capital l with belt - 1DF04) @ Letter for West African languages A7AE LATIN CAPITAL LETTER SMALL CAPITAL I * lowercase is 026A * also used in Unifon + x (latin capital letter i - 0049) + x (latin letter small capital i - 026A) @ Letter for Japanese phonemic transcription A7AF LATIN LETTER SMALL CAPITAL Q * used to represent gemination + x (modifier letter capital q - A7F4) @ Letters for Americanist orthographies A7B0 LATIN CAPITAL LETTER TURNED K * lowercase is 029E @@ -23979,11 +25053,15 @@ A7B3 LATIN CAPITAL LETTER CHI @ Letters for African languages A7B4 LATIN CAPITAL LETTER BETA A7B5 LATIN SMALL LETTER BETA + x (latin small letter sharp s - 00DF) x (greek small letter beta - 03B2) A7B6 LATIN CAPITAL LETTER OMEGA A7B7 LATIN SMALL LETTER OMEGA + x (latin small letter closed omega - 0277) x (greek small letter omega - 03C9) -@ Letters for Mazahua (Mexico) + x (cyrillic small letter omega - 0461) + x (cyrillic small letter broad omega - A64D) +@ Letters for Mazahua (México) A7B8 LATIN CAPITAL LETTER U WITH STROKE A7B9 LATIN SMALL LETTER U WITH STROKE @ Letters for Ugaritic and Egyptological transliteration @@ -23997,7 +25075,11 @@ A7BD LATIN SMALL LETTER GLOTTAL I x (latin small letter egyptological ain - A725) A7BE LATIN CAPITAL LETTER GLOTTAL U A7BF LATIN SMALL LETTER GLOTTAL U -@ Additional letters +@ Additional medieval letters +A7C0 LATIN CAPITAL LETTER OLD POLISH O +A7C1 LATIN SMALL LETTER OLD POLISH O + * used in Old Polish as a nasal vowel + x (latin small letter o with stroke - 00F8) A7C2 LATIN CAPITAL LETTER ANGLICANA W A7C3 LATIN SMALL LETTER ANGLICANA W * used in medieval English and Cornish @@ -24010,23 +25092,53 @@ A7C6 LATIN CAPITAL LETTER Z WITH PALATAL HOOK * lowercase is 1D8E @ Additional letters for Gaulish A7C7 LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY + x (latin capital letter eth - 00D0) + x (latin capital letter d with stroke - 0110) A7C8 LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY = tau gallicum * indicates a dental affricate + x (latin small letter d with stroke - 0111) A7C9 LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY A7CA LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY + * attested in handwritten documents used in pairs as an alternate tau gallicum +@ Letters used in the Middle English Ormulum +A7D0 LATIN CAPITAL LETTER CLOSED INSULAR G +A7D1 LATIN SMALL LETTER CLOSED INSULAR G + x (latin small letter insular g - 1D79) +A7D3 LATIN SMALL LETTER DOUBLE THORN + x (latin small letter thorn - 00FE) +A7D5 LATIN SMALL LETTER DOUBLE WYNN + x (latin letter wynn - 01BF) +@ Letters used in medieval palaeography +A7D6 LATIN CAPITAL LETTER MIDDLE SCOTS S +A7D7 LATIN SMALL LETTER MIDDLE SCOTS S + * used in Middle Scots for s, ss, ser, sir, is, sis, etc. + x (latin small letter sharp s - 00DF) +A7D8 LATIN CAPITAL LETTER SIGMOID S +A7D9 LATIN SMALL LETTER SIGMOID S + * used in Middle Cornish, Middle English, and Middle Scots +@ Modifier letters for Chatino (México) +A7F2 MODIFIER LETTER CAPITAL C + # <super> 0043 +A7F3 MODIFIER LETTER CAPITAL F + # <super> 0046 +@ Modifier letter for Japanese phonemic transcription +A7F4 MODIFIER LETTER CAPITAL Q + x (latin letter small capital q - A7AF) + # <super> 0051 @ Ancient Gaulish and Celtic epigraphic letters A7F5 LATIN CAPITAL LETTER REVERSED HALF H = H dimidié * appears in inscriptions from the Roman provinces of Gaul x (latin capital letter half h - 2C75) A7F6 LATIN SMALL LETTER REVERSED HALF H + * the lowercase is not attested in inscriptions but is used by scholars when transcribing A7F7 LATIN EPIGRAPHIC LETTER SIDEWAYS I * Celtic inscriptions @ Additions for Extended IPA A7F8 MODIFIER LETTER CAPITAL H WITH STROKE # <super> 0126 -@+ A typographical distinction between a capital form and a small capital form is not distinctive for this IPA usage. +@+ A typographical distinction between a capital form and a small capital form is not distinctive for this character in IPA usage. * faucalized x (latin letter small capital h - 029C) A7F9 MODIFIER LETTER SMALL LIGATURE OE @@ -24034,12 +25146,20 @@ A7F9 MODIFIER LETTER SMALL LIGATURE OE # <super> 0153 @ Addition for UPA A7FA LATIN LETTER SMALL CAPITAL TURNED M + * voiceless closed central vowel + x (latin small letter turned m - 026F) + x (cyrillic small letter sha - 0448) @ Ancient Roman epigraphic letters A7FB LATIN EPIGRAPHIC LETTER REVERSED F + = filia (daughter), femina (woman, female) A7FC LATIN EPIGRAPHIC LETTER REVERSED P + = puella (girl) A7FD LATIN EPIGRAPHIC LETTER INVERTED M + = mulier, matrona (married woman) + x (latin capital letter turned m - 019C) A7FE LATIN EPIGRAPHIC LETTER I LONGA A7FF LATIN EPIGRAPHIC LETTER ARCHAIC M + * logograph for the praenomen "Manius" @@ A800 Syloti Nagri A82F @ Independent vowels and dvisvara A800 SYLOTI NAGRI LETTER A @@ -24116,7 +25236,7 @@ A838 NORTH INDIC RUPEE MARK A839 NORTH INDIC QUANTITY MARK * a unit mark for various weights and measures @@ A840 Phags-pa A87F -@+ Phags-pa letters are used for Mongolian, Chinese, Uighur, Tibetan, and Sanskrit unless annotated with a more restricted list of languages. +@+ Phags-pa letters are used for Mongolian, Chinese, Uyghur, Tibetan, and Sanskrit unless annotated with a more restricted list of languages. @ Consonants A840 PHAGS-PA LETTER KA * Mongolian, Chinese, Tibetan, Sanskrit @@ -24132,10 +25252,10 @@ A844 PHAGS-PA LETTER CA * Chinese, Tibetan x (tibetan letter ca - 0F45) A845 PHAGS-PA LETTER CHA - * Mongolian, Chinese, Uighur, Tibetan + * Mongolian, Chinese, Uyghur, Tibetan x (tibetan letter cha - 0F46) A846 PHAGS-PA LETTER JA - * Mongolian, Chinese, Uighur, Tibetan + * Mongolian, Chinese, Uyghur, Tibetan x (tibetan letter ja - 0F47) A847 PHAGS-PA LETTER NYA * Chinese, Tibetan, Sanskrit @@ -24182,7 +25302,7 @@ A856 PHAGS-PA LETTER SMALL A A857 PHAGS-PA LETTER YA x (tibetan letter ya - 0F61) A858 PHAGS-PA LETTER RA - * Mongolian, Uighur, Tibetan, Sanskrit + * Mongolian, Uyghur, Tibetan, Sanskrit x (tibetan letter ra - 0F62) A859 PHAGS-PA LETTER LA x (tibetan letter la - 0F63) @@ -24210,18 +25330,18 @@ A861 PHAGS-PA LETTER O x (tibetan vowel sign o - 0F7C) @ Consonants A862 PHAGS-PA LETTER QA - * Mongolian, Uighur + * Mongolian, Uyghur A863 PHAGS-PA LETTER XA * Mongolian, Chinese A864 PHAGS-PA LETTER FA - * Chinese, Uighur + * Chinese, Uyghur x (phags-pa letter ha - A85C) A865 PHAGS-PA LETTER GGA * language usage unknown * created by reversal of A862 @ Vowel A866 PHAGS-PA LETTER EE - * Mongolian, Chinese, Uighur + * Mongolian, Chinese, Uyghur @ Subjoined consonants A867 PHAGS-PA SUBJOINED LETTER WA * Chinese, Tibetan, Sanskrit @@ -24497,11 +25617,13 @@ A91E KAYAH LI LETTER THA A91F KAYAH LI LETTER HA A920 KAYAH LI LETTER VA A921 KAYAH LI LETTER CA +@ Vowels A922 KAYAH LI LETTER A + * serves as a vowel carrier for vowels indicated with combining marks A923 KAYAH LI LETTER OE + * also serves as a vowel carrier A924 KAYAH LI LETTER I A925 KAYAH LI LETTER OO -@ Vowels A926 KAYAH LI VOWEL UE A927 KAYAH LI VOWEL E A928 KAYAH LI VOWEL U @@ -24607,7 +25729,9 @@ A980 JAVANESE SIGN PANYANGGA A981 JAVANESE SIGN CECAK = anusvara A982 JAVANESE SIGN LAYAR - = repha + = final r + * also used for repha in transliteration of Kawi + x (balinese sign surang - 1B03) A983 JAVANESE SIGN WIGNYAN = visarga @ Letters @@ -24643,6 +25767,7 @@ A996 JAVANESE LETTER CA MURDA A997 JAVANESE LETTER JA A998 JAVANESE LETTER NYA MURDA = jnya + x (balinese letter archaic jnya - 1B4C) A999 JAVANESE LETTER JA MAHAPRANA = jha A99A JAVANESE LETTER NYA @@ -24902,6 +26027,7 @@ AA6C MYANMAR LETTER KHAMTI SA ~ AA6C FE00 dotted form AA6D MYANMAR LETTER KHAMTI HA AA6E MYANMAR LETTER KHAMTI HHA + % MYANMAR LETTER KHAMTI LLA AA6F MYANMAR LETTER KHAMTI FA ~ AA6F FE00 dotted form AA70 MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION @@ -25096,8 +26222,10 @@ AB2E ETHIOPIC SYLLABLE BBO @@ AB30 Latin Extended-E AB6F @ Letters for German dialectology AB30 LATIN SMALL LETTER BARRED ALPHA +@+ * This letter is a Latin alpha with a horizontal strikethrough bar. In some font designs, the bar might not extend beyond the edge of the letter, and in such cases, the letter should not be confused with a ligature of epsilon and iota. AB31 LATIN SMALL LETTER A REVERSED-SCHWA AB32 LATIN SMALL LETTER BLACKLETTER E + x (mathematical fraktur small e - 1D522) AB33 LATIN SMALL LETTER BARRED E AB34 LATIN SMALL LETTER E WITH FLOURISH AB35 LATIN SMALL LETTER LENIS F @@ -25105,12 +26233,17 @@ AB35 LATIN SMALL LETTER LENIS F AB36 LATIN SMALL LETTER SCRIPT G WITH CROSSED-TAIL AB37 LATIN SMALL LETTER L WITH INVERTED LAZY S AB38 LATIN SMALL LETTER L WITH DOUBLE MIDDLE TILDE + x (latin small letter l with middle tilde - 026B) + x (latin small letter l with double bar - 2C61) AB39 LATIN SMALL LETTER L WITH MIDDLE RING AB3A LATIN SMALL LETTER M WITH CROSSED-TAIL AB3B LATIN SMALL LETTER N WITH CROSSED-TAIL AB3C LATIN SMALL LETTER ENG WITH CROSSED-TAIL AB3D LATIN SMALL LETTER BLACKLETTER O + x (mathematical fraktur small o - 1D52C) AB3E LATIN SMALL LETTER BLACKLETTER O WITH STROKE +@+ * This letter was encoded based on a misinterpretation of a low quality copy of Sievers 1901. It is not actually used in German dialectology. + x (latin small letter o with stroke - 00F8) AB3F LATIN SMALL LETTER OPEN O WITH STROKE AB40 LATIN SMALL LETTER INVERTED OE = latin small letter o reversed-schwa @@ -25125,8 +26258,10 @@ AB48 LATIN SMALL LETTER DOUBLE R AB49 LATIN SMALL LETTER R WITH CROSSED-TAIL AB4A LATIN SMALL LETTER DOUBLE R WITH CROSSED-TAIL AB4B LATIN SMALL LETTER SCRIPT R + x (mathematical script small r - 1D4C7) AB4C LATIN SMALL LETTER SCRIPT R WITH RING AB4D LATIN SMALL LETTER BASELINE ESH + x (latin small letter esh - 0283) AB4E LATIN SMALL LETTER U WITH SHORT RIGHT LEG AB4F LATIN SMALL LETTER U BAR WITH SHORT RIGHT LEG AB50 LATIN SMALL LETTER UI @@ -25144,8 +26279,9 @@ AB59 LATIN SMALL LETTER X WITH LONG LEFT LEG WITH SERIF AB5A LATIN SMALL LETTER Y WITH SHORT RIGHT LEG @ Modifier letters for German dialectology AB5B MODIFIER BREVE WITH INVERTED BREVE + * indicates a short vowel x (breve - 02D8) - x (close up - 2050) + x (equivalent to - 224D) x (metrical breve - 23D1) x (inverted low kavyka with kavyka above - 2E46) AB5C MODIFIER LETTER SMALL HENG @@ -25167,13 +26303,14 @@ AB62 LATIN SMALL LETTER OPEN OE AB63 LATIN SMALL LETTER UO @ Letters for Americanist orthographies AB64 LATIN SMALL LETTER INVERTED ALPHA + * unrounded low back vowel x (latin small letter turned alpha - 0252) AB65 GREEK LETTER SMALL CAPITAL OMEGA * obsolete for mid back rounded vowel +@+ Other Greek small capital letters are located in the range 1D26-1D2A. x (latin small letter closed omega - 0277) - x (greek small letter omega - 03C9) -@ Letters for Sinological transcription -@+ These letters are used in Sinological and Tibetanist systems of phonetic transcription. + x (greek capital letter omega - 03A9) +@ Letters for sinological and Tibetanist phonetic transcription AB66 LATIN SMALL LETTER DZ DIGRAPH WITH RETROFLEX HOOK * voiced retroflex affricate x (latin small letter z with retroflex hook - 0290) @@ -25482,7 +26619,7 @@ D7FB HANGUL JONGSEONG PHIEUPH-THIEUTH @@+ @+ This block, despite its name, contains a number of unified CJK ideographs. Each is also individually identified by an annotation. @+ Subheaders identifying sources for subranges do not indicate required usage or preclude mappings to other sources. For example, many pronunciation variants from KS X 1001:1998 are also mapped to a J source. -@ Pronunciation variants from KS X 1001:1998 +@ Pronunciation variants from KS X 1001:1998 F900 CJK COMPATIBILITY IDEOGRAPH-F900 : 8C48 F901 CJK COMPATIBILITY IDEOGRAPH-F901 @@ -25573,7 +26710,7 @@ F92B CJK COMPATIBILITY IDEOGRAPH-F92B : 72FC F92C CJK COMPATIBILITY IDEOGRAPH-F92C * a mapping change removed the original K0 source - x (cjk unified ideograph-90DE - 90DE) + x 90DE x (cjk compatibility ideograph-FA2E - FA2E) : 90CE F92D CJK COMPATIBILITY IDEOGRAPH-F92D @@ -25856,7 +26993,7 @@ F9B7 CJK COMPATIBILITY IDEOGRAPH-F9B7 : 91B4 F9B8 CJK COMPATIBILITY IDEOGRAPH-F9B8 * a mapping change removed the original K0 source - x (cjk unified ideograph-96B7 - 96B7) + x 96B7 x (cjk compatibility ideograph-FA2F - FA2F) : 96B8 F9B9 CJK COMPATIBILITY IDEOGRAPH-F9B9 @@ -26792,6 +27929,8 @@ FBC0 ARABIC SYMBOL SMALL TAH ABOVE * Urdu FBC1 ARABIC SYMBOL SMALL TAH BELOW * Urdu +FBC2 ARABIC SYMBOL WASLA ABOVE + x (arabic letter alef wasla - 0671) @ Glyphs for contextual forms of letters for Central Asian languages FBD3 ARABIC LETTER NG ISOLATED FORM # <isolated> 06AD @@ -27525,6 +28664,29 @@ FD3D ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM @+ These parentheses also do not have compatibility decompositions and should not be considered presentation forms. FD3E ORNATE LEFT PARENTHESIS FD3F ORNATE RIGHT PARENTHESIS +@ Honorific word ligatures +FD40 ARABIC LIGATURE RAHIMAHU ALLAAH + x (arabic sign rahmatullah alayhe - 0612) +FD41 ARABIC LIGATURE RADI ALLAAHU ANH + x (arabic sign radi allahou anhu - 0613) +FD42 ARABIC LIGATURE RADI ALLAAHU ANHAA +FD43 ARABIC LIGATURE RADI ALLAAHU ANHUM +FD44 ARABIC LIGATURE RADI ALLAAHU ANHUMAA +FD45 ARABIC LIGATURE RADI ALLAAHU ANHUNNA +FD46 ARABIC LIGATURE SALLALLAAHU ALAYHI WA-AALIH + x (arabic ligature sallallahou alayhe wasallam - FDFA) +FD47 ARABIC LIGATURE ALAYHI AS-SALAAM + x (arabic sign alayhe assallam - 0611) +FD48 ARABIC LIGATURE ALAYHIM AS-SALAAM +FD49 ARABIC LIGATURE ALAYHIMAA AS-SALAAM +FD4A ARABIC LIGATURE ALAYHI AS-SALAATU WAS-SALAAM +FD4B ARABIC LIGATURE QUDDISA SIRRAH +FD4C ARABIC LIGATURE SALLALLAHU ALAYHI WAAALIHEE WA-SALLAM + x (arabic ligature sallallahou alayhe wasallam - FDFA) + x (arabic ligature sallallaahu alayhi wa-aalih - FD46) +FD4D ARABIC LIGATURE ALAYHAA AS-SALAAM +FD4E ARABIC LIGATURE TABAARAKA WA-TAAALAA +FD4F ARABIC LIGATURE RAHIMAHUM ALLAAH @ Ligatures (three elements) FD50 ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM # <initial> 062A 062C 0645 @@ -27762,6 +28924,10 @@ FDC6 ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM # <final> 0633 062E 064A FDC7 ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM # <final> 0646 062C 064A +@ Honorific word ligature +FDCF ARABIC LIGATURE SALAAMUHU ALAYNAA + * his blessing on us + * used in Christian texts @ Noncharacters @+ These codes are intended for process-internal uses. FDD0 <not a character> @@ -27826,9 +28992,11 @@ FDFB ARABIC LIGATURE JALLAJALALOUHOU @ Currency symbol FDFC RIAL SIGN # <isolated> 0631 06CC 0627 0644 -@ Symbol -@+ The bismillah is treated as an atomic symbol, rather than as a word ligature. It has no decomposition. +@ Honorific word ligatures +@+ These word ligatures have no decompositions. FDFD ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM +FDFE ARABIC LIGATURE SUBHAANAHU WA TAAALAA +FDFF ARABIC LIGATURE AZZA WA JALL @@ FE00 Variation Selectors FE0F @ Variation selectors @+ These are combining characters; in conjunction with the preceding character they indicate a predetermined choice of variant glyph. @@ -30023,6 +31191,83 @@ FFFF <not a character> 10563 CAUCASIAN ALBANIAN LETTER KIW @ Punctuation 1056F CAUCASIAN ALBANIAN CITATION MARK +@@ 10570 Vithkuqi 105BF +@ Capital letters +10570 VITHKUQI CAPITAL LETTER A +10571 VITHKUQI CAPITAL LETTER BBE +10572 VITHKUQI CAPITAL LETTER BE +10573 VITHKUQI CAPITAL LETTER CE +10574 VITHKUQI CAPITAL LETTER CHE +10575 VITHKUQI CAPITAL LETTER DE +10576 VITHKUQI CAPITAL LETTER DHE +10577 VITHKUQI CAPITAL LETTER EI +10578 VITHKUQI CAPITAL LETTER E +10579 VITHKUQI CAPITAL LETTER FE +1057A VITHKUQI CAPITAL LETTER GA +1057C VITHKUQI CAPITAL LETTER HA +1057D VITHKUQI CAPITAL LETTER HHA + * used in 19th-century orthography +1057E VITHKUQI CAPITAL LETTER I +1057F VITHKUQI CAPITAL LETTER IJE + * used in 19th-century orthography +10580 VITHKUQI CAPITAL LETTER JE +10581 VITHKUQI CAPITAL LETTER KA +10582 VITHKUQI CAPITAL LETTER LA +10583 VITHKUQI CAPITAL LETTER LLA +10584 VITHKUQI CAPITAL LETTER ME +10585 VITHKUQI CAPITAL LETTER NE +10586 VITHKUQI CAPITAL LETTER NJE +10587 VITHKUQI CAPITAL LETTER O +10588 VITHKUQI CAPITAL LETTER PE +10589 VITHKUQI CAPITAL LETTER QA +1058A VITHKUQI CAPITAL LETTER RE +1058C VITHKUQI CAPITAL LETTER SE +1058D VITHKUQI CAPITAL LETTER SHE +1058E VITHKUQI CAPITAL LETTER TE +1058F VITHKUQI CAPITAL LETTER THE +10590 VITHKUQI CAPITAL LETTER U +10591 VITHKUQI CAPITAL LETTER VE +10592 VITHKUQI CAPITAL LETTER XE +10594 VITHKUQI CAPITAL LETTER Y +10595 VITHKUQI CAPITAL LETTER ZE +@ Small letters +10597 VITHKUQI SMALL LETTER A +10598 VITHKUQI SMALL LETTER BBE +10599 VITHKUQI SMALL LETTER BE +1059A VITHKUQI SMALL LETTER CE +1059B VITHKUQI SMALL LETTER CHE +1059C VITHKUQI SMALL LETTER DE +1059D VITHKUQI SMALL LETTER DHE +1059E VITHKUQI SMALL LETTER EI +1059F VITHKUQI SMALL LETTER E +105A0 VITHKUQI SMALL LETTER FE +105A1 VITHKUQI SMALL LETTER GA +105A3 VITHKUQI SMALL LETTER HA +105A4 VITHKUQI SMALL LETTER HHA + * used in 19th-century orthography +105A5 VITHKUQI SMALL LETTER I +105A6 VITHKUQI SMALL LETTER IJE + * used in 19th-century orthography +105A7 VITHKUQI SMALL LETTER JE +105A8 VITHKUQI SMALL LETTER KA +105A9 VITHKUQI SMALL LETTER LA +105AA VITHKUQI SMALL LETTER LLA +105AB VITHKUQI SMALL LETTER ME +105AC VITHKUQI SMALL LETTER NE +105AD VITHKUQI SMALL LETTER NJE +105AE VITHKUQI SMALL LETTER O +105AF VITHKUQI SMALL LETTER PE +105B0 VITHKUQI SMALL LETTER QA +105B1 VITHKUQI SMALL LETTER RE +105B3 VITHKUQI SMALL LETTER SE +105B4 VITHKUQI SMALL LETTER SHE +105B5 VITHKUQI SMALL LETTER TE +105B6 VITHKUQI SMALL LETTER THE +105B7 VITHKUQI SMALL LETTER U +105B8 VITHKUQI SMALL LETTER VE +105B9 VITHKUQI SMALL LETTER XE +105BB VITHKUQI SMALL LETTER Y +105BC VITHKUQI SMALL LETTER ZE @@ 10600 Linear A 1077F @ Simple signs 10600 LINEAR A SIGN AB001 @@ -30574,6 +31819,124 @@ FFFF <not a character> * 10668 a316, 10601 ab002 10767 LINEAR A SIGN A807 * 10668 a316, 10742 a703 d +@@ 10780 Latin Extended-F 107BF +@ Modifier letter for VoQS +10780 MODIFIER LETTER SMALL CAPITAL AA + * actually a small capital in VoQS (voice quality symbol) usage, with no semantic distinction from a full capital + x (latin capital letter aa - A732) +@ Modifier letters for IPA +10781 MODIFIER LETTER SUPERSCRIPT TRIANGULAR COLON + # <super> 02D0 +10782 MODIFIER LETTER SUPERSCRIPT HALF TRIANGULAR COLON + # <super> 02D1 +10783 MODIFIER LETTER SMALL AE + # <super> 00E6 +10784 MODIFIER LETTER SMALL CAPITAL B + # <super> 0299 +10785 MODIFIER LETTER SMALL B WITH HOOK + # <super> 0253 +10787 MODIFIER LETTER SMALL DZ DIGRAPH + # <super> 02A3 +10788 MODIFIER LETTER SMALL DZ DIGRAPH WITH RETROFLEX HOOK + # <super> AB66 +10789 MODIFIER LETTER SMALL DZ DIGRAPH WITH CURL + # <super> 02A5 +1078A MODIFIER LETTER SMALL DEZH DIGRAPH + # <super> 02A4 +1078B MODIFIER LETTER SMALL D WITH TAIL + # <super> 0256 +1078C MODIFIER LETTER SMALL D WITH HOOK + # <super> 0257 +1078D MODIFIER LETTER SMALL D WITH HOOK AND TAIL + # <super> 1D91 +1078E MODIFIER LETTER SMALL REVERSED E + # <super> 0258 +1078F MODIFIER LETTER SMALL CLOSED REVERSED OPEN E + # <super> 025E +10790 MODIFIER LETTER SMALL FENG DIGRAPH + # <super> 02A9 +10791 MODIFIER LETTER SMALL RAMS HORN + # <super> 0264 +10792 MODIFIER LETTER SMALL CAPITAL G + # <super> 0262 +10793 MODIFIER LETTER SMALL G WITH HOOK + # <super> 0260 +10794 MODIFIER LETTER SMALL CAPITAL G WITH HOOK + # <super> 029B +10795 MODIFIER LETTER SMALL H WITH STROKE + # <super> 0127 +10796 MODIFIER LETTER SMALL CAPITAL H + # <super> 029C +10797 MODIFIER LETTER SMALL HENG WITH HOOK + # <super> 0267 +10798 MODIFIER LETTER SMALL DOTLESS J WITH STROKE AND HOOK + # <super> 0284 +10799 MODIFIER LETTER SMALL LS DIGRAPH + # <super> 02AA +1079A MODIFIER LETTER SMALL LZ DIGRAPH + # <super> 02AB +1079B MODIFIER LETTER SMALL L WITH BELT + # <super> 026C +1079C MODIFIER LETTER SMALL CAPITAL L WITH BELT + # <super> 1DF04 +1079D MODIFIER LETTER SMALL L WITH RETROFLEX HOOK AND BELT + # <super> A78E +1079E MODIFIER LETTER SMALL LEZH + # <super> 026E +1079F MODIFIER LETTER SMALL LEZH WITH RETROFLEX HOOK + # <super> 1DF05 +107A0 MODIFIER LETTER SMALL TURNED Y + # <super> 028E +107A1 MODIFIER LETTER SMALL TURNED Y WITH BELT + # <super> 1DF06 +107A2 MODIFIER LETTER SMALL O WITH STROKE + # <super> 00F8 +107A3 MODIFIER LETTER SMALL CAPITAL OE + # <super> 0276 +107A4 MODIFIER LETTER SMALL CLOSED OMEGA + # <super> 0277 +107A5 MODIFIER LETTER SMALL Q + # <super> 0071 +107A6 MODIFIER LETTER SMALL TURNED R WITH LONG LEG + # <super> 027A +107A7 MODIFIER LETTER SMALL TURNED R WITH LONG LEG AND RETROFLEX HOOK + # <super> 1DF08 +107A8 MODIFIER LETTER SMALL R WITH TAIL + # <super> 027D +107A9 MODIFIER LETTER SMALL R WITH FISHHOOK + # <super> 027E +107AA MODIFIER LETTER SMALL CAPITAL R + # <super> 0280 +107AB MODIFIER LETTER SMALL TC DIGRAPH WITH CURL + # <super> 02A8 +107AC MODIFIER LETTER SMALL TS DIGRAPH + # <super> 02A6 +107AD MODIFIER LETTER SMALL TS DIGRAPH WITH RETROFLEX HOOK + # <super> AB67 +107AE MODIFIER LETTER SMALL TESH DIGRAPH + # <super> 02A7 +107AF MODIFIER LETTER SMALL T WITH RETROFLEX HOOK + # <super> 0288 +107B0 MODIFIER LETTER SMALL V WITH RIGHT HOOK + # <super> 2C71 +107B2 MODIFIER LETTER SMALL CAPITAL Y + # <super> 028F +107B3 MODIFIER LETTER GLOTTAL STOP WITH STROKE + # <super> 02A1 +107B4 MODIFIER LETTER REVERSED GLOTTAL STOP WITH STROKE + # <super> 02A2 +107B5 MODIFIER LETTER BILABIAL CLICK + # <super> 0298 +107B6 MODIFIER LETTER DENTAL CLICK + # <super> 01C0 +107B7 MODIFIER LETTER LATERAL CLICK + # <super> 01C1 +107B8 MODIFIER LETTER ALVEOLAR CLICK + # <super> 01C2 +107B9 MODIFIER LETTER RETROFLEX CLICK WITH RETROFLEX HOOK + # <super> 1DF0A +107BA MODIFIER LETTER SMALL S WITH CURL + # <super> 1DF1E @@ 10800 Cypriot Syllabary 1083F @ Syllables 10800 CYPRIOT SYLLABLE A @@ -31653,6 +33016,7 @@ FFFF <not a character> 10C47 OLD TURKIC LETTER ORKHON OT 10C48 OLD TURKIC LETTER ORKHON BASH @@ 10C80 Old Hungarian 10CFF +@+ This script has contemporary usage in Hungary, where users often prefer the name Szekely-Hungarian Rovas. @ Uppercase letters @+ The use of uppercase letters is a modern innovation. 10C80 OLD HUNGARIAN CAPITAL LETTER A @@ -31840,6 +33204,7 @@ FFFF <not a character> * in earlier literature called "tprus" (later recognized as an abbreviation for "temperius") 10CF2 OLD HUNGARIAN SMALL LETTER US @ Numbers +@+ The numbers for one, five, and ten have a clear relationship to Roman numerals. 10CFA OLD HUNGARIAN NUMBER ONE 10CFB OLD HUNGARIAN NUMBER FIVE 10CFC OLD HUNGARIAN NUMBER TEN @@ -32005,6 +33370,12 @@ FFFF <not a character> @ Historical letters with diacritics 10EB0 YEZIDI LETTER LAM WITH DOT ABOVE 10EB1 YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE +@@ 10EC0 Arabic Extended-C 10EFF +@ Quranic marks used in Turkey +10EFD ARABIC SMALL LOW WORD SAKTA + x (arabic small high word sakta - 08DD) +10EFE ARABIC SMALL LOW WORD QASR +10EFF ARABIC SMALL LOW WORD MADDA @@ 10F00 Old Sogdian 10F2F @+ This block unifies the scripts used in the Ancient Letters and the Kultobe and Upper Indus inscriptions. @ Letters @@ -32107,6 +33478,37 @@ FFFF <not a character> 10F57 SOGDIAN PUNCTUATION CIRCLE WITH DOT 10F58 SOGDIAN PUNCTUATION TWO CIRCLES WITH DOTS 10F59 SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT +@@ 10F70 Old Uyghur 10FAF +@ Letters +10F70 OLD UYGHUR LETTER ALEPH +10F71 OLD UYGHUR LETTER BETH +10F72 OLD UYGHUR LETTER GIMEL-HETH +10F73 OLD UYGHUR LETTER WAW +10F74 OLD UYGHUR LETTER ZAYIN +10F75 OLD UYGHUR LETTER FINAL HETH +10F76 OLD UYGHUR LETTER YODH +10F77 OLD UYGHUR LETTER KAPH +10F78 OLD UYGHUR LETTER LAMEDH +10F79 OLD UYGHUR LETTER MEM +10F7A OLD UYGHUR LETTER NUN +10F7B OLD UYGHUR LETTER SAMEKH +10F7C OLD UYGHUR LETTER PE +10F7D OLD UYGHUR LETTER SADHE +10F7E OLD UYGHUR LETTER RESH +10F7F OLD UYGHUR LETTER SHIN +10F80 OLD UYGHUR LETTER TAW +10F81 OLD UYGHUR LETTER LESH + = hooked resh +@ Combining signs +10F82 OLD UYGHUR COMBINING DOT ABOVE +10F83 OLD UYGHUR COMBINING DOT BELOW +10F84 OLD UYGHUR COMBINING TWO DOTS ABOVE +10F85 OLD UYGHUR COMBINING TWO DOTS BELOW +@ Punctuation +10F86 OLD UYGHUR PUNCTUATION BAR +10F87 OLD UYGHUR PUNCTUATION TWO BARS +10F88 OLD UYGHUR PUNCTUATION TWO DOTS +10F89 OLD UYGHUR PUNCTUATION FOUR DOTS @@ 10FB0 Chorasmian 10FDF @+ This script is also known as 'Khwarezmian', from its classical Persian name xvārazm. @ Letters @@ -32283,6 +33685,17 @@ FFFF <not a character> 1106D BRAHMI DIGIT SEVEN 1106E BRAHMI DIGIT EIGHT 1106F BRAHMI DIGIT NINE +@ Virama +@+ The Old Tamil virama and the other Old Tamil characters below are extensions used in Brahmi when writing Old Tamil. +11070 BRAHMI SIGN OLD TAMIL VIRAMA +@ Independent vowels +11071 BRAHMI LETTER OLD TAMIL SHORT E +11072 BRAHMI LETTER OLD TAMIL SHORT O +@ Dependent vowel signs +11073 BRAHMI VOWEL SIGN OLD TAMIL SHORT E +11074 BRAHMI VOWEL SIGN OLD TAMIL SHORT O +@ Consonant +11075 BRAHMI LETTER OLD TAMIL LLA @ Number joiner 1107F BRAHMI NUMBER JOINER * a virama used to form ligatures between Brahmi numbers signifying multiplication @@ -32369,6 +33782,8 @@ FFFF <not a character> x (khojki double section mark - 1123C) 110C0 KAITHI DANDA 110C1 KAITHI DOUBLE DANDA +@ Vowel sign +110C2 KAITHI VOWEL SIGN VOCALIC R @ Sign 110CD KAITHI NUMBER SIGN ABOVE * used to indicate a number in an itemized list @@ -32774,6 +34189,12 @@ FFFF <not a character> @ Sign 1123E KHOJKI SIGN SUKUN * used for Arabic transliteration +@ Consonant +1123F KHOJKI LETTER QA +@ Independent vowel +11240 KHOJKI LETTER SHORT I +@ Dependent vowel sign +11241 KHOJKI VOWEL SIGN VOCALIC R @@ 11280 Multani 112AF @ Vowels 11280 MULTANI LETTER A @@ -33531,6 +34952,10 @@ FFFF <not a character> @ Consonant 116B8 TAKRI LETTER ARCHAIC KHA * used in earlier writings to denote kha +@ Punctuation +116B9 TAKRI ABBREVIATION SIGN + x (gurmukhi abbreviation sign - 0A76) + x (sharada abbreviation sign - 111C7) @ Digits 116C0 TAKRI DIGIT ZERO 116C1 TAKRI DIGIT ONE @@ -33542,7 +34967,7 @@ FFFF <not a character> 116C7 TAKRI DIGIT SEVEN 116C8 TAKRI DIGIT EIGHT 116C9 TAKRI DIGIT NINE -@@ 11700 Ahom 1173F +@@ 11700 Ahom 1174F @ Consonants 11700 AHOM LETTER KA 11701 AHOM LETTER KHA @@ -33607,6 +35032,14 @@ FFFF <not a character> 1173D AHOM SIGN SECTION 1173E AHOM SIGN RULAI 1173F AHOM SYMBOL VI +@ Additional consonants +11740 AHOM LETTER CA +11741 AHOM LETTER TTA +11742 AHOM LETTER TTHA +11743 AHOM LETTER DDA +11744 AHOM LETTER DDHA +11745 AHOM LETTER NNA +11746 AHOM LETTER LLA @@ 11800 Dogra 1184F @ Independent vowels 11800 DOGRA LETTER A @@ -34168,6 +35601,29 @@ FFFF <not a character> 11AA1 SOYOMBO TERMINAL MARK-1 11AA2 SOYOMBO TERMINAL MARK-2 = cintamani, candamani +@@ 11AB0 Unified Canadian Aboriginal Syllabics Extended-A 11ABF +@ Syllables for Nattilik +11AB0 CANADIAN SYLLABICS NATTILIK HI +11AB1 CANADIAN SYLLABICS NATTILIK HII +11AB2 CANADIAN SYLLABICS NATTILIK HO + * Nattilik (HU) +11AB3 CANADIAN SYLLABICS NATTILIK HOO + * Nattilik (HUU) +11AB4 CANADIAN SYLLABICS NATTILIK HA +11AB5 CANADIAN SYLLABICS NATTILIK HAA +11AB6 CANADIAN SYLLABICS NATTILIK SHRI +11AB7 CANADIAN SYLLABICS NATTILIK SHRII +11AB8 CANADIAN SYLLABICS NATTILIK SHRO + * Nattilik (SHRU) +11AB9 CANADIAN SYLLABICS NATTILIK SHROO + * Nattilik (SHRUU) +11ABA CANADIAN SYLLABICS NATTILIK SHRA +11ABB CANADIAN SYLLABICS NATTILIK SHRAA +@ Historic syllables for Cree and Ojibway +11ABC CANADIAN SYLLABICS SPE +11ABD CANADIAN SYLLABICS SPI +11ABE CANADIAN SYLLABICS SPO +11ABF CANADIAN SYLLABICS SPA @@ 11AC0 Pau Cin Hau 11AFF @ Consonants 11AC0 PAU CIN HAU LETTER PA @@ -34230,6 +35686,22 @@ FFFF <not a character> 11AF6 PAU CIN HAU LOW-FALLING TONE LONG FINAL 11AF7 PAU CIN HAU LOW-FALLING TONE FINAL 11AF8 PAU CIN HAU GLOTTAL STOP FINAL +@@ 11B00 Devanagari Extended-A 11B5F +@ Head marks +11B00 DEVANAGARI HEAD MARK + x (devanagari double danda - 0965) +11B01 DEVANAGARI HEAD MARK WITH HEADSTROKE +@ Auspicious signs +@+ These are used for representing bhale mīndu signs. +11B02 DEVANAGARI SIGN BHALE +11B03 DEVANAGARI SIGN BHALE WITH HOOK +11B04 DEVANAGARI SIGN EXTENDED BHALE +11B05 DEVANAGARI SIGN EXTENDED BHALE WITH HOOK +11B06 DEVANAGARI SIGN WESTERN FIVE-LIKE BHALE +11B07 DEVANAGARI SIGN WESTERN NINE-LIKE BHALE +11B08 DEVANAGARI SIGN REVERSED NINE-LIKE BHALE +11B09 DEVANAGARI SIGN MINDU + x (devanagari digit zero - 0966) @@ 11C00 Bhaiksuki 11C6F @ Independent vowels 11C00 BHAIKSUKI LETTER A @@ -34604,6 +36076,106 @@ FFFF <not a character> @ Punctuation 11EF7 MAKASAR PASSIMBANG 11EF8 MAKASAR END OF SECTION +@@ 11F00 Kawi 11F5F +@ Signs +11F00 KAWI SIGN CANDRABINDU +11F01 KAWI SIGN ANUSVARA +11F02 KAWI SIGN REPHA + * cluster-initial form of 11F2C + * also used as final r +11F03 KAWI SIGN VISARGA +@ Independent vowels +11F04 KAWI LETTER A +11F05 KAWI LETTER AA +11F06 KAWI LETTER I +11F07 KAWI LETTER II +11F08 KAWI LETTER U +11F09 KAWI LETTER UU +11F0A KAWI LETTER VOCALIC R +11F0B KAWI LETTER VOCALIC RR +11F0C KAWI LETTER VOCALIC L +11F0D KAWI LETTER VOCALIC LL +11F0E KAWI LETTER E +11F0F KAWI LETTER AI +11F10 KAWI LETTER O +@ Consonants +11F12 KAWI LETTER KA +11F13 KAWI LETTER KHA +11F14 KAWI LETTER GA +11F15 KAWI LETTER GHA +11F16 KAWI LETTER NGA +11F17 KAWI LETTER CA +11F18 KAWI LETTER CHA +11F19 KAWI LETTER JA +11F1A KAWI LETTER JHA +11F1B KAWI LETTER NYA +11F1C KAWI LETTER TTA +11F1D KAWI LETTER TTHA +11F1E KAWI LETTER DDA +11F1F KAWI LETTER DDHA +11F20 KAWI LETTER NNA +11F21 KAWI LETTER TA +11F22 KAWI LETTER THA +11F23 KAWI LETTER DA +11F24 KAWI LETTER DHA +11F25 KAWI LETTER NA +11F26 KAWI LETTER PA +11F27 KAWI LETTER PHA +11F28 KAWI LETTER BA +11F29 KAWI LETTER BHA +11F2A KAWI LETTER MA +11F2B KAWI LETTER YA +11F2C KAWI LETTER RA +11F2D KAWI LETTER LA +11F2E KAWI LETTER WA +11F2F KAWI LETTER SHA +11F30 KAWI LETTER SSA +11F31 KAWI LETTER SA +11F32 KAWI LETTER HA +11F33 KAWI LETTER JNYA +@ Dependent vowel signs +11F34 KAWI VOWEL SIGN AA +11F35 KAWI VOWEL SIGN ALTERNATE AA +11F36 KAWI VOWEL SIGN I +11F37 KAWI VOWEL SIGN II +11F38 KAWI VOWEL SIGN U +11F39 KAWI VOWEL SIGN UU +11F3A KAWI VOWEL SIGN VOCALIC R +11F3E KAWI VOWEL SIGN E +11F3F KAWI VOWEL SIGN AI +11F40 KAWI VOWEL SIGN EU + * represents schwa [ə] +@ Viramas +11F41 KAWI SIGN KILLER + * vowel killer, always rendered visibly +11F42 KAWI CONJOINER + * used for producing below-base and post-base conjunct forms +@ Punctuation +11F43 KAWI DANDA +11F44 KAWI DOUBLE DANDA +11F45 KAWI PUNCTUATION SECTION MARKER +11F46 KAWI PUNCTUATION ALTERNATE SECTION MARKER +11F47 KAWI PUNCTUATION FLOWER +11F48 KAWI PUNCTUATION SPACE FILLER +11F49 KAWI PUNCTUATION DOT +11F4A KAWI PUNCTUATION DOUBLE DOT +11F4B KAWI PUNCTUATION TRIPLE DOT +11F4C KAWI PUNCTUATION CIRCLE +11F4D KAWI PUNCTUATION FILLED CIRCLE +11F4E KAWI PUNCTUATION SPIRAL +11F4F KAWI PUNCTUATION CLOSING SPIRAL +@ Digits +11F50 KAWI DIGIT ZERO +11F51 KAWI DIGIT ONE +11F52 KAWI DIGIT TWO + * also used as letter ro +11F53 KAWI DIGIT THREE +11F54 KAWI DIGIT FOUR +11F55 KAWI DIGIT FIVE +11F56 KAWI DIGIT SIX +11F57 KAWI DIGIT SEVEN +11F58 KAWI DIGIT EIGHT +11F59 KAWI DIGIT NINE @@ 11FB0 Lisu Supplement 11FBF @ Letter 11FB0 LISU LETTER YHA @@ -35992,6 +37564,108 @@ FFFF <not a character> 12541 CUNEIFORM SIGN ZA7 12542 CUNEIFORM SIGN ZU OVER ZU PLUS SAR 12543 CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +@@ 12F90 Cypro-Minoan 12FFF +@ Signs +12F90 CYPRO-MINOAN SIGN CM001 +12F91 CYPRO-MINOAN SIGN CM002 +12F92 CYPRO-MINOAN SIGN CM004 +12F93 CYPRO-MINOAN SIGN CM005 +12F94 CYPRO-MINOAN SIGN CM006 +12F95 CYPRO-MINOAN SIGN CM007 +12F96 CYPRO-MINOAN SIGN CM008 +12F97 CYPRO-MINOAN SIGN CM009 +12F98 CYPRO-MINOAN SIGN CM010 +12F99 CYPRO-MINOAN SIGN CM011 +12F9A CYPRO-MINOAN SIGN CM012 +12F9B CYPRO-MINOAN SIGN CM012B +12F9C CYPRO-MINOAN SIGN CM013 +12F9D CYPRO-MINOAN SIGN CM015 +12F9E CYPRO-MINOAN SIGN CM017 +12F9F CYPRO-MINOAN SIGN CM019 +12FA0 CYPRO-MINOAN SIGN CM021 +12FA1 CYPRO-MINOAN SIGN CM023 +12FA2 CYPRO-MINOAN SIGN CM024 +12FA3 CYPRO-MINOAN SIGN CM025 +12FA4 CYPRO-MINOAN SIGN CM026 +12FA5 CYPRO-MINOAN SIGN CM027 +12FA6 CYPRO-MINOAN SIGN CM028 +12FA7 CYPRO-MINOAN SIGN CM029 +12FA8 CYPRO-MINOAN SIGN CM030 +12FA9 CYPRO-MINOAN SIGN CM033 +12FAA CYPRO-MINOAN SIGN CM034 +12FAB CYPRO-MINOAN SIGN CM035 +12FAC CYPRO-MINOAN SIGN CM036 +12FAD CYPRO-MINOAN SIGN CM037 +12FAE CYPRO-MINOAN SIGN CM038 +12FAF CYPRO-MINOAN SIGN CM039 +12FB0 CYPRO-MINOAN SIGN CM040 +12FB1 CYPRO-MINOAN SIGN CM041 +12FB2 CYPRO-MINOAN SIGN CM044 +12FB3 CYPRO-MINOAN SIGN CM046 +12FB4 CYPRO-MINOAN SIGN CM047 +12FB5 CYPRO-MINOAN SIGN CM049 +12FB6 CYPRO-MINOAN SIGN CM050 +12FB7 CYPRO-MINOAN SIGN CM051 +12FB8 CYPRO-MINOAN SIGN CM052 +12FB9 CYPRO-MINOAN SIGN CM053 +12FBA CYPRO-MINOAN SIGN CM054 +12FBB CYPRO-MINOAN SIGN CM055 +12FBC CYPRO-MINOAN SIGN CM056 +12FBD CYPRO-MINOAN SIGN CM058 +12FBE CYPRO-MINOAN SIGN CM059 +12FBF CYPRO-MINOAN SIGN CM060 +12FC0 CYPRO-MINOAN SIGN CM061 +12FC1 CYPRO-MINOAN SIGN CM062 +12FC2 CYPRO-MINOAN SIGN CM063 +12FC3 CYPRO-MINOAN SIGN CM064 +12FC4 CYPRO-MINOAN SIGN CM066 +12FC5 CYPRO-MINOAN SIGN CM067 +12FC6 CYPRO-MINOAN SIGN CM068 +12FC7 CYPRO-MINOAN SIGN CM069 +12FC8 CYPRO-MINOAN SIGN CM070 +12FC9 CYPRO-MINOAN SIGN CM071 +12FCA CYPRO-MINOAN SIGN CM072 +12FCB CYPRO-MINOAN SIGN CM073 +12FCC CYPRO-MINOAN SIGN CM074 +12FCD CYPRO-MINOAN SIGN CM075 +12FCE CYPRO-MINOAN SIGN CM075B +12FCF CYPRO-MINOAN SIGN CM076 +12FD0 CYPRO-MINOAN SIGN CM078 +12FD1 CYPRO-MINOAN SIGN CM079 +12FD2 CYPRO-MINOAN SIGN CM080 +12FD3 CYPRO-MINOAN SIGN CM081 +12FD4 CYPRO-MINOAN SIGN CM082 +12FD5 CYPRO-MINOAN SIGN CM083 +12FD6 CYPRO-MINOAN SIGN CM084 +12FD7 CYPRO-MINOAN SIGN CM085 +12FD8 CYPRO-MINOAN SIGN CM086 +12FD9 CYPRO-MINOAN SIGN CM087 +12FDA CYPRO-MINOAN SIGN CM088 +12FDB CYPRO-MINOAN SIGN CM089 +12FDC CYPRO-MINOAN SIGN CM090 +12FDD CYPRO-MINOAN SIGN CM091 +12FDE CYPRO-MINOAN SIGN CM092 +12FDF CYPRO-MINOAN SIGN CM094 +12FE0 CYPRO-MINOAN SIGN CM095 +12FE1 CYPRO-MINOAN SIGN CM096 +12FE2 CYPRO-MINOAN SIGN CM097 +12FE3 CYPRO-MINOAN SIGN CM098 +12FE4 CYPRO-MINOAN SIGN CM099 +12FE5 CYPRO-MINOAN SIGN CM100 +12FE6 CYPRO-MINOAN SIGN CM101 +12FE7 CYPRO-MINOAN SIGN CM102 +12FE8 CYPRO-MINOAN SIGN CM103 +12FE9 CYPRO-MINOAN SIGN CM104 +12FEA CYPRO-MINOAN SIGN CM105 +12FEB CYPRO-MINOAN SIGN CM107 +12FEC CYPRO-MINOAN SIGN CM108 +12FED CYPRO-MINOAN SIGN CM109 +12FEE CYPRO-MINOAN SIGN CM110 +12FEF CYPRO-MINOAN SIGN CM112 +12FF0 CYPRO-MINOAN SIGN CM114 +@ Punctuation +12FF1 CYPRO-MINOAN SIGN CM301 +12FF2 CYPRO-MINOAN SIGN CM302 @@ 13000 Egyptian Hieroglyphs 1342F @+ The characters in this block are taken primarily from Alan Gardiner's works on Middle Egyptian. @ A. Man and his occupations @@ -36091,7 +37765,9 @@ FFFF <not a character> 1305B EGYPTIAN HIEROGLYPH C002 1305C EGYPTIAN HIEROGLYPH C002A 1305D EGYPTIAN HIEROGLYPH C002B + * mirrored version of 1305C 1305E EGYPTIAN HIEROGLYPH C002C + * mirrored version of 1305B 1305F EGYPTIAN HIEROGLYPH C003 13060 EGYPTIAN HIEROGLYPH C004 13061 EGYPTIAN HIEROGLYPH C005 @@ -36105,8 +37781,10 @@ FFFF <not a character> * 1,000,000 13069 EGYPTIAN HIEROGLYPH C012 1306A EGYPTIAN HIEROGLYPH C013 + * mirrored version of 13069 1306B EGYPTIAN HIEROGLYPH C014 1306C EGYPTIAN HIEROGLYPH C015 + * mirrored version of 1306B 1306D EGYPTIAN HIEROGLYPH C016 1306E EGYPTIAN HIEROGLYPH C017 1306F EGYPTIAN HIEROGLYPH C018 @@ -36131,6 +37809,8 @@ FFFF <not a character> 13081 EGYPTIAN HIEROGLYPH D011 * 1/2 13082 EGYPTIAN HIEROGLYPH D012 + * pupil of the eye + * not to be confused with 131F3 or 133F8 * 1/4 13083 EGYPTIAN HIEROGLYPH D013 * 1/8 @@ -36145,6 +37825,8 @@ FFFF <not a character> 13089 EGYPTIAN HIEROGLYPH D019 1308A EGYPTIAN HIEROGLYPH D020 1308B EGYPTIAN HIEROGLYPH D021 + * mouth + * not to be confused with 133AB * transliterated as r 1308C EGYPTIAN HIEROGLYPH D022 1308D EGYPTIAN HIEROGLYPH D023 @@ -36152,8 +37834,11 @@ FFFF <not a character> 1308F EGYPTIAN HIEROGLYPH D025 13090 EGYPTIAN HIEROGLYPH D026 13091 EGYPTIAN HIEROGLYPH D027 + ~ 13091 FE00 rotated 90 degrees 13092 EGYPTIAN HIEROGLYPH D027A + ~ 13092 FE00 rotated 90 degrees 13093 EGYPTIAN HIEROGLYPH D028 + ~ 13093 FE01 rotated 180 degrees 13094 EGYPTIAN HIEROGLYPH D029 13095 EGYPTIAN HIEROGLYPH D030 13096 EGYPTIAN HIEROGLYPH D031 @@ -36180,10 +37865,13 @@ FFFF <not a character> * transliterated as d 130A8 EGYPTIAN HIEROGLYPH D046A 130A9 EGYPTIAN HIEROGLYPH D047 + ~ 130A9 FE01 rotated 180 degrees 130AA EGYPTIAN HIEROGLYPH D048 130AB EGYPTIAN HIEROGLYPH D048A 130AC EGYPTIAN HIEROGLYPH D049 130AD EGYPTIAN HIEROGLYPH D050 + * classifier 'accurate, finger' + * not to be confused with 130B7 * 10,000 130AE EGYPTIAN HIEROGLYPH D050A * 20,000 @@ -36204,12 +37892,16 @@ FFFF <not a character> 130B6 EGYPTIAN HIEROGLYPH D050I * 50,000 130B7 EGYPTIAN HIEROGLYPH D051 + * classifier 'measure, nail, scratching, taking' + * not to be confused with 130AD 130B8 EGYPTIAN HIEROGLYPH D052 130B9 EGYPTIAN HIEROGLYPH D052A 130BA EGYPTIAN HIEROGLYPH D053 130BB EGYPTIAN HIEROGLYPH D054 + * (forward) motion 130BC EGYPTIAN HIEROGLYPH D054A 130BD EGYPTIAN HIEROGLYPH D055 + * backward motion 130BE EGYPTIAN HIEROGLYPH D056 130BF EGYPTIAN HIEROGLYPH D057 130C0 EGYPTIAN HIEROGLYPH D058 @@ -36224,6 +37916,7 @@ FFFF <not a character> 130C8 EGYPTIAN HIEROGLYPH D066 130C9 EGYPTIAN HIEROGLYPH D067 * 1 heqat measure + * not to be confused with 13212 130CA EGYPTIAN HIEROGLYPH D067A * 2 heqat measures 130CB EGYPTIAN HIEROGLYPH D067B @@ -36242,7 +37935,10 @@ FFFF <not a character> * 9 heqat measures @ E. Mammals 130D2 EGYPTIAN HIEROGLYPH E001 + * bull, classifier 'cattle' + * not to be confused with 130FD 130D3 EGYPTIAN HIEROGLYPH E002 + * aggressive bull 130D4 EGYPTIAN HIEROGLYPH E003 130D5 EGYPTIAN HIEROGLYPH E004 130D6 EGYPTIAN HIEROGLYPH E005 @@ -36282,9 +37978,12 @@ FFFF <not a character> 130F8 EGYPTIAN HIEROGLYPH E033 130F9 EGYPTIAN HIEROGLYPH E034 130FA EGYPTIAN HIEROGLYPH E034A + * stylistic variant, use of 130F9 is preferred 130FB EGYPTIAN HIEROGLYPH E036 130FC EGYPTIAN HIEROGLYPH E037 130FD EGYPTIAN HIEROGLYPH E038 + * cow + * not to be confused with 130D2 @ F. Parts of mammals 130FE EGYPTIAN HIEROGLYPH F001 130FF EGYPTIAN HIEROGLYPH F001A @@ -36301,34 +38000,43 @@ FFFF <not a character> 1310A EGYPTIAN HIEROGLYPH F012 1310B EGYPTIAN HIEROGLYPH F013 1310C EGYPTIAN HIEROGLYPH F013A + * stylistic variant, use of 1310B is preferred 1310D EGYPTIAN HIEROGLYPH F014 1310E EGYPTIAN HIEROGLYPH F015 1310F EGYPTIAN HIEROGLYPH F016 + ~ 1310F FE00 rotated 90 degrees 13110 EGYPTIAN HIEROGLYPH F017 13111 EGYPTIAN HIEROGLYPH F018 13112 EGYPTIAN HIEROGLYPH F019 13113 EGYPTIAN HIEROGLYPH F020 13114 EGYPTIAN HIEROGLYPH F021 13115 EGYPTIAN HIEROGLYPH F021A + * from hieratic 13116 EGYPTIAN HIEROGLYPH F022 13117 EGYPTIAN HIEROGLYPH F023 + ~ 13117 FE02 rotated 270 degrees 13118 EGYPTIAN HIEROGLYPH F024 + * mirrored version of 13117 13119 EGYPTIAN HIEROGLYPH F025 1311A EGYPTIAN HIEROGLYPH F026 1311B EGYPTIAN HIEROGLYPH F027 1311C EGYPTIAN HIEROGLYPH F028 + ~ 1311C FE00 rotated 90 degrees 1311D EGYPTIAN HIEROGLYPH F029 1311E EGYPTIAN HIEROGLYPH F030 1311F EGYPTIAN HIEROGLYPH F031 13120 EGYPTIAN HIEROGLYPH F031A + * cursive variant of 1311F 13121 EGYPTIAN HIEROGLYPH F032 * transliterated as 1E96 + ~ 13121 FE00 rotated 90 degrees 13122 EGYPTIAN HIEROGLYPH F033 13123 EGYPTIAN HIEROGLYPH F034 13124 EGYPTIAN HIEROGLYPH F035 13125 EGYPTIAN HIEROGLYPH F036 13126 EGYPTIAN HIEROGLYPH F037 13127 EGYPTIAN HIEROGLYPH F037A + ~ 13127 FE00 rotated 90 degrees 13128 EGYPTIAN HIEROGLYPH F038 13129 EGYPTIAN HIEROGLYPH F038A 1312A EGYPTIAN HIEROGLYPH F039 @@ -36341,25 +38049,37 @@ FFFF <not a character> 13131 EGYPTIAN HIEROGLYPH F045A 13132 EGYPTIAN HIEROGLYPH F046 13133 EGYPTIAN HIEROGLYPH F046A + * rotated version of 13132 13134 EGYPTIAN HIEROGLYPH F047 + * mirrored version of 13132 13135 EGYPTIAN HIEROGLYPH F047A + * mirrored version of 13133 13136 EGYPTIAN HIEROGLYPH F048 13137 EGYPTIAN HIEROGLYPH F049 + * mirrored version of 13136 13138 EGYPTIAN HIEROGLYPH F050 13139 EGYPTIAN HIEROGLYPH F051 + ~ 13139 FE00 rotated 90 degrees + ~ 13139 FE02 rotated 270 degrees 1313A EGYPTIAN HIEROGLYPH F051A 1313B EGYPTIAN HIEROGLYPH F051B + * variant of 1313A 1313C EGYPTIAN HIEROGLYPH F051C + * rotated version of 13139 1313D EGYPTIAN HIEROGLYPH F052 1313E EGYPTIAN HIEROGLYPH F053 @ G. Birds 1313F EGYPTIAN HIEROGLYPH G001 + * Egyptian vulture, Egyptological alef + * not to be confused with 13142 * transliterated as A723 x (hebrew letter alef - 05D0) x (arabic letter alef with hamza above - 0623) 13140 EGYPTIAN HIEROGLYPH G002 13141 EGYPTIAN HIEROGLYPH G003 13142 EGYPTIAN HIEROGLYPH G004 + * phonogram 'tw' + * not to be confused with 1313F 13143 EGYPTIAN HIEROGLYPH G005 13144 EGYPTIAN HIEROGLYPH G006 13145 EGYPTIAN HIEROGLYPH G006A @@ -36400,10 +38120,14 @@ FFFF <not a character> 13167 EGYPTIAN HIEROGLYPH G035 13168 EGYPTIAN HIEROGLYPH G036 13169 EGYPTIAN HIEROGLYPH G036A + * stylistic variant, use of 13168 is preferred 1316A EGYPTIAN HIEROGLYPH G037 1316B EGYPTIAN HIEROGLYPH G037A + * stylistic variant, use of 1316A is preferred 1316C EGYPTIAN HIEROGLYPH G038 + * goose 1316D EGYPTIAN HIEROGLYPH G039 + * duck 1316E EGYPTIAN HIEROGLYPH G040 1316F EGYPTIAN HIEROGLYPH G041 13170 EGYPTIAN HIEROGLYPH G042 @@ -36428,10 +38152,13 @@ FFFF <not a character> 13181 EGYPTIAN HIEROGLYPH H003 13182 EGYPTIAN HIEROGLYPH H004 13183 EGYPTIAN HIEROGLYPH H005 + ~ 13183 FE02 rotated 270 degrees 13184 EGYPTIAN HIEROGLYPH H006 13185 EGYPTIAN HIEROGLYPH H006A + * from hieratic 13186 EGYPTIAN HIEROGLYPH H007 13187 EGYPTIAN HIEROGLYPH H008 + ~ 13187 FE01 rotated 180 degrees @ I. Amphibious animals, reptiles, etc. 13188 EGYPTIAN HIEROGLYPH I001 13189 EGYPTIAN HIEROGLYPH I002 @@ -36462,9 +38189,11 @@ FFFF <not a character> 1319E EGYPTIAN HIEROGLYPH K004 1319F EGYPTIAN HIEROGLYPH K005 131A0 EGYPTIAN HIEROGLYPH K006 + ~ 131A0 FE00 rotated 90 degrees + ~ 131A0 FE02 rotated 270 degrees 131A1 EGYPTIAN HIEROGLYPH K007 131A2 EGYPTIAN HIEROGLYPH K008 -@ L. Invertabrata and lesser animals +@ L. Invertebrata and lesser animals 131A3 EGYPTIAN HIEROGLYPH L001 131A4 EGYPTIAN HIEROGLYPH L002 131A5 EGYPTIAN HIEROGLYPH L002A @@ -36473,6 +38202,7 @@ FFFF <not a character> 131A8 EGYPTIAN HIEROGLYPH L005 131A9 EGYPTIAN HIEROGLYPH L006 131AA EGYPTIAN HIEROGLYPH L006A + * mirrored version of 131A9 131AB EGYPTIAN HIEROGLYPH L007 131AC EGYPTIAN HIEROGLYPH L008 @ M. Trees and plants @@ -36481,6 +38211,8 @@ FFFF <not a character> 131AF EGYPTIAN HIEROGLYPH M001B 131B0 EGYPTIAN HIEROGLYPH M002 131B1 EGYPTIAN HIEROGLYPH M003 + ~ 131B1 FE00 rotated 90 degrees + ~ 131B1 FE01 rotated 180 degrees 131B2 EGYPTIAN HIEROGLYPH M003A 131B3 EGYPTIAN HIEROGLYPH M004 131B4 EGYPTIAN HIEROGLYPH M005 @@ -36488,8 +38220,11 @@ FFFF <not a character> 131B6 EGYPTIAN HIEROGLYPH M007 131B7 EGYPTIAN HIEROGLYPH M008 131B8 EGYPTIAN HIEROGLYPH M009 + ~ 131B8 FE00 rotated 90 degrees 131B9 EGYPTIAN HIEROGLYPH M010 + ~ 131B9 FE00 rotated 90 degrees 131BA EGYPTIAN HIEROGLYPH M010A + ~ 131BA FE02 rotated 270 degrees 131BB EGYPTIAN HIEROGLYPH M011 131BC EGYPTIAN HIEROGLYPH M012 * 1,000 @@ -36516,18 +38251,22 @@ FFFF <not a character> 131C9 EGYPTIAN HIEROGLYPH M016 131CA EGYPTIAN HIEROGLYPH M016A 131CB EGYPTIAN HIEROGLYPH M017 - * yod + * egyptological yod + * transliterated as A7BD x (hebrew letter yod - 05D9) x (arabic letter yeh - 064A) + ~ 131CB FE00 rotated 90 degrees 131CC EGYPTIAN HIEROGLYPH M017A - * transliterated as y + * phonogram 'y' x (egyptian hieroglyph z004 - 133ED) 131CD EGYPTIAN HIEROGLYPH M018 131CE EGYPTIAN HIEROGLYPH M019 131CF EGYPTIAN HIEROGLYPH M020 131D0 EGYPTIAN HIEROGLYPH M021 131D1 EGYPTIAN HIEROGLYPH M022 + * classifier 'bud, lotus bud' 131D2 EGYPTIAN HIEROGLYPH M022A + *phonogram 'nn' 131D3 EGYPTIAN HIEROGLYPH M023 131D4 EGYPTIAN HIEROGLYPH M024 131D5 EGYPTIAN HIEROGLYPH M024A @@ -36543,41 +38282,65 @@ FFFF <not a character> 131DF EGYPTIAN HIEROGLYPH M032 131E0 EGYPTIAN HIEROGLYPH M033 131E1 EGYPTIAN HIEROGLYPH M033A + * variant of 131E0 131E2 EGYPTIAN HIEROGLYPH M033B + * variant of 131E0 131E3 EGYPTIAN HIEROGLYPH M034 131E4 EGYPTIAN HIEROGLYPH M035 131E5 EGYPTIAN HIEROGLYPH M036 131E6 EGYPTIAN HIEROGLYPH M037 + * older variant of 131E5 131E7 EGYPTIAN HIEROGLYPH M038 131E8 EGYPTIAN HIEROGLYPH M039 131E9 EGYPTIAN HIEROGLYPH M040 + * phonogram 'js' + * not to be confused with 132A7 or 1342A 131EA EGYPTIAN HIEROGLYPH M040A 131EB EGYPTIAN HIEROGLYPH M041 131EC EGYPTIAN HIEROGLYPH M042 131ED EGYPTIAN HIEROGLYPH M043 131EE EGYPTIAN HIEROGLYPH M044 + * thorn + * not to be confused with 133DA + ~ 131EE FE01 rotated 180 degrees + ~ 131EE FE02 rotated 270 degrees @ N. Sky, earth, water 131EF EGYPTIAN HIEROGLYPH N001 131F0 EGYPTIAN HIEROGLYPH N002 131F1 EGYPTIAN HIEROGLYPH N003 + * older variant of 131F0 131F2 EGYPTIAN HIEROGLYPH N004 131F3 EGYPTIAN HIEROGLYPH N005 + * sun + * not to be confused with 13082 or 133F8 131F4 EGYPTIAN HIEROGLYPH N006 131F5 EGYPTIAN HIEROGLYPH N007 131F6 EGYPTIAN HIEROGLYPH N008 131F7 EGYPTIAN HIEROGLYPH N009 + * variant of 131F8 131F8 EGYPTIAN HIEROGLYPH N010 + * variant of 131F7 + ~ 131F8 FE01 rotated 180 degrees 131F9 EGYPTIAN HIEROGLYPH N011 + ~ 131F9 FE00 rotated 90 degrees + ~ 131F9 FE01 rotated 180 degrees 131FA EGYPTIAN HIEROGLYPH N012 + ~ 131FA FE00 rotated 90 degrees + ~ 131FA FE01 rotated 180 degrees 131FB EGYPTIAN HIEROGLYPH N013 131FC EGYPTIAN HIEROGLYPH N014 131FD EGYPTIAN HIEROGLYPH N015 131FE EGYPTIAN HIEROGLYPH N016 131FF EGYPTIAN HIEROGLYPH N017 + * land + * variant of 131FE 13200 EGYPTIAN HIEROGLYPH N018 + * island + * not to be confused with 132F0, 133D4, or 133F3 13201 EGYPTIAN HIEROGLYPH N018A 13202 EGYPTIAN HIEROGLYPH N018B 13203 EGYPTIAN HIEROGLYPH N019 + * logogram 'akhti' 13204 EGYPTIAN HIEROGLYPH N020 13205 EGYPTIAN HIEROGLYPH N021 13206 EGYPTIAN HIEROGLYPH N022 @@ -36585,10 +38348,13 @@ FFFF <not a character> 13208 EGYPTIAN HIEROGLYPH N024 13209 EGYPTIAN HIEROGLYPH N025 1320A EGYPTIAN HIEROGLYPH N025A + * stylistic variant, use of 13209 is preferred 1320B EGYPTIAN HIEROGLYPH N026 1320C EGYPTIAN HIEROGLYPH N027 1320D EGYPTIAN HIEROGLYPH N028 1320E EGYPTIAN HIEROGLYPH N029 + * hill + * not to be confused with 133D8 * transliterated as q or as 1E33 x (hebrew letter qof - 05E7) x (arabic letter qaf - 0642) @@ -36596,21 +38362,34 @@ FFFF <not a character> 13210 EGYPTIAN HIEROGLYPH N031 13211 EGYPTIAN HIEROGLYPH N032 13212 EGYPTIAN HIEROGLYPH N033 + * classifier 'granule, grain' + * not to be confused with 130C9 13213 EGYPTIAN HIEROGLYPH N033A + * classifier 'granules, grains' + * not to be confused with 133E7 13214 EGYPTIAN HIEROGLYPH N034 13215 EGYPTIAN HIEROGLYPH N034A + * stylistic variant, use of 13214 is preferred 13216 EGYPTIAN HIEROGLYPH N035 * transliterated as n + ~ 13216 FE02 rotated 270 degrees 13217 EGYPTIAN HIEROGLYPH N035A + * classifier 'liquid' 13218 EGYPTIAN HIEROGLYPH N036 13219 EGYPTIAN HIEROGLYPH N037 + * lake * transliterated as 0161 + * not to be confused with 1328C 1321A EGYPTIAN HIEROGLYPH N037A + * variant of 13219 1321B EGYPTIAN HIEROGLYPH N038 + * variant of 13219 1321C EGYPTIAN HIEROGLYPH N039 + * variant of 13219 1321D EGYPTIAN HIEROGLYPH N040 1321E EGYPTIAN HIEROGLYPH N041 1321F EGYPTIAN HIEROGLYPH N042 + * variant of 1321E @ NL. Nomes of Lower Egypt 13220 EGYPTIAN HIEROGLYPH NL001 13221 EGYPTIAN HIEROGLYPH NL002 @@ -36672,7 +38451,9 @@ FFFF <not a character> x (arabic letter heh - 0647) 13255 EGYPTIAN HIEROGLYPH O005 13256 EGYPTIAN HIEROGLYPH O005A + * mirrored version of 13255 13257 EGYPTIAN HIEROGLYPH O006 + ~ 13257 FE01 rotated 180 degrees 13258 EGYPTIAN HIEROGLYPH O006A * beginning of hwt or serekh enclosure x (egyptian hieroglyph o033a - 13282) @@ -36716,12 +38497,19 @@ FFFF <not a character> 13279 EGYPTIAN HIEROGLYPH O027 1327A EGYPTIAN HIEROGLYPH O028 1327B EGYPTIAN HIEROGLYPH O029 + ~ 1327B FE02 rotated 270 degrees 1327C EGYPTIAN HIEROGLYPH O029A + * rotated variant of 1327B 1327D EGYPTIAN HIEROGLYPH O030 + * supporting pole + * not to be confused with 13361 1327E EGYPTIAN HIEROGLYPH O030A 1327F EGYPTIAN HIEROGLYPH O031 + ~ 1327F FE00 rotated 90 degrees + ~ 1327F FE01 rotated 180 degrees 13280 EGYPTIAN HIEROGLYPH O032 13281 EGYPTIAN HIEROGLYPH O033 + * classifier 'serekh' 13282 EGYPTIAN HIEROGLYPH O033A * end of serekh enclosure x (egyptian hieroglyph o006a - 13258) @@ -36730,6 +38518,7 @@ FFFF <not a character> x (egyptian hieroglyph s029 - 132F4) 13284 EGYPTIAN HIEROGLYPH O035 13285 EGYPTIAN HIEROGLYPH O036 + ~ 13285 FE00 rotated 90 degrees 13286 EGYPTIAN HIEROGLYPH O036A * beginning of fortified wall cartouche 13287 EGYPTIAN HIEROGLYPH O036B @@ -36741,10 +38530,14 @@ FFFF <not a character> 1328A EGYPTIAN HIEROGLYPH O037 1328B EGYPTIAN HIEROGLYPH O038 1328C EGYPTIAN HIEROGLYPH O039 + * stone, brick + * not to be confused with 13219 + ~ 1328C FE00 rotated 90 degrees 1328D EGYPTIAN HIEROGLYPH O040 1328E EGYPTIAN HIEROGLYPH O041 1328F EGYPTIAN HIEROGLYPH O042 13290 EGYPTIAN HIEROGLYPH O043 + * older variant of 1328F 13291 EGYPTIAN HIEROGLYPH O044 13292 EGYPTIAN HIEROGLYPH O045 13293 EGYPTIAN HIEROGLYPH O046 @@ -36754,26 +38547,36 @@ FFFF <not a character> 13297 EGYPTIAN HIEROGLYPH O050 13298 EGYPTIAN HIEROGLYPH O050A 13299 EGYPTIAN HIEROGLYPH O050B + * mirrored version of 13298 1329A EGYPTIAN HIEROGLYPH O051 @ P. Ships and parts of ships 1329B EGYPTIAN HIEROGLYPH P001 + * classifier 'ship, travel' 1329C EGYPTIAN HIEROGLYPH P001A + * classifier 'upset, overturn' 1329D EGYPTIAN HIEROGLYPH P002 1329E EGYPTIAN HIEROGLYPH P003 + * sacred ship 1329F EGYPTIAN HIEROGLYPH P003A + * mirrored variant of 1329E 132A0 EGYPTIAN HIEROGLYPH P004 132A1 EGYPTIAN HIEROGLYPH P005 132A2 EGYPTIAN HIEROGLYPH P006 132A3 EGYPTIAN HIEROGLYPH P007 132A4 EGYPTIAN HIEROGLYPH P008 + ~ 132A4 FE01 rotated 180 degrees + ~ 132A4 FE02 rotated 270 degrees 132A5 EGYPTIAN HIEROGLYPH P009 132A6 EGYPTIAN HIEROGLYPH P010 132A7 EGYPTIAN HIEROGLYPH P011 + * mooring post + * not to be confused with 131E9 or 1342A @ Q. Domestic and funerary furniture 132A8 EGYPTIAN HIEROGLYPH Q001 132A9 EGYPTIAN HIEROGLYPH Q002 132AA EGYPTIAN HIEROGLYPH Q003 * transliterated as p + ~ 132AA FE00 rotated 90 degrees 132AB EGYPTIAN HIEROGLYPH Q004 132AC EGYPTIAN HIEROGLYPH Q005 132AD EGYPTIAN HIEROGLYPH Q006 @@ -36808,6 +38611,7 @@ FFFF <not a character> 132C9 EGYPTIAN HIEROGLYPH R022 132CA EGYPTIAN HIEROGLYPH R023 132CB EGYPTIAN HIEROGLYPH R024 + ~ 132CB FE00 rotated 90 degrees 132CC EGYPTIAN HIEROGLYPH R025 132CD EGYPTIAN HIEROGLYPH R026 132CE EGYPTIAN HIEROGLYPH R027 @@ -36826,6 +38630,7 @@ FFFF <not a character> 132DA EGYPTIAN HIEROGLYPH S008 132DB EGYPTIAN HIEROGLYPH S009 132DC EGYPTIAN HIEROGLYPH S010 + ~ 132DC FE00 rotated 90 degrees 132DD EGYPTIAN HIEROGLYPH S011 132DE EGYPTIAN HIEROGLYPH S012 132DF EGYPTIAN HIEROGLYPH S013 @@ -36837,8 +38642,11 @@ FFFF <not a character> 132E5 EGYPTIAN HIEROGLYPH S017 132E6 EGYPTIAN HIEROGLYPH S017A 132E7 EGYPTIAN HIEROGLYPH S018 + ~ 132E7 FE00 rotated 90 degrees + ~ 132E7 FE02 rotated 270 degrees 132E8 EGYPTIAN HIEROGLYPH S019 132E9 EGYPTIAN HIEROGLYPH S020 + ~ 132E9 FE02 rotated 270 degrees 132EA EGYPTIAN HIEROGLYPH S021 132EB EGYPTIAN HIEROGLYPH S022 132EC EGYPTIAN HIEROGLYPH S023 @@ -36846,6 +38654,8 @@ FFFF <not a character> 132EE EGYPTIAN HIEROGLYPH S025 132EF EGYPTIAN HIEROGLYPH S026 132F0 EGYPTIAN HIEROGLYPH S026A + * loin-cloth + * not to be confused with 13200, 133D4, or 133F3 132F1 EGYPTIAN HIEROGLYPH S026B 132F2 EGYPTIAN HIEROGLYPH S027 132F3 EGYPTIAN HIEROGLYPH S028 @@ -36856,24 +38666,36 @@ FFFF <not a character> 132F6 EGYPTIAN HIEROGLYPH S031 132F7 EGYPTIAN HIEROGLYPH S032 132F8 EGYPTIAN HIEROGLYPH S033 + ~ 132F8 FE02 rotated 270 degrees 132F9 EGYPTIAN HIEROGLYPH S034 132FA EGYPTIAN HIEROGLYPH S035 132FB EGYPTIAN HIEROGLYPH S035A + * variant of 132FA 132FC EGYPTIAN HIEROGLYPH S036 + * older variant of 132FA 132FD EGYPTIAN HIEROGLYPH S037 + ~ 132FD FE02 rotated 270 degrees 132FE EGYPTIAN HIEROGLYPH S038 132FF EGYPTIAN HIEROGLYPH S039 13300 EGYPTIAN HIEROGLYPH S040 + * phonogram 'wꜣs' 13301 EGYPTIAN HIEROGLYPH S041 + * phonogram 'ḏꜣm' 13302 EGYPTIAN HIEROGLYPH S042 + ~ 13302 FE02 rotated 270 degrees 13303 EGYPTIAN HIEROGLYPH S043 + ~ 13303 FE02 rotated 270 degrees 13304 EGYPTIAN HIEROGLYPH S044 13305 EGYPTIAN HIEROGLYPH S045 13306 EGYPTIAN HIEROGLYPH S046 @ T. Warfare, hunting, butchery 13307 EGYPTIAN HIEROGLYPH T001 + ~ 13307 FE00 rotated 90 degrees 13308 EGYPTIAN HIEROGLYPH T002 + * classifier 'striking, hitting' + ~ 13308 FE01 rotated 180 degrees 13309 EGYPTIAN HIEROGLYPH T003 + * classifier 'mace' 1330A EGYPTIAN HIEROGLYPH T003A 1330B EGYPTIAN HIEROGLYPH T004 1330C EGYPTIAN HIEROGLYPH T005 @@ -36881,51 +38703,86 @@ FFFF <not a character> 1330E EGYPTIAN HIEROGLYPH T007 1330F EGYPTIAN HIEROGLYPH T007A 13310 EGYPTIAN HIEROGLYPH T008 + * older variant of 13311 + ~ 13310 FE02 rotated 270 degrees 13311 EGYPTIAN HIEROGLYPH T008A + ~ 13311 FE02 rotated 270 degrees 13312 EGYPTIAN HIEROGLYPH T009 + ~ 13312 FE01 rotated 180 degrees + ~ 13312 FE02 rotated 270 degrees 13313 EGYPTIAN HIEROGLYPH T009A + * older variant of 13312 + ~ 13313 FE01 rotated 180 degrees + ~ 13313 FE02 rotated 270 degrees 13314 EGYPTIAN HIEROGLYPH T010 + ~ 13314 FE01 rotated 180 degrees + ~ 13314 FE02 rotated 270 degrees 13315 EGYPTIAN HIEROGLYPH T011 13316 EGYPTIAN HIEROGLYPH T011A 13317 EGYPTIAN HIEROGLYPH T012 13318 EGYPTIAN HIEROGLYPH T013 13319 EGYPTIAN HIEROGLYPH T014 1331A EGYPTIAN HIEROGLYPH T015 + * older variant of 13319 1331B EGYPTIAN HIEROGLYPH T016 + ~ 1331B FE00 rotated 90 degrees + ~ 1331B FE01 rotated 180 degrees 1331C EGYPTIAN HIEROGLYPH T016A + ~ 1331C FE02 rotated 270 degrees 1331D EGYPTIAN HIEROGLYPH T017 1331E EGYPTIAN HIEROGLYPH T018 1331F EGYPTIAN HIEROGLYPH T019 13320 EGYPTIAN HIEROGLYPH T020 + * older variant of 1331F 13321 EGYPTIAN HIEROGLYPH T021 + ~ 13321 FE01 rotated 180 degrees + ~ 13321 FE02 rotated 270 degrees 13322 EGYPTIAN HIEROGLYPH T022 + ~ 13322 FE00 rotated 90 degrees + ~ 13322 FE01 rotated 180 degrees 13323 EGYPTIAN HIEROGLYPH T023 + * more recent variant of 13322 13324 EGYPTIAN HIEROGLYPH T024 13325 EGYPTIAN HIEROGLYPH T025 13326 EGYPTIAN HIEROGLYPH T026 13327 EGYPTIAN HIEROGLYPH T027 + * older variant of 13326 13328 EGYPTIAN HIEROGLYPH T028 13329 EGYPTIAN HIEROGLYPH T029 1332A EGYPTIAN HIEROGLYPH T030 + * classifier 'knife, cutting' 1332B EGYPTIAN HIEROGLYPH T031 + * phonogram 'sšm' 1332C EGYPTIAN HIEROGLYPH T032 1332D EGYPTIAN HIEROGLYPH T032A 1332E EGYPTIAN HIEROGLYPH T033 + * older variant of 13326 1332F EGYPTIAN HIEROGLYPH T033A 13330 EGYPTIAN HIEROGLYPH T034 13331 EGYPTIAN HIEROGLYPH T035 + * variant of 13330 + ~ 13331 FE01 rotated 180 degrees + ~ 13331 FE02 rotated 270 degrees 13332 EGYPTIAN HIEROGLYPH T036 @ U. Agriculture, crafts, and professions 13333 EGYPTIAN HIEROGLYPH U001 13334 EGYPTIAN HIEROGLYPH U002 + * stylistic variant of 13333 13335 EGYPTIAN HIEROGLYPH U003 13336 EGYPTIAN HIEROGLYPH U004 13337 EGYPTIAN HIEROGLYPH U005 + * stylistic variant of 13336 13338 EGYPTIAN HIEROGLYPH U006 13339 EGYPTIAN HIEROGLYPH U006A + * stylistic variant of 13338 1333A EGYPTIAN HIEROGLYPH U006B + * mirrored version of 13339 1333B EGYPTIAN HIEROGLYPH U007 + * variant of 13338 + ~ 1333B FE00 rotated 90 degrees 1333C EGYPTIAN HIEROGLYPH U008 + * variant of 1333B + ~ 1333C FE00 rotated 90 degrees 1333D EGYPTIAN HIEROGLYPH U009 1333E EGYPTIAN HIEROGLYPH U010 1333F EGYPTIAN HIEROGLYPH U011 @@ -36936,18 +38793,25 @@ FFFF <not a character> 13344 EGYPTIAN HIEROGLYPH U016 13345 EGYPTIAN HIEROGLYPH U017 13346 EGYPTIAN HIEROGLYPH U018 + * variant of 13345 13347 EGYPTIAN HIEROGLYPH U019 13348 EGYPTIAN HIEROGLYPH U020 + * older variant of 13347 13349 EGYPTIAN HIEROGLYPH U021 1334A EGYPTIAN HIEROGLYPH U022 + ~ 1334A FE02 rotated 270 degrees 1334B EGYPTIAN HIEROGLYPH U023 1334C EGYPTIAN HIEROGLYPH U023A + * stylistic variant of 1334B 1334D EGYPTIAN HIEROGLYPH U024 1334E EGYPTIAN HIEROGLYPH U025 + * older variant of 1334D 1334F EGYPTIAN HIEROGLYPH U026 13350 EGYPTIAN HIEROGLYPH U027 + * older variant of 1334F 13351 EGYPTIAN HIEROGLYPH U028 13352 EGYPTIAN HIEROGLYPH U029 + * older variant of 13351 13353 EGYPTIAN HIEROGLYPH U029A 13354 EGYPTIAN HIEROGLYPH U030 13355 EGYPTIAN HIEROGLYPH U031 @@ -36961,11 +38825,17 @@ FFFF <not a character> 1335D EGYPTIAN HIEROGLYPH U038 1335E EGYPTIAN HIEROGLYPH U039 1335F EGYPTIAN HIEROGLYPH U040 + * cursive variant of 1335E 13360 EGYPTIAN HIEROGLYPH U041 13361 EGYPTIAN HIEROGLYPH U042 + * pitchfork + * not to be confused with 1327D + ~ 13361 FE02 rotated 270 degrees @ V. Rope, fiber, baskets, bags, etc. 13362 EGYPTIAN HIEROGLYPH V001 * 100 + * classifier 'cord, rope' + * not to be confused with 133F2 13363 EGYPTIAN HIEROGLYPH V001A * 200 13364 EGYPTIAN HIEROGLYPH V001B @@ -36990,13 +38860,21 @@ FFFF <not a character> 1336F EGYPTIAN HIEROGLYPH V004 13370 EGYPTIAN HIEROGLYPH V005 13371 EGYPTIAN HIEROGLYPH V006 + * phonogram 'šs' 13372 EGYPTIAN HIEROGLYPH V007 + * phonogram 'šn' 13373 EGYPTIAN HIEROGLYPH V007A + ~ 13373 FE02 rotated 270 degrees 13374 EGYPTIAN HIEROGLYPH V007B 13375 EGYPTIAN HIEROGLYPH V008 13376 EGYPTIAN HIEROGLYPH V009 13377 EGYPTIAN HIEROGLYPH V010 + * logogram 'name' + ~ 13377 FE00 rotated 90 degrees 13378 EGYPTIAN HIEROGLYPH V011 + * classifier 'restrain, split' + x (egyptian hieroglyph v011d - 1342F) + ~ 13378 FE00 rotated 90 degrees 13379 EGYPTIAN HIEROGLYPH V011A * beginning of cartouche 1337A EGYPTIAN HIEROGLYPH V011B @@ -37005,19 +38883,25 @@ FFFF <not a character> * end of knotless cartouche 1337C EGYPTIAN HIEROGLYPH V012 1337D EGYPTIAN HIEROGLYPH V012A + ~ 1337D FE02 rotated 270 degrees 1337E EGYPTIAN HIEROGLYPH V012B 1337F EGYPTIAN HIEROGLYPH V013 * transliterated as 1E6F 13380 EGYPTIAN HIEROGLYPH V014 + * variant of 1337F 13381 EGYPTIAN HIEROGLYPH V015 13382 EGYPTIAN HIEROGLYPH V016 13383 EGYPTIAN HIEROGLYPH V017 13384 EGYPTIAN HIEROGLYPH V018 + * older variant of 13383 13385 EGYPTIAN HIEROGLYPH V019 + ~ 13385 FE02 rotated 270 degrees 13386 EGYPTIAN HIEROGLYPH V020 * 10 + * not to be confused with 133AD 13387 EGYPTIAN HIEROGLYPH V020A * 20 + * not to be confused with 133AE 13388 EGYPTIAN HIEROGLYPH V020B * 30 13389 EGYPTIAN HIEROGLYPH V020C @@ -37034,20 +38918,29 @@ FFFF <not a character> * 90 1338F EGYPTIAN HIEROGLYPH V020I * 20 + * variant of 13387 13390 EGYPTIAN HIEROGLYPH V020J * 30 + * variant of 13388 13391 EGYPTIAN HIEROGLYPH V020K * 40 + * variant of 13389 13392 EGYPTIAN HIEROGLYPH V020L * 50 + * variant of 1338A 13393 EGYPTIAN HIEROGLYPH V021 13394 EGYPTIAN HIEROGLYPH V022 13395 EGYPTIAN HIEROGLYPH V023 + * older variant of 13394 13396 EGYPTIAN HIEROGLYPH V023A 13397 EGYPTIAN HIEROGLYPH V024 13398 EGYPTIAN HIEROGLYPH V025 + * more recent variant of 13397 13399 EGYPTIAN HIEROGLYPH V026 + ~ 13399 FE00 rotated 90 degrees 1339A EGYPTIAN HIEROGLYPH V027 + * older variant of 13399 + ~ 1339A FE00 rotated 90 degrees 1339B EGYPTIAN HIEROGLYPH V028 * transliterated as 1E25 x (arabic letter hah - 062D) @@ -37056,30 +38949,40 @@ FFFF <not a character> 1339E EGYPTIAN HIEROGLYPH V029A 1339F EGYPTIAN HIEROGLYPH V030 133A0 EGYPTIAN HIEROGLYPH V030A + * stylistic variant, use of 1339F is preferred 133A1 EGYPTIAN HIEROGLYPH V031 * transliterated as k x (hebrew letter kaf - 05DB) x (arabic letter kaf - 0643) 133A2 EGYPTIAN HIEROGLYPH V031A + * from hieratic 133A3 EGYPTIAN HIEROGLYPH V032 133A4 EGYPTIAN HIEROGLYPH V033 133A5 EGYPTIAN HIEROGLYPH V033A 133A6 EGYPTIAN HIEROGLYPH V034 + * more recent variant of 133A4 133A7 EGYPTIAN HIEROGLYPH V035 133A8 EGYPTIAN HIEROGLYPH V036 133A9 EGYPTIAN HIEROGLYPH V037 133AA EGYPTIAN HIEROGLYPH V037A 133AB EGYPTIAN HIEROGLYPH V038 + * bandage + * not to be confused with 1308B 133AC EGYPTIAN HIEROGLYPH V039 133AD EGYPTIAN HIEROGLYPH V040 * 10 in dates + * not to be confused with 13386 133AE EGYPTIAN HIEROGLYPH V040A * 20 in dates + * not to be confused with 13387 @ W. Vessels of stone and earthenware 133AF EGYPTIAN HIEROGLYPH W001 + ~ 133AF FE02 rotated 270 degrees 133B0 EGYPTIAN HIEROGLYPH W002 + ~ 133B0 FE02 rotated 270 degrees 133B1 EGYPTIAN HIEROGLYPH W003 133B2 EGYPTIAN HIEROGLYPH W003A + * stylistic variant, use of 133B1 is preferred 133B3 EGYPTIAN HIEROGLYPH W004 133B4 EGYPTIAN HIEROGLYPH W005 133B5 EGYPTIAN HIEROGLYPH W006 @@ -37087,93 +38990,142 @@ FFFF <not a character> 133B7 EGYPTIAN HIEROGLYPH W008 133B8 EGYPTIAN HIEROGLYPH W009 133B9 EGYPTIAN HIEROGLYPH W009A + * mirrored version of 133B8 133BA EGYPTIAN HIEROGLYPH W010 133BB EGYPTIAN HIEROGLYPH W010A 133BC EGYPTIAN HIEROGLYPH W011 * transliterated as g 133BD EGYPTIAN HIEROGLYPH W012 + * older variant of 133BC 133BE EGYPTIAN HIEROGLYPH W013 133BF EGYPTIAN HIEROGLYPH W014 + ~ 133BF FE02 rotated 270 degrees 133C0 EGYPTIAN HIEROGLYPH W014A 133C1 EGYPTIAN HIEROGLYPH W015 133C2 EGYPTIAN HIEROGLYPH W016 133C3 EGYPTIAN HIEROGLYPH W017 133C4 EGYPTIAN HIEROGLYPH W017A + * cursive variant of 133C3 133C5 EGYPTIAN HIEROGLYPH W018 + * older variant of 133C3 133C6 EGYPTIAN HIEROGLYPH W018A + * cursive variant of 133C5 133C7 EGYPTIAN HIEROGLYPH W019 133C8 EGYPTIAN HIEROGLYPH W020 133C9 EGYPTIAN HIEROGLYPH W021 133CA EGYPTIAN HIEROGLYPH W022 133CB EGYPTIAN HIEROGLYPH W023 133CC EGYPTIAN HIEROGLYPH W024 + * phonogram 'nw' 133CD EGYPTIAN HIEROGLYPH W024A + * monogram 'nw(n)' or 'nww' 133CE EGYPTIAN HIEROGLYPH W025 @ X. Loaves and cakes 133CF EGYPTIAN HIEROGLYPH X001 * transliterated as t 133D0 EGYPTIAN HIEROGLYPH X002 133D1 EGYPTIAN HIEROGLYPH X003 + * variant of 133D0 133D2 EGYPTIAN HIEROGLYPH X004 133D3 EGYPTIAN HIEROGLYPH X004A + * variant of 133D2 + ~ 133D3 FE00 rotated 90 degrees 133D4 EGYPTIAN HIEROGLYPH X004B + * cake + * variant of 133D2 + * not to be confused with 13200, 132F0, or 133F3 133D5 EGYPTIAN HIEROGLYPH X005 + * hieratic + * variant of 133D4 133D6 EGYPTIAN HIEROGLYPH X006 133D7 EGYPTIAN HIEROGLYPH X006A 133D8 EGYPTIAN HIEROGLYPH X007 + * classifier 'food' + * not to be confused with 1320E 133D9 EGYPTIAN HIEROGLYPH X008 133DA EGYPTIAN HIEROGLYPH X008A + * bread + * variant of 133D9 + * not to be confused with 131EE @ Y. Writings, games, music 133DB EGYPTIAN HIEROGLYPH Y001 133DC EGYPTIAN HIEROGLYPH Y001A + * rotated variant of 133DB 133DD EGYPTIAN HIEROGLYPH Y002 + * older variant of 133DB + ~ 133DD FE02 rotated 270 degrees 133DE EGYPTIAN HIEROGLYPH Y003 133DF EGYPTIAN HIEROGLYPH Y004 + * mirrored version of 133DE 133E0 EGYPTIAN HIEROGLYPH Y005 133E1 EGYPTIAN HIEROGLYPH Y006 133E2 EGYPTIAN HIEROGLYPH Y007 133E3 EGYPTIAN HIEROGLYPH Y008 @ Z. Strokes, signs derived from Hieratic, geometrical figures 133E4 EGYPTIAN HIEROGLYPH Z001 - x (egyptian hieroglyph z015 - 133FA) + * semogram index + * classifier 'single' + * not to be confused with 133FA 133E5 EGYPTIAN HIEROGLYPH Z002 - * plurality - x (egyptian hieroglyph z015b - 133FC) + * classifier 'plural' + * not to be confused with 133FC 133E6 EGYPTIAN HIEROGLYPH Z002A + * stylistic variant of 133E5 133E7 EGYPTIAN HIEROGLYPH Z002B + * classifier 'plural' + * not to be confused with 13213 133E8 EGYPTIAN HIEROGLYPH Z002C + * variant of 133E6 133E9 EGYPTIAN HIEROGLYPH Z002D + * variant of 133E8 133EA EGYPTIAN HIEROGLYPH Z003 + * variant of 133E5 133EB EGYPTIAN HIEROGLYPH Z003A + * variant of 133EA 133EC EGYPTIAN HIEROGLYPH Z003B - * 3 + * variant of 133E7 133ED EGYPTIAN HIEROGLYPH Z004 - * duality + * classifier 'dual' * transliterated as y x (egyptian hieroglyph m017a - 131CC) 133EE EGYPTIAN HIEROGLYPH Z004A - * duality - x (egyptian hieroglyph z015a - 133FB) + * variant of 133ED + * classifier 'dual' + * transliterated as y + * not to be confused with 133FB 133EF EGYPTIAN HIEROGLYPH Z005 133F0 EGYPTIAN HIEROGLYPH Z005A + * variant of 133EF 133F1 EGYPTIAN HIEROGLYPH Z006 133F2 EGYPTIAN HIEROGLYPH Z007 + * phonogram 'w' + * not to be confused with 13362 + ~ 133F2 FE00 rotated 90 degrees 133F3 EGYPTIAN HIEROGLYPH Z008 + * oval + * not to be confused with 13200, 132F0, or 133D4 133F4 EGYPTIAN HIEROGLYPH Z009 133F5 EGYPTIAN HIEROGLYPH Z010 + * older variant of 133F4 + ~ 133F5 FE00 rotated 90 degrees 133F6 EGYPTIAN HIEROGLYPH Z011 + ~ 133F6 FE00 rotated 90 degrees 133F7 EGYPTIAN HIEROGLYPH Z012 + * hieratic 133F8 EGYPTIAN HIEROGLYPH Z013 + * circle, unmarked round sign + * not to be confused with 13082 or 131F3 133F9 EGYPTIAN HIEROGLYPH Z014 + * hieratic 133FA EGYPTIAN HIEROGLYPH Z015 * 1 - x (egyptian hieroglyph z001 - 133E4) + * not to be confused with 133E4 133FB EGYPTIAN HIEROGLYPH Z015A * 2 - x (egyptian hieroglyph z004a - 133EE) + * not to be confused with 133EE 133FC EGYPTIAN HIEROGLYPH Z015B * 3 - x (egyptian hieroglyph z002 - 133E5) + * not to be confused with 133E5 x (egyptian hieroglyph z003 - 133EA) 133FD EGYPTIAN HIEROGLYPH Z015C * 4 @@ -37189,6 +39141,7 @@ FFFF <not a character> * 9 13403 EGYPTIAN HIEROGLYPH Z015I * 5 + ~ 13403 FE00 rotated 90 degrees 13404 EGYPTIAN HIEROGLYPH Z016 * 1 in dates 13405 EGYPTIAN HIEROGLYPH Z016A @@ -37218,34 +39171,58 @@ FFFF <not a character> 13412 EGYPTIAN HIEROGLYPH AA006 13413 EGYPTIAN HIEROGLYPH AA007 13414 EGYPTIAN HIEROGLYPH AA007A + * mirrored version of 13413 13415 EGYPTIAN HIEROGLYPH AA007B 13416 EGYPTIAN HIEROGLYPH AA008 + ~ 13416 FE00 rotated 90 degrees 13417 EGYPTIAN HIEROGLYPH AA009 13418 EGYPTIAN HIEROGLYPH AA010 13419 EGYPTIAN HIEROGLYPH AA011 + ~ 13419 FE00 rotated 90 degrees + ~ 13419 FE01 rotated 180 degrees + ~ 13419 FE02 rotated 270 degrees 1341A EGYPTIAN HIEROGLYPH AA012 + * older variant of 13419 + ~ 1341A FE00 rotated 90 degrees 1341B EGYPTIAN HIEROGLYPH AA013 1341C EGYPTIAN HIEROGLYPH AA014 + * older variant of 1341B 1341D EGYPTIAN HIEROGLYPH AA015 1341E EGYPTIAN HIEROGLYPH AA016 + * variant of 1341D 1341F EGYPTIAN HIEROGLYPH AA017 13420 EGYPTIAN HIEROGLYPH AA018 + * more recent variant of 1341F 13421 EGYPTIAN HIEROGLYPH AA019 13422 EGYPTIAN HIEROGLYPH AA020 13423 EGYPTIAN HIEROGLYPH AA021 + ~ 13423 FE00 rotated 90 degrees 13424 EGYPTIAN HIEROGLYPH AA022 13425 EGYPTIAN HIEROGLYPH AA023 13426 EGYPTIAN HIEROGLYPH AA024 + * older variant of 13425 13427 EGYPTIAN HIEROGLYPH AA025 13428 EGYPTIAN HIEROGLYPH AA026 13429 EGYPTIAN HIEROGLYPH AA027 1342A EGYPTIAN HIEROGLYPH AA028 + * phonogram 'qd' + * not to be confused with 131E9 and 132A7 1342B EGYPTIAN HIEROGLYPH AA029 + * older variant of 1342A 1342C EGYPTIAN HIEROGLYPH AA030 + ~ 1342C FE02 rotated 270 degrees 1342D EGYPTIAN HIEROGLYPH AA031 + * older variant of 1342C 1342E EGYPTIAN HIEROGLYPH AA032 -@@ 13430 Egyptian Hieroglyph Format Controls 1343F -@+ These format controls are used to render Egyptian hieroglyphic quadrats. + ~ 1342E FE02 rotated 270 degrees +@ Addition to group V +@+ This is part of the cartouche set: 13379, 1337A, 1337B, and 1342F. +1342F EGYPTIAN HIEROGLYPH V011D + * knotted beginning of cartouche + * not to be confused with 13378 +@~ Standardized Variation Sequences +@@ 13430 Egyptian Hieroglyph Format Controls 1345F +@+ These format controls are used to render Egyptian hieroglyphic spatial arrangements, including quadrats, overlays, insertions, and blank, lost or damaged sections. @ Joiners 13430 EGYPTIAN HIEROGLYPH VERTICAL JOINER = sign separator: subordination (Manuel de Codage) @@ -37261,6 +39238,45 @@ FFFF <not a character> @ Segment scoping delimiters 13437 EGYPTIAN HIEROGLYPH BEGIN SEGMENT 13438 EGYPTIAN HIEROGLYPH END SEGMENT +@ Sign insertion controls +13439 EGYPTIAN HIEROGLYPH INSERT AT MIDDLE +1343A EGYPTIAN HIEROGLYPH INSERT AT TOP +1343B EGYPTIAN HIEROGLYPH INSERT AT BOTTOM +@ Enclosure controls +1343C EGYPTIAN HIEROGLYPH BEGIN ENCLOSURE +1343D EGYPTIAN HIEROGLYPH END ENCLOSURE +1343E EGYPTIAN HIEROGLYPH BEGIN WALLED ENCLOSURE +1343F EGYPTIAN HIEROGLYPH END WALLED ENCLOSURE +@ Mirror control +13440 EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY +@ Blank and lost signs +13441 EGYPTIAN HIEROGLYPH FULL BLANK +13442 EGYPTIAN HIEROGLYPH HALF BLANK +13443 EGYPTIAN HIEROGLYPH LOST SIGN + ~ 13443 FE00 expanded +13444 EGYPTIAN HIEROGLYPH HALF LOST SIGN + ~ 13444 FE00 expanded +13445 EGYPTIAN HIEROGLYPH TALL LOST SIGN + ~ 13445 FE00 expanded +13446 EGYPTIAN HIEROGLYPH WIDE LOST SIGN + ~ 13446 FE00 expanded +@ Damage modifiers +13447 EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START +13448 EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START +13449 EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START +1344A EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP END +1344B EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP +1344C EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START AND TOP END +1344D EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND TOP +1344E EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM END +1344F EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START AND BOTTOM END +13450 EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM +13451 EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND BOTTOM +13452 EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT END +13453 EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP AND END +13454 EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM AND END +13455 EGYPTIAN HIEROGLYPH MODIFIER DAMAGED +@~ ! @@ 14400 Anatolian Hieroglyphs 1467F @+ In the names list, most of the comments are in Latin. Those which have a Luwian phonetic value are identified as syllabic. @ A. The human body and clothing @@ -38942,6 +40958,99 @@ FFFF <not a character> @ Punctuation 16A6E MRO DANDA 16A6F MRO DOUBLE DANDA +@@ 16A70 Tangsa 16ACF +@ Vowels +16A70 TANGSA LETTER OZ +16A71 TANGSA LETTER OC +16A72 TANGSA LETTER OQ +16A73 TANGSA LETTER OX +16A74 TANGSA LETTER AZ +16A75 TANGSA LETTER AC +16A76 TANGSA LETTER AQ +16A77 TANGSA LETTER AX +16A78 TANGSA LETTER VZ +16A79 TANGSA LETTER VC +16A7A TANGSA LETTER VQ +16A7B TANGSA LETTER VX +16A7C TANGSA LETTER EZ +16A7D TANGSA LETTER EC +16A7E TANGSA LETTER EQ +16A7F TANGSA LETTER EX +16A80 TANGSA LETTER IZ +16A81 TANGSA LETTER IC +16A82 TANGSA LETTER IQ +16A83 TANGSA LETTER IX +16A84 TANGSA LETTER UZ +16A85 TANGSA LETTER UC +16A86 TANGSA LETTER UQ +16A87 TANGSA LETTER UX +16A88 TANGSA LETTER AWZ +16A89 TANGSA LETTER AWC +16A8A TANGSA LETTER AWQ +16A8B TANGSA LETTER AWX +16A8C TANGSA LETTER UIZ +16A8D TANGSA LETTER UIC +16A8E TANGSA LETTER UIQ +16A8F TANGSA LETTER UIX +16A90 TANGSA LETTER FINAL NG +16A91 TANGSA LETTER LONG UEX +16A92 TANGSA LETTER SHORT UEZ +16A93 TANGSA LETTER SHORT AWX +16A94 TANGSA LETTER UEC +16A95 TANGSA LETTER UEZ +16A96 TANGSA LETTER UEQ +16A97 TANGSA LETTER UEX +16A98 TANGSA LETTER UIUZ +16A99 TANGSA LETTER UIUC +16A9A TANGSA LETTER UIUQ +16A9B TANGSA LETTER UIUX +16A9C TANGSA LETTER MZ +16A9D TANGSA LETTER MC +16A9E TANGSA LETTER MQ +16A9F TANGSA LETTER MX +@ Consonants +16AA0 TANGSA LETTER KA +16AA1 TANGSA LETTER KHA +16AA2 TANGSA LETTER GA +16AA3 TANGSA LETTER NGA +16AA4 TANGSA LETTER SA +16AA5 TANGSA LETTER YA +16AA6 TANGSA LETTER WA +16AA7 TANGSA LETTER PA +16AA8 TANGSA LETTER NYA +16AA9 TANGSA LETTER PHA +16AAA TANGSA LETTER BA +16AAB TANGSA LETTER MA +16AAC TANGSA LETTER NA +16AAD TANGSA LETTER HA +16AAE TANGSA LETTER LA +16AAF TANGSA LETTER HTA +16AB0 TANGSA LETTER TA +16AB1 TANGSA LETTER DA +16AB2 TANGSA LETTER RA +16AB3 TANGSA LETTER NHA +16AB4 TANGSA LETTER SHA +16AB5 TANGSA LETTER CA +16AB6 TANGSA LETTER TSA +16AB7 TANGSA LETTER GHA +16AB8 TANGSA LETTER HTTA +16AB9 TANGSA LETTER THA +16ABA TANGSA LETTER XA +16ABB TANGSA LETTER FA +16ABC TANGSA LETTER DHA +16ABD TANGSA LETTER CHA +16ABE TANGSA LETTER ZA +@ Digits +16AC0 TANGSA DIGIT ZERO +16AC1 TANGSA DIGIT ONE +16AC2 TANGSA DIGIT TWO +16AC3 TANGSA DIGIT THREE +16AC4 TANGSA DIGIT FOUR +16AC5 TANGSA DIGIT FIVE +16AC6 TANGSA DIGIT SIX +16AC7 TANGSA DIGIT SEVEN +16AC8 TANGSA DIGIT EIGHT +16AC9 TANGSA DIGIT NINE @@ 16AD0 Bassa Vah 16AFF @ Consonant letters 16AD0 BASSA VAH LETTER ENNI @@ -40587,6 +42696,7 @@ FFFF <not a character> 18BDC KHITAN SMALL SCRIPT CHARACTER-18BDC 18BDD KHITAN SMALL SCRIPT CHARACTER-18BDD 18BDE KHITAN SMALL SCRIPT CHARACTER-18BDE + x (khitan small script character-18cca - 18CCA) 18BDF KHITAN SMALL SCRIPT CHARACTER-18BDF 18BE0 KHITAN SMALL SCRIPT CHARACTER-18BE0 18BE1 KHITAN SMALL SCRIPT CHARACTER-18BE1 @@ -40835,6 +42945,7 @@ FFFF <not a character> 18CC8 KHITAN SMALL SCRIPT CHARACTER-18CC8 18CC9 KHITAN SMALL SCRIPT CHARACTER-18CC9 18CCA KHITAN SMALL SCRIPT CHARACTER-18CCA + x (khitan small script character-18bde - 18BDE) 18CCB KHITAN SMALL SCRIPT CHARACTER-18CCB @ Radical-19 18CCC KHITAN SMALL SCRIPT CHARACTER-18CCC @@ -40849,6 +42960,23 @@ FFFF <not a character> 18CD4 KHITAN SMALL SCRIPT CHARACTER-18CD4 18CD5 KHITAN SMALL SCRIPT CHARACTER-18CD5 @@ 18D00 Tangut Supplement 18D08 +@@ 1AFF0 Kana Extended-B 1AFFF +@+ This block contains tone marks occasionally used in furigana extensions to annotate Minnan Chinese. +@ Tone marks +1AFF0 KATAKANA LETTER MINNAN TONE-2 +1AFF1 KATAKANA LETTER MINNAN TONE-3 +1AFF2 KATAKANA LETTER MINNAN TONE-4 +1AFF3 KATAKANA LETTER MINNAN TONE-5 +1AFF5 KATAKANA LETTER MINNAN TONE-7 +1AFF6 KATAKANA LETTER MINNAN TONE-8 +@ Nasalized tone marks +1AFF7 KATAKANA LETTER MINNAN NASALIZED TONE-1 +1AFF8 KATAKANA LETTER MINNAN NASALIZED TONE-2 +1AFF9 KATAKANA LETTER MINNAN NASALIZED TONE-3 +1AFFA KATAKANA LETTER MINNAN NASALIZED TONE-4 +1AFFB KATAKANA LETTER MINNAN NASALIZED TONE-5 +1AFFD KATAKANA LETTER MINNAN NASALIZED TONE-7 +1AFFE KATAKANA LETTER MINNAN NASALIZED TONE-8 @@ 1B000 Kana Supplement 1B0FF @ Historic Katakana 1B000 KATAKANA LETTER ARCHAIC E @@ -41429,12 +43557,21 @@ FFFF <not a character> * derived from 65E0 1B11E HENTAIGANA LETTER N-MU-MO-2 * derived from 65E0 +@ Historic Hiragana +1B11F HIRAGANA LETTER ARCHAIC WU + * derived from 6C59 +@ Historic Katakana +1B120 KATAKANA LETTER ARCHAIC YI +1B121 KATAKANA LETTER ARCHAIC YE +1B122 KATAKANA LETTER ARCHAIC WU @@ 1B130 Small Kana Extension 1B16F @ Historic small hiragana letters +1B132 HIRAGANA LETTER SMALL KO 1B150 HIRAGANA LETTER SMALL WI 1B151 HIRAGANA LETTER SMALL WE 1B152 HIRAGANA LETTER SMALL WO @ Historic small katakana letters +1B155 KATAKANA LETTER SMALL KO 1B164 KATAKANA LETTER SMALL WI 1B165 KATAKANA LETTER SMALL WE 1B166 KATAKANA LETTER SMALL WO @@ -41888,6 +44025,7 @@ FFFF <not a character> 1BC01 DUPLOYAN LETTER X * Salishan @ Line consonants +@+ Small arrows shown in the chart glyphs for some strokes and arcs indicate the handwriting direction of these characters, and are not visibly rendered. 1BC02 DUPLOYAN LETTER P * Chinook number 1 1BC03 DUPLOYAN LETTER T @@ -42344,6 +44482,210 @@ FFFF <not a character> = Sloan contracted ending oo/o + ZWSP 1BCA3 SHORTHAND FORMAT UP STEP = Sloan contracted ending uh/au/aui + ZWSP +@@ 1CF00 Znamenny Musical Notation 1CFCF +@ Combining red marks +1CF00 ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT +1CF01 ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON LEFT +1CF02 ZNAMENNY COMBINING MARK TSATA ON LEFT +1CF03 ZNAMENNY COMBINING MARK GORAZDO NIZKO ON LEFT +1CF04 ZNAMENNY COMBINING MARK NIZKO ON LEFT +1CF05 ZNAMENNY COMBINING MARK SREDNE ON LEFT +1CF06 ZNAMENNY COMBINING MARK MALO POVYSHE ON LEFT +1CF07 ZNAMENNY COMBINING MARK POVYSHE ON LEFT +1CF08 ZNAMENNY COMBINING MARK VYSOKO ON LEFT +1CF09 ZNAMENNY COMBINING MARK MALO POVYSHE S KHOKHLOM ON LEFT +1CF0A ZNAMENNY COMBINING MARK POVYSHE S KHOKHLOM ON LEFT +1CF0B ZNAMENNY COMBINING MARK VYSOKO S KHOKHLOM ON LEFT +1CF0C ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON RIGHT +1CF0D ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON RIGHT +1CF0E ZNAMENNY COMBINING MARK TSATA ON RIGHT +1CF0F ZNAMENNY COMBINING MARK GORAZDO NIZKO ON RIGHT +1CF10 ZNAMENNY COMBINING MARK NIZKO ON RIGHT +1CF11 ZNAMENNY COMBINING MARK SREDNE ON RIGHT +1CF12 ZNAMENNY COMBINING MARK MALO POVYSHE ON RIGHT +1CF13 ZNAMENNY COMBINING MARK POVYSHE ON RIGHT +1CF14 ZNAMENNY COMBINING MARK VYSOKO ON RIGHT +1CF15 ZNAMENNY COMBINING MARK MALO POVYSHE S KHOKHLOM ON RIGHT +1CF16 ZNAMENNY COMBINING MARK POVYSHE S KHOKHLOM ON RIGHT +1CF17 ZNAMENNY COMBINING MARK VYSOKO S KHOKHLOM ON RIGHT +1CF18 ZNAMENNY COMBINING MARK TSATA S KRYZHEM +1CF19 ZNAMENNY COMBINING MARK MALO POVYSHE S KRYZHEM +1CF1A ZNAMENNY COMBINING MARK STRANNO MALO POVYSHE +1CF1B ZNAMENNY COMBINING MARK POVYSHE S KRYZHEM +1CF1C ZNAMENNY COMBINING MARK POVYSHE STRANNO +1CF1D ZNAMENNY COMBINING MARK VYSOKO S KRYZHEM +1CF1E ZNAMENNY COMBINING MARK MALO POVYSHE STRANNO +1CF1F ZNAMENNY COMBINING MARK GORAZDO VYSOKO +1CF20 ZNAMENNY COMBINING MARK ZELO +1CF21 ZNAMENNY COMBINING MARK ON +1CF22 ZNAMENNY COMBINING MARK RAVNO +1CF23 ZNAMENNY COMBINING MARK TIKHAYA +1CF24 ZNAMENNY COMBINING MARK BORZAYA +1CF25 ZNAMENNY COMBINING MARK UDARKA +1CF26 ZNAMENNY COMBINING MARK PODVERTKA +1CF27 ZNAMENNY COMBINING MARK LOMKA +1CF28 ZNAMENNY COMBINING MARK KUPNAYA +1CF29 ZNAMENNY COMBINING MARK KACHKA +1CF2A ZNAMENNY COMBINING MARK ZEVOK +1CF2B ZNAMENNY COMBINING MARK SKOBA +1CF2C ZNAMENNY COMBINING MARK RAZSEKA +1CF2D ZNAMENNY COMBINING MARK KRYZH ON LEFT +@ Combining black marks +1CF30 ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO +1CF31 ZNAMENNY COMBINING TONAL RANGE MARK SVETLO +1CF32 ZNAMENNY COMBINING TONAL RANGE MARK TRESVETLO +1CF33 ZNAMENNY COMBINING MARK ZADERZHKA + = ottyazhka +1CF34 ZNAMENNY COMBINING MARK DEMESTVENNY ZADERZHKA +1CF35 ZNAMENNY COMBINING MARK OTSECHKA +1CF36 ZNAMENNY COMBINING MARK PODCHASHIE +1CF37 ZNAMENNY COMBINING MARK PODCHASHIE WITH VERTICAL STROKE +1CF38 ZNAMENNY COMBINING MARK CHASHKA +1CF39 ZNAMENNY COMBINING MARK CHASHKA POLNAYA +1CF3A ZNAMENNY COMBINING MARK OBLACHKO +1CF3B ZNAMENNY COMBINING MARK SOROCHYA NOZHKA + = sokolik +1CF3C ZNAMENNY COMBINING MARK TOCHKA +1CF3D ZNAMENNY COMBINING MARK DVOETOCHIE +1CF3E ZNAMENNY COMBINING ATTACHING VERTICAL OMET +1CF3F ZNAMENNY COMBINING MARK CURVED OMET +1CF40 ZNAMENNY COMBINING MARK KRYZH +1CF41 ZNAMENNY COMBINING LOWER TONAL RANGE INDICATOR +@ Modifying marks for priznaki +1CF42 ZNAMENNY PRIZNAK MODIFIER LEVEL-2 +1CF43 ZNAMENNY PRIZNAK MODIFIER LEVEL-3 +1CF44 ZNAMENNY PRIZNAK MODIFIER DIRECTION FLIP +1CF45 ZNAMENNY PRIZNAK MODIFIER KRYZH +1CF46 ZNAMENNY PRIZNAK MODIFIER ROG +@ Znamenny neumes +1CF50 ZNAMENNY NEUME KRYUK +1CF51 ZNAMENNY NEUME KRYUK TIKHY +1CF52 ZNAMENNY NEUME PARAKLIT +1CF53 ZNAMENNY NEUME DVA V CHELNU +1CF54 ZNAMENNY NEUME KLYUCH + = kryuk klyuchevoy +1CF55 ZNAMENNY NEUME ZANOZHEK +1CF56 ZNAMENNY NEUME STOPITSA +1CF57 ZNAMENNY NEUME STOPITSA S OCHKOM +1CF58 ZNAMENNY NEUME PEREVODKA +1CF59 ZNAMENNY NEUME PEREVODKA NEPOSTOYANNAYA +1CF5A ZNAMENNY NEUME STOPITSA WITH SOROCHYA NOZHKA + * not a decomposable character +1CF5B ZNAMENNY NEUME CHELYUSTKA +1CF5C ZNAMENNY NEUME PALKA +1CF5D ZNAMENNY NEUME ZAPYATAYA +1CF5E ZNAMENNY NEUME GOLUBCHIK BORZY +1CF5F ZNAMENNY NEUME GOLUBCHIK TIKHY +1CF60 ZNAMENNY NEUME GOLUBCHIK MRACHNY +1CF61 ZNAMENNY NEUME GOLUBCHIK SVETLY +1CF62 ZNAMENNY NEUME GOLUBCHIK TRESVETLY + = golubchik nepostoyanny +1CF63 ZNAMENNY NEUME VRAKHIYA PROSTAYA +1CF64 ZNAMENNY NEUME VRAKHIYA MRACHNAYA +1CF65 ZNAMENNY NEUME VRAKHIYA SVETLAYA +1CF66 ZNAMENNY NEUME VRAKHIYA TRESVETLAYA + = vrakhia nepostoyannaya +1CF67 ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA PROSTAYA +1CF68 ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA MRACHNAYA +1CF69 ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA SVETLAYA +1CF6A ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA TRESVETLAYA + = vrakhia klyuchevaya nepostoyannaya +1CF6B ZNAMENNY NEUME DOUBLE ZAPYATAYA +1CF6C ZNAMENNY NEUME REVERSED CHELYUSTKA +1CF6D ZNAMENNY NEUME DERBITSA +1CF6E ZNAMENNY NEUME KHAMILO +1CF6F ZNAMENNY NEUME CHASHKA +1CF70 ZNAMENNY NEUME PODCHASHIE +1CF71 ZNAMENNY NEUME SKAMEYTSA MRACHNAYA +1CF72 ZNAMENNY NEUME SKAMEYTSA SVETLAYA +1CF73 ZNAMENNY NEUME SKAMEYTSA TRESVETLAYA +1CF74 ZNAMENNY NEUME SKAMEYTSA TIKHAYA +1CF75 ZNAMENNY NEUME DEMESTVENNY KLYUCH + = skameytsa klyuchevaya +1CF76 ZNAMENNY NEUME SKAMEYTSA KLYUCHEVAYA SVETLAYA +1CF77 ZNAMENNY NEUME SKAMEYTSA KLYUCHENEPOSTOYANNAYA +1CF78 ZNAMENNY NEUME SKAMEYTSA KLYUCHEVAYA TIKHAYA +1CF79 ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA PROSTAYA +1CF7A ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA SVETLAYA +1CF7B ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA NEPOSTOYANNAYA +1CF7C ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA KLYUCHEVAYA +1CF7D ZNAMENNY NEUME SLOZHITIE +1CF7E ZNAMENNY NEUME SLOZHITIE S ZAPYATOY +1CF7F ZNAMENNY NEUME SLOZHITIE ZAKRYTOE +1CF80 ZNAMENNY NEUME SLOZHITIE S KRYZHEM +1CF81 ZNAMENNY NEUME KRYZH +1CF82 ZNAMENNY NEUME ROG +1CF83 ZNAMENNY NEUME FITA +1CF84 ZNAMENNY NEUME KOBYLA +1CF85 ZNAMENNY NEUME ZMEYTSA + = litso +1CF86 ZNAMENNY NEUME STATYA +1CF87 ZNAMENNY NEUME STATYA S ZAPYATOY +1CF88 ZNAMENNY NEUME STATYA S KRYZHEM +1CF89 ZNAMENNY NEUME STATYA S ZAPYATOY I KRYZHEM +1CF8A ZNAMENNY NEUME STATYA S KRYZHEM I ZAPYATOY +1CF8B ZNAMENNY NEUME STATYA ZAKRYTAYA +1CF8C ZNAMENNY NEUME STATYA ZAKRYTAYA S ZAPYATOY +1CF8D ZNAMENNY NEUME STATYA S ROGOM +1CF8E ZNAMENNY NEUME STATYA S DVUMYA ZAPYATYMI +1CF8F ZNAMENNY NEUME STATYA S ZAPYATOY I PODCHASHIEM +1CF90 ZNAMENNY NEUME POLKULIZMY + * not a decomposable character +1CF91 ZNAMENNY NEUME STATYA NEPOSTOYANNAYA +1CF92 ZNAMENNY NEUME STRELA PROSTAYA +1CF93 ZNAMENNY NEUME STRELA MRACHNOTIKHAYA +1CF94 ZNAMENNY NEUME STRELA KRYZHEVAYA + = strela polukryzhevaya +1CF95 ZNAMENNY NEUME STRELA POLUPOVODNAYA +1CF96 ZNAMENNY NEUME STRELA POVODNAYA +1CF97 ZNAMENNY NEUME STRELA NEPOSTOYANNAYA +1CF98 ZNAMENNY NEUME STRELA KLYUCHEPOVODNAYA +1CF99 ZNAMENNY NEUME STRELA KLYUCHENEPOSTOYANNAYA +1CF9A ZNAMENNY NEUME STRELA TIKHAYA PUTNAYA +1CF9B ZNAMENNY NEUME STRELA DVOECHELNAYA +1CF9C ZNAMENNY NEUME STRELA DVOECHELNOKRYZHEVAYA +1CF9D ZNAMENNY NEUME STRELA DVOECHELNOPOVODNAYA +1CF9E ZNAMENNY NEUME STRELA DVOECHELNAYA KLYUCHEVAYA +1CF9F ZNAMENNY NEUME STRELA DVOECHELNOPOVODNAYA KLYUCHEVAYA +1CFA0 ZNAMENNY NEUME STRELA GROMNAYA WITH SINGLE ZAPYATAYA +1CFA1 ZNAMENNY NEUME STRELA GROMOPOVODNAYA WITH SINGLE ZAPYATAYA +1CFA2 ZNAMENNY NEUME STRELA GROMNAYA +1CFA3 ZNAMENNY NEUME STRELA GROMOPOVODNAYA +1CFA4 ZNAMENNY NEUME STRELA GROMOPOVODNAYA WITH DOUBLE ZAPYATAYA +1CFA5 ZNAMENNY NEUME STRELA GROMOKRYZHEVAYA +1CFA6 ZNAMENNY NEUME STRELA GROMOKRYZHEVAYA POVODNAYA + = strela gromomrachnaya s kryzhem +1CFA7 ZNAMENNY NEUME MECHIK +1CFA8 ZNAMENNY NEUME MECHIK POVODNY +1CFA9 ZNAMENNY NEUME MECHIK KLYUCHEVOY +1CFAA ZNAMENNY NEUME MECHIK KLYUCHEPOVODNY +1CFAB ZNAMENNY NEUME MECHIK KLYUCHENEPOSTOYANNY +1CFAC ZNAMENNY NEUME STRELA TRYASOGLASNAYA +1CFAD ZNAMENNY NEUME STRELA TRYASOPOVODNAYA +1CFAE ZNAMENNY NEUME STRELA TRYASOSTRELNAYA +1CFAF ZNAMENNY NEUME OSOKA +1CFB0 ZNAMENNY NEUME OSOKA SVETLAYA +1CFB1 ZNAMENNY NEUME OSOKA TRESVETLAYA + = osoka nepostoyannaya +1CFB2 ZNAMENNY NEUME OSOKA KRYUKOVAYA SVETLAYA +1CFB3 ZNAMENNY NEUME OSOKA KLYUCHEVAYA SVETLAYA +1CFB4 ZNAMENNY NEUME OSOKA KLYUCHEVAYA NEPOSTOYANNAYA +1CFB5 ZNAMENNY NEUME STRELA KRYUKOVAYA +1CFB6 ZNAMENNY NEUME STRELA KRYUKOVAYA POVODNAYA +1CFB7 ZNAMENNY NEUME STRELA KRYUKOVAYA GROMNAYA WITH SINGLE ZAPYATAYA +1CFB8 ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA WITH SINGLE ZAPYATAYA +1CFB9 ZNAMENNY NEUME STRELA KRYUKOVAYA GROMNAYA +1CFBA ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA +1CFBB ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA WITH DOUBLE ZAPYATAYA +1CFBC ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOKRYZHEVAYA +1CFBD ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOKRYZHEVAYA POVODNAYA + = strela kryukovaya gromomrachnaya s kryzhem +1CFBE ZNAMENNY NEUME STRELA KRYUKOVAYA TRYASKA +1CFBF ZNAMENNY NEUME KUFISMA +1CFC0 ZNAMENNY NEUME OBLAKO +1CFC1 ZNAMENNY NEUME DUDA +1CFC2 ZNAMENNY NEUME NEMKA +1CFC3 ZNAMENNY NEUME PAUK @@ 1D000 Byzantine Musical Symbols 1D0FF @@+ @ Prosodies (Prosodics) @@ -42943,6 +45285,11 @@ FFFF <not a character> 1D1E7 MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM UP @ Accidental 1D1E8 MUSICAL SYMBOL KIEVAN FLAT SIGN +@ Iranian notation +@+ The following range is specific to Iranian classical music. +@ Accidentals for quarter tones +1D1E9 MUSICAL SYMBOL SORI +1D1EA MUSICAL SYMBOL KORON @@ 1D200 Ancient Greek Musical Notation 1D24F @ Ancient Greek vocalic notation @+ In a few instances vocalic and instrumental symbols have been unified with each other. In other instances they have been unified with regular Greek letters. @@ -43111,6 +45458,28 @@ FFFF <not a character> 1D244 COMBINING GREEK MUSICAL PENTASEME x (metrical pentaseme - 23D9) 1D245 GREEK MUSICAL LEIMMA +@@ 1D2C0 Kaktovik Numerals 1D2DF +@ Numerals +1D2C0 KAKTOVIK NUMERAL ZERO +1D2C1 KAKTOVIK NUMERAL ONE +1D2C2 KAKTOVIK NUMERAL TWO +1D2C3 KAKTOVIK NUMERAL THREE +1D2C4 KAKTOVIK NUMERAL FOUR +1D2C5 KAKTOVIK NUMERAL FIVE +1D2C6 KAKTOVIK NUMERAL SIX +1D2C7 KAKTOVIK NUMERAL SEVEN +1D2C8 KAKTOVIK NUMERAL EIGHT +1D2C9 KAKTOVIK NUMERAL NINE +1D2CA KAKTOVIK NUMERAL TEN +1D2CB KAKTOVIK NUMERAL ELEVEN +1D2CC KAKTOVIK NUMERAL TWELVE +1D2CD KAKTOVIK NUMERAL THIRTEEN +1D2CE KAKTOVIK NUMERAL FOURTEEN +1D2CF KAKTOVIK NUMERAL FIFTEEN +1D2D0 KAKTOVIK NUMERAL SIXTEEN +1D2D1 KAKTOVIK NUMERAL SEVENTEEN +1D2D2 KAKTOVIK NUMERAL EIGHTEEN +1D2D3 KAKTOVIK NUMERAL NINETEEN @@ 1D2E0 Mayan Numerals 1D2FF @ Mayan numerals 1D2E0 MAYAN NUMERAL ZERO @@ -43588,57 +45957,93 @@ FFFF <not a character> @ Script symbols @+ Script symbols already encoded in the Letterlike Symbols block are omitted here to avoid duplicate encoding. Fonts that use a less elaborate style are also acceptable for many uses, as long as they can be distinguished from serifed and italic styles. 1D49C MATHEMATICAL SCRIPT CAPITAL A + ~ 1D49C FE00 chancery style + ~ 1D49C FE01 roundhand style # <font> 0041 latin capital letter a 1D49D <reserved> x (script capital b - 212C) 1D49E MATHEMATICAL SCRIPT CAPITAL C + ~ 1D49E FE00 chancery style + ~ 1D49E FE01 roundhand style # <font> 0043 latin capital letter c 1D49F MATHEMATICAL SCRIPT CAPITAL D + ~ 1D49F FE00 chancery style + ~ 1D49F FE01 roundhand style # <font> 0044 latin capital letter d 1D4A0 <reserved> x (script capital e - 2130) 1D4A1 <reserved> x (script capital f - 2131) 1D4A2 MATHEMATICAL SCRIPT CAPITAL G + ~ 1D4A2 FE00 chancery style + ~ 1D4A2 FE01 roundhand style # <font> 0047 latin capital letter g 1D4A3 <reserved> x (script capital h - 210B) 1D4A4 <reserved> x (script capital i - 2110) 1D4A5 MATHEMATICAL SCRIPT CAPITAL J + ~ 1D4A5 FE00 chancery style + ~ 1D4A5 FE01 roundhand style # <font> 004A latin capital letter j 1D4A6 MATHEMATICAL SCRIPT CAPITAL K + ~ 1D4A6 FE00 chancery style + ~ 1D4A6 FE01 roundhand style # <font> 004B latin capital letter k 1D4A7 <reserved> x (script capital l - 2112) 1D4A8 <reserved> x (script capital m - 2133) 1D4A9 MATHEMATICAL SCRIPT CAPITAL N + ~ 1D4A9 FE00 chancery style + ~ 1D4A9 FE01 roundhand style # <font> 004E latin capital letter n 1D4AA MATHEMATICAL SCRIPT CAPITAL O + ~ 1D4AA FE00 chancery style + ~ 1D4AA FE01 roundhand style # <font> 004F latin capital letter o 1D4AB MATHEMATICAL SCRIPT CAPITAL P = power set + ~ 1D4AB FE00 chancery style + ~ 1D4AB FE01 roundhand style # <font> 0050 latin capital letter p 1D4AC MATHEMATICAL SCRIPT CAPITAL Q + ~ 1D4AC FE00 chancery style + ~ 1D4AC FE01 roundhand style # <font> 0051 latin capital letter q 1D4AD <reserved> x (script capital r - 211B) 1D4AE MATHEMATICAL SCRIPT CAPITAL S + ~ 1D4AE FE00 chancery style + ~ 1D4AE FE01 roundhand style # <font> 0053 latin capital letter s 1D4AF MATHEMATICAL SCRIPT CAPITAL T + ~ 1D4AF FE00 chancery style + ~ 1D4AF FE01 roundhand style # <font> 0054 latin capital letter t 1D4B0 MATHEMATICAL SCRIPT CAPITAL U + ~ 1D4B0 FE00 chancery style + ~ 1D4B0 FE01 roundhand style # <font> 0055 latin capital letter u 1D4B1 MATHEMATICAL SCRIPT CAPITAL V + ~ 1D4B1 FE00 chancery style + ~ 1D4B1 FE01 roundhand style # <font> 0056 latin capital letter v 1D4B2 MATHEMATICAL SCRIPT CAPITAL W + ~ 1D4B2 FE00 chancery style + ~ 1D4B2 FE01 roundhand style # <font> 0057 latin capital letter w 1D4B3 MATHEMATICAL SCRIPT CAPITAL X + ~ 1D4B3 FE00 chancery style + ~ 1D4B3 FE01 roundhand style # <font> 0058 latin capital letter x 1D4B4 MATHEMATICAL SCRIPT CAPITAL Y + ~ 1D4B4 FE00 chancery style + ~ 1D4B4 FE01 roundhand style # <font> 0059 latin capital letter y 1D4B5 MATHEMATICAL SCRIPT CAPITAL Z + ~ 1D4B5 FE00 chancery style + ~ 1D4B5 FE01 roundhand style # <font> 005A latin capital letter z 1D4B6 MATHEMATICAL SCRIPT SMALL A # <font> 0061 latin small letter a @@ -45355,6 +47760,7 @@ FFFF <not a character> # <font> 0038 digit eight 1D7FF MATHEMATICAL MONOSPACE DIGIT NINE # <font> 0039 digit nine +@~ Standardized Variation Sequences @@ 1D800 Sutton SignWriting 1DAAF @ Hand shapes with index finger 1D800 SIGNWRITING HAND-FIST INDEX @@ -46050,6 +48456,59 @@ FFFF <not a character> 1DAAD SIGNWRITING ROTATION MODIFIER-14 1DAAE SIGNWRITING ROTATION MODIFIER-15 1DAAF SIGNWRITING ROTATION MODIFIER-16 +@@ 1DF00 Latin Extended-G 1DFFF +@ Extended IPA for disordered speech +1DF00 LATIN SMALL LETTER FENG DIGRAPH WITH TRILL + x (latin small letter feng digraph - 02A9) +1DF01 LATIN SMALL LETTER REVERSED SCRIPT G +1DF02 LATIN LETTER SMALL CAPITAL TURNED G + x (latin small letter turned g - 1D77) +1DF03 LATIN SMALL LETTER REVERSED K +1DF04 LATIN LETTER SMALL CAPITAL L WITH BELT + x (latin capital letter l with belt - A7AD) +1DF05 LATIN SMALL LETTER LEZH WITH RETROFLEX HOOK +1DF06 LATIN SMALL LETTER TURNED Y WITH BELT +1DF07 LATIN SMALL LETTER REVERSED ENG +@ IPA extensions +1DF08 LATIN SMALL LETTER TURNED R WITH LONG LEG AND RETROFLEX HOOK +1DF09 LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK + x (latin small letter t with hook - 01AD) +1DF0A LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK +@ Clicks +1DF0B LATIN SMALL LETTER ESH WITH DOUBLE BAR + x (integral with double stroke - 2A0E) +1DF0C LATIN SMALL LETTER ESH WITH DOUBLE BAR AND CURL +1DF0D LATIN SMALL LETTER TURNED T WITH CURL +1DF0E LATIN LETTER INVERTED GLOTTAL STOP WITH CURL +1DF0F LATIN LETTER STRETCHED C WITH CURL +1DF10 LATIN LETTER SMALL CAPITAL TURNED K + x (latin small letter turned k - 029E) + x (latin capital letter turned k - A7B0) +@ Lateral +1DF11 LATIN SMALL LETTER L WITH FISHHOOK +@ Letters with palatal hooks +1DF12 LATIN SMALL LETTER DEZH DIGRAPH WITH PALATAL HOOK +1DF13 LATIN SMALL LETTER L WITH BELT AND PALATAL HOOK +1DF14 LATIN SMALL LETTER ENG WITH PALATAL HOOK +1DF15 LATIN SMALL LETTER TURNED R WITH PALATAL HOOK +1DF16 LATIN SMALL LETTER R WITH FISHHOOK AND PALATAL HOOK +1DF17 LATIN SMALL LETTER TESH DIGRAPH WITH PALATAL HOOK +1DF18 LATIN SMALL LETTER EZH WITH PALATAL HOOK +@ Letters with retroflex hooks +1DF19 LATIN SMALL LETTER DEZH DIGRAPH WITH RETROFLEX HOOK +1DF1A LATIN SMALL LETTER I WITH STROKE AND RETROFLEX HOOK +1DF1B LATIN SMALL LETTER O WITH RETROFLEX HOOK +1DF1C LATIN SMALL LETTER TESH DIGRAPH WITH RETROFLEX HOOK +1DF1D LATIN SMALL LETTER C WITH RETROFLEX HOOK +@ IPA extension +1DF1E LATIN SMALL LETTER S WITH CURL +@ Letters for Malayalam transliteration +1DF25 LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK +1DF26 LATIN SMALL LETTER L WITH MID-HEIGHT LEFT HOOK +1DF27 LATIN SMALL LETTER N WITH MID-HEIGHT LEFT HOOK +1DF28 LATIN SMALL LETTER R WITH MID-HEIGHT LEFT HOOK +1DF29 LATIN SMALL LETTER S WITH MID-HEIGHT LEFT HOOK +1DF2A LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK @@ 1E000 Glagolitic Supplement 1E02F @ Combining letters 1E000 COMBINING GLAGOLITIC LETTER AZU @@ -46090,6 +48549,140 @@ FFFF <not a character> 1E028 COMBINING GLAGOLITIC LETTER BIG YUS 1E029 COMBINING GLAGOLITIC LETTER IOTATED BIG YUS 1E02A COMBINING GLAGOLITIC LETTER FITA +@@ 1E030 Cyrillic Extended-D 1E08F +@+ These are phonetic extensions, used in a manner analogous to IPA. Additional Cyrillic modifier letters are found in other blocks. + x (modifier letter cyrillic en - 1D78) + x (modifier letter cyrillic hard sign - A69C) + x (modifier letter cyrillic soft sign - A69D) +@ Superscript modifier letters +1E030 MODIFIER LETTER CYRILLIC SMALL A + # <super> 0430 +1E031 MODIFIER LETTER CYRILLIC SMALL BE + # <super> 0431 +1E032 MODIFIER LETTER CYRILLIC SMALL VE + # <super> 0432 +1E033 MODIFIER LETTER CYRILLIC SMALL GHE + # <super> 0433 +1E034 MODIFIER LETTER CYRILLIC SMALL DE + # <super> 0434 +1E035 MODIFIER LETTER CYRILLIC SMALL IE + # <super> 0435 +1E036 MODIFIER LETTER CYRILLIC SMALL ZHE + # <super> 0436 +1E037 MODIFIER LETTER CYRILLIC SMALL ZE + # <super> 0437 +1E038 MODIFIER LETTER CYRILLIC SMALL I + # <super> 0438 +1E039 MODIFIER LETTER CYRILLIC SMALL KA + # <super> 043A +1E03A MODIFIER LETTER CYRILLIC SMALL EL + # <super> 043B +1E03B MODIFIER LETTER CYRILLIC SMALL EM + # <super> 043C +1E03C MODIFIER LETTER CYRILLIC SMALL O + # <super> 043E +1E03D MODIFIER LETTER CYRILLIC SMALL PE + # <super> 043F +1E03E MODIFIER LETTER CYRILLIC SMALL ER + # <super> 0440 +1E03F MODIFIER LETTER CYRILLIC SMALL ES + # <super> 0441 +1E040 MODIFIER LETTER CYRILLIC SMALL TE + # <super> 0442 +1E041 MODIFIER LETTER CYRILLIC SMALL U + # <super> 0443 +1E042 MODIFIER LETTER CYRILLIC SMALL EF + # <super> 0444 +1E043 MODIFIER LETTER CYRILLIC SMALL HA + # <super> 0445 +1E044 MODIFIER LETTER CYRILLIC SMALL TSE + # <super> 0446 +1E045 MODIFIER LETTER CYRILLIC SMALL CHE + # <super> 0447 +1E046 MODIFIER LETTER CYRILLIC SMALL SHA + # <super> 0448 +1E047 MODIFIER LETTER CYRILLIC SMALL YERU + # <super> 044B +1E048 MODIFIER LETTER CYRILLIC SMALL E + # <super> 044D +1E049 MODIFIER LETTER CYRILLIC SMALL YU + # <super> 044E +1E04A MODIFIER LETTER CYRILLIC SMALL DZZE + # <super> A689 +1E04B MODIFIER LETTER CYRILLIC SMALL SCHWA + # <super> 04D9 +1E04C MODIFIER LETTER CYRILLIC SMALL BYELORUSSIAN-UKRAINIAN I + # <super> 0456 +1E04D MODIFIER LETTER CYRILLIC SMALL JE + # <super> 0458 +1E04E MODIFIER LETTER CYRILLIC SMALL BARRED O + # <super> 04E9 +1E04F MODIFIER LETTER CYRILLIC SMALL STRAIGHT U + # <super> 04AF +1E050 MODIFIER LETTER CYRILLIC SMALL PALOCHKA + # <super> 04CF +@ Subscript modifier letters +1E051 CYRILLIC SUBSCRIPT SMALL LETTER A + # <sub> 0430 +1E052 CYRILLIC SUBSCRIPT SMALL LETTER BE + # <sub> 0431 +1E053 CYRILLIC SUBSCRIPT SMALL LETTER VE + # <sub> 0432 +1E054 CYRILLIC SUBSCRIPT SMALL LETTER GHE + # <sub> 0433 +1E055 CYRILLIC SUBSCRIPT SMALL LETTER DE + # <sub> 0434 +1E056 CYRILLIC SUBSCRIPT SMALL LETTER IE + # <sub> 0435 +1E057 CYRILLIC SUBSCRIPT SMALL LETTER ZHE + # <sub> 0436 +1E058 CYRILLIC SUBSCRIPT SMALL LETTER ZE + # <sub> 0437 +1E059 CYRILLIC SUBSCRIPT SMALL LETTER I + # <sub> 0438 +1E05A CYRILLIC SUBSCRIPT SMALL LETTER KA + # <sub> 043A +1E05B CYRILLIC SUBSCRIPT SMALL LETTER EL + # <sub> 043B +1E05C CYRILLIC SUBSCRIPT SMALL LETTER O + # <sub> 043E +1E05D CYRILLIC SUBSCRIPT SMALL LETTER PE + # <sub> 043F +1E05E CYRILLIC SUBSCRIPT SMALL LETTER ES + # <sub> 0441 +1E05F CYRILLIC SUBSCRIPT SMALL LETTER U + # <sub> 0443 +1E060 CYRILLIC SUBSCRIPT SMALL LETTER EF + # <sub> 0444 +1E061 CYRILLIC SUBSCRIPT SMALL LETTER HA + # <sub> 0445 +1E062 CYRILLIC SUBSCRIPT SMALL LETTER TSE + # <sub> 0446 +1E063 CYRILLIC SUBSCRIPT SMALL LETTER CHE + # <sub> 0447 +1E064 CYRILLIC SUBSCRIPT SMALL LETTER SHA + # <sub> 0448 +1E065 CYRILLIC SUBSCRIPT SMALL LETTER HARD SIGN + # <sub> 044A +1E066 CYRILLIC SUBSCRIPT SMALL LETTER YERU + # <sub> 044B +1E067 CYRILLIC SUBSCRIPT SMALL LETTER GHE WITH UPTURN + # <sub> 0491 +1E068 CYRILLIC SUBSCRIPT SMALL LETTER BYELORUSSIAN-UKRAINIAN I + # <sub> 0456 +1E069 CYRILLIC SUBSCRIPT SMALL LETTER DZE + # <sub> 0455 +1E06A CYRILLIC SUBSCRIPT SMALL LETTER DZHE + # <sub> 045F +@ Superscript modifier letters +1E06B MODIFIER LETTER CYRILLIC SMALL ES WITH DESCENDER + # <super> 04AB +1E06C MODIFIER LETTER CYRILLIC SMALL YERU WITH BACK YER + # <super> A651 +1E06D MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE + # <super> 04B1 +@ Diacritical mark +1E08F COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I @@ 1E100 Nyiakeng Puachue Hmong 1E14F @+ The Nyiakeng Puachue Hmong script (Nyiaj Keeb Puaj Txwm in RPA orthography) is also known as Pa Dao (Paj Ntaub) and Chervang script (Txawj Vaag). @ Consonant onsets @@ -46207,6 +48800,41 @@ FFFF <not a character> 1E14F NYIAKENG PUACHUE HMONG CIRCLED CA * used to indicate ownership x (nyiakeng puachue hmong letter ca - 1E108) +@@ 1E290 Toto 1E2BF +@ Basic consonants +1E290 TOTO LETTER PA +1E291 TOTO LETTER BA +1E292 TOTO LETTER TA +1E293 TOTO LETTER DA +1E294 TOTO LETTER KA +1E295 TOTO LETTER GA +1E296 TOTO LETTER MA +1E297 TOTO LETTER NA +1E298 TOTO LETTER NGA +1E299 TOTO LETTER SA +1E29A TOTO LETTER CHA +1E29B TOTO LETTER YA +1E29C TOTO LETTER WA +1E29D TOTO LETTER JA +1E29E TOTO LETTER HA +1E29F TOTO LETTER RA +1E2A0 TOTO LETTER LA +@ Basic vowels +1E2A1 TOTO LETTER I +1E2A2 TOTO LETTER BREATHY I +1E2A3 TOTO LETTER IU +1E2A4 TOTO LETTER BREATHY IU +1E2A5 TOTO LETTER U +1E2A6 TOTO LETTER E +1E2A7 TOTO LETTER BREATHY E +1E2A8 TOTO LETTER EO +1E2A9 TOTO LETTER BREATHY EO +1E2AA TOTO LETTER O +1E2AB TOTO LETTER AE +1E2AC TOTO LETTER BREATHY AE +1E2AD TOTO LETTER A +@ Sign +1E2AE TOTO SIGN RISING TONE @@ 1E2C0 Wancho 1E2FF @ Letters 1E2C0 WANCHO LETTER AA @@ -46273,6 +48901,116 @@ FFFF <not a character> 1E2FF WANCHO NGUN SIGN = rupee x (indian rupee sign - 20B9) +@@ 1E4D0 Nag Mundari 1E4FF +@ Letters +1E4D0 NAG MUNDARI LETTER O +1E4D1 NAG MUNDARI LETTER OP +1E4D2 NAG MUNDARI LETTER OL +1E4D3 NAG MUNDARI LETTER OY +1E4D4 NAG MUNDARI LETTER ONG +1E4D5 NAG MUNDARI LETTER A +1E4D6 NAG MUNDARI LETTER AJ +1E4D7 NAG MUNDARI LETTER AB +1E4D8 NAG MUNDARI LETTER ANY +1E4D9 NAG MUNDARI LETTER AH +1E4DA NAG MUNDARI LETTER I +1E4DB NAG MUNDARI LETTER IS +1E4DC NAG MUNDARI LETTER IDD +1E4DD NAG MUNDARI LETTER IT +1E4DE NAG MUNDARI LETTER IH +1E4DF NAG MUNDARI LETTER U +1E4E0 NAG MUNDARI LETTER UC +1E4E1 NAG MUNDARI LETTER UD +1E4E2 NAG MUNDARI LETTER UK +1E4E3 NAG MUNDARI LETTER UR +1E4E4 NAG MUNDARI LETTER E +1E4E5 NAG MUNDARI LETTER ENN +1E4E6 NAG MUNDARI LETTER EG +1E4E7 NAG MUNDARI LETTER EM +1E4E8 NAG MUNDARI LETTER EN +1E4E9 NAG MUNDARI LETTER ETT +1E4EA NAG MUNDARI LETTER ELL +@ Various signs +1E4EB NAG MUNDARI SIGN OJOD + * precedes modified letters such as AB or UD + * may indicate consonant gemination +1E4EC NAG MUNDARI SIGN MUHOR + * vowel nasalization +1E4ED NAG MUNDARI SIGN TOYOR + * indicates a long vowel +1E4EE NAG MUNDARI SIGN IKIR + * vowel preceded by the 'w' sound +1E4EF NAG MUNDARI SIGN SUTUH + * mostly used for close transliteration of other languages +@ Digits +1E4F0 NAG MUNDARI DIGIT ZERO +1E4F1 NAG MUNDARI DIGIT ONE +1E4F2 NAG MUNDARI DIGIT TWO +1E4F3 NAG MUNDARI DIGIT THREE +1E4F4 NAG MUNDARI DIGIT FOUR +1E4F5 NAG MUNDARI DIGIT FIVE +1E4F6 NAG MUNDARI DIGIT SIX +1E4F7 NAG MUNDARI DIGIT SEVEN +1E4F8 NAG MUNDARI DIGIT EIGHT +1E4F9 NAG MUNDARI DIGIT NINE +@@ 1E7E0 Ethiopic Extended-B 1E7FF +@ Syllables for Gurage +1E7E0 ETHIOPIC SYLLABLE HHYA + x (ethiopic syllable xya - 2DD0) +1E7E1 ETHIOPIC SYLLABLE HHYU + x (ethiopic syllable xyu - 2DD1) +1E7E2 ETHIOPIC SYLLABLE HHYI + x (ethiopic syllable xyi - 2DD2) +1E7E3 ETHIOPIC SYLLABLE HHYAA + x (ethiopic syllable xyaa - 2DD3) +1E7E4 ETHIOPIC SYLLABLE HHYEE + x (ethiopic syllable xyee - 2DD4) +1E7E5 ETHIOPIC SYLLABLE HHYE + x (ethiopic syllable xye - 2DD5) +1E7E6 ETHIOPIC SYLLABLE HHYO + x (ethiopic syllable xyo - 2DD6) +1E7E8 ETHIOPIC SYLLABLE GURAGE HHWA + x (ethiopic syllable kxwa - 12C0) +1E7E9 ETHIOPIC SYLLABLE HHWI + x (ethiopic syllable kxwi - 12C2) +1E7EA ETHIOPIC SYLLABLE HHWEE + x (ethiopic syllable kxwee - 12C4) +1E7EB ETHIOPIC SYLLABLE HHWE + x (ethiopic syllable kxwe - 12C5) +1E7ED ETHIOPIC SYLLABLE GURAGE MWI + x (ethiopic syllable mwi - 1381) +1E7EE ETHIOPIC SYLLABLE GURAGE MWEE + x (ethiopic syllable mwee - 1382) +1E7F0 ETHIOPIC SYLLABLE GURAGE QWI + x (ethiopic syllable qwi - 124A) +1E7F1 ETHIOPIC SYLLABLE GURAGE QWEE + x (ethiopic syllable qwee - 124C) +1E7F2 ETHIOPIC SYLLABLE GURAGE QWE + x (ethiopic syllable qwe - 124D) +1E7F3 ETHIOPIC SYLLABLE GURAGE BWI + x (ethiopic syllable bwi - 1385) +1E7F4 ETHIOPIC SYLLABLE GURAGE BWEE + x (ethiopic syllable bwee - 1386) +1E7F5 ETHIOPIC SYLLABLE GURAGE KWI + x (ethiopic syllable kwi - 12B2) +1E7F6 ETHIOPIC SYLLABLE GURAGE KWEE + x (ethiopic syllable kwee - 12B4) +1E7F7 ETHIOPIC SYLLABLE GURAGE KWE + x (ethiopic syllable kwe - 12B5) +1E7F8 ETHIOPIC SYLLABLE GURAGE GWI + x (ethiopic syllable gwi - 1312) +1E7F9 ETHIOPIC SYLLABLE GURAGE GWEE + x (ethiopic syllable gwee - 1314) +1E7FA ETHIOPIC SYLLABLE GURAGE GWE + x (ethiopic syllable gwe - 1315) +1E7FB ETHIOPIC SYLLABLE GURAGE FWI + x (ethiopic syllable fwi - 1389) +1E7FC ETHIOPIC SYLLABLE GURAGE FWEE + x (ethiopic syllable fwee - 138A) +1E7FD ETHIOPIC SYLLABLE GURAGE PWI + x (ethiopic syllable pwi - 138D) +1E7FE ETHIOPIC SYLLABLE GURAGE PWEE + x (ethiopic syllable pwee - 138E) @@ 1E800 Mende Kikakui 1E8DF @+ Annotations refer to the syllabaries of Amara Mansaray and David Dalby. @ Syllables in k- @@ -48671,9 +51409,11 @@ FFFF <not a character> 1F448 WHITE LEFT POINTING BACKHAND INDEX x (white left pointing index - 261C) x (black left pointing backhand index - 1F59C) + x (leftwards hand - 1FAF2) 1F449 WHITE RIGHT POINTING BACKHAND INDEX x (white right pointing index - 261E) x (black right pointing backhand index - 1F59D) + x (rightwards hand - 1FAF1) 1F44A FISTED HAND SIGN = punch x (raised fist - 270A) @@ -48745,6 +51485,7 @@ FFFF <not a character> @ Fairy tale symbols 1F478 PRINCESS x (prince - 1F934) + x (person with crown - 1FAC5) 1F479 JAPANESE OGRE 1F47A JAPANESE GOBLIN 1F47B GHOST @@ -48803,6 +51544,7 @@ FFFF <not a character> x (heavy black heart - 2764) x (white heart - 1F90D) x (orange heart - 1F9E1) + x (light blue heart - 1FA75) 1F49A GREEN HEART 1F49B YELLOW HEART 1F49C PURPLE HEART @@ -48826,6 +51568,7 @@ FFFF <not a character> 1F4A7 DROPLET * represents a drop of sweat or drop of water x (black droplet - 1F322) + x (drop of blood - 1FA78) 1F4A8 DASH SYMBOL = running dash, briffits 1F4A9 PILE OF POO @@ -49005,6 +51748,7 @@ FFFF <not a character> 1F50A SPEAKER WITH THREE SOUND WAVES = sound 1F50B BATTERY + x (low battery - 1FAAB) 1F50C ELECTRIC PLUG 1F50D LEFT-POINTING MAGNIFYING GLASS = search @@ -49422,6 +52166,7 @@ FFFF <not a character> = rated for sex = kiss x (kiss mark - 1F48B) + x (biting lip - 1FAE6) 1F5E3 SPEAKING HEAD IN SILHOUETTE = rated for strong language @ Sound symbols @@ -49810,6 +52555,10 @@ FFFF <not a character> 1F6D6 HUT 1F6D7 ELEVATOR @ Miscellaneous symbols +1F6DC WIRELESS +1F6DD PLAYGROUND SLIDE +1F6DE WHEEL +1F6DF RING BUOY 1F6E0 HAMMER AND WRENCH = tools, repair facility x (hammer and pick - 2692) @@ -49941,8 +52690,9 @@ FFFF <not a character> x (alchemical symbol for sal-ammoniac - 1F739) 1F728 ALCHEMICAL SYMBOL FOR VERDIGRIS = aes viride, copper subacetate - = early astronomical symbol for earth + = astronomical symbol for earth x (circled plus - 2295) + x (earth - 2641) @ Symbols for tin and lead ore 1F729 ALCHEMICAL SYMBOL FOR TIN ORE x (jupiter - 2643) @@ -50081,10 +52831,27 @@ FFFF <not a character> @ Measures 1F772 ALCHEMICAL SYMBOL FOR HALF DRAM = drachma semis + * handwritten ligature of 0292 + 00DF, typically spelled out as ʒss x (latin small letter ezh - 0292) 1F773 ALCHEMICAL SYMBOL FOR HALF OUNCE = uncia semis + * handwritten ligature of 2125 + 00DF, typically spelled out as 2125 ss x (ounce sign - 2125) +@ Other symbol +1F774 LOT OF FORTUNE + = pars fortunae + x (circled times - 2297) +@ Eclipse symbols +1F775 OCCULTATION + x (conjunction - 260C) +1F776 LUNAR ECLIPSE + x (opposition - 260D) +@ Symbols for dwarf planets +1F77B HAUMEA +1F77C MAKEMAKE +1F77D GONGGONG +1F77E QUAOAR +1F77F ORCUS @@ 1F780 Geometric Shapes Extended 1F7FF @+ These geometric shapes originate from the Webdings/Wingdings collections. @ Isosceles right triangles @@ -50238,6 +53005,9 @@ FFFF <not a character> 1F7D6 NEGATIVE CIRCLED TRIANGLE 1F7D7 CIRCLED SQUARE 1F7D8 NEGATIVE CIRCLED SQUARE +@ Nine pointed star +1F7D9 NINE POINTED WHITE STAR + * commonly used by members of the Bahá'í faith @ Colored circles @+ For use with emoji. Constitute a set as follows: 26AA, 26AB, 1F534, 1F535, 1F7E0-1F7E4 1F7E0 LARGE ORANGE CIRCLE @@ -50254,6 +53024,14 @@ FFFF <not a character> 1F7E9 LARGE GREEN SQUARE 1F7EA LARGE PURPLE SQUARE 1F7EB LARGE BROWN SQUARE +@ Miscellaneous symbol +1F7F0 HEAVY EQUALS SIGN + * symbol of equality + x (equals sign - 003D) + x (heavy multiplication x - 2716) + x (heavy plus sign - 2795) + x (geta mark - 3013) + x (roman sextans sign - 10190) @@ 1F800 Supplemental Arrows-C 1F8FF @ Arrows with triangle arrowheads 1F800 LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD @@ -50457,7 +53235,7 @@ FFFF <not a character> @ Hand symbol 1F90C PINCHED FINGERS @ Colored heart symbols -@+ For use with emoji. Constitute a set as follows: 2764, 1F499-1F49C, 1F5A4, 1F90D, 1F90E, and 1F9E1. +@+ For use with emoji. Constitute a set as follows: 2764, 1F499-1F49C, 1F5A4, 1F90D, 1F90E, 1F9E1, and 1FA75-1FA77. 1F90D WHITE HEART 1F90E BROWN HEART @ Hand symbol @@ -50477,9 +53255,12 @@ FFFF <not a character> 1F919 CALL ME HAND 1F91A RAISED BACK OF HAND 1F91B LEFT-FACING FIST + x (leftwards hand - 1FAF2) 1F91C RIGHT-FACING FIST + x (rightwards hand - 1FAF1) 1F91D HANDSHAKE 1F91E HAND WITH INDEX AND MIDDLE FINGERS CROSSED + x (hand with index finger and thumb crossed - 1FAF0) 1F91F I LOVE YOU HAND SIGN * can be abbreviated ILY @ Emoticon faces @@ -50504,6 +53285,7 @@ FFFF <not a character> 1F92F SHOCKED FACE WITH EXPLODING HEAD @ Portrait and role symbols 1F930 PREGNANT WOMAN + x (pregnant person - 1FAC4) 1F931 BREAST-FEEDING 1F932 PALMS UP TOGETHER * used for prayer in some cultures @@ -50581,6 +53363,7 @@ FFFF <not a character> = chicken egg 1F95B GLASS OF MILK = milk + x (pouring liquid - 1FAD7) 1F95C PEANUTS 1F95D KIWIFRUIT 1F95E PANCAKES @@ -50622,6 +53405,7 @@ FFFF <not a character> 1F976 FREEZING FACE 1F977 NINJA 1F978 DISGUISED FACE +1F979 FACE HOLDING BACK TEARS 1F97A FACE WITH PLEADING EYES @ Clothing 1F97B SARI @@ -50724,6 +53508,8 @@ FFFF <not a character> 1F9C9 MATE DRINK 1F9CA ICE CUBE 1F9CB BUBBLE TEA +@ Fantasy being +1F9CC TROLL @ Portrait and accessibility symbols 1F9CD STANDING PERSON 1F9CE KNEELING PERSON @@ -50968,10 +53754,19 @@ FFFF <not a character> 1FA72 BRIEFS 1FA73 SHORTS 1FA74 THONG SANDAL + = flip flop +@ Colored heart symbols +@+ For use with emoji. Constitute a set as follows: 2764, 1F499-1F49C, 1F5A4, 1F90D, 1F90E, 1F9E1, and 1FA75-1FA77. +1FA75 LIGHT BLUE HEART +1FA76 GREY HEART +1FA77 PINK HEART @ Medical symbols 1FA78 DROP OF BLOOD + x (droplet - 1F4A7) 1FA79 ADHESIVE BANDAGE 1FA7A STETHOSCOPE +1FA7B X-RAY +1FA7C CRUTCH @ Toys and sport symbols 1FA80 YO-YO 1FA81 KITE @@ -50980,6 +53775,9 @@ FFFF <not a character> 1FA84 MAGIC WAND 1FA85 PINATA 1FA86 NESTING DOLLS +@ Musical instruments +1FA87 MARACAS +1FA88 FLUTE @ Miscellaneous objects 1FA90 RINGED PLANET 1FA91 CHAIR @@ -51006,6 +53804,17 @@ FFFF <not a character> 1FAA6 HEADSTONE 1FAA7 PLACARD 1FAA8 ROCK +1FAA9 MIRROR BALL +1FAAA IDENTIFICATION CARD + = ID +1FAAB LOW BATTERY + x (battery - 1F50B) +1FAAC HAMSA +1FAAD FOLDING HAND FAN +1FAAE HAIR PICK +@ Religious symbol +1FAAF KHANDA + x (adi shakti - 262C) @ Animals and nature 1FAB0 FLY 1FAB1 WORM @@ -51014,11 +53823,27 @@ FFFF <not a character> 1FAB4 POTTED PLANT 1FAB5 WOOD 1FAB6 FEATHER +1FAB7 LOTUS +1FAB8 CORAL +1FAB9 EMPTY NEST +1FABA NEST WITH EGGS +1FABB HYACINTH +1FABC JELLYFISH +1FABD WING +1FABF GOOSE @ Body parts 1FAC0 ANATOMICAL HEART 1FAC1 LUNGS @ People 1FAC2 PEOPLE HUGGING +1FAC3 PREGNANT MAN +1FAC4 PREGNANT PERSON + x (pregnant woman - 1F930) +1FAC5 PERSON WITH CROWN + x (princess - 1F478) +@ Animals and nature +1FACE MOOSE +1FACF DONKEY @ Food and drink 1FAD0 BLUEBERRIES 1FAD1 BELL PEPPER @@ -51027,6 +53852,36 @@ FFFF <not a character> 1FAD4 TAMALE 1FAD5 FONDUE 1FAD6 TEAPOT +1FAD7 POURING LIQUID + x (glass of milk - 1F95B) +1FAD8 BEANS +1FAD9 JAR +1FADA GINGER ROOT +1FADB PEA POD +@ Faces +1FAE0 MELTING FACE +1FAE1 SALUTING FACE +1FAE2 FACE WITH OPEN EYES AND HAND OVER MOUTH +1FAE3 FACE WITH PEEKING EYE +1FAE4 FACE WITH DIAGONAL MOUTH +1FAE5 DOTTED LINE FACE +@ Emotion +1FAE6 BITING LIP + x (lips - 1F5E2) +1FAE7 BUBBLES +@ Face +1FAE8 SHAKING FACE +@ Hand symbols +1FAF0 HAND WITH INDEX FINGER AND THUMB CROSSED + x (hand with index and middle fingers crossed - 1F91E) +1FAF1 RIGHTWARDS HAND +1FAF2 LEFTWARDS HAND +1FAF3 PALM DOWN HAND +1FAF4 PALM UP HAND +1FAF5 INDEX POINTING AT THE VIEWER +1FAF6 HEART HANDS +1FAF7 LEFTWARDS PUSHING HAND +1FAF8 RIGHTWARDS PUSHING HAND @@ 1FB00 Symbols for Legacy Computing 1FBFF @ Block mosaic terminal graphic characters @+ The term "sextant" refers to block mosaics divided into six parts. @@ -51342,13 +54197,14 @@ FFFF <not a character> @+ These codes are intended for process-internal uses. 1FFFE <not a character> 1FFFF <not a character> -@@ 20000 CJK Unified Ideographs Extension B 2A6DD -@@ 2A700 CJK Unified Ideographs Extension C 2B734 +@@ 20000 CJK Unified Ideographs Extension B 2A6DF +@@ 2A700 CJK Unified Ideographs Extension C 2B739 @@ 2B740 CJK Unified Ideographs Extension D 2B81D @@ 2B820 CJK Unified Ideographs Extension E 2CEA1 @@ 2CEB0 CJK Unified Ideographs Extension F 2EBE0 +@@ 2EBF0 CJK Unified Ideographs Extension I 2EE5D @@ 2F800 CJK Compatibility Ideographs Supplement 2FA1F -@ Duplicate characters from CNS 11643-1992 +@ Duplicate characters from CNS 11643-1992 2F800 CJK COMPATIBILITY IDEOGRAPH-2F800 : 4E3D 2F801 CJK COMPATIBILITY IDEOGRAPH-2F801 @@ -51440,6 +54296,7 @@ FFFF <not a character> 2F82B CJK COMPATIBILITY IDEOGRAPH-2F82B : 5317 2F82C CJK COMPATIBILITY IDEOGRAPH-2F82C + x 20984 : 5349 2F82D CJK COMPATIBILITY IDEOGRAPH-2F82D : 5351 @@ -51470,6 +54327,7 @@ FFFF <not a character> 2F83A CJK COMPATIBILITY IDEOGRAPH-2F83A : 53F1 2F83B CJK COMPATIBILITY IDEOGRAPH-2F83B + x 4DB8 : 5406 2F83C CJK COMPATIBILITY IDEOGRAPH-2F83C : 549E @@ -51546,6 +54404,7 @@ FFFF <not a character> 2F85F CJK COMPATIBILITY IDEOGRAPH-2F85F : 5962 2F860 CJK COMPATIBILITY IDEOGRAPH-2F860 + x 216A7 : 216A8 2F861 CJK COMPATIBILITY IDEOGRAPH-2F861 : 216EA @@ -51586,6 +54445,7 @@ FFFF <not a character> 2F873 CJK COMPATIBILITY IDEOGRAPH-2F873 : 5C06 2F874 CJK COMPATIBILITY IDEOGRAPH-2F874 + x 22450 : 5F53 2F875 CJK COMPATIBILITY IDEOGRAPH-2F875 : 5C22 @@ -51594,6 +54454,7 @@ FFFF <not a character> 2F877 CJK COMPATIBILITY IDEOGRAPH-2F877 : 5C60 2F878 CJK COMPATIBILITY IDEOGRAPH-2F878 + x 4DB9 : 5C6E 2F879 CJK COMPATIBILITY IDEOGRAPH-2F879 : 5CC0 @@ -51835,6 +54696,7 @@ FFFF <not a character> 2F8EF CJK COMPATIBILITY IDEOGRAPH-2F8EF : 6B21 2F8F0 CJK COMPATIBILITY IDEOGRAPH-2F8F0 + x 4DBE : 238A7 2F8F1 CJK COMPATIBILITY IDEOGRAPH-2F8F1 : 6B54 @@ -51861,6 +54723,7 @@ FFFF <not a character> 2F8FC CJK COMPATIBILITY IDEOGRAPH-2F8FC : 6CBF 2F8FD CJK COMPATIBILITY IDEOGRAPH-2F8FD + x 2DC09 : 6CCD 2F8FE CJK COMPATIBILITY IDEOGRAPH-2F8FE : 6C67 @@ -51877,6 +54740,7 @@ FFFF <not a character> 2F904 CJK COMPATIBILITY IDEOGRAPH-2F904 : 6D78 2F905 CJK COMPATIBILITY IDEOGRAPH-2F905 + x 23D40 : 6D85 2F906 CJK COMPATIBILITY IDEOGRAPH-2F906 : 23D1E @@ -51895,6 +54759,7 @@ FFFF <not a character> 2F90D CJK COMPATIBILITY IDEOGRAPH-2F90D : 23ED1 2F90E CJK COMPATIBILITY IDEOGRAPH-2F90E + x 23F1C : 6DF9 2F90F CJK COMPATIBILITY IDEOGRAPH-2F90F : 6F6E @@ -51923,6 +54788,7 @@ FFFF <not a character> 2F91B CJK COMPATIBILITY IDEOGRAPH-2F91B : 20525 2F91C CJK COMPATIBILITY IDEOGRAPH-2F91C + x 242B3 : 7145 2F91D CJK COMPATIBILITY IDEOGRAPH-2F91D : 24263 @@ -51945,6 +54811,7 @@ FFFF <not a character> 2F926 CJK COMPATIBILITY IDEOGRAPH-2F926 : 24735 2F927 CJK COMPATIBILITY IDEOGRAPH-2F927 + x 2AEC5 : 24814 2F928 CJK COMPATIBILITY IDEOGRAPH-2F928 : 737A @@ -52001,6 +54868,7 @@ FFFF <not a character> 2F942 CJK COMPATIBILITY IDEOGRAPH-2F942 : 250F2 2F943 CJK COMPATIBILITY IDEOGRAPH-2F943 + x 2511A : 25119 2F944 CJK COMPATIBILITY IDEOGRAPH-2F944 : 25133 @@ -52017,6 +54885,7 @@ FFFF <not a character> 2F94A CJK COMPATIBILITY IDEOGRAPH-2F94A : 778B 2F94B CJK COMPATIBILITY IDEOGRAPH-2F94B + x 25271 : 4046 2F94C CJK COMPATIBILITY IDEOGRAPH-2F94C : 4096 @@ -52451,6 +55320,7 @@ FFFF <not a character> 2FFFE <not a character> 2FFFF <not a character> @@ 30000 CJK Unified Ideographs Extension G 3134A +@@ 31350 CJK Unified Ideographs Extension H 323AF @@ 3FF80 Unassigned 3FFFF @ Noncharacters @+ These codes are intended for process-internal uses. diff --git a/source/x/ibus/ibus-autostart b/source/x/ibus/ibus-autostart index 4f274335a..c6b473ea7 100644 --- a/source/x/ibus/ibus-autostart +++ b/source/x/ibus/ibus-autostart @@ -20,7 +20,7 @@ fi if [ "$START" = "yes" ]; then if [ "$1" = "--plasma" ]; then - ibus-daemon -drx --panel=/usr/libLIBDIRSUFFIX/kimpanel-ibus-panel + ibus-daemon -drx --panel=/usr/libLIBDIRSUFFIX/libexec/kimpanel-ibus-panel else ibus-daemon -drx fi diff --git a/source/x/ibus/ibus.SlackBuild b/source/x/ibus/ibus.SlackBuild index 77457f354..f63aa805b 100755 --- a/source/x/ibus/ibus.SlackBuild +++ b/source/x/ibus/ibus.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for ibus - # Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2017, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2020, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ibus VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -103,6 +101,13 @@ fi # fix libdir sed -i "s|/lib/python|/lib$LIBDIRSUFFIX/python|g" ./configure +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -112,12 +117,29 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-python-library \ --with-python=python3 \ + --disable-python2 \ --with-unicode-emoji-dir=$TMP/ibus-$VERSION \ --with-ucd-dir=$TMP/ibus-$VERSION \ + --disable-systemd-services \ + --enable-gtk-doc \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 +make install DESTDIR=$PKG || exit 1 + +# cleanup temporary files: +rm -rf $PKG/usr/lib$LIBDIRSUFFIX/python*/site-packages/gi + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cu +t -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done mkdir -p $PKG/etc/xdg/autostart install -m 644 $CWD/ibus-autostart.desktop $PKG/etc/xdg/autostart/ @@ -125,9 +147,6 @@ install -m 644 $CWD/ibus-autostart-plasma.desktop $PKG/etc/xdg/autostart/ install -m 755 $CWD/ibus-autostart $PKG/usr/bin/ sed -i "s|LIBDIRSUFFIX|$LIBDIRSUFFIX|" $PKG/usr/bin/ibus-autostart -# cleanup temporary files -rm -rf $PKG/usr/lib$LIBDIRSUFFIX/python2.7/site-packages/gi - # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/source/x/ibus/ibus.url b/source/x/ibus/ibus.url index 6b073dff6..81895b338 100644 --- a/source/x/ibus/ibus.url +++ b/source/x/ibus/ibus.url @@ -1,4 +1,4 @@ -https://github.com/ibus/ibus/releases/download/1.5.25/ibus-1.5.25.tar.gz -http://www.unicode.org/Public/emoji/11.0/emoji-test.txt +https://github.com/ibus/ibus/releases/download/1.5.29/ibus-1.5.29.tar.gz +https://www.unicode.org/Public/emoji/11.0/emoji-test.txt https://www.unicode.org/Public/UNIDATA/NamesList.txt https://www.unicode.org/Public/UNIDATA/Blocks.txt diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild index 20ecf7dda..6dab01980 100755 --- a/source/x/libdrm/libdrm.SlackBuild +++ b/source/x/libdrm/libdrm.SlackBuild @@ -98,6 +98,7 @@ meson setup \ --localstatedir=/var \ --buildtype=release \ -Dudev=true \ + -Dintel=enabled \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG $NINJA install || exit 1 diff --git a/source/x/libepoxy/libepoxy.SlackBuild b/source/x/libepoxy/libepoxy.SlackBuild index e364abcc9..462531f7f 100755 --- a/source/x/libepoxy/libepoxy.SlackBuild +++ b/source/x/libepoxy/libepoxy.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libepoxy -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -70,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ diff --git a/source/x/libepoxy/libepoxy.url b/source/x/libepoxy/libepoxy.url index bf9b5eda9..7ef3b618e 100644 --- a/source/x/libepoxy/libepoxy.url +++ b/source/x/libepoxy/libepoxy.url @@ -1 +1 @@ -https://github.com/anholt/libepoxy/releases/download/1.5.9/libepoxy-1.5.9.tar.xz +https://github.com/anholt/libepoxy diff --git a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild index 35c82129e..0c27b109b 100755 --- a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild +++ b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=liberation-fonts-ttf -VERSION=2.1.4 +VERSION=2.1.5 ARCH=noarch BUILD=${BUILD:-1} diff --git a/source/x/libevdev/libevdev.SlackBuild b/source/x/libevdev/libevdev.SlackBuild index b04fd28b8..4a124336b 100755 --- a/source/x/libevdev/libevdev.SlackBuild +++ b/source/x/libevdev/libevdev.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libevdev VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/x/libglvnd/libglvnd.url b/source/x/libglvnd/libglvnd.url index 73e5bc491..694c472de 100644 --- a/source/x/libglvnd/libglvnd.url +++ b/source/x/libglvnd/libglvnd.url @@ -1 +1 @@ -https://github.com/NVIDIA/libglvnd/releases +https://github.com/NVIDIA/libglvnd diff --git a/source/x/libime/libime-1.1.7_dict.tar.zst b/source/x/libime/libime-1.1.7_dict.tar.zst Binary files differnew file mode 100644 index 000000000..37ff9f6ce --- /dev/null +++ b/source/x/libime/libime-1.1.7_dict.tar.zst diff --git a/source/x/libime/libime.SlackBuild b/source/x/libime/libime.SlackBuild new file mode 100755 index 000000000..0fd4bf964 --- /dev/null +++ b/source/x/libime/libime.SlackBuild @@ -0,0 +1,109 @@ +#!/bin/bash + +# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=libime +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | cut -f 2- -d _ | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-libime + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf libime-$VERSION +tar xvf $CWD/libime-${VERSION}_dict.tar.zst || exit 1 +cd libime-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="${SLKCFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${SLKCFLAGS}" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + .. + make $NUMJOBS || make || exit 1 + make install/strip DESTDIR=$PKG || exit 1 +cd .. + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a README* LICENSES/* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/libime/libime.url b/source/x/libime/libime.url new file mode 100644 index 000000000..b5d03da63 --- /dev/null +++ b/source/x/libime/libime.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/libime/ diff --git a/source/x/libime/slack-desc b/source/x/libime/slack-desc new file mode 100644 index 000000000..b4d8e1764 --- /dev/null +++ b/source/x/libime/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +libime: libime (Generic input method library) +libime: +libime: This is a library to support generic input method implementation. +libime: +libime: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +libime: +libime: +libime: +libime: +libime: +libime: diff --git a/source/x/libinput/libinput.SlackBuild b/source/x/libinput/libinput.SlackBuild index 54b37bada..df669fbc8 100755 --- a/source/x/libinput/libinput.SlackBuild +++ b/source/x/libinput/libinput.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libinput # Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA -# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libinput -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -70,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ diff --git a/source/x/libinput/libinput.less.lag.complaining.diff b/source/x/libinput/libinput.less.lag.complaining.diff index 5c1ec03b8..51fbfa4b4 100644 --- a/source/x/libinput/libinput.less.lag.complaining.diff +++ b/source/x/libinput/libinput.less.lag.complaining.diff @@ -1,6 +1,6 @@ ---- ./src/evdev.c.orig 2021-04-29 23:25:41.531076400 -0500 -+++ ./src/evdev.c 2021-04-30 12:39:02.636755868 -0500 -@@ -1028,7 +1028,7 @@ +--- ./src/evdev.c.orig 2022-02-19 06:32:09.000000000 -0600 ++++ ./src/evdev.c 2022-03-04 00:16:00.850979376 -0600 +@@ -1105,7 +1105,7 @@ /* if we have a current libinput_dispatch() snapshot, compare our * event time with the one from the snapshot. If we have more than @@ -9,11 +9,11 @@ * where there is no steady event flow and thus SYN_DROPPED may not * get hit by the kernel despite us being too slow. */ -@@ -1037,7 +1037,7 @@ +@@ -1114,7 +1114,7 @@ return; tdelta = us2ms(libinput->dispatch_time - eventtime); -- if (tdelta > 10) { +- if (tdelta > 20) { + if (tdelta > 75) { evdev_log_bug_client_ratelimit(device, &device->delay_warning_limit, diff --git a/source/x/libinput/libinput.url b/source/x/libinput/libinput.url index f50e5e120..ab3293ccf 100644 --- a/source/x/libinput/libinput.url +++ b/source/x/libinput/libinput.url @@ -1 +1 @@ -http://www.freedesktop.org/software/libinput/ +https://gitlab.freedesktop.org/libinput/libinput diff --git a/source/x/libkkc-data/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch b/source/x/libkkc-data/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch new file mode 100644 index 000000000..91d3f6956 --- /dev/null +++ b/source/x/libkkc-data/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch @@ -0,0 +1,138 @@ +From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001 +From: Takao Fujiwara <tfujiwar@redhat.com> +Date: Mon, 30 Jul 2018 15:26:37 +0900 +Subject: [PATCH] build: Enable python3 + +--- + data/templates/libkkc-data/tools/genfilter.py | 18 +++++++-------- + data/templates/libkkc-data/tools/sortlm.py | 23 ++++++++----------- + 2 files changed, 19 insertions(+), 22 deletions(-) + +diff --git a/data/templates/libkkc-data/tools/genfilter.py b/data/templates/libkkc-data/tools/genfilter.py +index 5ffab32..0c5f75a 100644 +--- a/data/templates/libkkc-data/tools/genfilter.py ++++ b/data/templates/libkkc-data/tools/genfilter.py +@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size): + + def generate(self): + size = os.fstat(self.infile.fileno()).st_size +- n = size / self.record_size ++ n = size // self.record_size + m = int(math.ceil(-n*math.log10(ERROR_RATE) / + math.pow(math.log10(2), 2))) +- m = (m/8 + 1)*8 ++ m = (m//8 + 1)*8 + inmem = mmap.mmap(self.infile.fileno(), + size, + access=mmap.ACCESS_READ) +- outmem = bytearray(m/8) +- for i in xrange(0, n): ++ outmem = bytearray(m//8) ++ for i in range(0, n): + offset = i*self.record_size + b0, b1 = struct.unpack("=LL", inmem[offset:offset+8]) +- for k in xrange(0, 4): ++ for k in range(0, 4): + h = murmur_hash3_32(b0, b1, k) + h = int(h * (m / float(0xFFFFFFFF))) +- outmem[h/8] |= (1 << (h%8)) ++ outmem[h//8] |= (1 << (h%8)) + inmem.close() +- # Convert bytearray to str, for Python 2.6 compatibility. +- self.outfile.write(str(outmem)) ++ # Convert bytearray to bytes, for Python 3 compatibility. ++ self.outfile.write(bytes(outmem)) + + if __name__ == '__main__': + import sys +@@ -110,7 +110,7 @@ def generate(self): + parser = argparse.ArgumentParser(description='filter') + parser.add_argument('infile', type=argparse.FileType('r'), + help='input file') +- parser.add_argument('outfile', type=argparse.FileType('w'), ++ parser.add_argument('outfile', type=argparse.FileType('wb'), + help='output file') + parser.add_argument('record_size', type=int, + help='record size') +diff --git a/data/templates/libkkc-data/tools/sortlm.py b/data/templates/libkkc-data/tools/sortlm.py +index a0dd8fe..40f0837 100644 +--- a/data/templates/libkkc-data/tools/sortlm.py ++++ b/data/templates/libkkc-data/tools/sortlm.py +@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix): + self.__min_cost = 0.0 + + def read(self): +- print "reading N-grams" ++ print("reading N-grams") + self.__read_tries() + self.__read_ngrams() +- print "min cost = %lf" % self.__min_cost ++ print("min cost = %lf" % self.__min_cost) + + def __read_tries(self): + while True: +@@ -58,7 +58,7 @@ def __read_tries(self): + line = self.__infile.readline() + if line == "": + break +- line = line.strip() ++ line = line.strip('\n') + if line == "": + break + match = self.__ngram_line_regex.match(line) +@@ -89,7 +89,7 @@ def __read_ngrams(self): + line = self.__infile.readline() + if line == "": + break +- line = line.strip() ++ line = line.strip('\n') + if line == "": + break + match = self.__ngram_line_regex.match(line) +@@ -125,14 +125,11 @@ def __write_ngrams(self): + def quantize(cost, min_cost): + return max(0, min(65535, int(cost * 65535 / min_cost))) + +- def cmp_header(a, b): +- return cmp(a[0], b[0]) +- +- print "writing 1-gram file" ++ print("writing 1-gram file") + unigram_offsets = {} + unigram_file = open("%s.1gram" % self.__output_prefix, "wb") + offset = 0 +- for ids, value in sorted(self.__ngram_entries[0].iteritems()): ++ for ids, value in sorted(self.__ngram_entries[0].items()): + unigram_offsets[ids[0]] = offset + s = struct.pack("=HHH", + quantize(value[0], self.__min_cost), +@@ -143,13 +140,13 @@ def cmp_header(a, b): + offset += 1 + unigram_file.close() + +- print "writing 2-gram file" ++ print("writing 2-gram file") + bigram_offsets = {} + bigram_file = open("%s.2gram" % self.__output_prefix, "wb") + keys = self.__ngram_entries[1].keys() + items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys] + offset = 0 +- for header, ids in sorted(items, cmp=cmp_header): ++ for header, ids in sorted(items, key=lambda x: x[0]): + value = self.__ngram_entries[1][ids] + bigram_offsets[ids] = offset + s = struct.pack("=HH", +@@ -160,11 +157,11 @@ def cmp_header(a, b): + bigram_file.close() + + if len(self.__ngram_entries[2]) > 0: +- print "writing 3-gram file" ++ print("writing 3-gram file") + trigram_file = open("%s.3gram" % self.__output_prefix, "wb") + keys = self.__ngram_entries[2].keys() + items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys] +- for header, ids in sorted(items, cmp=cmp_header): ++ for header, ids in sorted(items, key=lambda x: x[0]): + value = self.__ngram_entries[2][ids] + s = struct.pack("=H", + quantize(value[0], self.__min_cost)) diff --git a/source/x/libkkc-data/libkkc-data.SlackBuild b/source/x/libkkc-data/libkkc-data.SlackBuild index c35d3b623..e83b18f30 100755 --- a/source/x/libkkc-data/libkkc-data.SlackBuild +++ b/source/x/libkkc-data/libkkc-data.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libkkc-data # Copyright 2015-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libkkc-data VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -85,6 +85,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Patch scripts to support python3: +cat $CWD/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch | patch -p4 --verbose || exit 1 + if [ ! -r configure ]; then if [ -x ./autogen.sh ]; then NOCONFIGURE=1 ./autogen.sh @@ -93,6 +96,7 @@ if [ ! -r configure ]; then fi fi +PYTHON=python3 \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/x/libkkc/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch b/source/x/libkkc/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch new file mode 100644 index 000000000..91d3f6956 --- /dev/null +++ b/source/x/libkkc/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch @@ -0,0 +1,138 @@ +From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001 +From: Takao Fujiwara <tfujiwar@redhat.com> +Date: Mon, 30 Jul 2018 15:26:37 +0900 +Subject: [PATCH] build: Enable python3 + +--- + data/templates/libkkc-data/tools/genfilter.py | 18 +++++++-------- + data/templates/libkkc-data/tools/sortlm.py | 23 ++++++++----------- + 2 files changed, 19 insertions(+), 22 deletions(-) + +diff --git a/data/templates/libkkc-data/tools/genfilter.py b/data/templates/libkkc-data/tools/genfilter.py +index 5ffab32..0c5f75a 100644 +--- a/data/templates/libkkc-data/tools/genfilter.py ++++ b/data/templates/libkkc-data/tools/genfilter.py +@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size): + + def generate(self): + size = os.fstat(self.infile.fileno()).st_size +- n = size / self.record_size ++ n = size // self.record_size + m = int(math.ceil(-n*math.log10(ERROR_RATE) / + math.pow(math.log10(2), 2))) +- m = (m/8 + 1)*8 ++ m = (m//8 + 1)*8 + inmem = mmap.mmap(self.infile.fileno(), + size, + access=mmap.ACCESS_READ) +- outmem = bytearray(m/8) +- for i in xrange(0, n): ++ outmem = bytearray(m//8) ++ for i in range(0, n): + offset = i*self.record_size + b0, b1 = struct.unpack("=LL", inmem[offset:offset+8]) +- for k in xrange(0, 4): ++ for k in range(0, 4): + h = murmur_hash3_32(b0, b1, k) + h = int(h * (m / float(0xFFFFFFFF))) +- outmem[h/8] |= (1 << (h%8)) ++ outmem[h//8] |= (1 << (h%8)) + inmem.close() +- # Convert bytearray to str, for Python 2.6 compatibility. +- self.outfile.write(str(outmem)) ++ # Convert bytearray to bytes, for Python 3 compatibility. ++ self.outfile.write(bytes(outmem)) + + if __name__ == '__main__': + import sys +@@ -110,7 +110,7 @@ def generate(self): + parser = argparse.ArgumentParser(description='filter') + parser.add_argument('infile', type=argparse.FileType('r'), + help='input file') +- parser.add_argument('outfile', type=argparse.FileType('w'), ++ parser.add_argument('outfile', type=argparse.FileType('wb'), + help='output file') + parser.add_argument('record_size', type=int, + help='record size') +diff --git a/data/templates/libkkc-data/tools/sortlm.py b/data/templates/libkkc-data/tools/sortlm.py +index a0dd8fe..40f0837 100644 +--- a/data/templates/libkkc-data/tools/sortlm.py ++++ b/data/templates/libkkc-data/tools/sortlm.py +@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix): + self.__min_cost = 0.0 + + def read(self): +- print "reading N-grams" ++ print("reading N-grams") + self.__read_tries() + self.__read_ngrams() +- print "min cost = %lf" % self.__min_cost ++ print("min cost = %lf" % self.__min_cost) + + def __read_tries(self): + while True: +@@ -58,7 +58,7 @@ def __read_tries(self): + line = self.__infile.readline() + if line == "": + break +- line = line.strip() ++ line = line.strip('\n') + if line == "": + break + match = self.__ngram_line_regex.match(line) +@@ -89,7 +89,7 @@ def __read_ngrams(self): + line = self.__infile.readline() + if line == "": + break +- line = line.strip() ++ line = line.strip('\n') + if line == "": + break + match = self.__ngram_line_regex.match(line) +@@ -125,14 +125,11 @@ def __write_ngrams(self): + def quantize(cost, min_cost): + return max(0, min(65535, int(cost * 65535 / min_cost))) + +- def cmp_header(a, b): +- return cmp(a[0], b[0]) +- +- print "writing 1-gram file" ++ print("writing 1-gram file") + unigram_offsets = {} + unigram_file = open("%s.1gram" % self.__output_prefix, "wb") + offset = 0 +- for ids, value in sorted(self.__ngram_entries[0].iteritems()): ++ for ids, value in sorted(self.__ngram_entries[0].items()): + unigram_offsets[ids[0]] = offset + s = struct.pack("=HHH", + quantize(value[0], self.__min_cost), +@@ -143,13 +140,13 @@ def cmp_header(a, b): + offset += 1 + unigram_file.close() + +- print "writing 2-gram file" ++ print("writing 2-gram file") + bigram_offsets = {} + bigram_file = open("%s.2gram" % self.__output_prefix, "wb") + keys = self.__ngram_entries[1].keys() + items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys] + offset = 0 +- for header, ids in sorted(items, cmp=cmp_header): ++ for header, ids in sorted(items, key=lambda x: x[0]): + value = self.__ngram_entries[1][ids] + bigram_offsets[ids] = offset + s = struct.pack("=HH", +@@ -160,11 +157,11 @@ def cmp_header(a, b): + bigram_file.close() + + if len(self.__ngram_entries[2]) > 0: +- print "writing 3-gram file" ++ print("writing 3-gram file") + trigram_file = open("%s.3gram" % self.__output_prefix, "wb") + keys = self.__ngram_entries[2].keys() + items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys] +- for header, ids in sorted(items, cmp=cmp_header): ++ for header, ids in sorted(items, key=lambda x: x[0]): + value = self.__ngram_entries[2][ids] + s = struct.pack("=H", + quantize(value[0], self.__min_cost)) diff --git a/source/x/libkkc/libkkc.SlackBuild b/source/x/libkkc/libkkc.SlackBuild index ee44d61ba..0db5617af 100755 --- a/source/x/libkkc/libkkc.SlackBuild +++ b/source/x/libkkc/libkkc.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libkkc # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libkkc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -85,6 +85,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Patch scripts to support python3: +cat $CWD/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch | patch -p1 --verbose || exit 1 + if [ ! -r configure ]; then if [ -x ./autogen.sh ]; then NOCONFIGURE=1 ./autogen.sh @@ -93,6 +96,7 @@ if [ ! -r configure ]; then fi fi +PYTHON=python3 \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/x/libmypaint/libmypaint.SlackBuild b/source/x/libmypaint/libmypaint.SlackBuild index caa1851d9..7ccf86b0b 100755 --- a/source/x/libmypaint/libmypaint.SlackBuild +++ b/source/x/libmypaint/libmypaint.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/x/libpinyin/libpinyin.SlackBuild b/source/x/libpinyin/libpinyin.SlackBuild index 27d67040e..67ec0aae8 100755 --- a/source/x/libpinyin/libpinyin.SlackBuild +++ b/source/x/libpinyin/libpinyin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libpinyin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/libva-utils/libva-utils.url b/source/x/libva-utils/libva-utils.url index 0b9042411..1ee8c3ac3 100644 --- a/source/x/libva-utils/libva-utils.url +++ b/source/x/libva-utils/libva-utils.url @@ -1 +1 @@ -https://github.com/intel/libva-utils +https://github.com/intel/libva-utils/tags diff --git a/source/x/libva/doinst.sh b/source/x/libva/doinst.sh new file mode 100644 index 000000000..c95eee889 --- /dev/null +++ b/source/x/libva/doinst.sh @@ -0,0 +1,14 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/libva.conf.new diff --git a/source/x/libva/libva.SlackBuild b/source/x/libva/libva.SlackBuild index 677a2fa1f..50b694591 100755 --- a/source/x/libva/libva.SlackBuild +++ b/source/x/libva/libva.SlackBuild @@ -97,6 +97,10 @@ meson setup \ DESTDIR=$PKG $NINJA install || exit 1 cd .. +# Add a default config file to reduce message verbosity: +mkdir -p $PKG/etc +cat $CWD/libva.conf > $PKG/etc/libva.conf.new + # Fix a couple of mistakenly executable header files: chmod 644 $PKG/usr/include/va/*.h @@ -107,6 +111,7 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a COPYING* NEWS README* $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/source/x/libva/libva.conf b/source/x/libva/libva.conf new file mode 100644 index 000000000..3c564abe7 --- /dev/null +++ b/source/x/libva/libva.conf @@ -0,0 +1 @@ +LIBVA_MESSAGING_LEVEL=1 diff --git a/source/x/libvdpau/libvdpau.SlackBuild b/source/x/libvdpau/libvdpau.SlackBuild index 7ee30c090..4b15127c2 100755 --- a/source/x/libvdpau/libvdpau.SlackBuild +++ b/source/x/libvdpau/libvdpau.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libvdpau VERSION=${VERSION:-$(echo libvdpau-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/x/libwacom/libwacom.SlackBuild b/source/x/libwacom/libwacom.SlackBuild index 207b2374f..2ea9abb4f 100755 --- a/source/x/libwacom/libwacom.SlackBuild +++ b/source/x/libwacom/libwacom.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libwacom # Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA -# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -79,24 +79,29 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-static \ - --with-udev-dir=/lib/udev \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + --buildtype=release \ + -Dudev-dir=/lib/udev \ + -Dtests=disabled \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/source/x/libwacom/libwacom.url b/source/x/libwacom/libwacom.url index 94d53d201..060b61d7f 100644 --- a/source/x/libwacom/libwacom.url +++ b/source/x/libwacom/libwacom.url @@ -1 +1,2 @@ https://github.com/linuxwacom/libwacom +https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.10.0/libwacom-2.10.0.tar.xz diff --git a/source/x/m17n-lib/m17n-lib.SlackBuild b/source/x/m17n-lib/m17n-lib.SlackBuild index 86552505c..11136cbb6 100755 --- a/source/x/m17n-lib/m17n-lib.SlackBuild +++ b/source/x/m17n-lib/m17n-lib.SlackBuild @@ -36,9 +36,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=m17n-lib SHORTNAM=m17n -VERSION=${VERSION:-1.8.0} -DBVERSION=${DBVERSION:-1.8.0} -BUILD=${BUILD:-4} +VERSION=${VERSION:-1.8.4} +DBVERSION=${DBVERSION:-1.8.3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/x/marisa/marisa.SlackBuild b/source/x/marisa/marisa.SlackBuild index 50d238048..ef31b394f 100755 --- a/source/x/marisa/marisa.SlackBuild +++ b/source/x/marisa/marisa.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=marisa SRCNAM=marisa-trie VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-9} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -92,6 +92,7 @@ if [ ! -r configure ]; then fi fi +PYTHON=python3 \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -105,6 +106,9 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Regenerate bindings: +make -C bindings -j1 swig-perl swig-python + cd bindings/perl perl Makefile.PL \ INC="-I$PKG/usr/include" \ @@ -118,10 +122,10 @@ cd bindings/perl cd - cd bindings/python - python setup.py build_ext \ + python3 setup.py build_ext \ --include-dirs="$PKG/usr/include" \ --library-dirs="$PKG/usr/lib${LIBDIRSUFFIX}" || exit 1 - python setup.py install \ + python3 setup.py install \ --root=$PKG || exit 1 cd - diff --git a/source/x/mesa/patches-revert/72566fd92c27b39abe2057f6f23388ec40793dd9.patch b/source/x/mesa/amber/patches-revert/72566fd92c27b39abe2057f6f23388ec40793dd9.patch index 0200efa3f..0200efa3f 100644 --- a/source/x/mesa/patches-revert/72566fd92c27b39abe2057f6f23388ec40793dd9.patch +++ b/source/x/mesa/amber/patches-revert/72566fd92c27b39abe2057f6f23388ec40793dd9.patch diff --git a/source/x/mesa/patches-revert/80817b6e344258ac9b955f824ebf9019a0fc1610.patch b/source/x/mesa/amber/patches-revert/80817b6e344258ac9b955f824ebf9019a0fc1610.patch index 13eec39c3..13eec39c3 100644 --- a/source/x/mesa/patches-revert/80817b6e344258ac9b955f824ebf9019a0fc1610.patch +++ b/source/x/mesa/amber/patches-revert/80817b6e344258ac9b955f824ebf9019a0fc1610.patch diff --git a/source/x/mesa/mesa-amber.build b/source/x/mesa/mesa-amber.build new file mode 100755 index 000000000..9a6d3d98e --- /dev/null +++ b/source/x/mesa/mesa-amber.build @@ -0,0 +1,94 @@ +#!/bin/bash +# This script is not meant to be run directly: +if [ -z $AMBERVERS ]; then + exit 1 +fi + + +# Be sure this list is up-to-date: +DRI_DRIVERS="i915,i965,r100,r200,nouveau" + +cd $TMP +rm -rf ${PKGNAM}-${AMBERVERS} + +tar xvf $CWD/amber/${PKGNAM}-${AMBERVERS}.tar.?z || exit 1 +cd ${PKGNAM}-$AMBERVERS || exit 1 + +# Let's kill the warning about operating on a dangling symlink: +rm -f src/gallium/state_trackers/d3d1x/w32api + +# Make sure ownerships and permissions are sane: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Apply patches from git (and maybe elsewhere): +# Patches obtained by: +# git checkout origin/17.2 +# git format-patch 93c2beafc0a7fa2f210b006d22aba61caa71f773 # 17.2.6 release +if /bin/ls $CWD/amber/patches/*.patch 1> /dev/null 2> /dev/null ; then + for patch in $CWD/amber/patches/*.patch ; do + patch -p1 --verbose < $patch || exit 1 ; + done +fi + +# Revert these patches from git (and maybe elsewhere): +if /bin/ls $CWD/amber/patches-revert/*.patch 1> /dev/null 2> /dev/null ; then + for patch in $CWD/amber/patches-revert/*.patch ; do + patch -p1 -R --verbose < $patch || exit 1 ; + done +fi + +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +# Architecture-specific settings can be configured in the mesa.SlackBuild +# within the variable 'SLK_AMBER_CONF_OPTS' +meson setup \ + $SLK_AMBER_CONF_OPTS \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + -Dplatforms=x11,wayland \ + -Damber=true \ + -Ddri-drivers=$DRI_DRIVERS \ + -Dgallium-drivers='' \ + -Dvulkan-drivers='' \ + -Dosmesa=false \ + -Dglvnd=true \ + -Dllvm=enabled \ + -Dshared-llvm=enabled \ + -Dshared-glapi=enabled \ + -Degl=enabled \ + -Dgles1=enabled \ + -Dgles2=enabled \ + -Dopengl=true \ + -Dglx=dri \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG/cruft $NINJA install || exit 1 +cd .. + +# We will install only the DRI drivers: +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/dri +rsync -lHprvt $PKG/cruft/usr/lib${LIBDIRSUFFIX}/dri/ $PKG/usr/lib${LIBDIRSUFFIX}/dri/ +rm -rf $PKG/cruft + +rm -rf $PKG/usr/doc/$PKGNAM-$AMBERVERS +mkdir -p $PKG/usr/doc/$PKGNAM-amber-$AMBERVERS +cp -a \ + CODEOWNERS* README* docs/README* docs/license* docs/relnotes/${AMBERVERS}.* \ + $PKG/usr/doc/$PKGNAM-amber-$AMBERVERS diff --git a/source/x/mesa/mesa-demos.build b/source/x/mesa/mesa-demos.build new file mode 100755 index 000000000..c9452d088 --- /dev/null +++ b/source/x/mesa/mesa-demos.build @@ -0,0 +1,45 @@ +#!/bin/bash +# This script is not meant to be run directly: +if [ -z $DEMOVERS ]; then + exit 1 +fi + +# Now build/install a small subset of the demos: +export CWD SLKCFLAGS NUMJOBS PKG +( cd $TMP + rm -rf mesa-demos-$DEMOVERS + tar xvf $CWD/mesa-demos-$DEMOVERS.tar.?z* || exit 1 + cd mesa-demos-$DEMOVERS + chown -R root:root . + find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + # Architecture-specific settings can be configured in the mesa.SlackBuild + # within the variable 'SLK_MESADEMOS_CONF_OPTS' + CFLAGS="$SLKCFLAGS" \ + ./configure \ + $SLK_MESADEMOS_CONF_OPTS \ + --enable-autotools \ + --prefix=/usr \ + --build=$ARCH-slackware-linux || exit 1 + make $NUMJOBS || exit 1 + # Install all the demos (including the pointless ones) at first, in a + # temporary location: + make install DESTDIR=$PKG/cruft || exit 1 + # Install gears and glinfo, as well as a few other demos: + mkdir -p $PKG/usr/bin + MESA_DEMO_BINS="${MESA_DEMO_BINS:=eglinfo gears glinfo glthreads glxcontexts glxdemo \ + glxgears glxgears_fbconfig glxheads glxinfo glxpbdemo glxpixmap}" + # Install the demo: + for demo in $MESA_DEMO_BINS ; do + mv --verbose $PKG/cruft/usr/bin/$demo $PKG/usr/bin + done + # Remove cruft: + rm -rf $PKG/cruft + # Add the README file(s): + rm -rf $PKG/usr/doc/mesa-demos-$DEMOVERS + mkdir -p $PKG/usr/doc/mesa-demos-$DEMOVERS + cp -a README* $PKG/usr/doc/mesa-demos-$DEMOVERS +) || exit 1 diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index 3841ca316..d36d456b9 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,15 +23,17 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mesa -VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -DEMOVERS=${DEMOVERS:-8.4.0} +VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} +AMBERVERS=${AMBERVERS:-21.3.9} +DEMOVERS=${DEMOVERS:-8.5.0} BUILD=${BUILD:-1} +BUILD_AMBER=${BUILD_AMBER:-YES} BUILD_DEMOS=${BUILD_DEMOS:-YES} +CODECS=${CODECS:-h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Be sure this list is up-to-date: -DRI_DRIVERS="i915,i965,r100,r200,nouveau" GALLIUM_DRIVERS="nouveau,r300,r600,svga,radeonsi,swrast,virgl,iris,crocus,zink" if [ -z "$ARCH" ]; then @@ -46,17 +48,18 @@ fi # the name of the created package would be, and then exit. This information # could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + echo "$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz" exit 0 fi -# Build swr for the following architectures (not for i?x6, as this will cause -# an Illegal Instruction startup failure on many otherwise supported CPUs): -for swr_arch in x86_64 ; do - if [ "$ARCH" = "x86_64" ]; then - GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swr" - fi -done +## COMMENTED OUT as swr seems to be broken with llvm13: +## Build swr for the following architectures (not for i?x6, as this will cause +## an Illegal Instruction startup failure on many otherwise supported CPUs): +#for swr_arch in x86_64 ; do +# if [ "$ARCH" = "x86_64" ]; then +# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swr" +# fi +#done TMP=${TMP:-/tmp} PKG=$TMP/package-mesa @@ -128,11 +131,13 @@ meson setup \ -Dplatforms=x11,wayland \ -Dgallium-opencl=icd \ -Dgallium-nine=true \ + -Dgallium-rusticl=true \ + -Drust_std=2021 \ -Dosmesa=true \ - -Ddri-drivers=$DRI_DRIVERS \ -Dgallium-drivers=$GALLIUM_DRIVERS \ - -Dvulkan-drivers=amd,intel,swrast \ + -Dvulkan-drivers=amd,intel,intel_hasvk,swrast \ -Dvulkan-layers=device-select,intel-nullhw,overlay \ + -Dvideo-codecs="$CODECS" \ -Dglvnd=true \ -Dllvm=enabled \ -Dshared-llvm=enabled \ @@ -159,44 +164,23 @@ fi fi ) +if [ "$BUILD_AMBER" = "YES" ]; then + . $CWD/mesa-amber.build +fi + if [ "$BUILD_DEMOS" = "YES" ]; then - # Now build/install a small subset of the demos: - export CWD SLKCFLAGS NUMJOBS PKG - ( cd $TMP - rm -rf mesa-demos-$DEMOVERS - tar xvf $CWD/mesa-demos-$DEMOVERS.tar.?z* || exit 1 - cd mesa-demos-$DEMOVERS - chown -R root:root . - find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - CFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix=/usr \ - --build=$ARCH-slackware-linux || exit 1 - make $NUMJOBS || exit 1 - # Install all the demos (including the pointless ones) at first, in a - # temporary location: - make install DESTDIR=$PKG/cruft || exit 1 - # Install gears and glinfo, as well as a few other demos: - mkdir -p $PKG/usr/bin - for demo in gears glinfo glthreads glxcontexts glxdemo glxgears \ - glxgears_fbconfig glxheads glxinfo glxpbdemo glxpixmap ; do - mv --verbose $PKG/cruft/usr/bin/$demo $PKG/usr/bin - done - # Remove cruft: - rm -rf $PKG/cruft - ) || exit 1 + . $CWD/mesa-demos.build fi # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \+ -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Compress man pages, if any: +if [ -d $PKG/usr/man ]; then + find $PKG/usr/man -type f -exec gzip -9 {} \+ + for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +fi # Compress info files, if any: if [ -d $PKG/usr/info ]; then @@ -204,17 +188,14 @@ if [ -d $PKG/usr/info ]; then gzip -9 $PKG/usr/info/* fi -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - docs/COPYING* docs/relnotes/${VERSION}.html docs/README* docs/GL* \ + CODEOWNERS* README* docs/README* docs/license* docs/relnotes/${VERSION}.* \ $PKG/usr/doc/$PKGNAM-$VERSION -cp -a docs/*.html $PKG/usr/doc/$PKGNAM-$VERSION/html -rm -f $PKG/usr/doc/$PKGNAM-$VERSION/html/relnotes*.html mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz - +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz diff --git a/source/x/motif/motif.SlackBuild b/source/x/motif/motif.SlackBuild index 5afd9e15c..27091980f 100755 --- a/source/x/motif/motif.SlackBuild +++ b/source/x/motif/motif.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2014, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2014, 2016, 2018, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,13 +24,13 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=motif VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2 -d - | cut -f 1-3 -d .)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac @@ -107,7 +107,8 @@ zcat $CWD/motif.rgbtxt.patch.gz | patch -p1 --verbose || exit 1 autoreconf -vif # Configure: -LDFLAGS="$SLKLDFLAGS" \ +LEXLIB="-lfl" \ +LDFLAGS="-Wl,-O1,--as-needed" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/x/mtdev/mtdev.SlackBuild b/source/x/mtdev/mtdev.SlackBuild index 64b21abc5..3a428b669 100755 --- a/source/x/mtdev/mtdev.SlackBuild +++ b/source/x/mtdev/mtdev.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mtdev -VERSION=${VERSION:-1.1.6} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.1.7} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/x/mypaint-brushes/mypaint-brushes.SlackBuild b/source/x/mypaint-brushes/mypaint-brushes.SlackBuild index 93ca69ed4..ff217432a 100755 --- a/source/x/mypaint-brushes/mypaint-brushes.SlackBuild +++ b/source/x/mypaint-brushes/mypaint-brushes.SlackBuild @@ -24,13 +24,13 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mypaint-brushes VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/x/mypaint-brushes/mypaint-brushes.url b/source/x/mypaint-brushes/mypaint-brushes.url index 11c1c2ef8..20d17e1c6 100644 --- a/source/x/mypaint-brushes/mypaint-brushes.url +++ b/source/x/mypaint-brushes/mypaint-brushes.url @@ -1 +1 @@ -https://github.com/Jehan/mypaint-brushes +https://github.com/mypaint/mypaint-brushes diff --git a/source/x/mypaint-brushes/slack-desc b/source/x/mypaint-brushes/slack-desc index 745bd9e39..1e0defb67 100644 --- a/source/x/mypaint-brushes/slack-desc +++ b/source/x/mypaint-brushes/slack-desc @@ -10,7 +10,7 @@ mypaint-brushes: mypaint-brushes (brushes for libmypaint) mypaint-brushes: mypaint-brushes: Brushes used by MyPaint and other software using libmypaint. mypaint-brushes: -mypaint-brushes: Homepage: https://github.com/Jehan/mypaint-brushes +mypaint-brushes: Homepage: https://github.com/mypaint/mypaint-brushes mypaint-brushes: mypaint-brushes: mypaint-brushes: diff --git a/source/x/noto-fonts-ttf/fonts-to-skip.txt b/source/x/noto-fonts-ttf/fonts-to-skip.txt index d9048251d..d07943224 100644 --- a/source/x/noto-fonts-ttf/fonts-to-skip.txt +++ b/source/x/noto-fonts-ttf/fonts-to-skip.txt @@ -47,7 +47,6 @@ Ugaritic ###################################################################################### Avestan Balinese -Coptic Mandaic ################################################################### # === Scripts which may still be used for decorative purposes === # diff --git a/source/x/noto-fonts-ttf/noto-fonts-ttf.SlackBuild b/source/x/noto-fonts-ttf/noto-fonts-ttf.SlackBuild index 1fb2b9712..55ae9a080 100755 --- a/source/x/noto-fonts-ttf/noto-fonts-ttf.SlackBuild +++ b/source/x/noto-fonts-ttf/noto-fonts-ttf.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=noto-fonts-ttf VERSION=${VERSION:-$(echo noto-fonts-subset-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} ARCH=noarch # If the variable PRINT_PACKAGE_NAME is set, then this script will report what diff --git a/source/x/noto-fonts-ttf/package-source.sh b/source/x/noto-fonts-ttf/package-source.sh index 2e11c8724..30ae68482 100755 --- a/source/x/noto-fonts-ttf/package-source.sh +++ b/source/x/noto-fonts-ttf/package-source.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -41,8 +41,9 @@ PACKAGE_NON_NOTO=${PACKAGE_NON_NOTO:-NO} PACKAGE_UNCOMMON_WEIGHTS=${PACKAGE_UNCOMMON_WEIGHTS:-NO} # Package unique unhinted fonts? This used to be needed solely for the symbol -# font, but there are hinted versions now. Suggest NO. -PACKAGE_UNHINTED_FONTS=${PACKAGE_UNHINTED_FONTS:-NO} +# font, but there are hinted versions now. There are a few other fonts that are +# only available as unhinted though. +PACKAGE_UNHINTED_FONTS=${PACKAGE_UNHINTED_FONTS:-YES} # Create a temporary extraction directory: EXTRACT_DIR=$(mktemp -d) @@ -86,7 +87,8 @@ EXTRACT_DIR=$(mktemp -d) rm -f --verbose noto-fonts/unhinted/* fi mkdir fonts - mv noto-fonts/*hinted/* fonts + mv noto-fonts/unhinted/* fonts + mv noto-fonts/hinted/* fonts # Unless we selected to take non-Noto fonts (these are usually the ChromeOS # fonts), eliminate any fonts that do not begin with Noto: if [ "$PACKAGE_NON_NOTO" = "NO" ]; then diff --git a/source/x/pyxdg/pyxdg.SlackBuild b/source/x/pyxdg/pyxdg.SlackBuild index 297f53799..7b705aeb1 100755 --- a/source/x/pyxdg/pyxdg.SlackBuild +++ b/source/x/pyxdg/pyxdg.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2019, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pyxdg VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -75,14 +75,16 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -python3 setup.py install --root=$PKG || exit 1 +unshare -n python3 -m build --wheel --no-isolation || exit 1 + +python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL PKG-INFO README TODO \ + AUTHORS* COPYING* ChangeLog* INSTALL* PKG-INFO* README* TODO* \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install diff --git a/source/x/sddm/doinst.sh b/source/x/sddm/doinst.sh new file mode 100644 index 000000000..f5dd9379f --- /dev/null +++ b/source/x/sddm/doinst.sh @@ -0,0 +1,19 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/sddm.conf.new +config etc/default/sddm.new +config etc/pam.d/sddm.new +config etc/pam.d/sddm-autologin.new +config etc/pam.d/sddm-greeter.new + diff --git a/source/x/sddm/pam.d/sddm b/source/x/sddm/pam.d/sddm new file mode 100644 index 000000000..df016a7ec --- /dev/null +++ b/source/x/sddm/pam.d/sddm @@ -0,0 +1,26 @@ +#%PAM-1.0 + +auth substack system-auth + +# Uncomment this line to restrict login to users with a UID greater +# than 999 (in other words, don't allow login for root): +#auth required pam_succeed_if.so uid >= 1000 quiet + +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet5.so +auth include postlogin + +account include system-auth + +password substack system-auth +-password optional pam_gnome_keyring.so use_authtok +-password optional pam_kwallet5.so use_authtok + +session optional pam_keyinit.so force revoke +session substack system-auth +session required pam_loginuid.so +-session optional pam_ck_connector.so nox11 +-session optional pam_elogind.so +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet5.so auto_start +session include postlogin diff --git a/source/x/sddm/pam.d/sddm-autologin b/source/x/sddm/pam.d/sddm-autologin new file mode 100644 index 000000000..360239544 --- /dev/null +++ b/source/x/sddm/pam.d/sddm-autologin @@ -0,0 +1,25 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_shells.so + +# Uncomment this line to restrict autologin to users with a UID greater +# than 999 (in other words, don't allow autologin for root): +#auth required pam_succeed_if.so uid >= 1000 quiet + +auth required pam_permit.so +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet5.so + +account include system-auth + +password include system-auth + +session substack system-auth +session required pam_loginuid.so +-session optional pam_ck_connector.so nox11 +-session optional pam_elogind.so +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet5.so auto_start +session include postlogin + diff --git a/source/x/sddm/pam.d/sddm-greeter b/source/x/sddm/pam.d/sddm-greeter new file mode 100644 index 000000000..fe30e60c2 --- /dev/null +++ b/source/x/sddm/pam.d/sddm-greeter @@ -0,0 +1,19 @@ +#%PAM-1.0 + +# Load environment from /etc/environment and ~/.pam_environment +auth required pam_env.so + +# Always let the greeter start without authentication +auth required pam_permit.so + +# No action required for account management +account required pam_permit.so + +# Can't change password +password required pam_deny.so + +# Setup session +session required pam_unix.so +-session optional pam_systemd.so +-session optional pam_ck_connector.so nox11 +-session optional pam_elogind.so diff --git a/source/x/sddm/sddm.SlackBuild b/source/x/sddm/sddm.SlackBuild new file mode 100755 index 000000000..264adbf44 --- /dev/null +++ b/source/x/sddm/sddm.SlackBuild @@ -0,0 +1,216 @@ +#!/bin/bash + +# Copyright 2015, 2016, 2017, 2018, 2019, 2020 Eric Hameleers, Eindhoven, NL +# Copyright 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=sddm +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Don't source $HOME/.xession in SDDM's Xsession script. It may cause the +# wrong session type to launch, or run a second copy of dbus-run-session which +# will break logout: +cat $CWD/sddm.do.not.source.HOME.xsession.diff | patch -p1 --verbose || exit 1 + +# List Wayland sessions after X11 sessions since Wayland is more experimental: +cat $CWD/sddm.list.X11.sessions.before.Wayland.Sessions.diff | patch -p1 --verbose || exit 1 + +# Configure, build, and install: +mkdir -p cmake-build +cd cmake-build + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_MAN_PAGES:BOOL=TRUE \ + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" \ + -DUSE_QT5:BOOL=TRUE \ + -DENABLE_JOURNALD:BOOL=FALSE \ + -DENABLE_PAM:BOOL=ON \ + -DNO_SYSTEMD:BOOL=TRUE \ + -DUSE_ELOGIND:BOOL=TRUE \ + .. || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. + +# Replace systemd-centric files with ours: +rm -f $PKG/etc/pam.d/sddm* +for FILE in sddm sddm-autologin sddm-greeter ; do + install -Dm644 $CWD/pam.d/$FILE $PKG/etc/pam.d/${FILE}.new +done + +# Create the SDDM home directory: +mkdir -p $PKG/var/lib/sddm +chmod 755 $PKG/var/lib/sddm +chown sddm:sddm $PKG/var/lib/sddm + +# D-Bus configs should be under /usr, not /etc: +mkdir -p $PKG/usr/share/dbus-1/system.d +mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d +rmdir --parents $PKG/etc/dbus-1/system.d + +# Remove the sddm.conf file because we will generate our own in doinst.sh: +rm -f $PKG/etc/sddm.conf + +# Generate the default sddm.conf: +$PKG/usr/bin/sddm --example-config > $PKG/etc/sddm.conf + +# Set the KDE5 theme 'breeze' as default (integrates better with Plasma 5): +sed -i -e "/\[Theme\]/,/^\[/s/^Current.*/Current=breeze/" $PKG/etc/sddm.conf + +# Move the default config file to .new: +mv $PKG/etc/sddm.conf $PKG/etc/sddm.conf.new + +# Make sure that Plasma and SDDM work on older GPUs, +# by forcing Qt5 to use software GL rendering: +cat << "EOF" >> $PKG/usr/share/sddm/scripts/Xsetup +# Make sure that Plasma and SDDM work on older GPUs by forcing Qt5 to use +# software GL rendering if the OpenGL version is not new enough: +OPENGL_VERSION=$(LANG=C glxinfo |grep '^OpenGL version string: ' |head -n 1 |sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g') +if [ "$OPENGL_VERSION" -lt 2 ]; then + QT_XCB_FORCE_SOFTWARE_OPENGL=1 + export QT_XCB_FORCE_SOFTWARE_OPENGL +fi +EOF + +# Add a wrapper for the sddm binary, to enable a custom environment: +mv $PKG/usr/bin/sddm $PKG/usr/bin/sddm.bin +cat <<"EOT" > $PKG/usr/bin/sddm +#!/bin/sh +# Customized environment (LANG definition): +if [ -f /etc/default/sddm ]; then + . /etc/default/sddm +fi + +# Ensure non-world readable permissions on /var/log/sddm.log: +touch /var/log/sddm.log +chmod 640 /var/log/sddm.log + +# Add a timestamp: +date >> /var/log/sddm.log + +# Redirect stdout/stderr to /dev/null to avoid polluting a virtual +# console with duplicate log messages: +exec /usr/bin/sddm.bin "$@" 1> /dev/null 2> /dev/null +EOT +chmod 0755 $PKG/usr/bin/sddm + +# Let's also add an example customization (localization of the UI): +mkdir -p $PKG/etc/default +echo ". /etc/profile.d/lang.sh" > $PKG/etc/default/sddm.new + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + CONTRIBUTORS* ChangeLog* INSTALL* LICENSE* README* docs/* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/sddm/sddm.do.not.source.HOME.xsession.diff b/source/x/sddm/sddm.do.not.source.HOME.xsession.diff new file mode 100644 index 000000000..c14b266d6 --- /dev/null +++ b/source/x/sddm/sddm.do.not.source.HOME.xsession.diff @@ -0,0 +1,18 @@ +--- ./data/scripts/Xsession.orig 2020-11-03 01:41:06.000000000 -0600 ++++ ./data/scripts/Xsession 2020-12-15 14:16:30.968724577 -0600 +@@ -94,9 +94,12 @@ + if [ -f "$USERXSESSIONRC" ]; then + . "$USERXSESSIONRC" + fi +-if [ -f "$USERXSESSION" ]; then +- . "$USERXSESSION" +-fi ++ ++# Commented out because $HOME/.xsession may start the wrong session type or ++# cause dbus-run-session to start twice. ++#if [ -f "$USERXSESSION" ]; then ++# . "$USERXSESSION" ++#fi + + if [ -z "$*" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." diff --git a/source/x/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff b/source/x/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff new file mode 100644 index 000000000..23577f97b --- /dev/null +++ b/source/x/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff @@ -0,0 +1,29 @@ +--- ./src/greeter/SessionModel.cpp.orig 2023-06-23 07:28:38.000000000 -0500 ++++ ./src/greeter/SessionModel.cpp 2023-07-16 14:56:32.741943650 -0500 +@@ -46,9 +46,9 @@ + + // initial population + beginResetModel(); ++ populate(Session::X11Session, mainConfig.X11.SessionDir.get()); + if (dri_active) + populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get()); +- populate(Session::X11Session, mainConfig.X11.SessionDir.get()); + endResetModel(); + + // refresh everytime a file is changed, added or removed +@@ -59,13 +59,13 @@ + beginResetModel(); + d->sessions.clear(); + d->displayNames.clear(); ++ populate(Session::X11Session, mainConfig.X11.SessionDir.get()); + if (dri_active) + populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get()); +- populate(Session::X11Session, mainConfig.X11.SessionDir.get()); + endResetModel(); + }); +- watcher->addPaths(mainConfig.Wayland.SessionDir.get()); + watcher->addPaths(mainConfig.X11.SessionDir.get()); ++ watcher->addPaths(mainConfig.Wayland.SessionDir.get()); + } + + SessionModel::~SessionModel() { diff --git a/source/x/sddm/sddm.url b/source/x/sddm/sddm.url new file mode 100644 index 000000000..90a6e2c43 --- /dev/null +++ b/source/x/sddm/sddm.url @@ -0,0 +1 @@ +https://github.com/sddm/sddm diff --git a/source/x/sddm/slack-desc b/source/x/sddm/slack-desc new file mode 100644 index 000000000..7fa590b2a --- /dev/null +++ b/source/x/sddm/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +sddm: sddm (QML based X11 display manager) +sddm: +sddm: SDDM is a modern display manager for X11 aiming to be fast, simple and +sddm: beautiful. It uses modern technologies like QtQuick, which in turn +sddm: gives the designer the ability to create smooth, animated user +sddm: interfaces. SDDM is extremely themeable. There are a few sample themes +sddm: distributed with SDDM. They can be used as a starting point for new +sddm: themes. +sddm: +sddm: Homepage: https://github.com/sddm/sddm +sddm: diff --git a/source/x/skkdic/skkdic.SlackBuild b/source/x/skkdic/skkdic.SlackBuild index a9381849b..a1999ef78 100755 --- a/source/x/skkdic/skkdic.SlackBuild +++ b/source/x/skkdic/skkdic.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for skkdic # Copyright 2015-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,8 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=skkdic SRCVER=${SRCVER:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -VERSION=${VERSION:-$(echo $SRCVER | cut -f 1 -d 'T')} -BUILD=${BUILD:-3} +SRCDATE=${SRCDATE:-$(echo $SRCVER | cut -f 1 -d '.')} +VERSION=${VERSION:-$(echo $SRCVER | cut -f 2 -d '.' | sed "s|git||")} +BUILD=${BUILD:-1} ARCH=noarch NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -37,7 +38,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # the name of the created package would be, and then exit. This information # could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + echo "$PKGNAM-$SRCDATE-$ARCH-$BUILD.txz" exit 0 fi @@ -47,9 +48,9 @@ PKG=$TMP/package-skkdic rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf skkdic-$VERSION +rm -rf dict-$VERSION tar xvf $CWD/skkdic-$SRCVER.tar.?z || exit 1 -cd skkdic-$VERSION || exit 1 +cd dict-$VERSION || exit 1 chown -R root:root . find . \ @@ -71,13 +72,14 @@ for i in SKK-JISYO* zipcode/SKK-JISYO*; do install -p -m 644 "$i" $PKG/usr/share/skk done -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a ChangeLog READMEs/committers.txt edict_doc.txt $CWD/README-skkdic.rh.ja \ - $PKG/usr/doc/$PKGNAM-$VERSION -cp -a zipcode/README.ja $PKG/usr/doc/$PKGNAM-$VERSION/README-zipcode.ja +mkdir -p $PKG/usr/doc/$PKGNAM-$SRCDATE/zipcode +cp -a ChangeLog committers.md edict_doc.html unicode-license.txt README.md \ + $PKG/usr/doc/$PKGNAM-$SRCDATE +cp -a zipcode/README.md \ + $PKG/usr/doc/$PKGNAM-$SRCDATE/zipcode mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$SRCDATE-$ARCH-$BUILD.txz diff --git a/source/x/skkdic/skkdic.url b/source/x/skkdic/skkdic.url index c22ca5604..502ad24bc 100644 --- a/source/x/skkdic/skkdic.url +++ b/source/x/skkdic/skkdic.url @@ -1,2 +1,2 @@ (fetch from Fedora SRPM) -http://pkgs.fedoraproject.org/repo/pkgs/skkdic/skkdic-20170102T1100.tar.bz2/sha512/550ba8cde28c460fdb71fd15e74b76c2a752e574f56ffbb9d69001e2c4379d5640979983288d4b937c09d752f5784890ecf66abbc153953072a389b5c9979259/skkdic-20170102T1100.tar.bz2 +http://pkgs.fedoraproject.org/repo/pkgs/skkdic/ diff --git a/source/x/ttf-tlwg/ttf-tlwg.SlackBuild b/source/x/ttf-tlwg/ttf-tlwg.SlackBuild index 87847c85f..5dc33c0ff 100755 --- a/source/x/ttf-tlwg/ttf-tlwg.SlackBuild +++ b/source/x/ttf-tlwg/ttf-tlwg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ttf-tlwg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ARCH=noarch -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/x/vulkan-sdk/DirectXShaderCompiler.noverify.patch b/source/x/vulkan-sdk/DirectXShaderCompiler.noverify.patch new file mode 100644 index 000000000..bc86805d6 --- /dev/null +++ b/source/x/vulkan-sdk/DirectXShaderCompiler.noverify.patch @@ -0,0 +1,15 @@ +--- ./cmake/modules/HCT.cmake.orig 2024-02-03 14:07:18.000000000 -0600 ++++ ./cmake/modules/HCT.cmake 2024-02-03 14:29:21.535797775 -0600 +@@ -92,9 +92,9 @@ + # file, and define the verification command + if(NOT copy_sources) + set(output ${temp_output}) +- if (CLANG_FORMAT_EXE) # Only verify sources if clang-format is available. +- set(verification COMMAND ${CMAKE_COMMAND} -E compare_files ${temp_output} ${full_output}) +- endif() ++ #if (CLANG_FORMAT_EXE) # Only verify sources if clang-format is available. ++ # set(verification COMMAND ${CMAKE_COMMAND} -E compare_files ${temp_output} ${full_output}) ++ #endif() + endif() + if(WIN32 AND NOT HLSL_AUTOCRLF) + set(force_lf "--force-lf") diff --git a/source/x/vulkan-sdk/VERSION b/source/x/vulkan-sdk/VERSION index 0b8928f3a..2cd3c443b 100644 --- a/source/x/vulkan-sdk/VERSION +++ b/source/x/vulkan-sdk/VERSION @@ -1 +1 @@ -1.2.176.1 +1.3.275.0 diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh index da1121023..4202b1d4a 100755 --- a/source/x/vulkan-sdk/fetch-sources.sh +++ b/source/x/vulkan-sdk/fetch-sources.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2017, 2018, 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2021 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # @@ -48,7 +48,7 @@ EOF echo $DEP_COMMIT } -rm -f *.tar.lz +rm -f *.tar.lz *.fetched release_notes.html wget https://vulkan.lunarg.com/doc/view/$VERSION/linux/release_notes.html @@ -58,6 +58,9 @@ for i in $(grep "Repo:" release_notes.html | cut -d "\"" -f 2); do COMMIT=$(basename $i) REPO=$(echo $i | cut -d "/" -f 1-5) NAME=$(basename $REPO) + echo "" + echo "$NAME" + echo "" # release notes for bugfix releases contain the repo list multiple times # only create tarballs for the most recent ones (on top) @@ -66,7 +69,7 @@ for i in $(grep "Repo:" release_notes.html | cut -d "\"" -f 2); do cd $NAME-$COMMIT git reset --hard $COMMIT || git reset --hard origin/$COMMIT git submodule update --init --recursive - git describe > .git-version + git describe --tags > .git-version cd .. tar --exclude-vcs -cf $NAME-$COMMIT.tar $NAME-$COMMIT plzip -9 $NAME-$COMMIT.tar @@ -79,7 +82,7 @@ for i in $(grep "Repo:" release_notes.html | cut -d "\"" -f 2); do cd SPIRV-Headers-$SPIRV_HEADERS_COMMIT git reset --hard $SPIRV_HEADERS_COMMIT || git reset --hard origin/$SPIRV_HEADERS_COMMIT git submodule update --init --recursive - git describe > .git-version + git describe --tags > .git-version cd .. tar --exclude-vcs -cf SPIRV-Headers-$SPIRV_HEADERS_COMMIT.tar SPIRV-Headers-$SPIRV_HEADERS_COMMIT plzip -9 SPIRV-Headers-$SPIRV_HEADERS_COMMIT.tar @@ -92,12 +95,42 @@ for i in $(grep "Repo:" release_notes.html | cut -d "\"" -f 2); do cd robin-hood-hashing-$ROBIN_HOOD_COMMIT git reset --hard $ROBIN_HOOD_COMMIT || git reset --hard origin/$ROBIN_HOOD_COMMIT git submodule update --init --recursive - git describe > .git-version + git describe --tags > .git-version cd .. tar --exclude-vcs -cf robin-hood-hashing-$ROBIN_HOOD_COMMIT.tar robin-hood-hashing-$ROBIN_HOOD_COMMIT plzip -9 robin-hood-hashing-$ROBIN_HOOD_COMMIT.tar rm -rf robin-hood-hashing-$ROBIN_HOOD_COMMIT touch robin-hood-hashing.fetched + elif [ "$NAME" = "Vulkan-Profiles" ]; then + if [ ! -e jsoncpp.fetched ]; then + JSONCPP_COMMIT=$(get_known_good Vulkan-Profiles-$COMMIT/scripts/known_good.json jsoncpp repos) + + git clone https://github.com/open-source-parsers/jsoncpp.git jsoncpp-$JSONCPP_COMMIT + cd jsoncpp-$JSONCPP_COMMIT + git reset --hard $JSONCPP_COMMIT || git reset --hard origin/$JSONCPP_COMMIT + git submodule update --init --recursive + git describe --tags > .git-version + cd .. + tar --exclude-vcs -cf jsoncpp-$JSONCPP_COMMIT.tar jsoncpp-$JSONCPP_COMMIT + plzip -9 jsoncpp-$JSONCPP_COMMIT.tar + rm -rf jsoncpp-$JSONCPP_COMMIT + touch jsoncpp.fetched + fi + if [ ! -e valijson.fetched ]; then + VALIJSON_COMMIT=$(get_known_good Vulkan-Profiles-$COMMIT/scripts/known_good.json valijson repos) + + git clone https://github.com/tristanpenman/valijson.git valijson-$VALIJSON_COMMIT + cd valijson-$VALIJSON_COMMIT + git reset --hard $VALIJSON_COMMIT || git reset --hard origin/$VALIJSON_COMMIT + # Intentionally skipping the submodules, as those result in a huge source tarball + #git submodule update --init --recursive + git describe --tags > .git-version + cd .. + tar --exclude-vcs -cf valijson-$VALIJSON_COMMIT.tar valijson-$VALIJSON_COMMIT + plzip -9 valijson-$VALIJSON_COMMIT.tar + rm -rf valijson-$VALIJSON_COMMIT + touch valijson.fetched + fi fi rm -rf $NAME-$COMMIT @@ -112,7 +145,7 @@ if ! [ -e "Vulkan-ExtensionLayer.fetched" ]; then git reset --hard sdk-$VERSION-TAG || git reset --hard origin/sdk-$VERSION-TAG || \ git reset --hard sdk.$VERSION-TAG || git reset --hard origin/sdk.$VERSION-TAG git submodule update --init --recursive - git describe > .git-version + git describe --tags > .git-version cd .. tar --exclude-vcs -cf Vulkan-ExtensionLayer-sdk-$VERSION.tar Vulkan-ExtensionLayer-sdk-$VERSION plzip -9 Vulkan-ExtensionLayer-sdk-$VERSION.tar @@ -124,3 +157,15 @@ echo $VERSION > VERSION rm -f release_notes.html rm -f *.fetched + +# Adding this kludge since 1.3.268 is somehow pulling a bad shaderc (the +# commit referenced can't be found in the repo, and a mostly empty archive +# is produced.) So, if we find an unreasonably small shaderc, just pull a +# recent one. +if [ "$(tar tf shaderc-*.tar.lz | wc -l)" -lt "7" ]; then + rm shaderc-*.tar.* + lftpget https://github.com/google/shaderc/archive/refs/tags/v2023.8.tar.gz + mv v2023.8.tar.gz shaderc-2023.8.tar.gz + gzip -d shaderc-2023.8.tar.gz + plzip -9 shaderc-2023.8.tar +fi diff --git a/source/x/vulkan-sdk/shaderc-2023.8.python3.patch b/source/x/vulkan-sdk/shaderc-2023.8.python3.patch new file mode 100644 index 000000000..263788ef0 --- /dev/null +++ b/source/x/vulkan-sdk/shaderc-2023.8.python3.patch @@ -0,0 +1,24 @@ +--- ./utils/update_build_version.py.orig 2024-01-03 11:45:00.000000000 -0600 ++++ ./utils/update_build_version.py 2024-02-03 13:48:45.412743279 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Copyright 2016 The Shaderc Authors. All rights reserved. + # +--- ./utils/add_copyright.py.orig 2024-01-03 11:45:00.000000000 -0600 ++++ ./utils/add_copyright.py 2024-02-03 13:48:14.417742586 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Copyright 2015 The Shaderc Authors. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +--- ./utils/remove-file-by-suffix.py.orig 2024-01-03 11:45:00.000000000 -0600 ++++ ./utils/remove-file-by-suffix.py 2024-02-03 13:48:31.279742963 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Copyright 2015 The Shaderc Authors. All rights reserved. + # diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild index 72a86f7d2..2c6d92358 100755 --- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild +++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for vulkan-sdk -# Copyright 2016, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2017, 2018, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,6 +29,10 @@ PKGNAM=vulkan-sdk VERSION=${VERSION:-$(cat VERSION)} BUILD=${BUILD:-2} +# Choose a compiler (gcc/g++ or clang/clang++ if you'd like to debug that ;-) +export CC=${CC:-gcc} +export CXX=${CXX:-g++} + # Automatically determine the architecture we're building on: MARCH=$( uname -m ) if [ -z "$ARCH" ]; then @@ -71,29 +75,39 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-vulkan-sdk -GLSLANG_VERSION=$(echo glslang-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_HEADERS_VERSION=$(echo SPIRV-Headers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_TOOLS_VERSION=$(echo SPIRV-Tools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_HEADERS_VERSION=$(echo Vulkan-Headers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_LOADER_VERSION=$(echo Vulkan-Loader-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_VALIDATIONLAYERS_VERSION=$(echo Vulkan-ValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +GLSLANG_VERSION=$(echo glslang-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +SPIRV_HEADERS_VERSION=$(echo SPIRV-Headers-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +SPIRV_TOOLS_VERSION=$(echo SPIRV-Tools-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_HEADERS_VERSION=$(echo Vulkan-Headers-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_LOADER_VERSION=$(echo Vulkan-Loader-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_VALIDATIONLAYERS_VERSION=$(echo Vulkan-ValidationLayers-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) ROBIN_HOOD_VERSION=$(echo robin-hood-hashing-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_EXTENSIONLAYER_VERSION=$(echo Vulkan-ExtensionLayer-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_TOOLS_VERSION=$(echo Vulkan-Tools-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKANTOOLS_VERSION=$(echo VulkanTools-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_EXTENSIONLAYER_VERSION=$(echo Vulkan-ExtensionLayer-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_TOOLS_VERSION=$(echo Vulkan-Tools-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKANTOOLS_VERSION=$(echo VulkanTools-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) SHADERC_VERSION=$(echo shaderc-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_CROSS_VERSION=$(echo SPIRV-Cross-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -GFXRECONSTRUCT_VERSION=$(echo gfxreconstruct-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +SPIRV_CROSS_VERSION=$(echo SPIRV-Cross-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +GFXRECONSTRUCT_VERSION=$(echo gfxreconstruct-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) DXC_VERSION=$(echo DirectXShaderCompiler-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_REFLECT_VERSION=$(echo SPIRV-Reflect-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +SPIRV_REFLECT_VERSION=$(echo SPIRV-Reflect-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_PROFILES_VERSION=$(echo Vulkan-Profiles-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VOLK_VERSION=$(echo volk-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_UTILITY_LIBRARIES_VERSION=$(echo Vulkan-Utility-Libraries-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_CAPS_VIEWER_VERSION=$(echo VulkanCapsViewer-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_MEMORY_ALLOCATOR_VERSION=$(echo VulkanMemoryAllocator-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VALIJSON_VERSION=$(echo valijson-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +JSONCPP_VERSION=$(echo jsoncpp-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) # upstream builder order: +# NOTE from volkerdi: any magic build order given in the comments is always, by definition, wrong # - SPIRV-Headers # - glslang # - Vulkan-Headers # - Vulkan-Loader +# - Vulkan-Utility-Libraries # - Vulkan-ValidationLayers # - Vulkan-ExtensionLayer +# = valijson # - Vulkan-Tools # - VulkanTools # - shaderc @@ -101,6 +115,7 @@ SPIRV_REFLECT_VERSION=$(echo SPIRV-Reflect-*.tar.?z | rev | cut -f 3- -d . | cut # - gfxreconstruct # - DirectXShaderCompiler # - SPIRV-Reflect +# - Vulkan-Profiles rm -rf $PKG mkdir -p $TMP $PKG @@ -108,18 +123,25 @@ mkdir -p $TMP $PKG cd $TMP # Clear existing tmp sources: rm -rf SPIRV-Headers-$SPIRV_HEADERS_VERSION \ - glslang-${GLSLANG_VERSION} \ - Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION \ - Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION \ - Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION \ - Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION \ - VulkanTools-sdk-$VULKANTOOLS_VERSION \ + glslang-vulkan-sdk-${GLSLANG_VERSION} \ + Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION \ + Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION \ + Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION \ + Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION \ + VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION \ shaderc-$SHADERC_VERSION \ - SPIRV-Cross-$SPIRV_CROSS_VERSION \ - gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION \ + SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION \ + gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION \ DirectXShaderCompiler-$DXC_VERSION \ - SPIRV-Reflect-$SPIRV_REFLECT_VERSION + SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION \ + Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION \ + volk-vulkan-sdk-$VOLK_VERSION \ + Vulkan-Utility-Libraries-$VULKAN_UTILITY_LIBRARIES_VERSION \ + VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION \ + VulkanMemoryAllocator-$VULKAN_MEMORY_ALLOCATOR_VERSION \ + valijson-$VALIJSON_VERSION \ + jsoncpp-$JSONCPP_VERSION tar xvf $CWD/SPIRV-Headers-$SPIRV_HEADERS_VERSION.tar.?z || exit 1 cd SPIRV-Headers-$SPIRV_HEADERS_VERSION @@ -144,15 +166,15 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/glslang-${GLSLANG_VERSION}.tar.?z || exit 1 -cd glslang-$GLSLANG_VERSION/External -tar xvf $CWD/SPIRV-Tools-$SPIRV_TOOLS_VERSION.tar.?z || exit 1 -mv SPIRV-Tools-$SPIRV_TOOLS_VERSION spirv-tools +tar xvf $CWD/glslang-vulkan-sdk-${GLSLANG_VERSION}.tar.?z || exit 1 +cd glslang-vulkan-sdk-$GLSLANG_VERSION/External +tar xvf $CWD/SPIRV-Tools-vulkan-sdk-$SPIRV_TOOLS_VERSION.tar.?z || exit 1 +mv SPIRV-Tools-vulkan-sdk-$SPIRV_TOOLS_VERSION spirv-tools cd spirv-tools/external tar xvf $CWD/SPIRV-Headers-$SPIRV_HEADERS_VERSION.tar.?z || exit 1 mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers -cd $TMP/glslang-${GLSLANG_VERSION} +cd $TMP/glslang-vulkan-sdk-${GLSLANG_VERSION} chown -R root:root . find . \ @@ -161,11 +183,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix LIBDIRSUFFIX -for i in $(find . -name CMakeLists.txt); do - sed -i "s|DESTINATION lib|DESTINATION \${CMAKE_INSTALL_LIBDIR}|" "$i" -done - mkdir -p build cd build cmake \ @@ -176,13 +193,14 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=On \ -DSPIRV_TOOLS_BUILD_STATIC=Off \ + -DENABLE_OPT=Off \ .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION.tar.?z || exit 1 -cd Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION +tar xvf $CWD/Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION.tar.?z || exit 1 +cd Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION chown -R root:root . find . \ @@ -204,8 +222,8 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION +tar xvf $CWD/Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION chown -R root:root . find . \ @@ -228,11 +246,56 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/external tar xvf $CWD/robin-hood-hashing-$ROBIN_HOOD_VERSION.tar.?z || exit 1 -mv robin-hood-hashing-$ROBIN_HOOD_VERSION robin-hood-hashing -cd .. +cd robin-hood-hashing-$ROBIN_HOOD_VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DRH_STANDALONE_PROJECT="OFF" \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$TMP/robin-hood-hashing-$ROBIN_HOOD_VERSION/build/install || exit 1 + +cd $TMP +tar xvf $CWD/Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ + -DVulkanHeaders_DIR=$PKG/usr/share/cmake/VulkanHeaders/ \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + +cd $TMP +tar xvf $CWD/Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION.tar.?z || exit 1 +cd Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION chown -R root:root . find . \ @@ -259,15 +322,15 @@ cd build -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \ -DSPIRV_HEADERS_INSTALL_DIR=$PKG/usr \ -DBUILD_LAYER_SUPPORT_FILES=On \ - -DROBIN_HOOD_HASHING_INSTALL_DIR="$TMP/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/external/robin-hood-hashing" \ + -DROBIN_HOOD_HASHING_INSTALL_DIR="$TMP/robin-hood-hashing-$ROBIN_HOOD_VERSION/build/install/usr" \ .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION +tar xvf $CWD/Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION chown -R root:root . find . \ @@ -298,8 +361,34 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION +tar xvf $CWD/volk-vulkan-sdk-$VOLK_VERSION.tar.?z || exit 1 +cd $TMP/volk-vulkan-sdk-$VOLK_VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ + -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \ + -DVOLK_INSTALL=ON \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + +cd $TMP +tar xvf $CWD/Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION chown -R root:root . find . \ @@ -329,8 +418,8 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/VulkanTools-sdk-$VULKANTOOLS_VERSION.tar.?z || exit 1 -cd $TMP/VulkanTools-sdk-$VULKANTOOLS_VERSION +tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.?z || exit 1 +cd jsoncpp-$JSONCPP_VERSION chown -R root:root . find . \ @@ -339,10 +428,54 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# building jsoncpp -cd submodules/jsoncpp - python3 amalgamate.py -cd ../../ +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_OBJECT_LIBS=OFF \ + -DBUILD_STATIC_LIBS=ON \ + -DBUILD_SHARED_LIBS=OFF \ + -DJSONCPP_WITH_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$TMP/jsoncpp-$JSONCPP_VERSION/build/install || exit 1 + +cd $TMP +tar xvf $CWD/valijson-$VALIJSON_VERSION.tar.?z || exit 1 +cd valijson-$VALIJSON_VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$TMP/valijson-$VALIJSON_VERSION/build/install || exit 1 + +cd $TMP +tar xvf $CWD/VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION.tar.?z || exit 1 +cd $TMP/VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ mkdir -p build cd build @@ -356,6 +489,8 @@ cd build -DVULKAN_REGISTRY_PATH_HINT=$PKG/usr \ -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \ -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=$PKG/usr \ + -Dvalijson_DIR="$TMP/valijson-$VALIJSON_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/valijson" \ + -Djsoncpp_DIR="$TMP/jsoncpp-$JSONCPP_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/jsoncpp" \ -DBUILD_WSI_WAYLAND_SUPPORT=On \ -DBUILD_TESTS=Off \ -DINSTALL_GTEST=Off \ @@ -364,10 +499,6 @@ cd build make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 - mkdir -p $PKG/usr/share/vulkan/config/VK_LAYER_LUNARG_device_simulation - install -m 644 ../layersvt/device_simulation_examples/sdk_sample_configs/*.json \ - $PKG/usr/share/vulkan/config/VK_LAYER_LUNARG_device_simulation/ - cd $TMP tar xvf $CWD/shaderc-$SHADERC_VERSION.tar.?z || exit 1 cd $TMP/shaderc-$SHADERC_VERSION @@ -379,6 +510,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Use python3: +cat $CWD/shaderc-2023.8.python3.patch | patch -p1 --verbose || exit 1 + # Report correct versions in `glslc --version` # git describe output collected in fetch-sources.sh sed -i "s|\['git', 'describe'\]|\['cat', '.git-version'\]|" \ @@ -401,8 +535,8 @@ cd build -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ -DSHADERC_SKIP_TESTS=On \ -DSHADERC_SKIP_EXAMPLES=On \ - -DSHADERC_SPIRV_TOOLS_DIR=$TMP/glslang-$GLSLANG_VERSION/External/spirv-tools \ - -DSHADERC_GLSLANG_DIR=$TMP/glslang-$GLSLANG_VERSION \ + -DSHADERC_SPIRV_TOOLS_DIR=$TMP/glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools \ + -DSHADERC_GLSLANG_DIR=$TMP/glslang-vulkan-sdk-$GLSLANG_VERSION \ -DSKIP_GLSLANG_INSTALL=On \ -DSKIP_SPIRV_TOOLS_INSTALL=On \ -DBUILD_SHARED_LIBS=On \ @@ -410,13 +544,12 @@ cd build -DBUILD_TESTING=Off \ .. - make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/SPIRV-Cross-$SPIRV_CROSS_VERSION.tar.?z || exit 1 -cd $TMP/SPIRV-Cross-$SPIRV_CROSS_VERSION +tar xvf $CWD/SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION.tar.?z || exit 1 +cd $TMP/SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION chown -R root:root . find . \ @@ -425,9 +558,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Set git hash -SPIRV_CROSS_SHORT_HASH=$(echo $SPIRV_CROSS_VERSION | cut -c 1-8) -sed -i "s|version \"unknown\"|version \"$SPIRV_CROSS_SHORT_HASH\"|" \ +# Set version +sed -i "s|version \"unknown\"|version \"$SPIRV_CROSS_VERSION\"|" \ CMakeLists.txt mkdir -p build @@ -447,8 +579,8 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION.tar.?z || exit 1 -cd $TMP/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION +tar xvf $CWD/gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION.tar.?z || exit 1 +cd $TMP/gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION chown -R root:root . find . \ @@ -461,7 +593,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=stringop-overflow" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=stringop-overflow" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ .. @@ -473,6 +605,9 @@ cd $TMP tar xvf $CWD/DirectXShaderCompiler-$DXC_VERSION.tar.?z || exit 1 cd $TMP/DirectXShaderCompiler-$DXC_VERSION +# This breaks the build, so skip it: +cat $CWD/DirectXShaderCompiler.noverify.patch | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -480,7 +615,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -mkdir -p build +mkdir -p build/docs cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -489,10 +624,12 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_INCLUDEDIR=include/dxc \ -DLLVM_LIBDIR_SUFFIX=$LIBDIRSUFFIX \ - $(cat ../utils/cmake-predefined-config-params) \ + -DLLVM_BUILD_TOOLS="OFF" \ + -C"../cmake/caches/PredefinedParams.cmake" \ + -DHLSL_INCLUDE_TESTS="OFF" \ .. - make $NUMJOBS || make || exit 1 + make $NUMJOBS VERBOSE=1 || make VERBOSE=1 || exit 1 # "make install" is essentially useless at this point # It installs a bunch of unnecessary llvm files @@ -504,9 +641,12 @@ cd build cp -P lib$LIBDIRSUFFIX/libdxcompiler.so* $PKG/usr/lib$LIBDIRSUFFIX/ cp -r ../include/dxc $PKG/usr/include/ + # Remove CMakeLists.txt files in /usr/include + find $PKG/usr/include/dxc -name "CMakeLists.txt" | xargs rm -f + cd $TMP -tar xvf $CWD/SPIRV-Reflect-$SPIRV_REFLECT_VERSION.tar.?z || exit 1 -cd $TMP/SPIRV-Reflect-$SPIRV_REFLECT_VERSION +tar xvf $CWD/SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION.tar.?z || exit 1 +cd $TMP/SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION chown -R root:root . find . \ @@ -534,6 +674,106 @@ cd build $PKG/usr/include/SPIRV-Reflect/include/spirv/unified1/ cd $TMP +tar xvf $CWD/Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION + +# do not depend on python-jsonschema +#sed -i "/jsonschema/d" scripts/gen_profiles_solution.py + +# Fix indentation error: +#cat $CWD/Vulkan-Profiles-vulkan-sdk.indent.patch | patch -p1 --verbose || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -Wno-error=deprecated-declarations -I$PKG/usr/include/vulkan" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=deprecated-declarations -I$PKG/usr/include/vulkan" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ + -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \ + -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \ + -DVULKAN_HEADERS_SOURCE_DIR="$TMP/Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION" \ + -DVULKAN_VALIDATIONLAYERS_SOURCE_DIR="$TMP/Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION" \ + -DVVL_INCLUDE_DIR="$PKG/usr/include/vulkan" \ + -Dvalijson_DIR="$TMP/valijson-$VALIJSON_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/valijson" \ + -Djsoncpp_DIR="$TMP/jsoncpp-$JSONCPP_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/jsoncpp" \ + -DVulkan_INCLUDE_DIR="$PKG/usr/include/vulkan" \ + -DPROFILES_BUILD_TESTS=OFF \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + +cd $TMP +tar xvf $CWD/VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION.tar.?z || exit 1 +cd $TMP/VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION + +# Fix finding Vulkan-Loader +sed -i "s|/lib/|/lib$LIBDIRSUFFIX/|g" CMakeLists.txt + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ + -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \ + -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + +cd $TMP +tar xvf $CWD/VulkanMemoryAllocator-$VULKAN_MEMORY_ALLOCATOR_VERSION.tar.?z || exit 1 +cd $TMP/VulkanMemoryAllocator-$VULKAN_MEMORY_ALLOCATOR_VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ + -DVulkan_GLSLANG_VALIDATOR_EXECUTABLE=$PKG/usr/bin/glslangValidator \ + -DVulkan_GLSLC_EXECUTABLE=$PKG/usr/bin/glslc \ + -DVulkan_INCLUDE_DIR=$PKG/usr/include \ + -DVulkan_LIBRARY=$PKG/usr/lib$LIBDIRSUFFIX/libvulkan.so.$VULKAN_LOADER_VERSION \ + .. + + # make uses glslangValidator/glslc, which is built against a shared + # libglslang that isn't installed yet + export LD_LIBRARY_PATH=$PKG/usr/lib$LIBDIRSUFFIX + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + +cd $TMP find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -553,50 +793,55 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Cross mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/gfxreconstruct mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/DirectXShaderCompiler mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Reflect +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Profiles +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/volk +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Utility-Libraries +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/VulkanCapsViewer +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/VulkanMemoryAllocator cp -a \ SPIRV-Headers-$SPIRV_HEADERS_VERSION/LICENSE* \ SPIRV-Headers-$SPIRV_HEADERS_VERSION/README* \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Headers cp -a \ - glslang-$GLSLANG_VERSION/External/spirv-tools/LICENSE* \ - glslang-$GLSLANG_VERSION/External/spirv-tools/README* \ - glslang-$GLSLANG_VERSION/External/spirv-tools/*.md \ + glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools/LICENSE* \ + glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools/README* \ + glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Tools cp -a \ - glslang-$GLSLANG_VERSION/LICENSE* \ - glslang-$GLSLANG_VERSION/README* \ - glslang-$GLSLANG_VERSION/*.md \ + glslang-vulkan-sdk-$GLSLANG_VERSION/LICENSE* \ + glslang-vulkan-sdk-$GLSLANG_VERSION/README* \ + glslang-vulkan-sdk-$GLSLANG_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/glslang cp -a \ - Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/LICENSE* \ - Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/README* \ - Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/*.md \ + Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION/LICENSE* \ + Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION/README* \ + Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Headers cp -a \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/LICENSE* \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/README* \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/*.md \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/loader/LoaderAndLayerInterface.md \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/LICENSE* \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/README* \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/*.md \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/loader/LoaderAndLayerInterface.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Loader cp -a \ - Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/LICENSE* \ - Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/README* \ - Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/*.md \ + Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/LICENSE* \ + Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/README* \ + Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-ValidationLayers cp -a \ - Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION/LICENSE* \ - Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION/README* \ - Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION/*.md \ + Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION/LICENSE* \ + Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION/README* \ + Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-ExtensionLayer cp -a \ - Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION/LICENSE* \ - Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION/README* \ - Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION/*.md \ + Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION/LICENSE* \ + Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION/README* \ + Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Tools cp -a \ - VulkanTools-sdk-$VULKANTOOLS_VERSION/LICENSE* \ - VulkanTools-sdk-$VULKANTOOLS_VERSION/README* \ - VulkanTools-sdk-$VULKANTOOLS_VERSION/*.md \ + VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION/LICENSE* \ + VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION/README* \ + VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/VulkanTools cp -a \ shaderc-$SHADERC_VERSION/AUTHORS \ @@ -605,14 +850,14 @@ cp -a \ shaderc-$SHADERC_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/shaderc cp -a \ - SPIRV-Cross-$SPIRV_CROSS_VERSION/LICENSE* \ - SPIRV-Cross-$SPIRV_CROSS_VERSION/README* \ - SPIRV-Cross-$SPIRV_CROSS_VERSION/*.md \ + SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION/LICENSE* \ + SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION/README* \ + SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Cross cp -a \ - gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/LICENSE* \ - gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/README* \ - gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/*.md \ + gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION/LICENSE* \ + gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION/README* \ + gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/gfxreconstruct cp -a \ DirectXShaderCompiler-$DXC_VERSION/LICENSE* \ @@ -621,10 +866,35 @@ cp -a \ DirectXShaderCompiler-$DXC_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/DirectXShaderCompiler cp -a \ - SPIRV-Reflect-$SPIRV_REFLECT_VERSION/LICENSE* \ - SPIRV-Reflect-$SPIRV_REFLECT_VERSION/README* \ - SPIRV-Reflect-$SPIRV_REFLECT_VERSION/*.md \ + SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION/LICENSE* \ + SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION/README* \ + SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Reflect +cp -a \ + Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION/LICENSE* \ + Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION/README* \ + Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION/*.md \ + $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Profiles +cp -a \ + volk-vulkan-sdk-$VOLK_VERSION/LICENSE* \ + volk-vulkan-sdk-$VOLK_VERSION/README* \ + volk-vulkan-sdk-$VOLK_VERSION/*.md \ + $PKG/usr/doc/$PKGNAM-$VERSION/volk +cp -a \ + Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/LICENSE* \ + Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/README* \ + Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/*.md \ + $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Utility-Libraries +cp -a \ + VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION/LICENSE* \ + VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION/README* \ + VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION/docs/*.md \ + $PKG/usr/doc/$PKGNAM-$VERSION/VulkanCapsViewer +cp -a \ + VulkanMemoryAllocator-$VULKAN_MEMORY_ALLOCATOR_VERSION/LICENSE* \ + VulkanMemoryAllocator-$VULKAN_MEMORY_ALLOCATOR_VERSION/README* \ + VulkanMemoryAllocator-$VULKAN_MEMORY_ALLOCATOR_VERSION/docs/*.md \ + $PKG/usr/doc/$PKGNAM-$VERSION/VulkanMemoryAllocator mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/wayland-protocols/wayland-protocols.SlackBuild b/source/x/wayland-protocols/wayland-protocols.SlackBuild index 00b862d63..d98970ed8 100755 --- a/source/x/wayland-protocols/wayland-protocols.SlackBuild +++ b/source/x/wayland-protocols/wayland-protocols.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac @@ -88,19 +88,26 @@ find . \ -exec chmod 644 {} \+ # Configure, build, and install: -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --build=$ARCH-slackware-linux || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/source/x/wayland-protocols/wayland-protocols.url b/source/x/wayland-protocols/wayland-protocols.url index e7383601d..e4c608987 100644 --- a/source/x/wayland-protocols/wayland-protocols.url +++ b/source/x/wayland-protocols/wayland-protocols.url @@ -1 +1,2 @@ https://wayland.freedesktop.org/releases.html +https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.36/downloads/wayland-protocols-1.36.tar.xz diff --git a/source/x/wayland/wayland.SlackBuild b/source/x/wayland/wayland.SlackBuild index 76f12c9e3..577cd70af 100755 --- a/source/x/wayland/wayland.SlackBuild +++ b/source/x/wayland/wayland.SlackBuild @@ -25,13 +25,13 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wayland VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/x/x11-skel/manpages/imconfig.1 b/source/x/x11-skel/manpages/imconfig.1 new file mode 100644 index 000000000..7ca95108a --- /dev/null +++ b/source/x/x11-skel/manpages/imconfig.1 @@ -0,0 +1,25 @@ +.\" -*- nroff -*- +.ds g \" empty +.ds G \" empty +.\" Like TP, but if specified indent is more than half +.\" the current line-length - indent, use the default indent. +.de Tp +.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP +.el .TP "\\$1" +.. +.TH IMCONFIG 1 "01 June 2022" "Slackware Version 15.1.0" +.SH NAME +imconfig \- choose a default input method for X/Wayland. +.SH SYNOPSIS +.B imconfig +.SH DESCRIPTION +.B imconfig +provides a menu of the input methods available on the machine so that you +may choose one of them to use within an XDG compliant desktop environment. + +imconfig writes out $HOME/.profile.d/input-method.{sh,csh} files, allowing +the user to choose their own default input method (possibly overriding the +one chosen as a system default). +.SH AUTHOR +Patrick J. Volkerding <volkerdi@slackware.com> +Heinz Wiesinger <pprkut@slackware.com> diff --git a/source/x/x11-skel/scripts/imconfig b/source/x/x11-skel/scripts/imconfig new file mode 100644 index 000000000..a576b2732 --- /dev/null +++ b/source/x/x11-skel/scripts/imconfig @@ -0,0 +1,146 @@ +#!/bin/sh + +# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2022 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +TMP=$HOME/.imconfig + +if [ ! -d $TMP ]; then + mkdir -p $TMP + chmod 700 $TMP +fi + +# Set up some background information: +BACKTITLE="--backtitle \"Setting default input method in $HOME/.profile.d/input-method.sh\"" + +# This stops --backtitle from cluttering the initial install: +if [ ! -r /proc/kcore ]; then + BACKTITLE="" +fi + +# Do we already have an existing default? +unset PRESELECT +if [ -f "$HOME/.profile.d/input-method.sh" ]; then + CURRENT="$(grep QT_IM_MODULE "$HOME/.profile.d/input-method.sh" | cut -d '=' -f 2)" + if ! [ "$CURRENT" = "" ]; then + PRESELECT=" --default-item $CURRENT " + fi +fi + +# Remove any previous script: +rm -f $TMP/tmpscript.sh + +# Add the top of the script: +cat << EOF > $TMP/tmpscript.sh +dialog $BACKTITLE --title "SELECT DEFAULT INPUT METHOD FOR X/WAYLAND" $PRESELECT --menu \\ +"Please select the default input method to use. This will define the application that is \\ +being used to type non-latin characters in a desktop environment." 12 74 0 \\ +EOF + +# Add default "none" option to disable input methods: +echo "\"none\" \"Do not use input methods\" \\" >> $TMP/tmpscript.sh + +# Add fcitx as the first and default entry: +if [ -r /usr/bin/fcitx5-autostart ]; then + echo "\"fcitx\" \"Fcitx5: Flexible Context-aware Input Tool with eXtension support\" \\" >> $TMP/tmpscript.sh +elif [ -r /usr/bin/fcitx-autostart ]; then + echo "\"fcitx\" \"Fcitx: Flexible Context-aware Input Tool with eXtension support\" \\" >> $TMP/tmpscript.sh +fi + +# Add ibus: +if [ -r /usr/bin/ibus-autostart ]; then + echo "\"ibus\" \"IBus: Intelligent Input Bus\" \\" >> $TMP/tmpscript.sh +fi + +# Add uim: +if [ -r /usr/bin/uim-autostart ]; then + echo "\"uim\" \"uim: Universal Input Method\" \\" >> $TMP/tmpscript.sh +fi + +# Add scim: +if [ -r /usr/bin/scim-autostart ]; then + echo "\"scim\" \"SCIM: Smart Common Input Method\" \\" >> $TMP/tmpscript.sh +fi + +# Then, the tail end: +cat << EOF >> $TMP/tmpscript.sh +2> $TMP/output +if [ ! \$? = 0 ]; then + rm -f $TMP/output + echo "Canceled." + exit +fi + +dialog $BACKTITLE --title "SELECT DEFAULT INPUT METHOD FOR X/WAYLAND" --msgbox \\ +"Changes will take effect after a re-login." 0 0 +EOF + +sh $TMP/tmpscript.sh + +if [ ! -r $TMP/output ]; then + rm -f $TMP/tmpscript.sh + exit +fi + +OUTPUT=$(cat $TMP/output) + +# Create $HOME/.profile.d if it doesn't exist yet +if ! [ -e "$HOME/.profile.d" ]; then + mkdir "$HOME/.profile.d" +fi + +if [ "$OUTPUT" = "none" ]; then + +# Create the bash profile script +cat << EOF > "$HOME/.profile.d/input-method.sh" +# File auto-generated by imconfig +EOF + +cat << EOF > "$HOME/.profile.d/input-method.csh" +# File auto-generated by imconfig +EOF + +else + +# Create the bash profile script +cat << EOF > "$HOME/.profile.d/input-method.sh" +# File auto-generated by imconfig +export XMODIFIERS="@im=$OUTPUT" +export XIM=$OUTPUT +export XIM_PROGRAM=$OUTPUT +export GTK_IM_MODULE=$OUTPUT +export QT_IM_MODULE=$OUTPUT +EOF + +# Create the csh profile script +cat << EOF > "$HOME/.profile.d/input-method.csh" +# File auto-generated by imconfig +setenv XMODIFIERS "@im=$OUTPUT" +setenv XIM $OUTPUT +setenv XIM_PROGRAM $OUTPUT +setenv GTK_IM_MODULE $OUTPUT +setenv QT_IM_MODULE $OUTPUT +EOF + +fi + +rm -f $TMP/tmpscript.sh $TMP/output diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild index 07451e767..18daa38fa 100755 --- a/source/x/x11-skel/x11-skel.SlackBuild +++ b/source/x/x11-skel/x11-skel.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=x11-skel VERSION=7.7 -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -73,6 +73,7 @@ chown -R root:root etc/X11 find etc/X11 -type f -exec chmod 644 {} \+ cp -a $CWD/scripts/xorgsetup usr/bin cp -a $CWD/scripts/xwmconfig usr/bin +cp -a $CWD/scripts/imconfig usr/bin chown root:root usr/bin/* chmod 755 usr/bin/* sed -i -e "s#lib/#lib${LIBDIRSUFFIX}/#g" usr/bin/* @@ -80,6 +81,7 @@ cp -a $CWD/scripts/setup.xwmconfig var/log/setup chown root:root var/log/setup/setup.xwmconfig chmod 755 var/log/setup/setup.xwmconfig cat $CWD/manpages/xwmconfig.1 | gzip -9c > $PKG/usr/man/man1/xwmconfig.1.gz +cat $CWD/manpages/imconfig.1 | gzip -9c > $PKG/usr/man/man1/imconfig.1.gz cp -a $CWD/scripts/xwmconfig.desktop usr/share/xsessions chown root:root usr/share/xsessions/xwmconfig.desktop chmod 644 usr/share/xsessions/xwmconfig.desktop diff --git a/source/x/x11/build/appres b/source/x/x11/build/appres index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/appres +++ b/source/x/x11/build/appres @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/bdftopcf b/source/x/x11/build/bdftopcf index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/bdftopcf +++ b/source/x/x11/build/bdftopcf @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/beforelight b/source/x/x11/build/beforelight index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/beforelight +++ b/source/x/x11/build/beforelight @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/bitmap b/source/x/x11/build/bitmap index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/bitmap +++ b/source/x/x11/build/bitmap @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/dejavu-fonts-ttf b/source/x/x11/build/dejavu-fonts-ttf deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/dejavu-fonts-ttf +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/editres b/source/x/x11/build/editres index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/editres +++ b/source/x/x11/build/editres @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/encodings b/source/x/x11/build/encodings index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/encodings +++ b/source/x/x11/build/encodings @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/font-adobe-100dpi b/source/x/x11/build/font-adobe-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-100dpi +++ b/source/x/x11/build/font-adobe-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-adobe-75dpi b/source/x/x11/build/font-adobe-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-75dpi +++ b/source/x/x11/build/font-adobe-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-adobe-utopia-100dpi b/source/x/x11/build/font-adobe-utopia-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-utopia-100dpi +++ b/source/x/x11/build/font-adobe-utopia-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-adobe-utopia-75dpi b/source/x/x11/build/font-adobe-utopia-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-utopia-75dpi +++ b/source/x/x11/build/font-adobe-utopia-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-adobe-utopia-type1 b/source/x/x11/build/font-adobe-utopia-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-utopia-type1 +++ b/source/x/x11/build/font-adobe-utopia-type1 @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-alias b/source/x/x11/build/font-alias index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/font-alias +++ b/source/x/x11/build/font-alias @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/font-arabic-misc b/source/x/x11/build/font-arabic-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-arabic-misc +++ b/source/x/x11/build/font-arabic-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-100dpi b/source/x/x11/build/font-bh-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-100dpi +++ b/source/x/x11/build/font-bh-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-75dpi b/source/x/x11/build/font-bh-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-75dpi +++ b/source/x/x11/build/font-bh-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-lucidatypewriter-100dpi b/source/x/x11/build/font-bh-lucidatypewriter-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-lucidatypewriter-100dpi +++ b/source/x/x11/build/font-bh-lucidatypewriter-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-lucidatypewriter-75dpi b/source/x/x11/build/font-bh-lucidatypewriter-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-lucidatypewriter-75dpi +++ b/source/x/x11/build/font-bh-lucidatypewriter-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-ttf b/source/x/x11/build/font-bh-ttf index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-ttf +++ b/source/x/x11/build/font-bh-ttf @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-type1 b/source/x/x11/build/font-bh-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-type1 +++ b/source/x/x11/build/font-bh-type1 @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bitstream-100dpi b/source/x/x11/build/font-bitstream-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bitstream-100dpi +++ b/source/x/x11/build/font-bitstream-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bitstream-75dpi b/source/x/x11/build/font-bitstream-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bitstream-75dpi +++ b/source/x/x11/build/font-bitstream-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bitstream-type1 b/source/x/x11/build/font-bitstream-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bitstream-type1 +++ b/source/x/x11/build/font-bitstream-type1 @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-cronyx-cyrillic b/source/x/x11/build/font-cronyx-cyrillic index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-cronyx-cyrillic +++ b/source/x/x11/build/font-cronyx-cyrillic @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-cursor-misc b/source/x/x11/build/font-cursor-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-cursor-misc +++ b/source/x/x11/build/font-cursor-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-daewoo-misc b/source/x/x11/build/font-daewoo-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-daewoo-misc +++ b/source/x/x11/build/font-daewoo-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-dec-misc b/source/x/x11/build/font-dec-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-dec-misc +++ b/source/x/x11/build/font-dec-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-ibm-type1 b/source/x/x11/build/font-ibm-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-ibm-type1 +++ b/source/x/x11/build/font-ibm-type1 @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-isas-misc b/source/x/x11/build/font-isas-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-isas-misc +++ b/source/x/x11/build/font-isas-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-jis-misc b/source/x/x11/build/font-jis-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-jis-misc +++ b/source/x/x11/build/font-jis-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-micro-misc b/source/x/x11/build/font-micro-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-micro-misc +++ b/source/x/x11/build/font-micro-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-misc-cyrillic b/source/x/x11/build/font-misc-cyrillic index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-misc-cyrillic +++ b/source/x/x11/build/font-misc-cyrillic @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-misc-ethiopic b/source/x/x11/build/font-misc-ethiopic index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/font-misc-ethiopic +++ b/source/x/x11/build/font-misc-ethiopic @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/font-misc-meltho b/source/x/x11/build/font-misc-meltho index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-misc-meltho +++ b/source/x/x11/build/font-misc-meltho @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-misc-misc b/source/x/x11/build/font-misc-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-misc-misc +++ b/source/x/x11/build/font-misc-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-mutt-misc b/source/x/x11/build/font-mutt-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-mutt-misc +++ b/source/x/x11/build/font-mutt-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-schumacher-misc b/source/x/x11/build/font-schumacher-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-schumacher-misc +++ b/source/x/x11/build/font-schumacher-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-screen-cyrillic b/source/x/x11/build/font-screen-cyrillic index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-screen-cyrillic +++ b/source/x/x11/build/font-screen-cyrillic @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-sony-misc b/source/x/x11/build/font-sony-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-sony-misc +++ b/source/x/x11/build/font-sony-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-sun-misc b/source/x/x11/build/font-sun-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-sun-misc +++ b/source/x/x11/build/font-sun-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-util b/source/x/x11/build/font-util index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/font-util +++ b/source/x/x11/build/font-util @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/font-winitzki-cyrillic b/source/x/x11/build/font-winitzki-cyrillic index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-winitzki-cyrillic +++ b/source/x/x11/build/font-winitzki-cyrillic @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-xfree86-type1 b/source/x/x11/build/font-xfree86-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-xfree86-type1 +++ b/source/x/x11/build/font-xfree86-type1 @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/fontconfig b/source/x/x11/build/fontconfig deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/fontconfig +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/freeglut b/source/x/x11/build/freeglut deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/freeglut +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/fslsfonts b/source/x/x11/build/fslsfonts index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/fslsfonts +++ b/source/x/x11/build/fslsfonts @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/fstobdf b/source/x/x11/build/fstobdf index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/fstobdf +++ b/source/x/x11/build/fstobdf @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/gccmakedep b/source/x/x11/build/gccmakedep index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/gccmakedep +++ b/source/x/x11/build/gccmakedep @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/glew b/source/x/x11/build/glew deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/glew +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/glu b/source/x/x11/build/glu deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/glu +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/iceauth b/source/x/x11/build/iceauth index b8626c4cf..0cfbf0888 100644 --- a/source/x/x11/build/iceauth +++ b/source/x/x11/build/iceauth @@ -1 +1 @@ -4 +2 diff --git a/source/x/x11/build/ico b/source/x/x11/build/ico index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/ico +++ b/source/x/x11/build/ico @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/igt-gpu-tools b/source/x/x11/build/igt-gpu-tools index d00491fd7..0cfbf0888 100644 --- a/source/x/x11/build/igt-gpu-tools +++ b/source/x/x11/build/igt-gpu-tools @@ -1 +1 @@ -1 +2 diff --git a/source/x/x11/build/imake b/source/x/x11/build/imake index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/imake +++ b/source/x/x11/build/imake @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/intel-vaapi-driver b/source/x/x11/build/intel-vaapi-driver deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/intel-vaapi-driver +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libFS b/source/x/x11/build/libFS index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libFS +++ b/source/x/x11/build/libFS @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libICE b/source/x/x11/build/libICE index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libICE +++ b/source/x/x11/build/libICE @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libSM b/source/x/x11/build/libSM index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libSM +++ b/source/x/x11/build/libSM @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXScrnSaver b/source/x/x11/build/libXScrnSaver index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXScrnSaver +++ b/source/x/x11/build/libXScrnSaver @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXau b/source/x/x11/build/libXau index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXau +++ b/source/x/x11/build/libXau @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXaw3d b/source/x/x11/build/libXaw3d index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXaw3d +++ b/source/x/x11/build/libXaw3d @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXaw3dXft b/source/x/x11/build/libXaw3dXft deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/libXaw3dXft +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libXcomposite b/source/x/x11/build/libXcomposite index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXcomposite +++ b/source/x/x11/build/libXcomposite @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXcursor b/source/x/x11/build/libXcursor index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXcursor +++ b/source/x/x11/build/libXcursor @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXdamage b/source/x/x11/build/libXdamage index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXdamage +++ b/source/x/x11/build/libXdamage @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXdmcp b/source/x/x11/build/libXdmcp index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXdmcp +++ b/source/x/x11/build/libXdmcp @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXext b/source/x/x11/build/libXext index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXext +++ b/source/x/x11/build/libXext @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXi b/source/x/x11/build/libXi index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXi +++ b/source/x/x11/build/libXi @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXinerama b/source/x/x11/build/libXinerama index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXinerama +++ b/source/x/x11/build/libXinerama @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXmu b/source/x/x11/build/libXmu index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXmu +++ b/source/x/x11/build/libXmu @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXp b/source/x/x11/build/libXp index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/libXp +++ b/source/x/x11/build/libXp @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/libXpm b/source/x/x11/build/libXpm index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXpm +++ b/source/x/x11/build/libXpm @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXpresent b/source/x/x11/build/libXpresent index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/libXpresent +++ b/source/x/x11/build/libXpresent @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/libXrandr b/source/x/x11/build/libXrandr index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXrandr +++ b/source/x/x11/build/libXrandr @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXrender b/source/x/x11/build/libXrender index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/libXrender +++ b/source/x/x11/build/libXrender @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/libXt b/source/x/x11/build/libXt index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/libXt +++ b/source/x/x11/build/libXt @@ -1 +1 @@ -2 +1 diff --git a/source/x/x11/build/libXtst b/source/x/x11/build/libXtst index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/libXtst +++ b/source/x/x11/build/libXtst @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/libXv b/source/x/x11/build/libXv index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/libXv +++ b/source/x/x11/build/libXv @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/libXvMC b/source/x/x11/build/libXvMC index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/libXvMC +++ b/source/x/x11/build/libXvMC @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/libXxf86dga b/source/x/x11/build/libXxf86dga index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXxf86dga +++ b/source/x/x11/build/libXxf86dga @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXxf86vm b/source/x/x11/build/libXxf86vm index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/libXxf86vm +++ b/source/x/x11/build/libXxf86vm @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/libdmx b/source/x/x11/build/libdmx index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libdmx +++ b/source/x/x11/build/libdmx @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libdrm b/source/x/x11/build/libdrm deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/libdrm +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libepoxy b/source/x/x11/build/libepoxy deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/libepoxy +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/liberation-fonts-ttf b/source/x/x11/build/liberation-fonts-ttf deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/liberation-fonts-ttf +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libevdev b/source/x/x11/build/libevdev deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/libevdev +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libfontenc b/source/x/x11/build/libfontenc index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libfontenc +++ b/source/x/x11/build/libfontenc @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libinput b/source/x/x11/build/libinput deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/libinput +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libpciaccess b/source/x/x11/build/libpciaccess index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libpciaccess +++ b/source/x/x11/build/libpciaccess @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libpthread-stubs b/source/x/x11/build/libpthread-stubs index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/libpthread-stubs +++ b/source/x/x11/build/libpthread-stubs @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/libva b/source/x/x11/build/libva deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/libva +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libva-utils b/source/x/x11/build/libva-utils deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/libva-utils +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libvdpau b/source/x/x11/build/libvdpau deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/libvdpau +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libwacom b/source/x/x11/build/libwacom deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/libwacom +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/libxcb b/source/x/x11/build/libxcb index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libxcb +++ b/source/x/x11/build/libxcb @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libxcvt b/source/x/x11/build/libxcvt new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/source/x/x11/build/libxcvt @@ -0,0 +1 @@ +1 diff --git a/source/x/x11/build/libxkbfile b/source/x/x11/build/libxkbfile index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libxkbfile +++ b/source/x/x11/build/libxkbfile @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libxshmfence b/source/x/x11/build/libxshmfence index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/libxshmfence +++ b/source/x/x11/build/libxshmfence @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/listres b/source/x/x11/build/listres index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/listres +++ b/source/x/x11/build/listres @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/lndir b/source/x/x11/build/lndir index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/lndir +++ b/source/x/x11/build/lndir @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/makedepend b/source/x/x11/build/makedepend index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/makedepend +++ b/source/x/x11/build/makedepend @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/mesa b/source/x/x11/build/mesa deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/mesa +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/mkcomposecache b/source/x/x11/build/mkcomposecache index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/mkcomposecache +++ b/source/x/x11/build/mkcomposecache @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/mkfontscale b/source/x/x11/build/mkfontscale index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/mkfontscale +++ b/source/x/x11/build/mkfontscale @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/oclock b/source/x/x11/build/oclock index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/oclock +++ b/source/x/x11/build/oclock @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/pixman b/source/x/x11/build/pixman index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/pixman +++ b/source/x/x11/build/pixman @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/rendercheck b/source/x/x11/build/rendercheck index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/rendercheck +++ b/source/x/x11/build/rendercheck @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/rgb b/source/x/x11/build/rgb index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/rgb +++ b/source/x/x11/build/rgb @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/sazanami-fonts-ttf b/source/x/x11/build/sazanami-fonts-ttf deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/sazanami-fonts-ttf +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/sessreg b/source/x/x11/build/sessreg index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/sessreg +++ b/source/x/x11/build/sessreg @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/setxkbmap b/source/x/x11/build/setxkbmap index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/setxkbmap +++ b/source/x/x11/build/setxkbmap @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/showfont b/source/x/x11/build/showfont index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/showfont +++ b/source/x/x11/build/showfont @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/sinhala_lklug-font-ttf b/source/x/x11/build/sinhala_lklug-font-ttf deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/sinhala_lklug-font-ttf +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/smproxy b/source/x/x11/build/smproxy index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/smproxy +++ b/source/x/x11/build/smproxy @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/tibmachuni-font-ttf b/source/x/x11/build/tibmachuni-font-ttf deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/tibmachuni-font-ttf +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/transset b/source/x/x11/build/transset index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/transset +++ b/source/x/x11/build/transset @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/ttf-indic-fonts b/source/x/x11/build/ttf-indic-fonts deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/ttf-indic-fonts +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/ttf-tlwg b/source/x/x11/build/ttf-tlwg deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/ttf-tlwg +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/twm b/source/x/x11/build/twm index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/twm +++ b/source/x/x11/build/twm @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/util-macros b/source/x/x11/build/util-macros index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/util-macros +++ b/source/x/x11/build/util-macros @@ -1 +1 @@ -2 +1 diff --git a/source/x/x11/build/viewres b/source/x/x11/build/viewres index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/viewres +++ b/source/x/x11/build/viewres @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/vulkan-sdk b/source/x/x11/build/vulkan-sdk deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/vulkan-sdk +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/x11-skel b/source/x/x11/build/x11-skel deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/x11-skel +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/x11perf b/source/x/x11/build/x11perf index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/x11perf +++ b/source/x/x11/build/x11perf @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xauth b/source/x/x11/build/xauth index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xauth +++ b/source/x/x11/build/xauth @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xbiff b/source/x/x11/build/xbiff index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xbiff +++ b/source/x/x11/build/xbiff @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xbitmaps b/source/x/x11/build/xbitmaps index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xbitmaps +++ b/source/x/x11/build/xbitmaps @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xcalc b/source/x/x11/build/xcalc index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xcalc +++ b/source/x/x11/build/xcalc @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xcb-proto b/source/x/x11/build/xcb-proto index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xcb-proto +++ b/source/x/x11/build/xcb-proto @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xcb-util b/source/x/x11/build/xcb-util index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xcb-util +++ b/source/x/x11/build/xcb-util @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xcb-util-cursor b/source/x/x11/build/xcb-util-cursor index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xcb-util-cursor +++ b/source/x/x11/build/xcb-util-cursor @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xcb-util-errors b/source/x/x11/build/xcb-util-errors index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xcb-util-errors +++ b/source/x/x11/build/xcb-util-errors @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xcb-util-image b/source/x/x11/build/xcb-util-image index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xcb-util-image +++ b/source/x/x11/build/xcb-util-image @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xcb-util-keysyms b/source/x/x11/build/xcb-util-keysyms index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xcb-util-keysyms +++ b/source/x/x11/build/xcb-util-keysyms @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xcb-util-renderutil b/source/x/x11/build/xcb-util-renderutil index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xcb-util-renderutil +++ b/source/x/x11/build/xcb-util-renderutil @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xcb-util-wm b/source/x/x11/build/xcb-util-wm index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xcb-util-wm +++ b/source/x/x11/build/xcb-util-wm @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xclipboard b/source/x/x11/build/xclipboard index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xclipboard +++ b/source/x/x11/build/xclipboard @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xclock b/source/x/x11/build/xclock index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xclock +++ b/source/x/x11/build/xclock @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xcmsdb b/source/x/x11/build/xcmsdb index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xcmsdb +++ b/source/x/x11/build/xcmsdb @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xcompmgr +++ b/source/x/x11/build/xcompmgr @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xconsole b/source/x/x11/build/xconsole index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xconsole +++ b/source/x/x11/build/xconsole @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xcursor-themes b/source/x/x11/build/xcursor-themes index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xcursor-themes +++ b/source/x/x11/build/xcursor-themes @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xcursorgen b/source/x/x11/build/xcursorgen index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xcursorgen +++ b/source/x/x11/build/xcursorgen @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xdg-user-dirs b/source/x/x11/build/xdg-user-dirs deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/xdg-user-dirs +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/xditview b/source/x/x11/build/xditview index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xditview +++ b/source/x/x11/build/xditview @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm index 8351c1939..d00491fd7 100644 --- a/source/x/x11/build/xdm +++ b/source/x/x11/build/xdm @@ -1 +1 @@ -14 +1 diff --git a/source/x/x11/build/xdpyinfo b/source/x/x11/build/xdpyinfo index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xdpyinfo +++ b/source/x/x11/build/xdpyinfo @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xdriinfo b/source/x/x11/build/xdriinfo index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xdriinfo +++ b/source/x/x11/build/xdriinfo @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xedit b/source/x/x11/build/xedit index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xedit +++ b/source/x/x11/build/xedit @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xev b/source/x/x11/build/xev index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xev +++ b/source/x/x11/build/xev @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-input-acecad b/source/x/x11/build/xf86-input-acecad index 8351c1939..60d3b2f4a 100644 --- a/source/x/x11/build/xf86-input-acecad +++ b/source/x/x11/build/xf86-input-acecad @@ -1 +1 @@ -14 +15 diff --git a/source/x/x11/build/xf86-input-evdev b/source/x/x11/build/xf86-input-evdev index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-input-evdev +++ b/source/x/x11/build/xf86-input-evdev @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-input-joystick b/source/x/x11/build/xf86-input-joystick index 7ed6ff82d..1e8b31496 100644 --- a/source/x/x11/build/xf86-input-joystick +++ b/source/x/x11/build/xf86-input-joystick @@ -1 +1 @@ -5 +6 diff --git a/source/x/x11/build/xf86-input-keyboard b/source/x/x11/build/xf86-input-keyboard index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xf86-input-keyboard +++ b/source/x/x11/build/xf86-input-keyboard @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xf86-input-mouse b/source/x/x11/build/xf86-input-mouse index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-input-mouse +++ b/source/x/x11/build/xf86-input-mouse @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-input-penmount b/source/x/x11/build/xf86-input-penmount index 8351c1939..60d3b2f4a 100644 --- a/source/x/x11/build/xf86-input-penmount +++ b/source/x/x11/build/xf86-input-penmount @@ -1 +1 @@ -14 +15 diff --git a/source/x/x11/build/xf86-input-synaptics b/source/x/x11/build/xf86-input-synaptics index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-input-synaptics +++ b/source/x/x11/build/xf86-input-synaptics @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse index ec635144f..d00491fd7 100644 --- a/source/x/x11/build/xf86-input-vmmouse +++ b/source/x/x11/build/xf86-input-vmmouse @@ -1 +1 @@ -9 +1 diff --git a/source/x/x11/build/xf86-input-void b/source/x/x11/build/xf86-input-void index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-input-void +++ b/source/x/x11/build/xf86-input-void @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-input-wacom b/source/x/x11/build/xf86-input-wacom index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/xf86-input-wacom +++ b/source/x/x11/build/xf86-input-wacom @@ -1 +1 @@ -2 +1 diff --git a/source/x/x11/build/xf86-video-apm b/source/x/x11/build/xf86-video-apm index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-apm +++ b/source/x/x11/build/xf86-video-apm @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-ark b/source/x/x11/build/xf86-video-ark index b1bd38b62..8351c1939 100644 --- a/source/x/x11/build/xf86-video-ark +++ b/source/x/x11/build/xf86-video-ark @@ -1 +1 @@ -13 +14 diff --git a/source/x/x11/build/xf86-video-ast b/source/x/x11/build/xf86-video-ast index 7f8f011eb..45a4fb75d 100644 --- a/source/x/x11/build/xf86-video-ast +++ b/source/x/x11/build/xf86-video-ast @@ -1 +1 @@ -7 +8 diff --git a/source/x/x11/build/xf86-video-ati b/source/x/x11/build/xf86-video-ati index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-ati +++ b/source/x/x11/build/xf86-video-ati @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-chips b/source/x/x11/build/xf86-video-chips index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-chips +++ b/source/x/x11/build/xf86-video-chips @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xf86-video-cirrus index 7f8f011eb..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-cirrus +++ b/source/x/x11/build/xf86-video-cirrus @@ -1 +1 @@ -7 +1 diff --git a/source/x/x11/build/xf86-video-dummy b/source/x/x11/build/xf86-video-dummy index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-dummy +++ b/source/x/x11/build/xf86-video-dummy @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xf86-video-geode b/source/x/x11/build/xf86-video-geode index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-geode +++ b/source/x/x11/build/xf86-video-geode @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-glint b/source/x/x11/build/xf86-video-glint index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-glint +++ b/source/x/x11/build/xf86-video-glint @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xf86-video-i128 b/source/x/x11/build/xf86-video-i128 index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-i128 +++ b/source/x/x11/build/xf86-video-i128 @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-i740 b/source/x/x11/build/xf86-video-i740 index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-i740 +++ b/source/x/x11/build/xf86-video-i740 @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-intel b/source/x/x11/build/xf86-video-intel index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-intel +++ b/source/x/x11/build/xf86-video-intel @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64 index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-mach64 +++ b/source/x/x11/build/xf86-video-mach64 @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-mga b/source/x/x11/build/xf86-video-mga index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-mga +++ b/source/x/x11/build/xf86-video-mga @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-neomagic b/source/x/x11/build/xf86-video-neomagic index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-neomagic +++ b/source/x/x11/build/xf86-video-neomagic @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-nouveau b/source/x/x11/build/xf86-video-nouveau index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-nouveau +++ b/source/x/x11/build/xf86-video-nouveau @@ -1 +1 @@ -2 +1 diff --git a/source/x/x11/build/xf86-video-nv b/source/x/x11/build/xf86-video-nv index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-nv +++ b/source/x/x11/build/xf86-video-nv @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xf86-video-omap b/source/x/x11/build/xf86-video-omap index 7f8f011eb..45a4fb75d 100644 --- a/source/x/x11/build/xf86-video-omap +++ b/source/x/x11/build/xf86-video-omap @@ -1 +1 @@ -7 +8 diff --git a/source/x/x11/build/xf86-video-openchrome b/source/x/x11/build/xf86-video-openchrome index 7ed6ff82d..1e8b31496 100644 --- a/source/x/x11/build/xf86-video-openchrome +++ b/source/x/x11/build/xf86-video-openchrome @@ -1 +1 @@ -5 +6 diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128 index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-r128 +++ b/source/x/x11/build/xf86-video-r128 @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-rendition b/source/x/x11/build/xf86-video-rendition index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-rendition +++ b/source/x/x11/build/xf86-video-rendition @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3 index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-s3 +++ b/source/x/x11/build/xf86-video-s3 @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-s3virge +++ b/source/x/x11/build/xf86-video-s3virge @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-savage b/source/x/x11/build/xf86-video-savage index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-savage +++ b/source/x/x11/build/xf86-video-savage @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-siliconmotion b/source/x/x11/build/xf86-video-siliconmotion index 7ed6ff82d..1e8b31496 100644 --- a/source/x/x11/build/xf86-video-siliconmotion +++ b/source/x/x11/build/xf86-video-siliconmotion @@ -1 +1 @@ -5 +6 diff --git a/source/x/x11/build/xf86-video-sis b/source/x/x11/build/xf86-video-sis index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-sis +++ b/source/x/x11/build/xf86-video-sis @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-sisusb b/source/x/x11/build/xf86-video-sisusb index 7ed6ff82d..1e8b31496 100644 --- a/source/x/x11/build/xf86-video-sisusb +++ b/source/x/x11/build/xf86-video-sisusb @@ -1 +1 @@ -5 +6 diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-tdfx +++ b/source/x/x11/build/xf86-video-tdfx @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-tga b/source/x/x11/build/xf86-video-tga index b1bd38b62..8351c1939 100644 --- a/source/x/x11/build/xf86-video-tga +++ b/source/x/x11/build/xf86-video-tga @@ -1 +1 @@ -13 +14 diff --git a/source/x/x11/build/xf86-video-trident b/source/x/x11/build/xf86-video-trident index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-trident +++ b/source/x/x11/build/xf86-video-trident @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng index b1bd38b62..8351c1939 100644 --- a/source/x/x11/build/xf86-video-tseng +++ b/source/x/x11/build/xf86-video-tseng @@ -1 +1 @@ -13 +14 diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l index 00750edc0..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-v4l +++ b/source/x/x11/build/xf86-video-v4l @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-vboxvideo b/source/x/x11/build/xf86-video-vboxvideo index 7ed6ff82d..1e8b31496 100644 --- a/source/x/x11/build/xf86-video-vboxvideo +++ b/source/x/x11/build/xf86-video-vboxvideo @@ -1 +1 @@ -5 +6 diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-vesa +++ b/source/x/x11/build/xf86-video-vesa @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-vmware +++ b/source/x/x11/build/xf86-video-vmware @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo index 8351c1939..60d3b2f4a 100644 --- a/source/x/x11/build/xf86-video-voodoo +++ b/source/x/x11/build/xf86-video-voodoo @@ -1 +1 @@ -14 +15 diff --git a/source/x/x11/build/xfd b/source/x/x11/build/xfd index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xfd +++ b/source/x/x11/build/xfd @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xfontsel b/source/x/x11/build/xfontsel index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xfontsel +++ b/source/x/x11/build/xfontsel @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xfs b/source/x/x11/build/xfs index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xfs +++ b/source/x/x11/build/xfs @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xfsinfo b/source/x/x11/build/xfsinfo index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xfsinfo +++ b/source/x/x11/build/xfsinfo @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xgamma b/source/x/x11/build/xgamma index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xgamma +++ b/source/x/x11/build/xgamma @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xgc b/source/x/x11/build/xgc index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xgc +++ b/source/x/x11/build/xgc @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xhost b/source/x/x11/build/xhost index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xhost +++ b/source/x/x11/build/xhost @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xinit b/source/x/x11/build/xinit index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xinit +++ b/source/x/x11/build/xinit @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xinput b/source/x/x11/build/xinput index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xinput +++ b/source/x/x11/build/xinput @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xisxwayland b/source/x/x11/build/xisxwayland index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xisxwayland +++ b/source/x/x11/build/xisxwayland @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xkbevd b/source/x/x11/build/xkbevd index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xkbevd +++ b/source/x/x11/build/xkbevd @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xkbprint b/source/x/x11/build/xkbprint index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xkbprint +++ b/source/x/x11/build/xkbprint @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xkbutils b/source/x/x11/build/xkbutils index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xkbutils +++ b/source/x/x11/build/xkbutils @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xkill b/source/x/x11/build/xkill index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xkill +++ b/source/x/x11/build/xkill @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xload b/source/x/x11/build/xload index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xload +++ b/source/x/x11/build/xload @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xlogo b/source/x/x11/build/xlogo index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xlogo +++ b/source/x/x11/build/xlogo @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xlsatoms b/source/x/x11/build/xlsatoms index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xlsatoms +++ b/source/x/x11/build/xlsatoms @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xlsclients b/source/x/x11/build/xlsclients index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xlsclients +++ b/source/x/x11/build/xlsclients @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xlsfonts b/source/x/x11/build/xlsfonts index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xlsfonts +++ b/source/x/x11/build/xlsfonts @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xmag b/source/x/x11/build/xmag index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xmag +++ b/source/x/x11/build/xmag @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xman b/source/x/x11/build/xman index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xman +++ b/source/x/x11/build/xman @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xmessage b/source/x/x11/build/xmessage index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xmessage +++ b/source/x/x11/build/xmessage @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xmh b/source/x/x11/build/xmh index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xmh +++ b/source/x/x11/build/xmh @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xmodmap b/source/x/x11/build/xmodmap index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xmodmap +++ b/source/x/x11/build/xmodmap @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xmore b/source/x/x11/build/xmore index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xmore +++ b/source/x/x11/build/xmore @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xorg-docs b/source/x/x11/build/xorg-docs index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xorg-docs +++ b/source/x/x11/build/xorg-docs @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xorg-sgml-doctools b/source/x/x11/build/xorg-sgml-doctools index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xorg-sgml-doctools +++ b/source/x/x11/build/xorg-sgml-doctools @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xpr b/source/x/x11/build/xpr index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xpr +++ b/source/x/x11/build/xpr @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xprop b/source/x/x11/build/xprop index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xprop +++ b/source/x/x11/build/xprop @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xrandr b/source/x/x11/build/xrandr index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xrandr +++ b/source/x/x11/build/xrandr @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xrefresh b/source/x/x11/build/xrefresh index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xrefresh +++ b/source/x/x11/build/xrefresh @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xscope b/source/x/x11/build/xscope index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xscope +++ b/source/x/x11/build/xscope @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xset b/source/x/x11/build/xset index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xset +++ b/source/x/x11/build/xset @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xsetroot b/source/x/x11/build/xsetroot index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xsetroot +++ b/source/x/x11/build/xsetroot @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xsm b/source/x/x11/build/xsm index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xsm +++ b/source/x/x11/build/xsm @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xstdcmap b/source/x/x11/build/xstdcmap index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xstdcmap +++ b/source/x/x11/build/xstdcmap @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xterm b/source/x/x11/build/xterm deleted file mode 100644 index b8626c4cf..000000000 --- a/source/x/x11/build/xterm +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/xtrans b/source/x/x11/build/xtrans index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xtrans +++ b/source/x/x11/build/xtrans @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xvidtune b/source/x/x11/build/xvidtune index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xvidtune +++ b/source/x/x11/build/xvidtune @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/xvinfo b/source/x/x11/build/xvinfo index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xvinfo +++ b/source/x/x11/build/xvinfo @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xwininfo b/source/x/x11/build/xwininfo index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xwininfo +++ b/source/x/x11/build/xwininfo @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xwud b/source/x/x11/build/xwud index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xwud +++ b/source/x/x11/build/xwud @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/configure/configure b/source/x/x11/configure/configure index dcb1109bd..61a80c318 100644 --- a/source/x/x11/configure/configure +++ b/source/x/x11/configure/configure @@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --with-udev-rules-dir=/lib/udev/rules.d \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/gccmakedep b/source/x/x11/configure/gccmakedep index 181ae81e9..741f8ea6e 100644 --- a/source/x/x11/configure/gccmakedep +++ b/source/x/x11/configure/gccmakedep @@ -8,6 +8,7 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux # # --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} diff --git a/source/x/x11/configure/libX11 b/source/x/x11/configure/libX11 index cf85e58d4..625ca2e15 100644 --- a/source/x/x11/configure/libX11 +++ b/source/x/x11/configure/libX11 @@ -9,4 +9,6 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --disable-static \ + --disable-thread-safety-constructor \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libXaw3d b/source/x/x11/configure/libXaw3d index 0d802fa3b..814adf0e7 100644 --- a/source/x/x11/configure/libXaw3d +++ b/source/x/x11/configure/libXaw3d @@ -13,4 +13,5 @@ CXXFLAGS=$SLKCFLAGS \ --enable-gray-stipples \ --enable-arrow-scrollbars \ --enable-internationalization \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libXp b/source/x/x11/configure/libXp index 181ae81e9..741f8ea6e 100644 --- a/source/x/x11/configure/libXp +++ b/source/x/x11/configure/libXp @@ -8,6 +8,7 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux # # --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} diff --git a/source/x/x11/configure/libXt b/source/x/x11/configure/libXt index 3c832abd2..758e719ca 100644 --- a/source/x/x11/configure/libXt +++ b/source/x/x11/configure/libXt @@ -9,4 +9,5 @@ CXXFLAGS=$SLKCFLAGS \ --mandir=/usr/man \ --disable-static \ --with-appdefaultdir=/etc/X11/app-defaults \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libpciaccess b/source/x/x11/configure/libpciaccess new file mode 100644 index 000000000..cd149401c --- /dev/null +++ b/source/x/x11/configure/libpciaccess @@ -0,0 +1,17 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir build +cd build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir /usr/libexec \ + --bindir /usr/bin \ + --sbindir /usr/sbin \ + --includedir /usr/include \ + --datadir /usr/share \ + --mandir /usr/man \ + --sysconfdir /etc \ + --localstatedir /var \ + --buildtype=release \ + .. || exit 1 diff --git a/source/x/x11/configure/libxcb b/source/x/x11/configure/libxcb index 0c8a4a8c8..c3cc35473 100644 --- a/source/x/x11/configure/libxcb +++ b/source/x/x11/configure/libxcb @@ -11,4 +11,5 @@ CXXFLAGS=$SLKCFLAGS \ --disable-static \ --enable-xinput \ --enable-xkb \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libxcvt b/source/x/x11/configure/libxcvt new file mode 100644 index 000000000..cd149401c --- /dev/null +++ b/source/x/x11/configure/libxcvt @@ -0,0 +1,17 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir build +cd build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir /usr/libexec \ + --bindir /usr/bin \ + --sbindir /usr/sbin \ + --includedir /usr/include \ + --datadir /usr/share \ + --mandir /usr/man \ + --sysconfdir /etc \ + --localstatedir /var \ + --buildtype=release \ + .. || exit 1 diff --git a/source/x/x11/configure/libxshmfence b/source/x/x11/configure/libxshmfence index ec0521d86..7b3b7025d 100644 --- a/source/x/x11/configure/libxshmfence +++ b/source/x/x11/configure/libxshmfence @@ -12,4 +12,5 @@ CXXFLAGS=$SLKCFLAGS \ --mandir=/usr/man \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/meson b/source/x/x11/configure/meson new file mode 100644 index 000000000..cd149401c --- /dev/null +++ b/source/x/x11/configure/meson @@ -0,0 +1,17 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir build +cd build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir /usr/libexec \ + --bindir /usr/bin \ + --sbindir /usr/sbin \ + --includedir /usr/include \ + --datadir /usr/share \ + --mandir /usr/man \ + --sysconfdir /etc \ + --localstatedir /var \ + --buildtype=release \ + .. || exit 1 diff --git a/source/x/x11/configure/pixman b/source/x/x11/configure/pixman index 52cb86c34..8a76b364b 100644 --- a/source/x/x11/configure/pixman +++ b/source/x/x11/configure/pixman @@ -2,21 +2,28 @@ PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") if [ "$ARCH" = "x86_64" ]; then - do_sse2="--enable-sse2" + do_sse2=enabled else - do_sse2="--disable-sse2" + do_sse2=disabled fi -CFLAGS=$SLKCFLAGS \ -CXXFLAGS=$SLKCFLAGS \ -./configure \ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --disable-static \ - --disable-vmx \ - --build=$ARCH-slackware-linux \ - ${do_sse2} + --buildtype=release \ + -Dvmx=disabled \ + -Dtests=disabled \ + -Dsse2=$do_sse2 \ + .. || exit 1 diff --git a/source/x/x11/configure/rendercheck b/source/x/x11/configure/rendercheck new file mode 100644 index 000000000..cd149401c --- /dev/null +++ b/source/x/x11/configure/rendercheck @@ -0,0 +1,17 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir build +cd build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir /usr/libexec \ + --bindir /usr/bin \ + --sbindir /usr/sbin \ + --includedir /usr/include \ + --datadir /usr/share \ + --mandir /usr/man \ + --sysconfdir /etc \ + --localstatedir /var \ + --buildtype=release \ + .. || exit 1 diff --git a/source/x/x11/configure/setxkbmap b/source/x/x11/configure/setxkbmap index 91f8353fb..0a6de166f 100644 --- a/source/x/x11/configure/setxkbmap +++ b/source/x/x11/configure/setxkbmap @@ -8,4 +8,5 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --with-xkb-config-root=/etc/X11/xkb \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xcb-proto b/source/x/x11/configure/xcb-proto index 2df1aaf74..4074f1583 100644 --- a/source/x/x11/configure/xcb-proto +++ b/source/x/x11/configure/xcb-proto @@ -1,26 +1,8 @@ -mkdir python2 python3 - -cd python2 - CFLAGS=$SLKCFLAGS \ - CXXFLAGS=$SLKCFLAGS \ - PYTHON=python3 \ - ../configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ - --with-udev-rules-dir=/lib/udev/rules.d \ - --disable-static \ - --build=$ARCH-slackware-linux -cd - - +mkdir python3 cd python3 CFLAGS=$SLKCFLAGS \ CXXFLAGS=$SLKCFLAGS \ - PYTHON=python \ + PYTHON=python3 \ ../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/x/x11/configure/xdm b/source/x/x11/configure/xdm index 1c7dc7ccd..5bc76962b 100644 --- a/source/x/x11/configure/xdm +++ b/source/x/x11/configure/xdm @@ -16,4 +16,5 @@ CXXFLAGS=$SLKCFLAGS \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ $XDM_PAM_OPTION \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-geode b/source/x/x11/configure/xf86-video-geode index a6eab1095..128f66476 100644 --- a/source/x/x11/configure/xf86-video-geode +++ b/source/x/x11/configure/xf86-video-geode @@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --with-udev-rules-dir=/lib/udev/rules.d \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-savage b/source/x/x11/configure/xf86-video-glint index 291eb9b94..39eaf927c 100644 --- a/source/x/x11/configure/xf86-video-savage +++ b/source/x/x11/configure/xf86-video-glint @@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --with-udev-rules-dir=/lib/udev/rules.d \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-intel b/source/x/x11/configure/xf86-video-intel index 88581a1e7..faf752eba 100644 --- a/source/x/x11/configure/xf86-video-intel +++ b/source/x/x11/configure/xf86-video-intel @@ -18,4 +18,5 @@ CXXFLAGS="$ALTCFLAGS" \ --enable-kms-only \ --enable-uxa \ --with-default-dri=3 \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau index 0f3bccf24..a9dcd059b 100644 --- a/source/x/x11/configure/xf86-video-nouveau +++ b/source/x/x11/configure/xf86-video-nouveau @@ -1,6 +1,6 @@ CFLAGS=$SLKCFLAGS \ CXXFLAGS=$SLKCFLAGS \ -./configure \ +./autogen.sh \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ @@ -9,4 +9,5 @@ CXXFLAGS=$SLKCFLAGS \ --mandir=/usr/man \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-s3 b/source/x/x11/configure/xf86-video-s3 new file mode 100644 index 000000000..39eaf927c --- /dev/null +++ b/source/x/x11/configure/xf86-video-s3 @@ -0,0 +1,14 @@ +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +./autogen.sh \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ + --with-udev-rules-dir=/lib/udev/rules.d \ + --disable-static \ + --enable-year2038 \ + --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xfs b/source/x/x11/configure/xfs index 38f50c9a8..570dca393 100644 --- a/source/x/x11/configure/xfs +++ b/source/x/x11/configure/xfs @@ -9,4 +9,5 @@ CXXFLAGS=$SLKCFLAGS \ --mandir=/usr/man \ --disable-static \ --disable-devel-docs \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xkbcomp b/source/x/x11/configure/xkbcomp index 91f8353fb..0a6de166f 100644 --- a/source/x/x11/configure/xkbcomp +++ b/source/x/x11/configure/xkbcomp @@ -8,4 +8,5 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --with-xkb-config-root=/etc/X11/xkb \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xkeyboard-config b/source/x/x11/configure/xkeyboard-config index a5e05d6b5..fc2a5f14e 100644 --- a/source/x/x11/configure/xkeyboard-config +++ b/source/x/x11/configure/xkeyboard-config @@ -1,13 +1,19 @@ -./configure \ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir build +cd build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --disable-static \ - --enable-xkbcomp-symlink \ - --enable-compat-rules \ - --with-xkb-base=/etc/X11/xkb \ - --with-xkb-rules-symlink=xfree86,xorg \ - --build=$ARCH-slackware-linux + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir /usr/libexec \ + --bindir /usr/bin \ + --sbindir /usr/sbin \ + --includedir /usr/include \ + --datadir /usr/share \ + --mandir /usr/man \ + --sysconfdir /etc \ + --localstatedir /var \ + --buildtype=release \ + -Dcompat-rules=true \ + -Dxorg-rules-symlinks=true \ + .. || exit 1 diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server index c107644e0..6a536c0d5 100644 --- a/source/x/x11/configure/xorg-server +++ b/source/x/x11/configure/xorg-server @@ -1,6 +1,34 @@ # Build Wayland X Server (currently built as standalone): BUILD_XWAYLAND=NO +# Build rootless X packages. This is not the default in Slackware and is +# unlikely to be any time soon, as --enable-systemd-logind seems to really +# require systemd and does not function 100% with all graphics chipsets. +# In particular, resuming from suspend may not work with (at least) Radeon +# chipsets, and NVIDIA chipsets using proprietary drivers. Also, while +# rootless X works from "startx", it is unsupported by most login managers +# which will continue to start X as root. +# +# Feel free to try it out, though. To build rootless X packages, start the +# build like this: +# +# ROOTLESSX=YES ./x11.SlackBuild xserver xorg-server +# +if [ "$ROOTLESSX" = "YES" ]; then + ROOTLESS_OPTIONS="--enable-suid-wrapper --disable-install-setuid --enable-systemd-logind" +else + # Here we are building the traditional setuid root X. Technically we could + # dispense with the Xorg.wrap wrapper and just have the actual Xorg binary + # in /usr/bin, but we've always had the wrapper anyway and it should not + # cause any problems. Besides, it might be possible with this configuration + # to remove the setuid permissions from /usr/libexec/Xorg and then add the + # user to required groups such as input to run rootless as well, though it + # may bring its own security issues since other users who are members of + # these groups could monitor the devices. It's not recommended to try to + # run X rootless in this way, but we're going to keep the option open for now. + ROOTLESS_OPTIONS="--enable-suid-wrapper --enable-install-setuid --disable-systemd-logind" +fi + # Servers to build: if [ "$BUILD_XWAYLAND" = "NO" ]; then XWAYLAND_OPTION="--disable-xwayland" @@ -14,12 +42,7 @@ BUILD_SERVERS="--enable-xorg \ --enable-glamor \ --enable-kdrive \ --enable-xephyr \ - $XWAYLAND_OPTION \ - --enable-config-udev \ - --disable-config-hal \ - --disable-systemd-logind" - -#MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7+ + $XWAYLAND_OPTION " # Default font paths to be used by the X server: DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic" @@ -37,22 +60,22 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --disable-static \ --with-pic \ - --enable-suid-wrapper \ --with-int10=x86emu \ --with-default-font-path="${DEF_FONTPATH}" \ --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \ - --with-os-name="Slackware 15.0" \ + --with-os-name="Slackware 15.1" \ --with-os-vendor="Slackware Linux Project" \ - --with-xkb-path=/etc/X11/xkb \ + --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ + --enable-config-udev \ + --disable-config-hal \ + --enable-year2038 \ $BUILD_SERVERS \ + $ROOTLESS_OPTIONS \ --build=$ARCH-slackware-linux -# --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri - if [ "$ARCH" = "x86_64" ]; then # To prevent the error "No rule to make target `-ldl'" sed -i -e 's#-ldl##' hw/xfree86/Makefile sed -i -e 's#-lm#-lm -ldl#' hw/xfree86/Makefile fi - diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm index fc3b5a679..78d53d822 100644 --- a/source/x/x11/doinst.sh/xdm +++ b/source/x/x11/doinst.sh/xdm @@ -21,3 +21,8 @@ do config etc/X11/xdm/${conffile}.new done +# Prevent a black background for login/password when upgrading from xdm-1.1.1 +# and ignoring the .new files :-) +if ! grep -q inpColor etc/X11/xdm/Xresources ; then + echo 'xlogin*inpColor: grey80' >> etc/X11/xdm/Xresources +fi diff --git a/source/x/x11/make/libpciaccess b/source/x/x11/make/libpciaccess new file mode 100644 index 000000000..635ee83dc --- /dev/null +++ b/source/x/x11/make/libpciaccess @@ -0,0 +1,5 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. diff --git a/source/x/x11/make/libxcvt b/source/x/x11/make/libxcvt new file mode 100644 index 000000000..635ee83dc --- /dev/null +++ b/source/x/x11/make/libxcvt @@ -0,0 +1,5 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. diff --git a/source/x/x11/make/ninja b/source/x/x11/make/ninja new file mode 100644 index 000000000..635ee83dc --- /dev/null +++ b/source/x/x11/make/ninja @@ -0,0 +1,5 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. diff --git a/source/x/x11/make/pixman b/source/x/x11/make/pixman new file mode 100644 index 000000000..635ee83dc --- /dev/null +++ b/source/x/x11/make/pixman @@ -0,0 +1,5 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. diff --git a/source/x/x11/make/rendercheck b/source/x/x11/make/rendercheck new file mode 100644 index 000000000..635ee83dc --- /dev/null +++ b/source/x/x11/make/rendercheck @@ -0,0 +1,5 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. diff --git a/source/x/x11/make/xcb-proto b/source/x/x11/make/xcb-proto index a4c380bbc..b39aa7786 100644 --- a/source/x/x11/make/xcb-proto +++ b/source/x/x11/make/xcb-proto @@ -1,17 +1,7 @@ -cd python2 - if ! make $NUMJOBS ; then - touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed - continue - fi - - make install DESTDIR=$PKG -cd - - cd python3 if ! make $NUMJOBS ; then touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed continue fi - make install DESTDIR=$PKG cd - diff --git a/source/x/x11/make/xkeyboard-config b/source/x/x11/make/xkeyboard-config new file mode 100644 index 000000000..635ee83dc --- /dev/null +++ b/source/x/x11/make/xkeyboard-config @@ -0,0 +1,5 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. diff --git a/source/x/x11/makepkg/xorg-server b/source/x/x11/makepkg/xorg-server index 1f5faf3c4..f395855d5 100644 --- a/source/x/x11/makepkg/xorg-server +++ b/source/x/x11/makepkg/xorg-server @@ -1,3 +1,7 @@ +# Add _rootless tag to the $BUILD if making rootless X packages: +if [ "$ROOTLESSX" = "YES" ]; then + BUILD="${BUILD}_rootless" +fi rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/usr/bin diff --git a/source/x/x11/package-blacklist b/source/x/x11/package-blacklist index 8e2f3eb5c..51c508d07 100644 --- a/source/x/x11/package-blacklist +++ b/source/x/x11/package-blacklist @@ -6,38 +6,44 @@ # They also say in the README for this one that it is not yet ready: xf86-video-omap -# MacOS related packages: -applewmproto -windowswmproto -libAppleWM -libWindowsWM - -# Sun video cards: -xf86-video-sunbw2 -xf86-video-suncg14 -xf86-video-suncg3 -xf86-video-suncg6 -xf86-video-sunffb -xf86-video-sunleo -xf86-video-suntcx - # Obsolete packages: -liboldX -xf86-video-amd -xf86-video-via -xkbdata -xphelloworld -xrx - -# Not applicable to us -grandr -constype +xf86-input-acecad +xf86-input-aiptek +xf86-input-joystick +xf86-input-keyboard +xf86-input-mouse +xf86-input-penmount +xf86-input-void +xf86-video-apm +xf86-video-ark +xf86-video-ast +xf86-video-chips +xf86-video-cirrus +xf86-video-geode +xf86-video-glint +xf86-video-i128 +xf86-video-i740 +#xf86-video-neomagic +xf86-video-nv +xf86-video-omap +xf86-video-qxl +xf86-video-rendition +xf86-video-s3 +#xf86-video-savage +xf86-video-siliconmotion +xf86-video-sis +xf86-video-sisusb +xf86-video-tdfx +xf86-video-tga +xf86-video-tseng +xf86-video-v4l +xf86-video-vboxvideo +xf86-video-voodoo +xf86-video-xgi +xf86-video-xgixp +xpyb # CAREFUL NOT TO "SHIP" THE STUFF BELOW IN THE MAIN X PACKAGES DIR! -# This is probably obsolete, and kills "X -configure" too -xf86-video-nsc - # We don't want this one, as it causes failure of X with no xorg.conf xf86-video-fbdev - diff --git a/source/x/x11/patch/pixman.patch b/source/x/x11/patch/pixman.patch deleted file mode 100644 index 947341105..000000000 --- a/source/x/x11/patch/pixman.patch +++ /dev/null @@ -1 +0,0 @@ -zcat $CWD/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff.gz | patch -p1 --backup --suffix=.orig || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff deleted file mode 100644 index 99017b166..000000000 --- a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff +++ /dev/null @@ -1,919 +0,0 @@ ---- ./test/Makefile.in.orig 2020-04-19 16:53:21.000000000 -0500 -+++ ./test/Makefile.in 2020-04-20 15:08:52.348545235 -0500 -@@ -102,24 +102,15 @@ - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - am__EXEEXT_1 = oob-test$(EXEEXT) infinite-loop$(EXEEXT) \ -- trap-crasher$(EXEEXT) fence-image-self-test$(EXEEXT) \ -+ trap-crasher$(EXEEXT) \ - region-translate-test$(EXEEXT) fetch-test$(EXEEXT) \ - a1-trap-test$(EXEEXT) prng-test$(EXEEXT) \ - radial-invalid$(EXEEXT) pdf-op-test$(EXEEXT) \ -- region-test$(EXEEXT) combiner-test$(EXEEXT) \ -- scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \ -- scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \ -- rotate-test$(EXEEXT) alphamap$(EXEEXT) \ -- gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \ -- matrix-test$(EXEEXT) filter-reduction-test$(EXEEXT) \ -- composite-traps-test$(EXEEXT) region-contains-test$(EXEEXT) \ -- glyph-test$(EXEEXT) solid-test$(EXEEXT) stress-test$(EXEEXT) \ -- cover-test$(EXEEXT) blitters-test$(EXEEXT) \ -- affine-test$(EXEEXT) scaling-test$(EXEEXT) composite$(EXEEXT) \ -- tolerance-test$(EXEEXT) --am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \ -- check-formats$(EXEEXT) scaling-bench$(EXEEXT) \ -- affine-bench$(EXEEXT) -+ combiner-test$(EXEEXT) \ -+ scaling-crash-test$(EXEEXT) \ -+ thread-test$(EXEEXT) \ -+ pixel-test$(EXEEXT) -+am__EXEEXT_2 = - PROGRAMS = $(noinst_PROGRAMS) - LTLIBRARIES = $(noinst_LTLIBRARIES) - libutils_la_LIBADD = -@@ -138,114 +129,24 @@ - a1_trap_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --affine_bench_SOURCES = affine-bench.c --affine_bench_OBJECTS = affine-bench.$(OBJEXT) --affine_bench_LDADD = $(LDADD) --affine_bench_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --affine_test_SOURCES = affine-test.c --affine_test_OBJECTS = affine-test.$(OBJEXT) --affine_test_LDADD = $(LDADD) --affine_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --alpha_loop_SOURCES = alpha-loop.c --alpha_loop_OBJECTS = alpha-loop.$(OBJEXT) --alpha_loop_LDADD = $(LDADD) --alpha_loop_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --alphamap_SOURCES = alphamap.c --alphamap_OBJECTS = alphamap.$(OBJEXT) --alphamap_LDADD = $(LDADD) --alphamap_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --blitters_test_SOURCES = blitters-test.c --blitters_test_OBJECTS = blitters-test.$(OBJEXT) --blitters_test_LDADD = $(LDADD) --blitters_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --check_formats_SOURCES = check-formats.c --check_formats_OBJECTS = check-formats.$(OBJEXT) --check_formats_LDADD = $(LDADD) --check_formats_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - combiner_test_SOURCES = combiner-test.c - combiner_test_OBJECTS = combiner-test.$(OBJEXT) - combiner_test_LDADD = $(LDADD) - combiner_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --composite_SOURCES = composite.c --composite_OBJECTS = composite.$(OBJEXT) --composite_LDADD = $(LDADD) --composite_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --composite_traps_test_SOURCES = composite-traps-test.c --composite_traps_test_OBJECTS = composite-traps-test.$(OBJEXT) --composite_traps_test_LDADD = $(LDADD) --composite_traps_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --cover_test_SOURCES = cover-test.c --cover_test_OBJECTS = cover-test.$(OBJEXT) --cover_test_LDADD = $(LDADD) --cover_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --fence_image_self_test_SOURCES = fence-image-self-test.c --fence_image_self_test_OBJECTS = fence-image-self-test.$(OBJEXT) --fence_image_self_test_LDADD = $(LDADD) --fence_image_self_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - fetch_test_SOURCES = fetch-test.c - fetch_test_OBJECTS = fetch-test.$(OBJEXT) - fetch_test_LDADD = $(LDADD) - fetch_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --filter_reduction_test_SOURCES = filter-reduction-test.c --filter_reduction_test_OBJECTS = filter-reduction-test.$(OBJEXT) --filter_reduction_test_LDADD = $(LDADD) --filter_reduction_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --glyph_test_SOURCES = glyph-test.c --glyph_test_OBJECTS = glyph-test.$(OBJEXT) --glyph_test_LDADD = $(LDADD) --glyph_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --gradient_crash_test_SOURCES = gradient-crash-test.c --gradient_crash_test_OBJECTS = gradient-crash-test.$(OBJEXT) --gradient_crash_test_LDADD = $(LDADD) --gradient_crash_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - infinite_loop_SOURCES = infinite-loop.c - infinite_loop_OBJECTS = infinite-loop.$(OBJEXT) - infinite_loop_LDADD = $(LDADD) - infinite_loop_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --lowlevel_blt_bench_SOURCES = lowlevel-blt-bench.c --lowlevel_blt_bench_OBJECTS = lowlevel-blt-bench.$(OBJEXT) --lowlevel_blt_bench_LDADD = $(LDADD) --lowlevel_blt_bench_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --matrix_test_SOURCES = matrix-test.c --matrix_test_OBJECTS = matrix-test.$(OBJEXT) --matrix_test_LDADD = $(LDADD) --matrix_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - oob_test_SOURCES = oob-test.c - oob_test_OBJECTS = oob-test.$(OBJEXT) - oob_test_LDADD = $(LDADD) -@@ -276,84 +177,24 @@ - radial_invalid_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --radial_perf_test_SOURCES = radial-perf-test.c --radial_perf_test_OBJECTS = radial-perf-test.$(OBJEXT) --radial_perf_test_LDADD = $(LDADD) --radial_perf_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --region_contains_test_SOURCES = region-contains-test.c --region_contains_test_OBJECTS = region-contains-test.$(OBJEXT) --region_contains_test_LDADD = $(LDADD) --region_contains_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --region_test_SOURCES = region-test.c --region_test_OBJECTS = region-test.$(OBJEXT) --region_test_LDADD = $(LDADD) --region_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - region_translate_test_SOURCES = region-translate-test.c - region_translate_test_OBJECTS = region-translate-test.$(OBJEXT) - region_translate_test_LDADD = $(LDADD) - region_translate_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --rotate_test_SOURCES = rotate-test.c --rotate_test_OBJECTS = rotate-test.$(OBJEXT) --rotate_test_LDADD = $(LDADD) --rotate_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --scaling_bench_SOURCES = scaling-bench.c --scaling_bench_OBJECTS = scaling-bench.$(OBJEXT) --scaling_bench_LDADD = $(LDADD) --scaling_bench_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - scaling_crash_test_SOURCES = scaling-crash-test.c - scaling_crash_test_OBJECTS = scaling-crash-test.$(OBJEXT) - scaling_crash_test_LDADD = $(LDADD) - scaling_crash_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --scaling_helpers_test_SOURCES = scaling-helpers-test.c --scaling_helpers_test_OBJECTS = scaling-helpers-test.$(OBJEXT) --scaling_helpers_test_LDADD = $(LDADD) --scaling_helpers_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --scaling_test_SOURCES = scaling-test.c --scaling_test_OBJECTS = scaling-test.$(OBJEXT) --scaling_test_LDADD = $(LDADD) --scaling_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --solid_test_SOURCES = solid-test.c --solid_test_OBJECTS = solid-test.$(OBJEXT) --solid_test_LDADD = $(LDADD) --solid_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --stress_test_SOURCES = stress-test.c --stress_test_OBJECTS = stress-test.$(OBJEXT) --stress_test_LDADD = $(LDADD) --stress_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - thread_test_SOURCES = thread-test.c - thread_test_OBJECTS = thread-test.$(OBJEXT) - thread_test_LDADD = $(LDADD) - thread_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --tolerance_test_SOURCES = tolerance-test.c --tolerance_test_OBJECTS = tolerance-test.$(OBJEXT) --tolerance_test_LDADD = $(LDADD) --tolerance_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - trap_crasher_SOURCES = trap-crasher.c - trap_crasher_OBJECTS = trap-crasher.$(OBJEXT) - trap_crasher_LDADD = $(LDADD) -@@ -376,27 +217,16 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__maybe_remake_depfiles = depfiles - am__depfiles_remade = ./$(DEPDIR)/a1-trap-test.Po \ -- ./$(DEPDIR)/affine-bench.Po ./$(DEPDIR)/affine-test.Po \ -- ./$(DEPDIR)/alpha-loop.Po ./$(DEPDIR)/alphamap.Po \ -- ./$(DEPDIR)/blitters-test.Po ./$(DEPDIR)/check-formats.Po \ - ./$(DEPDIR)/combiner-test.Po \ -- ./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.Po \ -- ./$(DEPDIR)/cover-test.Po ./$(DEPDIR)/fence-image-self-test.Po \ -- ./$(DEPDIR)/fetch-test.Po ./$(DEPDIR)/filter-reduction-test.Po \ -- ./$(DEPDIR)/glyph-test.Po ./$(DEPDIR)/gradient-crash-test.Po \ -- ./$(DEPDIR)/infinite-loop.Po ./$(DEPDIR)/lowlevel-blt-bench.Po \ -- ./$(DEPDIR)/matrix-test.Po ./$(DEPDIR)/oob-test.Po \ -+ ./$(DEPDIR)/fetch-test.Po \ -+ ./$(DEPDIR)/infinite-loop.Po \ -+ ./$(DEPDIR)/oob-test.Po \ - ./$(DEPDIR)/pdf-op-test.Po ./$(DEPDIR)/pixel-test.Po \ - ./$(DEPDIR)/prng-test.Po ./$(DEPDIR)/radial-invalid.Po \ -- ./$(DEPDIR)/radial-perf-test.Po \ -- ./$(DEPDIR)/region-contains-test.Po ./$(DEPDIR)/region-test.Po \ - ./$(DEPDIR)/region-translate-test.Po \ -- ./$(DEPDIR)/rotate-test.Po ./$(DEPDIR)/scaling-bench.Po \ - ./$(DEPDIR)/scaling-crash-test.Po \ -- ./$(DEPDIR)/scaling-helpers-test.Po \ -- ./$(DEPDIR)/scaling-test.Po ./$(DEPDIR)/solid-test.Po \ -- ./$(DEPDIR)/stress-test.Po ./$(DEPDIR)/thread-test.Po \ -- ./$(DEPDIR)/tolerance-test.Po ./$(DEPDIR)/trap-crasher.Po \ -+ ./$(DEPDIR)/thread-test.Po \ -+ ./$(DEPDIR)/trap-crasher.Po \ - ./$(DEPDIR)/utils-prng.Plo ./$(DEPDIR)/utils.Plo - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -417,30 +247,24 @@ - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; - am__v_CCLD_1 = --SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \ -- affine-test.c alpha-loop.c alphamap.c blitters-test.c \ -- check-formats.c combiner-test.c composite.c \ -- composite-traps-test.c cover-test.c fence-image-self-test.c \ -- fetch-test.c filter-reduction-test.c glyph-test.c \ -- gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \ -- matrix-test.c oob-test.c pdf-op-test.c pixel-test.c \ -- prng-test.c radial-invalid.c radial-perf-test.c \ -- region-contains-test.c region-test.c region-translate-test.c \ -- rotate-test.c scaling-bench.c scaling-crash-test.c \ -- scaling-helpers-test.c scaling-test.c solid-test.c \ -- stress-test.c thread-test.c tolerance-test.c trap-crasher.c --DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \ -- affine-test.c alpha-loop.c alphamap.c blitters-test.c \ -- check-formats.c combiner-test.c composite.c \ -- composite-traps-test.c cover-test.c fence-image-self-test.c \ -- fetch-test.c filter-reduction-test.c glyph-test.c \ -- gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \ -- matrix-test.c oob-test.c pdf-op-test.c pixel-test.c \ -- prng-test.c radial-invalid.c radial-perf-test.c \ -- region-contains-test.c region-test.c region-translate-test.c \ -- rotate-test.c scaling-bench.c scaling-crash-test.c \ -- scaling-helpers-test.c scaling-test.c solid-test.c \ -- stress-test.c thread-test.c tolerance-test.c trap-crasher.c -+SOURCES = $(libutils_la_SOURCES) a1-trap-test.c \ -+ combiner-test.c \ -+ fetch-test.c \ -+ infinite-loop.c \ -+ oob-test.c pdf-op-test.c pixel-test.c \ -+ prng-test.c radial-invalid.c \ -+ region-translate-test.c \ -+ scaling-crash-test.c \ -+ thread-test.c trap-crasher.c -+DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c \ -+ combiner-test.c \ -+ fetch-test.c \ -+ infinite-loop.c \ -+ oob-test.c pdf-op-test.c pixel-test.c \ -+ prng-test.c radial-invalid.c \ -+ region-translate-test.c \ -+ scaling-crash-test.c \ -+ thread-test.c trap-crasher.c - am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ -@@ -826,46 +650,21 @@ - oob-test \ - infinite-loop \ - trap-crasher \ -- fence-image-self-test \ - region-translate-test \ - fetch-test \ - a1-trap-test \ - prng-test \ - radial-invalid \ - pdf-op-test \ -- region-test \ - combiner-test \ - scaling-crash-test \ -- alpha-loop \ -- scaling-helpers-test \ - thread-test \ -- rotate-test \ -- alphamap \ -- gradient-crash-test \ - pixel-test \ -- matrix-test \ -- filter-reduction-test \ -- composite-traps-test \ -- region-contains-test \ -- glyph-test \ -- solid-test \ -- stress-test \ -- cover-test \ -- blitters-test \ -- affine-test \ -- scaling-test \ -- composite \ -- tolerance-test \ - $(NULL) - - - # Other programs - OTHERPROGRAMS = \ -- lowlevel-blt-bench \ -- radial-perf-test \ -- check-formats \ -- scaling-bench \ -- affine-bench \ - $(NULL) - - -@@ -952,78 +751,18 @@ - @rm -f a1-trap-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(a1_trap_test_OBJECTS) $(a1_trap_test_LDADD) $(LIBS) - --affine-bench$(EXEEXT): $(affine_bench_OBJECTS) $(affine_bench_DEPENDENCIES) $(EXTRA_affine_bench_DEPENDENCIES) -- @rm -f affine-bench$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS) -- --affine-test$(EXEEXT): $(affine_test_OBJECTS) $(affine_test_DEPENDENCIES) $(EXTRA_affine_test_DEPENDENCIES) -- @rm -f affine-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(affine_test_OBJECTS) $(affine_test_LDADD) $(LIBS) -- --alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) $(EXTRA_alpha_loop_DEPENDENCIES) -- @rm -f alpha-loop$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS) -- --alphamap$(EXEEXT): $(alphamap_OBJECTS) $(alphamap_DEPENDENCIES) $(EXTRA_alphamap_DEPENDENCIES) -- @rm -f alphamap$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS) -- --blitters-test$(EXEEXT): $(blitters_test_OBJECTS) $(blitters_test_DEPENDENCIES) $(EXTRA_blitters_test_DEPENDENCIES) -- @rm -f blitters-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(blitters_test_OBJECTS) $(blitters_test_LDADD) $(LIBS) -- --check-formats$(EXEEXT): $(check_formats_OBJECTS) $(check_formats_DEPENDENCIES) $(EXTRA_check_formats_DEPENDENCIES) -- @rm -f check-formats$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(check_formats_OBJECTS) $(check_formats_LDADD) $(LIBS) -- - combiner-test$(EXEEXT): $(combiner_test_OBJECTS) $(combiner_test_DEPENDENCIES) $(EXTRA_combiner_test_DEPENDENCIES) - @rm -f combiner-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(combiner_test_OBJECTS) $(combiner_test_LDADD) $(LIBS) - --composite$(EXEEXT): $(composite_OBJECTS) $(composite_DEPENDENCIES) $(EXTRA_composite_DEPENDENCIES) -- @rm -f composite$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(composite_OBJECTS) $(composite_LDADD) $(LIBS) -- --composite-traps-test$(EXEEXT): $(composite_traps_test_OBJECTS) $(composite_traps_test_DEPENDENCIES) $(EXTRA_composite_traps_test_DEPENDENCIES) -- @rm -f composite-traps-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(composite_traps_test_OBJECTS) $(composite_traps_test_LDADD) $(LIBS) -- --cover-test$(EXEEXT): $(cover_test_OBJECTS) $(cover_test_DEPENDENCIES) $(EXTRA_cover_test_DEPENDENCIES) -- @rm -f cover-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(cover_test_OBJECTS) $(cover_test_LDADD) $(LIBS) -- --fence-image-self-test$(EXEEXT): $(fence_image_self_test_OBJECTS) $(fence_image_self_test_DEPENDENCIES) $(EXTRA_fence_image_self_test_DEPENDENCIES) -- @rm -f fence-image-self-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(fence_image_self_test_OBJECTS) $(fence_image_self_test_LDADD) $(LIBS) -- - fetch-test$(EXEEXT): $(fetch_test_OBJECTS) $(fetch_test_DEPENDENCIES) $(EXTRA_fetch_test_DEPENDENCIES) - @rm -f fetch-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fetch_test_OBJECTS) $(fetch_test_LDADD) $(LIBS) - --filter-reduction-test$(EXEEXT): $(filter_reduction_test_OBJECTS) $(filter_reduction_test_DEPENDENCIES) $(EXTRA_filter_reduction_test_DEPENDENCIES) -- @rm -f filter-reduction-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(filter_reduction_test_OBJECTS) $(filter_reduction_test_LDADD) $(LIBS) -- --glyph-test$(EXEEXT): $(glyph_test_OBJECTS) $(glyph_test_DEPENDENCIES) $(EXTRA_glyph_test_DEPENDENCIES) -- @rm -f glyph-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(glyph_test_OBJECTS) $(glyph_test_LDADD) $(LIBS) -- --gradient-crash-test$(EXEEXT): $(gradient_crash_test_OBJECTS) $(gradient_crash_test_DEPENDENCIES) $(EXTRA_gradient_crash_test_DEPENDENCIES) -- @rm -f gradient-crash-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(gradient_crash_test_OBJECTS) $(gradient_crash_test_LDADD) $(LIBS) -- - infinite-loop$(EXEEXT): $(infinite_loop_OBJECTS) $(infinite_loop_DEPENDENCIES) $(EXTRA_infinite_loop_DEPENDENCIES) - @rm -f infinite-loop$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(infinite_loop_OBJECTS) $(infinite_loop_LDADD) $(LIBS) - --lowlevel-blt-bench$(EXEEXT): $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_DEPENDENCIES) $(EXTRA_lowlevel_blt_bench_DEPENDENCIES) -- @rm -f lowlevel-blt-bench$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS) -- --matrix-test$(EXEEXT): $(matrix_test_OBJECTS) $(matrix_test_DEPENDENCIES) $(EXTRA_matrix_test_DEPENDENCIES) -- @rm -f matrix-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(matrix_test_OBJECTS) $(matrix_test_LDADD) $(LIBS) -- - oob-test$(EXEEXT): $(oob_test_OBJECTS) $(oob_test_DEPENDENCIES) $(EXTRA_oob_test_DEPENDENCIES) - @rm -f oob-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(oob_test_OBJECTS) $(oob_test_LDADD) $(LIBS) -@@ -1044,58 +783,18 @@ - @rm -f radial-invalid$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(radial_invalid_OBJECTS) $(radial_invalid_LDADD) $(LIBS) - --radial-perf-test$(EXEEXT): $(radial_perf_test_OBJECTS) $(radial_perf_test_DEPENDENCIES) $(EXTRA_radial_perf_test_DEPENDENCIES) -- @rm -f radial-perf-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS) -- --region-contains-test$(EXEEXT): $(region_contains_test_OBJECTS) $(region_contains_test_DEPENDENCIES) $(EXTRA_region_contains_test_DEPENDENCIES) -- @rm -f region-contains-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(region_contains_test_OBJECTS) $(region_contains_test_LDADD) $(LIBS) -- --region-test$(EXEEXT): $(region_test_OBJECTS) $(region_test_DEPENDENCIES) $(EXTRA_region_test_DEPENDENCIES) -- @rm -f region-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(region_test_OBJECTS) $(region_test_LDADD) $(LIBS) -- - region-translate-test$(EXEEXT): $(region_translate_test_OBJECTS) $(region_translate_test_DEPENDENCIES) $(EXTRA_region_translate_test_DEPENDENCIES) - @rm -f region-translate-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(region_translate_test_OBJECTS) $(region_translate_test_LDADD) $(LIBS) - --rotate-test$(EXEEXT): $(rotate_test_OBJECTS) $(rotate_test_DEPENDENCIES) $(EXTRA_rotate_test_DEPENDENCIES) -- @rm -f rotate-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(rotate_test_OBJECTS) $(rotate_test_LDADD) $(LIBS) -- --scaling-bench$(EXEEXT): $(scaling_bench_OBJECTS) $(scaling_bench_DEPENDENCIES) $(EXTRA_scaling_bench_DEPENDENCIES) -- @rm -f scaling-bench$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(scaling_bench_OBJECTS) $(scaling_bench_LDADD) $(LIBS) -- - scaling-crash-test$(EXEEXT): $(scaling_crash_test_OBJECTS) $(scaling_crash_test_DEPENDENCIES) $(EXTRA_scaling_crash_test_DEPENDENCIES) - @rm -f scaling-crash-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(scaling_crash_test_OBJECTS) $(scaling_crash_test_LDADD) $(LIBS) - --scaling-helpers-test$(EXEEXT): $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_DEPENDENCIES) $(EXTRA_scaling_helpers_test_DEPENDENCIES) -- @rm -f scaling-helpers-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_LDADD) $(LIBS) -- --scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) $(EXTRA_scaling_test_DEPENDENCIES) -- @rm -f scaling-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS) -- --solid-test$(EXEEXT): $(solid_test_OBJECTS) $(solid_test_DEPENDENCIES) $(EXTRA_solid_test_DEPENDENCIES) -- @rm -f solid-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(solid_test_OBJECTS) $(solid_test_LDADD) $(LIBS) -- --stress-test$(EXEEXT): $(stress_test_OBJECTS) $(stress_test_DEPENDENCIES) $(EXTRA_stress_test_DEPENDENCIES) -- @rm -f stress-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(stress_test_OBJECTS) $(stress_test_LDADD) $(LIBS) -- - thread-test$(EXEEXT): $(thread_test_OBJECTS) $(thread_test_DEPENDENCIES) $(EXTRA_thread_test_DEPENDENCIES) - @rm -f thread-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS) - --tolerance-test$(EXEEXT): $(tolerance_test_OBJECTS) $(tolerance_test_DEPENDENCIES) $(EXTRA_tolerance_test_DEPENDENCIES) -- @rm -f tolerance-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(tolerance_test_OBJECTS) $(tolerance_test_LDADD) $(LIBS) -- - trap-crasher$(EXEEXT): $(trap_crasher_OBJECTS) $(trap_crasher_DEPENDENCIES) $(EXTRA_trap_crasher_DEPENDENCIES) - @rm -f trap-crasher$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(trap_crasher_OBJECTS) $(trap_crasher_LDADD) $(LIBS) -@@ -1107,42 +806,17 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a1-trap-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blitters-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combiner-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fetch-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter-reduction-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glyph-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oob-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf-op-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prng-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-invalid.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-perf-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-contains-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-translate-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotate-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-bench.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-crash-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-helpers-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tolerance-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils-prng.Plo@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ # am--include-marker -@@ -1394,13 +1068,6 @@ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) --fence-image-self-test.log: fence-image-self-test$(EXEEXT) -- @p='fence-image-self-test$(EXEEXT)'; \ -- b='fence-image-self-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) - region-translate-test.log: region-translate-test$(EXEEXT) - @p='region-translate-test$(EXEEXT)'; \ - b='region-translate-test'; \ -@@ -1443,13 +1110,6 @@ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) --region-test.log: region-test$(EXEEXT) -- @p='region-test$(EXEEXT)'; \ -- b='region-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) - combiner-test.log: combiner-test$(EXEEXT) - @p='combiner-test$(EXEEXT)'; \ - b='combiner-test'; \ -@@ -1464,20 +1124,6 @@ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) --alpha-loop.log: alpha-loop$(EXEEXT) -- @p='alpha-loop$(EXEEXT)'; \ -- b='alpha-loop'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --scaling-helpers-test.log: scaling-helpers-test$(EXEEXT) -- @p='scaling-helpers-test$(EXEEXT)'; \ -- b='scaling-helpers-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) - thread-test.log: thread-test$(EXEEXT) - @p='thread-test$(EXEEXT)'; \ - b='thread-test'; \ -@@ -1485,27 +1131,6 @@ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) --rotate-test.log: rotate-test$(EXEEXT) -- @p='rotate-test$(EXEEXT)'; \ -- b='rotate-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --alphamap.log: alphamap$(EXEEXT) -- @p='alphamap$(EXEEXT)'; \ -- b='alphamap'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --gradient-crash-test.log: gradient-crash-test$(EXEEXT) -- @p='gradient-crash-test$(EXEEXT)'; \ -- b='gradient-crash-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) - pixel-test.log: pixel-test$(EXEEXT) - @p='pixel-test$(EXEEXT)'; \ - b='pixel-test'; \ -@@ -1513,97 +1138,6 @@ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) --matrix-test.log: matrix-test$(EXEEXT) -- @p='matrix-test$(EXEEXT)'; \ -- b='matrix-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --filter-reduction-test.log: filter-reduction-test$(EXEEXT) -- @p='filter-reduction-test$(EXEEXT)'; \ -- b='filter-reduction-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --composite-traps-test.log: composite-traps-test$(EXEEXT) -- @p='composite-traps-test$(EXEEXT)'; \ -- b='composite-traps-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --region-contains-test.log: region-contains-test$(EXEEXT) -- @p='region-contains-test$(EXEEXT)'; \ -- b='region-contains-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --glyph-test.log: glyph-test$(EXEEXT) -- @p='glyph-test$(EXEEXT)'; \ -- b='glyph-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --solid-test.log: solid-test$(EXEEXT) -- @p='solid-test$(EXEEXT)'; \ -- b='solid-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --stress-test.log: stress-test$(EXEEXT) -- @p='stress-test$(EXEEXT)'; \ -- b='stress-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --cover-test.log: cover-test$(EXEEXT) -- @p='cover-test$(EXEEXT)'; \ -- b='cover-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --blitters-test.log: blitters-test$(EXEEXT) -- @p='blitters-test$(EXEEXT)'; \ -- b='blitters-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --affine-test.log: affine-test$(EXEEXT) -- @p='affine-test$(EXEEXT)'; \ -- b='affine-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --scaling-test.log: scaling-test$(EXEEXT) -- @p='scaling-test$(EXEEXT)'; \ -- b='scaling-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --composite.log: composite$(EXEEXT) -- @p='composite$(EXEEXT)'; \ -- b='composite'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --tolerance-test.log: tolerance-test$(EXEEXT) -- @p='tolerance-test$(EXEEXT)'; \ -- b='tolerance-test'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) - .test.log: - @p='$<'; \ - $(am__set_b); \ -@@ -1697,42 +1231,17 @@ - - distclean: distclean-am - -rm -f ./$(DEPDIR)/a1-trap-test.Po -- -rm -f ./$(DEPDIR)/affine-bench.Po -- -rm -f ./$(DEPDIR)/affine-test.Po -- -rm -f ./$(DEPDIR)/alpha-loop.Po -- -rm -f ./$(DEPDIR)/alphamap.Po -- -rm -f ./$(DEPDIR)/blitters-test.Po -- -rm -f ./$(DEPDIR)/check-formats.Po - -rm -f ./$(DEPDIR)/combiner-test.Po -- -rm -f ./$(DEPDIR)/composite-traps-test.Po -- -rm -f ./$(DEPDIR)/composite.Po -- -rm -f ./$(DEPDIR)/cover-test.Po -- -rm -f ./$(DEPDIR)/fence-image-self-test.Po - -rm -f ./$(DEPDIR)/fetch-test.Po -- -rm -f ./$(DEPDIR)/filter-reduction-test.Po -- -rm -f ./$(DEPDIR)/glyph-test.Po -- -rm -f ./$(DEPDIR)/gradient-crash-test.Po - -rm -f ./$(DEPDIR)/infinite-loop.Po -- -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po -- -rm -f ./$(DEPDIR)/matrix-test.Po - -rm -f ./$(DEPDIR)/oob-test.Po - -rm -f ./$(DEPDIR)/pdf-op-test.Po - -rm -f ./$(DEPDIR)/pixel-test.Po - -rm -f ./$(DEPDIR)/prng-test.Po - -rm -f ./$(DEPDIR)/radial-invalid.Po -- -rm -f ./$(DEPDIR)/radial-perf-test.Po -- -rm -f ./$(DEPDIR)/region-contains-test.Po -- -rm -f ./$(DEPDIR)/region-test.Po - -rm -f ./$(DEPDIR)/region-translate-test.Po -- -rm -f ./$(DEPDIR)/rotate-test.Po -- -rm -f ./$(DEPDIR)/scaling-bench.Po - -rm -f ./$(DEPDIR)/scaling-crash-test.Po -- -rm -f ./$(DEPDIR)/scaling-helpers-test.Po -- -rm -f ./$(DEPDIR)/scaling-test.Po -- -rm -f ./$(DEPDIR)/solid-test.Po -- -rm -f ./$(DEPDIR)/stress-test.Po - -rm -f ./$(DEPDIR)/thread-test.Po -- -rm -f ./$(DEPDIR)/tolerance-test.Po - -rm -f ./$(DEPDIR)/trap-crasher.Po - -rm -f ./$(DEPDIR)/utils-prng.Plo - -rm -f ./$(DEPDIR)/utils.Plo -@@ -1782,42 +1291,17 @@ - - maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/a1-trap-test.Po -- -rm -f ./$(DEPDIR)/affine-bench.Po -- -rm -f ./$(DEPDIR)/affine-test.Po -- -rm -f ./$(DEPDIR)/alpha-loop.Po -- -rm -f ./$(DEPDIR)/alphamap.Po -- -rm -f ./$(DEPDIR)/blitters-test.Po -- -rm -f ./$(DEPDIR)/check-formats.Po - -rm -f ./$(DEPDIR)/combiner-test.Po -- -rm -f ./$(DEPDIR)/composite-traps-test.Po -- -rm -f ./$(DEPDIR)/composite.Po -- -rm -f ./$(DEPDIR)/cover-test.Po -- -rm -f ./$(DEPDIR)/fence-image-self-test.Po - -rm -f ./$(DEPDIR)/fetch-test.Po -- -rm -f ./$(DEPDIR)/filter-reduction-test.Po -- -rm -f ./$(DEPDIR)/glyph-test.Po -- -rm -f ./$(DEPDIR)/gradient-crash-test.Po - -rm -f ./$(DEPDIR)/infinite-loop.Po -- -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po -- -rm -f ./$(DEPDIR)/matrix-test.Po - -rm -f ./$(DEPDIR)/oob-test.Po - -rm -f ./$(DEPDIR)/pdf-op-test.Po - -rm -f ./$(DEPDIR)/pixel-test.Po - -rm -f ./$(DEPDIR)/prng-test.Po - -rm -f ./$(DEPDIR)/radial-invalid.Po -- -rm -f ./$(DEPDIR)/radial-perf-test.Po -- -rm -f ./$(DEPDIR)/region-contains-test.Po -- -rm -f ./$(DEPDIR)/region-test.Po - -rm -f ./$(DEPDIR)/region-translate-test.Po -- -rm -f ./$(DEPDIR)/rotate-test.Po -- -rm -f ./$(DEPDIR)/scaling-bench.Po - -rm -f ./$(DEPDIR)/scaling-crash-test.Po -- -rm -f ./$(DEPDIR)/scaling-helpers-test.Po -- -rm -f ./$(DEPDIR)/scaling-test.Po -- -rm -f ./$(DEPDIR)/solid-test.Po -- -rm -f ./$(DEPDIR)/stress-test.Po - -rm -f ./$(DEPDIR)/thread-test.Po -- -rm -f ./$(DEPDIR)/tolerance-test.Po - -rm -f ./$(DEPDIR)/trap-crasher.Po - -rm -f ./$(DEPDIR)/utils-prng.Plo - -rm -f ./$(DEPDIR)/utils.Plo ---- ./demos/Makefile.in.orig 2020-04-19 16:53:21.000000000 -0500 -+++ ./demos/Makefile.in 2020-04-20 14:54:20.827508022 -0500 -@@ -107,7 +107,7 @@ - @HAVE_GTK_TRUE@ trap-test$(EXEEXT) tri-test$(EXEEXT) \ - @HAVE_GTK_TRUE@ quad2quad$(EXEEXT) checkerboard$(EXEEXT) \ - @HAVE_GTK_TRUE@ srgb-trap-test$(EXEEXT) srgb-test$(EXEEXT) \ --@HAVE_GTK_TRUE@ scale$(EXEEXT) dither$(EXEEXT) -+@HAVE_GTK_TRUE@ scale$(EXEEXT) - PROGRAMS = $(noinst_PROGRAMS) - am__alpha_test_SOURCES_DIST = alpha-test.c gtk-utils.c gtk-utils.h \ - ../test/utils.c ../test/utils.h ../test/utils-prng.c \ -@@ -185,15 +185,6 @@ - @HAVE_GTK_TRUE@convolution_test_DEPENDENCIES = \ - @HAVE_GTK_TRUE@ $(top_builddir)/pixman/libpixman-1.la \ - @HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am__dither_SOURCES_DIST = dither.c gtk-utils.c gtk-utils.h \ -- ../test/utils.c ../test/utils.h ../test/utils-prng.c \ -- ../test/utils-prng.h --@HAVE_GTK_TRUE@am_dither_OBJECTS = dither.$(OBJEXT) $(am__objects_1) --dither_OBJECTS = $(am_dither_OBJECTS) --dither_LDADD = $(LDADD) --@HAVE_GTK_TRUE@dither_DEPENDENCIES = \ --@HAVE_GTK_TRUE@ $(top_builddir)/pixman/libpixman-1.la \ --@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - am__gradient_test_SOURCES_DIST = gradient-test.c gtk-utils.c \ - gtk-utils.h ../test/utils.c ../test/utils.h \ - ../test/utils-prng.c ../test/utils-prng.h -@@ -308,7 +299,7 @@ - ./$(DEPDIR)/checkerboard.Po ./$(DEPDIR)/clip-in.Po \ - ./$(DEPDIR)/clip-test.Po ./$(DEPDIR)/composite-test.Po \ - ./$(DEPDIR)/conical-test.Po ./$(DEPDIR)/convolution-test.Po \ -- ./$(DEPDIR)/dither.Po ./$(DEPDIR)/gradient-test.Po \ -+ ./$(DEPDIR)/gradient-test.Po \ - ./$(DEPDIR)/gtk-utils.Po ./$(DEPDIR)/linear-gradient.Po \ - ./$(DEPDIR)/quad2quad.Po ./$(DEPDIR)/radial-test.Po \ - ./$(DEPDIR)/scale.Po ./$(DEPDIR)/screen-test.Po \ -@@ -337,7 +328,7 @@ - SOURCES = $(alpha_test_SOURCES) $(checkerboard_SOURCES) \ - $(clip_in_SOURCES) $(clip_test_SOURCES) \ - $(composite_test_SOURCES) $(conical_test_SOURCES) \ -- $(convolution_test_SOURCES) $(dither_SOURCES) \ -+ $(convolution_test_SOURCES) \ - $(gradient_test_SOURCES) $(linear_gradient_SOURCES) \ - quad2quad.c $(radial_test_SOURCES) $(scale_SOURCES) \ - $(screen_test_SOURCES) $(srgb_test_SOURCES) \ -@@ -349,7 +340,7 @@ - $(am__composite_test_SOURCES_DIST) \ - $(am__conical_test_SOURCES_DIST) \ - $(am__convolution_test_SOURCES_DIST) \ -- $(am__dither_SOURCES_DIST) $(am__gradient_test_SOURCES_DIST) \ -+ $(am__gradient_test_SOURCES_DIST) \ - $(am__linear_gradient_SOURCES_DIST) quad2quad.c \ - $(am__radial_test_SOURCES_DIST) $(am__scale_SOURCES_DIST) \ - $(am__screen_test_SOURCES_DIST) $(am__srgb_test_SOURCES_DIST) \ -@@ -533,7 +524,6 @@ - parrot.c \ - parrot.jpg \ - scale.ui \ -- dither.ui \ - meson.build \ - $(NULL) - -@@ -561,8 +551,7 @@ - @HAVE_GTK_TRUE@ checkerboard \ - @HAVE_GTK_TRUE@ srgb-trap-test \ - @HAVE_GTK_TRUE@ srgb-test \ --@HAVE_GTK_TRUE@ scale \ --@HAVE_GTK_TRUE@ dither -+@HAVE_GTK_TRUE@ scale - - @HAVE_GTK_TRUE@gradient_test_SOURCES = gradient-test.c $(GTK_UTILS) - @HAVE_GTK_TRUE@alpha_test_SOURCES = alpha-test.c $(GTK_UTILS) -@@ -580,7 +569,6 @@ - @HAVE_GTK_TRUE@srgb_test_SOURCES = srgb-test.c $(GTK_UTILS) - @HAVE_GTK_TRUE@srgb_trap_test_SOURCES = srgb-trap-test.c $(GTK_UTILS) - @HAVE_GTK_TRUE@scale_SOURCES = scale.c $(GTK_UTILS) --@HAVE_GTK_TRUE@dither_SOURCES = dither.c $(GTK_UTILS) - all: all-am - - .SUFFIXES: -@@ -652,10 +640,6 @@ - @rm -f convolution-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(convolution_test_OBJECTS) $(convolution_test_LDADD) $(LIBS) - --dither$(EXEEXT): $(dither_OBJECTS) $(dither_DEPENDENCIES) $(EXTRA_dither_DEPENDENCIES) -- @rm -f dither$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(dither_OBJECTS) $(dither_LDADD) $(LIBS) -- - gradient-test$(EXEEXT): $(gradient_test_OBJECTS) $(gradient_test_DEPENDENCIES) $(EXTRA_gradient_test_DEPENDENCIES) - @rm -f gradient-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gradient_test_OBJECTS) $(gradient_test_LDADD) $(LIBS) -@@ -709,7 +693,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conical-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convolution-test.Po@am__quote@ # am--include-marker --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-utils.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linear-gradient.Po@am__quote@ # am--include-marker -@@ -917,7 +900,6 @@ - -rm -f ./$(DEPDIR)/composite-test.Po - -rm -f ./$(DEPDIR)/conical-test.Po - -rm -f ./$(DEPDIR)/convolution-test.Po -- -rm -f ./$(DEPDIR)/dither.Po - -rm -f ./$(DEPDIR)/gradient-test.Po - -rm -f ./$(DEPDIR)/gtk-utils.Po - -rm -f ./$(DEPDIR)/linear-gradient.Po -@@ -983,7 +965,6 @@ - -rm -f ./$(DEPDIR)/composite-test.Po - -rm -f ./$(DEPDIR)/conical-test.Po - -rm -f ./$(DEPDIR)/convolution-test.Po -- -rm -f ./$(DEPDIR)/dither.Po - -rm -f ./$(DEPDIR)/gradient-test.Po - -rm -f ./$(DEPDIR)/gtk-utils.Po - -rm -f ./$(DEPDIR)/linear-gradient.Po diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch deleted file mode 100644 index 936bf1ca4..000000000 --- a/source/x/x11/patch/xdm.patch +++ /dev/null @@ -1,6 +0,0 @@ -zcat $CWD/patch/xdm/xdm.glibc.crypt.diff.gz | patch -p1 --verbose || \ - { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/xdm/xdm-1.1.11-arc4random-include.patch.gz | patch -p1 --verbose || \ - { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/xdm/xdm-1.1.11-setproctitle-include.patch.gz | patch -p1 --verbose || \ - { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch b/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch deleted file mode 100644 index db948094b..000000000 --- a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur a/xdm/genauth.c b/xdm/genauth.c ---- a/xdm/genauth.c 2011-09-25 09:35:47.000000000 +0200 -+++ b/xdm/genauth.c 2014-01-06 16:28:09.664060603 +0100 -@@ -40,6 +40,14 @@ - - #include <errno.h> - -+#ifdef HAVE_ARC4RANDOM -+# ifdef __linux__ -+# include <bsd/stdlib.h> -+# else -+# include <stdlib.h> -+# endif -+#endif -+ - #include <time.h> - #define Time_t time_t - diff --git a/source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch b/source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch deleted file mode 100644 index 0a3f32bbe..000000000 --- a/source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ur a/xdm/choose.c b/xdm/choose.c ---- a/xdm/choose.c 2011-09-25 09:35:47.000000000 +0200 -+++ b/xdm/choose.c 2014-01-06 16:33:09.628065364 +0100 -@@ -54,6 +54,14 @@ - # include <tiuser.h> - # endif - -+# ifdef HAVE_SETPROCTITLE -+# ifdef __linux__ -+# include <bsd/unistd.h> -+# else -+# include <unistd.h> -+# endif -+# endif -+ - # include <time.h> - # define Time_t time_t - -diff -ur a/xdm/session.c b/xdm/session.c ---- a/xdm/session.c 2011-09-25 09:35:47.000000000 +0200 -+++ b/xdm/session.c 2014-01-06 16:40:57.508072789 +0100 -@@ -54,6 +54,15 @@ - # include <usersec.h> - #endif - -+# ifdef HAVE_SETPROCTITLE -+# include <sys/types.h> -+# ifdef __linux__ -+# include <bsd/unistd.h> -+# else -+# include <unistd.h> -+# endif -+# endif -+ - #ifndef USE_PAM /* PAM modules should handle these */ - # ifdef SECURE_RPC - # include <rpc/rpc.h> diff --git a/source/x/x11/patch/xdm/xdm.glibc.crypt.diff b/source/x/x11/patch/xdm/xdm.glibc.crypt.diff deleted file mode 100644 index 076df37dc..000000000 --- a/source/x/x11/patch/xdm/xdm.glibc.crypt.diff +++ /dev/null @@ -1,42 +0,0 @@ -From 8d1eb5c74413e4c9a21f689fc106949b121c0117 Mon Sep 17 00:00:00 2001 -From: mancha <mancha1@hush.com> -Date: Wed, 22 May 2013 14:20:26 +0000 -Subject: Handle NULL returns from glibc 2.17+ crypt(). - -Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL -(w/ NULL return) if the salt violates specifications. Additionally, -on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords -passed to crypt() fail with EPERM (w/ NULL return). - -If using glibc's crypt(), check return value to avoid a possible -NULL pointer dereference. - -Reviewed-by: Matthieu Herrb <matthieu@herrb.eu> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/greeter/verify.c b/greeter/verify.c -index db3cb7d..b009e2b 100644 ---- a/greeter/verify.c -+++ b/greeter/verify.c -@@ -329,6 +329,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) - struct spwd *sp; - # endif - char *user_pass = NULL; -+ char *crypted_pass = NULL; - # endif - # ifdef __OpenBSD__ - char *s; -@@ -464,7 +465,9 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) - # if defined(ultrix) || defined(__ultrix__) - if (authenticate_user(p, greet->password, NULL) < 0) - # else -- if (strcmp (crypt (greet->password, user_pass), user_pass)) -+ crypted_pass = crypt (greet->password, user_pass); -+ if ((crypted_pass == NULL) -+ || (strcmp (crypted_pass, user_pass))) - # endif - { - if(!greet->allow_null_passwd || strlen(p->pw_passwd) > 0) { --- -cgit v0.9.0.2-2-gbebe - diff --git a/source/x/x11/patch/xf86-video-s3virge.patch b/source/x/x11/patch/xf86-video-s3virge.patch deleted file mode 100644 index 5e65d8563..000000000 --- a/source/x/x11/patch/xf86-video-s3virge.patch +++ /dev/null @@ -1,2 +0,0 @@ -# Patch for xorg-server-1.20.x: -zcat $CWD/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff b/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff deleted file mode 100644 index 685282dfa..000000000 --- a/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -aurN xf86-video-s3virge-1.10.7/src/s3v_driver.c xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c ---- xf86-video-s3virge-1.10.7/src/s3v_driver.c 2015-09-26 18:28:11.000000000 +0200 -+++ xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c 2018-07-14 12:43:11.986789561 +0200 -@@ -1203,6 +1203,7 @@ - vga256InfoRec.directMode = XF86DGADirectPresent; - #endif - -+#if 0 - /* - * xf86ValidateModes will check that the mode HTotal and VTotal values - * don't exceed the chipset's limit if pScrn->maxHValue and -@@ -1214,6 +1215,7 @@ - /* true for all ViRGE? */ - pScrn->maxHValue = 2048; - pScrn->maxVValue = 2048; -+#endif - - /* Lower depths default to config file */ - pScrn->virtualX = pScrn->display->virtualX; diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch index e1e5d20f6..b75c4cf40 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -9,13 +9,8 @@ zcat $CWD/patch/xorg-server/xorg-server.combo.mouse.keyboard.layout.patch.gz | p # the next xorg-server and will no longer apply then. zcat $CWD/patch/xorg-server/fix-nouveau-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -# From Fedora Rawhide 2018/7 (possibly useful, doesn't seem like it will hurt anything): -zcat $CWD/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - -# From Fedora Rawhide 2018/7, looks like many other distributions have added -# this patch for a long time. Keep an eye out for newer versions though, and -# revisit this if any DE begin to manage secondary GPUs (although none do yet): -zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +## From Fedora Rawhide 2018/7 (possibly useful, doesn't seem like it will hurt anything): +#zcat $CWD/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # The upstream nouveau developers recommend this. On newer nvidia cards it works # better to use the generic modesetting ddx rather than nouveau. @@ -23,8 +18,6 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p # Added here 2018/7. zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -# Fix a PCI related segfault: -zcat $CWD/patch/xorg-server/fix-pci-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - # Only use Intel DDX with pre-gen4 hardware. Newer hardware will the the modesetting driver by default: zcat $CWD/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch b/source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch deleted file mode 100644 index c613eb8f9..000000000 --- a/source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e96a83d9b1b5a52a41213c7a4840dc96b4f5b06f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 15 Aug 2012 12:35:21 -0400 -Subject: [PATCH] Always install vbe and int10 sdk headers - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- - hw/xfree86/Makefile.am | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am -index b876b79..a170b58 100644 ---- a/hw/xfree86/Makefile.am -+++ b/hw/xfree86/Makefile.am -@@ -26,17 +26,9 @@ if VGAHW - VGAHW_SUBDIR = vgahw - endif - --if VBE --VBE_SUBDIR = vbe --endif -- --if INT10MODULE --INT10_SUBDIR = int10 --endif -- --SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ -+SUBDIRS = common ddc x86emu int10 os-support parser \ - ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ -- $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \ -+ $(DRI2_SUBDIR) . vbe i2c dixmods xkb \ - fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \ - $(GLAMOR_EGL_SUBDIR) drivers - --- -2.13.6 - diff --git a/source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch b/source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch deleted file mode 100644 index 86b96a23e..000000000 --- a/source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch +++ /dev/null @@ -1,293 +0,0 @@ -From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Mon, 2 Apr 2018 16:49:02 -0400 -Subject: [PATCH] autobind GPUs to the screen - -This is a modified version of a patch we've been carry-ing in Fedora and -RHEL for years now. This patch automatically adds secondary GPUs to the -master as output sink / offload source making e.g. the use of -slave-outputs just work, with requiring the user to manually run -"xrandr --setprovideroutputsource" before he can hookup an external -monitor to his hybrid graphics laptop. - -There is one problem with this patch, which is why it was not upstreamed -before. What to do when a secondary GPU gets detected really is a policy -decission (e.g. one may want to autobind PCI GPUs but not USB ones) and -as such should be under control of the Desktop Environment. - -Unconditionally adding autobinding support to the xserver will result -in races between the DE dealing with the hotplug of a secondary GPU -and the server itself dealing with it. - -However we've waited for years for any Desktop Environments to actually -start doing some sort of autoconfiguration of secondary GPUs and there -is still not a single DE dealing with this, so I believe that it is -time to upstream this now. - -To avoid potential future problems if any DEs get support for doing -secondary GPU configuration themselves, the new autobind functionality -is made optional. Since no DEs currently support doing this themselves it -is enabled by default. When DEs grow support for doing this themselves -they can disable the servers autobinding through the servers cmdline or a -xorg.conf snippet. - -Signed-off-by: Dave Airlie <airlied@gmail.com> -[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream] -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86Config.c | 19 +++++++++++++++++++ - hw/xfree86/common/xf86Globals.c | 2 ++ - hw/xfree86/common/xf86Init.c | 20 ++++++++++++++++++++ - hw/xfree86/common/xf86Priv.h | 1 + - hw/xfree86/common/xf86Privstr.h | 1 + - hw/xfree86/common/xf86platformBus.c | 4 ++++ - hw/xfree86/man/Xorg.man | 7 +++++++ - hw/xfree86/man/xorg.conf.man | 6 ++++++ - randr/randrstr.h | 3 +++ - randr/rrprovider.c | 22 ++++++++++++++++++++++ - 10 files changed, 85 insertions(+) - -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 2c1d335..d7d7c2e 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -643,6 +643,7 @@ typedef enum { - FLAG_DRI2, - FLAG_USE_SIGIO, - FLAG_AUTO_ADD_GPU, -+ FLAG_AUTO_BIND_GPU, - FLAG_MAX_CLIENTS, - FLAG_IGLX, - FLAG_DEBUG, -@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = { - {0}, FALSE}, - {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN, - {0}, FALSE}, -+ {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN, -+ {0}, FALSE}, - {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER, - {0}, FALSE }, - {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN, -@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) - } - xf86Msg(from, "%sutomatically adding GPU devices\n", - xf86Info.autoAddGPU ? "A" : "Not a"); -+ -+ if (xf86AutoBindGPUDisabled) { -+ xf86Info.autoBindGPU = FALSE; -+ from = X_CMDLINE; -+ } -+ else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) { -+ xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU, -+ &xf86Info.autoBindGPU); -+ from = X_CONFIG; -+ } -+ else { -+ from = X_DEFAULT; -+ } -+ xf86Msg(from, "%sutomatically binding GPU devices\n", -+ xf86Info.autoBindGPU ? "A" : "Not a"); -+ - /* - * Set things up based on the config file information. Some of these - * settings may be overridden later when the command line options are -diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c -index e890f05..7b27b4c 100644 ---- a/hw/xfree86/common/xf86Globals.c -+++ b/hw/xfree86/common/xf86Globals.c -@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = { - #else - .autoAddGPU = FALSE, - #endif -+ .autoBindGPU = TRUE, - }; - - const char *xf86ConfigFile = NULL; -@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE; - Gamma xf86Gamma = { 0.0, 0.0, 0.0 }; - - Bool xf86AllowMouseOpenFail = FALSE; -+Bool xf86AutoBindGPUDisabled = FALSE; - - #ifdef XF86VIDMODE - Bool xf86VidModeDisabled = FALSE; -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index ea42ec9..ec255b6 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -76,6 +76,7 @@ - #include "xf86DDC.h" - #include "xf86Xinput.h" - #include "xf86InPriv.h" -+#include "xf86Crtc.h" - #include "picturestr.h" - #include "randrstr.h" - #include "glxvndabi.h" -@@ -237,6 +238,19 @@ xf86PrivsElevated(void) - return PrivsElevated(); - } - -+static void -+xf86AutoConfigOutputDevices(void) -+{ -+ int i; -+ -+ if (!xf86Info.autoBindGPU) -+ return; -+ -+ for (i = 0; i < xf86NumGPUScreens; i++) -+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), -+ xf86ScrnToScreen(xf86Screens[0])); -+} -+ - static void - TrapSignals(void) - { -@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) - for (i = 0; i < xf86NumGPUScreens; i++) - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); - -+ xf86AutoConfigOutputDevices(); -+ - xf86VGAarbiterWrapFunctions(); - if (sigio_blocked) - input_unlock(); -@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i) - xf86Info.iglxFrom = X_CMDLINE; - return 0; - } -+ if (!strcmp(argv[i], "-noautoBindGPU")) { -+ xf86AutoBindGPUDisabled = TRUE; -+ return 1; -+ } - - /* OS-specific processing */ - return xf86ProcessArgument(argc, argv, i); -diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h -index 4fe2b5f..6566622 100644 ---- a/hw/xfree86/common/xf86Priv.h -+++ b/hw/xfree86/common/xf86Priv.h -@@ -46,6 +46,7 @@ - extern _X_EXPORT const char *xf86ConfigFile; - extern _X_EXPORT const char *xf86ConfigDir; - extern _X_EXPORT Bool xf86AllowMouseOpenFail; -+extern _X_EXPORT Bool xf86AutoBindGPUDisabled; - - #ifdef XF86VIDMODE - extern _X_EXPORT Bool xf86VidModeDisabled; -diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h -index 21c2e1f..6c71863 100644 ---- a/hw/xfree86/common/xf86Privstr.h -+++ b/hw/xfree86/common/xf86Privstr.h -@@ -98,6 +98,7 @@ typedef struct { - - Bool autoAddGPU; - const char *debug; -+ Bool autoBindGPU; - } xf86InfoRec, *xf86InfoPtr; - - /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */ -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index cef47da..913a324 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -49,6 +49,7 @@ - #include "Pci.h" - #include "xf86platformBus.h" - #include "xf86Config.h" -+#include "xf86Crtc.h" - - #include "randrstr.h" - int platformSlotClaimed; -@@ -665,6 +666,9 @@ xf86platformAddDevice(int index) - } - /* attach unbound to 0 protocol screen */ - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); -+ if (xf86Info.autoBindGPU) -+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), -+ xf86ScrnToScreen(xf86Screens[0])); - - RRResourcesChanged(xf86Screens[0]->pScreen); - RRTellChanged(xf86Screens[0]->pScreen); -diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man -index 13a9dc3..745f986 100644 ---- a/hw/xfree86/man/Xorg.man -+++ b/hw/xfree86/man/Xorg.man -@@ -283,6 +283,13 @@ is a comma separated list of directories to search for - server modules. This option is only available when the server is run - as root (i.e, with real-uid 0). - .TP 8 -+.B \-noautoBindGPU -+Disable automatically setting secondary GPUs up as output sinks and offload -+sources. This is equivalent to setting the -+.B AutoBindGPU -+xorg.conf(__filemansuffix__) file option. To -+.B false. -+.TP 8 - .B \-nosilk - Disable Silken Mouse support. - .TP 8 -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 9589262..8d51e06 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -672,6 +672,12 @@ Enabled by default. - If this option is disabled, then no GPU devices will be added from the udev - backend. Enabled by default. (May need to be disabled to setup Xinerama). - .TP 7 -+.BI "Option \*qAutoBindGPU\*q \*q" boolean \*q -+If enabled then secondary GPUs will be automatically set up as output-sinks and -+offload-sources. Making e.g. laptop outputs connected only to the secondary -+GPU directly available for use without needing to run -+"xrandr --setprovideroutputsource". Enabled by default. -+.TP 7 - .BI "Option \*qLog\*q \*q" string \*q - This option controls whether the log is flushed and/or synced to disk after - each message. -diff --git a/randr/randrstr.h b/randr/randrstr.h -index f94174b..092d726 100644 ---- a/randr/randrstr.h -+++ b/randr/randrstr.h -@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p); - extern _X_EXPORT void - RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider); - -+extern _X_EXPORT void -+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen); -+ - /* rrproviderproperty.c */ - - extern _X_EXPORT void -diff --git a/randr/rrprovider.c b/randr/rrprovider.c -index e4bc2bf..e04c18f 100644 ---- a/randr/rrprovider.c -+++ b/randr/rrprovider.c -@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider) - - WriteEventsToClient(client, 1, (xEvent *) &pe); - } -+ -+void -+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen) -+{ -+ rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); -+ rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen); -+ RRProviderPtr provider = pScrPriv->provider; -+ RRProviderPtr master_provider = masterPriv->provider; -+ -+ if (!provider || !master_provider) -+ return; -+ -+ if ((provider->capabilities & RR_Capability_SinkOutput) && -+ (master_provider->capabilities & RR_Capability_SourceOutput)) { -+ pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider); -+ RRInitPrimeSyncProps(pScreen); -+ } -+ -+ if ((provider->capabilities & RR_Capability_SourceOffload) && -+ (master_provider->capabilities & RR_Capability_SinkOffload)) -+ pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider); -+} --- -2.16.2 - diff --git a/source/x/x11/patch/xorg-server/fix-pci-segfault.diff b/source/x/x11/patch/xorg-server/fix-pci-segfault.diff deleted file mode 100644 index 400376287..000000000 --- a/source/x/x11/patch/xorg-server/fix-pci-segfault.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index cef47da03d0e91e6a56a5e3cb14a51d931633eff..dadbac6c8f0ae6f3d636fdfe245e61bc0c98581d 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -289,7 +289,7 @@ xf86platformProbe(void) - for (i = 0; i < xf86_num_platform_devices; i++) { - char *busid = xf86_platform_odev_attributes(i)->busid; - -- if (pci && (strncmp(busid, "pci:", 4) == 0)) { -+ if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) { - platform_find_pci_info(&xf86_platform_devices[i], busid); - } diff --git a/source/x/x11/post-install/xkeyboard-config.post-install b/source/x/x11/post-install/xkeyboard-config.post-install index 8446f0641..92c647239 100644 --- a/source/x/x11/post-install/xkeyboard-config.post-install +++ b/source/x/x11/post-install/xkeyboard-config.post-install @@ -1,11 +1,2 @@ -# Move things into /etc/X11 that are supposed to be there: -#mkdir -p $PKG/etc/X11 -#rm -rf $PKG/etc/X11/xkb -#mv $PKG/usr/share/X11/xkb $PKG/etc/X11 -mkdir -p $PKG/usr/share/X11 -( cd $PKG/usr/share/X11 ; ln -sf ../../../etc/X11/xkb . ) -#( cd $PKG/etc/X11/xkb/rules -# ln -sf base.lst xorg.lst -# ln -sf base.xml xorg.xml -# ln -sf base xorg -#) +mkdir -p $PKG/etc/X11 +( cd $PKG/etc/X11 ; ln -sf ../../usr/share/X11/xkb . ) diff --git a/source/x/x11/post-install/xorg-cf-files.post-install b/source/x/x11/post-install/xorg-cf-files.post-install index e5fc2cc45..650ed9dac 100644 --- a/source/x/x11/post-install/xorg-cf-files.post-install +++ b/source/x/x11/post-install/xorg-cf-files.post-install @@ -1,4 +1,4 @@ -if [ "$(uname -m)" = "x86_64" ]; then +if [[ "$(uname -m)" =~ (x86_64|aarch64|riscv64) ]]; then ( cd $PKG/usr/lib/X11/config zcat $CWD/post-install/xorg-cf-files/x11.tmpl.lib64.kludge.diff.gz | patch -p1 || exit 1 ) diff --git a/source/x/x11/slack-desc/libxcvt b/source/x/x11/slack-desc/libxcvt new file mode 100644 index 000000000..b9162be46 --- /dev/null +++ b/source/x/x11/slack-desc/libxcvt @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libxcvt: libxcvt (VESA CVT standard modelines library) +libxcvt: +libxcvt: libxcvt is a library providing a standalone version of the X server +libxcvt: implementation of the VESA CVT standard timing modelines generator. +libxcvt: libxcvt also provides a command line tool "cvt". +libxcvt: +libxcvt: +libxcvt: +libxcvt: +libxcvt: +libxcvt: diff --git a/source/x/x11/slack-desc/xorg-server b/source/x/x11/slack-desc/xorg-server index 981a1a3dc..5595ad0be 100644 --- a/source/x/x11/slack-desc/xorg-server +++ b/source/x/x11/slack-desc/xorg-server @@ -12,8 +12,8 @@ xorg-server: Xorg is a full featured X server that was originally designed for U xorg-server: and UNIX-like operating systems running on Intel x86 hardware. It now xorg-server: runs on a wider range of hardware and OS platforms. This work was xorg-server: derived by the X.Org Foundation from the XFree86 Project's XFree86 -xorg-server: 4.4rc2 release. The XFree86 release was originally derived from X386 +xorg-server: 4.4rc2 release. The XFree86 release was originally derived from X386 xorg-server: 1.2 by Thomas Roell which was contributed to X11R5 by Snitily Graphics xorg-server: Consulting Service. xorg-server: -xorg-server: Homepage: https://www.x.org +xorg-server: Homepage: https://www.x.org diff --git a/source/x/x11/src/get-xf86-video-mach64.sh b/source/x/x11/src/get-xf86-video-mach64.sh new file mode 100755 index 000000000..0f1f827d2 --- /dev/null +++ b/source/x/x11/src/get-xf86-video-mach64.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +# Copyright 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Pull a stable branch + patches +BRANCH=${1:-master} + +# Clear download area: +rm -rf xf86-video-mach64 + +# Clone repository: +git clone https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/ + +# checkout $BRANCH: +( cd xf86-video-mach64 + git checkout $BRANCH || exit 1 +) + +HEADISAT="$( cd xf86-video-mach64 && git log -1 --format=%h )" +DATE="$( cd xf86-video-mach64 && git log -1 --format=%cd --date=format:%Y%m%d )" +LONGDATE="$( cd xf86-video-mach64 && git log -1 --format=%cd --date=format:%c )" +# Cleanup. We're not packing up the whole git repo. +( cd xf86-video-mach64 && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv xf86-video-mach64 xf86-video-mach64-${DATE}_${HEADISAT} +tar cf xf86-video-mach64-${DATE}_${HEADISAT}.tar xf86-video-mach64-${DATE}_${HEADISAT} +xz -9 -f xf86-video-mach64-${DATE}_${HEADISAT}.tar +rm -rf xf86-video-mach64-${DATE}_${HEADISAT} +touch -d "$LONGDATE" xf86-video-mach64-${DATE}_${HEADISAT}.tar.xz +echo +echo "xf86-video-mach64 branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-mach64-${DATE}_${HEADISAT}.tar.xz" +echo diff --git a/source/x/x11/src/get-xf86-video-mga.sh b/source/x/x11/src/get-xf86-video-mga.sh new file mode 100755 index 000000000..8550b38c5 --- /dev/null +++ b/source/x/x11/src/get-xf86-video-mga.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +# Copyright 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Pull a stable branch + patches +BRANCH=${1:-master} + +# Clear download area: +rm -rf xf86-video-mga + +# Clone repository: +git clone https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/ + +# checkout $BRANCH: +( cd xf86-video-mga + git checkout $BRANCH || exit 1 +) + +HEADISAT="$( cd xf86-video-mga && git log -1 --format=%h )" +DATE="$( cd xf86-video-mga && git log -1 --format=%cd --date=format:%Y%m%d )" +LONGDATE="$( cd xf86-video-mga && git log -1 --format=%cd --date=format:%c )" +# Cleanup. We're not packing up the whole git repo. +( cd xf86-video-mga && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv xf86-video-mga xf86-video-mga-${DATE}_${HEADISAT} +tar cf xf86-video-mga-${DATE}_${HEADISAT}.tar xf86-video-mga-${DATE}_${HEADISAT} +xz -9 -f xf86-video-mga-${DATE}_${HEADISAT}.tar +rm -rf xf86-video-mga-${DATE}_${HEADISAT} +touch -d "$LONGDATE" xf86-video-mga-${DATE}_${HEADISAT}.tar.xz +echo +echo "xf86-video-mga branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-mga-${DATE}_${HEADISAT}.tar.xz" +echo diff --git a/source/x/x11/src/get-xf86-video-vmware.sh b/source/x/x11/src/get-xf86-video-vmware.sh new file mode 100755 index 000000000..00fef209b --- /dev/null +++ b/source/x/x11/src/get-xf86-video-vmware.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +# Copyright 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modificvmwareon, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Pull a stable branch + patches +BRANCH=${1:-master} + +# Clear download area: +rm -rf xf86-video-vmware + +# Clone repository: +git clone https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware/ + +# checkout $BRANCH: +( cd xf86-video-vmware + git checkout $BRANCH || exit 1 +) + +HEADISAT="$( cd xf86-video-vmware && git log -1 --format=%h )" +DATE="$( cd xf86-video-vmware && git log -1 --format=%cd --date=format:%Y%m%d )" +LONGDATE="$( cd xf86-video-vmware && git log -1 --format=%cd --date=format:%c )" +# Cleanup. We're not packing up the whole git repo. +( cd xf86-video-vmware && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv xf86-video-vmware xf86-video-vmware-${DATE}_${HEADISAT} +tar cf xf86-video-vmware-${DATE}_${HEADISAT}.tar xf86-video-vmware-${DATE}_${HEADISAT} +xz -9 -f xf86-video-vmware-${DATE}_${HEADISAT}.tar +rm -rf xf86-video-vmware-${DATE}_${HEADISAT} +touch -d "$LONGDATE" xf86-video-vmware-${DATE}_${HEADISAT}.tar.xz +echo +echo "xf86-video-vmware branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-vmware-${DATE}_${HEADISAT}.tar.xz" +echo diff --git a/source/x/x11/src/xf86-input-wacom.url b/source/x/x11/src/xf86-input-wacom.url index 9550a8000..53b87de6f 100644 --- a/source/x/x11/src/xf86-input-wacom.url +++ b/source/x/x11/src/xf86-input-wacom.url @@ -1 +1,2 @@ https://github.com/linuxwacom/xf86-input-wacom +https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-1.2.2/xf86-input-wacom-1.2.2.tar.bz2 diff --git a/source/x/xcb-imdkit/slack-desc b/source/x/xcb-imdkit/slack-desc new file mode 100644 index 000000000..7e6b805e9 --- /dev/null +++ b/source/x/xcb-imdkit/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +xcb-imdkit: xcb-imdkit (XIM protocol implementation in xcb) +xcb-imdkit: +xcb-imdkit: xcb-imdkit is an implementation of xim protocol in xcb, comparing +xcb-imdkit: with the implementation of IMDkit with Xlib, and xim inside Xlib, +xcb-imdkit: it has less memory foot print, better performance, and safer on +xcb-imdkit: malformed client. +xcb-imdkit: +xcb-imdkit: Homepage: https://fcitx-im.org/wiki/Fcitx_5 +xcb-imdkit: +xcb-imdkit: +xcb-imdkit: diff --git a/source/x/xcb-imdkit/xcb-imdkit-1.0.8.tar.zst b/source/x/xcb-imdkit/xcb-imdkit-1.0.8.tar.zst Binary files differnew file mode 100644 index 000000000..29e70513c --- /dev/null +++ b/source/x/xcb-imdkit/xcb-imdkit-1.0.8.tar.zst diff --git a/source/x/xcb-imdkit/xcb-imdkit.SlackBuild b/source/x/xcb-imdkit/xcb-imdkit.SlackBuild new file mode 100755 index 000000000..a9be5a5da --- /dev/null +++ b/source/x/xcb-imdkit/xcb-imdkit.SlackBuild @@ -0,0 +1,111 @@ +#!/bin/bash + +# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=xcb-imdkit +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-xcb-imdkit + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf xcb-imdkit-$VERSION +tar xvf $CWD/xcb-imdkit-$VERSION.tar.zst || exit 1 +cd xcb-imdkit-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="${SLKCFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${SLKCFLAGS}" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + .. + make $NUMJOBS || make || exit 1 + make install/strip DESTDIR=$PKG || exit 1 +cd .. + +#find $PKG/usr/man -type f -exec gzip -9 {} \; + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a README* LICENSES/* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/xcb-imdkit/xcb-imdkit.url b/source/x/xcb-imdkit/xcb-imdkit.url new file mode 100644 index 000000000..65aa5dbe0 --- /dev/null +++ b/source/x/xcb-imdkit/xcb-imdkit.url @@ -0,0 +1 @@ +https://download.fcitx-im.org/fcitx5/xcb-imdkit/ diff --git a/source/x/xdg-desktop-portal/slack-desc b/source/x/xdg-desktop-portal/slack-desc new file mode 100644 index 000000000..8adad0cdd --- /dev/null +++ b/source/x/xdg-desktop-portal/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +xdg-desktop-portal: xdg-desktop-portal (XDG portal frontend service) +xdg-desktop-portal: +xdg-desktop-portal: A portal frontend service for Flatpak and possibly other desktop +xdg-desktop-portal: containment frameworks. xdg-desktop-portal works by exposing a series +xdg-desktop-portal: of D-Bus interfaces known as _portals_ under a well-known name +xdg-desktop-portal: (org.freedesktop.portal.Desktop) and object path +xdg-desktop-portal: (/org/freedesktop/portal/desktop). The portal interfaces include APIs +xdg-desktop-portal: for file access, opening URIs, printing and others. +xdg-desktop-portal: +xdg-desktop-portal: +xdg-desktop-portal: diff --git a/source/x/fcitx-configtool/fcitx-configtool.SlackBuild b/source/x/xdg-desktop-portal/xdg-desktop-portal.SlackBuild index 1452ecb03..db782ccbf 100755 --- a/source/x/fcitx-configtool/fcitx-configtool.SlackBuild +++ b/source/x/xdg-desktop-portal/xdg-desktop-portal.SlackBuild @@ -1,10 +1,7 @@ #!/bin/bash -# Slackware build script for fcitx. - -# Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2017, 2020 Patrick J. Volkerding, Sebeka, MN, USA -# +# Copyright 2018 Vincent Batts <vbatts@hashbangbash.com> +# Copyright 2021, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -13,7 +10,7 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -26,58 +23,61 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=fcitx-configtool -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | cut -f 2- -d _ | rev)} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} +PKGNAM=xdg-desktop-portal +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 fi +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - TMP=${TMP:-/tmp} -PKG=$TMP/package-fcitx +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG + cd $TMP -rm -rf fcitx-configtool-$VERSION -tar xvf $CWD/fcitx-configtool-${VERSION}.tar.?z || exit 1 -cd fcitx-configtool-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -86,22 +86,56 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -mkdir build -cd build - cmake \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - .. - make $NUMJOBS || make || exit 1 - make install/strip DESTDIR=$PKG || exit 1 +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + -Dlibportal=disabled \ + -Dflatpak-interfaces=disabled \ + -Dgeoclue=disabled \ + -Dsystemd=disabled \ + -Dsandboxed-image-validation=false \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 cd .. -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING INSTALL README \ - $PKG/usr/doc/$PKGNAM-$VERSION +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* ChangeLog CHANGES COPYING* LICENSE* NEWS* README* SECURITY* THANKS* TODO* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/xdg-desktop-portal/xdg-desktop-portal.url b/source/x/xdg-desktop-portal/xdg-desktop-portal.url new file mode 100644 index 000000000..5ec63f2bc --- /dev/null +++ b/source/x/xdg-desktop-portal/xdg-desktop-portal.url @@ -0,0 +1 @@ +https://github.com/flatpak/xdg-desktop-portal diff --git a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild index 05bfed0b3..5b981c170 100755 --- a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild +++ b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xdg-user-dirs -VERSION=${VERSION:-0.17} -BUILD=${BUILD:-3} +VERSION=${VERSION:-0.18} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/x/xdg-utils/fetch-xdg-utils.sh b/source/x/xdg-utils/fetch-xdg-utils.sh new file mode 100755 index 000000000..3995c718e --- /dev/null +++ b/source/x/xdg-utils/fetch-xdg-utils.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# Copyright 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=xdg-utils + +# Pull a stable branch + patches +BRANCH=${1:-v1.2.1} + +# Clear download area: +rm -rf ${PKGNAM} + +# Clone repository: +git clone https://gitlab.freedesktop.org/xdg/xdg-utils + +# checkout $BRANCH: +( cd ${PKGNAM} + git checkout $BRANCH || exit 1 +) + +HEADISAT="$( cd ${PKGNAM} && git log -1 --format=%h )" +DATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%Y%m%d )" +LONGDATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%c )" +# Cleanup. We're not packing up the whole git repo. +( cd ${PKGNAM} && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv ${PKGNAM} ${PKGNAM}-${DATE}_${HEADISAT} +tar cf ${PKGNAM}-${DATE}_${HEADISAT}.tar ${PKGNAM}-${DATE}_${HEADISAT} +plzip -9 -f ${PKGNAM}-${DATE}_${HEADISAT}.tar +rm -rf ${PKGNAM}-${DATE}_${HEADISAT} +touch -d "$LONGDATE" ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz +echo +echo "${PKGNAM} branch $BRANCH with HEAD at $HEADISAT packaged as ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz" +echo diff --git a/source/x/xdg-utils/xdg-open.no.relative.paths.diff b/source/x/xdg-utils/xdg-open.no.relative.paths.diff index f28308eeb..15cbb0dfd 100644 --- a/source/x/xdg-utils/xdg-open.no.relative.paths.diff +++ b/source/x/xdg-utils/xdg-open.no.relative.paths.diff @@ -1,10 +1,9 @@ ---- ./scripts/xdg-open.in.orig 2018-05-10 10:02:31.000000000 -0500 -+++ ./scripts/xdg-open.in 2019-01-25 13:01:17.492733618 -0600 -@@ -453,12 +453,6 @@ - # pcmanfm only knows how to handle file:// urls and filepaths, it seems. - if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then - local file="$(file_url_to_path "$1")" -- +--- ./scripts/xdg-open.in.orig 2024-02-03 12:40:07.000000000 -0600 ++++ ./scripts/xdg-open.in 2024-02-03 12:45:57.900659000 -0600 +@@ -533,11 +533,6 @@ + local file + file="$(file_url_to_path "$1")" + - # handle relative paths - if ! echo "$file" | grep -q ^/; then - file="$(pwd)/$file" diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild index 77f19a252..97d93cf85 100755 --- a/source/x/xdg-utils/xdg-utils.SlackBuild +++ b/source/x/xdg-utils/xdg-utils.SlackBuild @@ -4,7 +4,7 @@ # Written by Erik Hanson erik@slackbuilds.org # Modified for VERSION version by Patrick Volkerding <volkerdi@slackware.com> -# Copyright 2008, 2009, 2010, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2013, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,10 +27,10 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xdg-utils -VERSION=1.1.3 +VERSION=1.2.1 PKG_VERSION=${VERSION/-/_} ARCH=noarch -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information @@ -50,9 +50,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 -cd $PKGNAM-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION $PKGNAM-v$VERSION +tar xvf $CWD/$PKGNAM-v$VERSION.tar.?z || tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-v$VERSION || cd $PKGNAM-$VERSION || exit 1 # Fix xdg-open usage in LXDE: zcat $CWD/xdg-open.no.relative.paths.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/xdg-utils/xdg-utils.url b/source/x/xdg-utils/xdg-utils.url index ed2683487..087118b43 100644 --- a/source/x/xdg-utils/xdg-utils.url +++ b/source/x/xdg-utils/xdg-utils.url @@ -1,2 +1 @@ -http://www.freedesktop.org/wiki/Software/xdg-utils/ -http://portland.freedesktop.org/download/ +https://gitlab.freedesktop.org/xdg/xdg-utils diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild index 11c7061ff..06948306c 100755 --- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild +++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2018, 2019, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -100,6 +100,7 @@ meson setup \ -Dxwayland_eglstream=true \ -Ddefault_font_path="${DEF_FONTPATH}" \ -Dbuilder_string="Build ID: $PKGNAM $VERSION-$BUILD" \ + -Dxkb_dir=/usr/share/X11/xkb \ -Dxkb_output_dir=/var/lib/xkb \ -Dvendor_name="Slackware Linux Project" \ -Dxdmcp=false \ @@ -150,6 +151,12 @@ if [ -r ChangeLog ]; then touch -r ChangeLog $DOCSDIR/ChangeLog fi +# Relocate some docs: +mv $PKG/usr/share/doc/xorg-server/* $PKG/usr/doc/$PKGNAM-$VERSION +rmdir $PKG/usr/share/doc/xorg-server +rmdir $PKG/usr/share/doc +rmdir $PKG/usr/share + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/x/xterm/XTerm-console b/source/x/xterm/XTerm-console new file mode 100644 index 000000000..3e28bf7a9 --- /dev/null +++ b/source/x/xterm/XTerm-console @@ -0,0 +1,95 @@ +! /etc/X11/app-defaults/XTerm-console !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +! +! This resorce file will, as much as possible, configure +! xterm to look and act like a linux console: + +#include "XTerm-upstream" + +! VT100 Fonts !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +*VT100.renderFont: false +! - Use bitmap fonts by default. User can switch to Scalable/TrueType +! fonts from the VT_FONTS ctrl/right-click menu if required. + +*VT100.initialFont: 3 +! - Choose which of the following gets used on start, values: 1-6, or 'd'. +! It probably makes sense to set this to the same as the default font. + +! Bitmap fonts: +! note: Some folks may find these a little large, but 'hidpi' display +! users will appreciate the larger sizes, and the other sizes in the +! the terminus series don't maintain a consistent aspect ratio and +! can look a little odd when being resized. + +*VT100.font: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1 +*VT100.font2: -*-terminus-bold-r-normal-*-12-*-*-*-*-*-iso10646-1 +*VT100.font3: -*-terminus-bold-r-normal-*-16-*-*-*-*-*-iso10646-1 +*VT100.font4: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1 +*VT100.font5: -*-terminus-bold-r-normal-*-24-*-*-*-*-*-iso10646-1 +*VT100.font6: -*-terminus-bold-r-normal-*-28-*-*-*-*-*-iso10646-1 +*VT100.font7: -*-terminus-bold-r-normal-*-32-*-*-*-*-*-iso10646-1 + +! Scalable/TrueType fonts: + +*VT100.faceName: monospace +*VT100.faceSize: 12.6 +*VT100.faceSize2: 7.5 +*VT100.faceSize3: 10.0 +*VT100.faceSize4: 12.6 +*VT100.faceSize5: 15.0 +*VT100.faceSize6: 17.6 +*VT100.faceSize7: 20.0 + +! VT100 colours and appearance !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +*VT100.Background: rgb:00/00/00 +*VT100.Foreground: rgb:aa/aa/aa +*VT100.cursorUnderLine: true +*VT100.cursorBlink: true + +! Simulate underline using colour, just like the console does: +*VT100.colorULMode: true +*VT100.colorUL: rgb:00/aa/aa + +! Simulate bold using colour, just like the console does: +*VT100.boldMode: false +*VT100.colorBDMode: true +*VT100.colorBD: rgb:ff/ff/ff + +! CGA 16-colour palette: +*VT100.color0: rgb:00/00/00 +*VT100.color1: rgb:aa/00/00 +*VT100.color2: rgb:00/aa/00 +*VT100.color3: rgb:aa/55/00 +*VT100.color4: rgb:00/00/aa +*VT100.color5: rgb:aa/00/aa +*VT100.color6: rgb:00/aa/aa +*VT100.color7: rgb:aa/aa/aa +*VT100.color8: rgb:55/55/55 +*VT100.color9: rgb:ff/55/55 +*VT100.color10: rgb:55/ff/55 +*VT100.color11: rgb:ff/ff/55 +*VT100.color12: rgb:55/55/ff +*VT100.color13: rgb:ff/55/ff +*VT100.color14: rgb:55/ff/ff +*VT100.color15: rgb:ff/ff/ff + +*termName: xterm-16color +! - 16 colours only, just like the console. + +! Some behavioural stuff to make it work nice !!!!!!!!!!!!!!!!!!!!!!!!!! + +*VT100.metaSendsEscape: true +! - Send meta-characters as a two-byte sequence prefixed with ESCAPE. +! "XTerm.vt100.eightBitInput: false" is an alternative approach +! but metaSendsEscape has a menu option in the ctrl-button1 +! popup menu, allowing the user to turn it off if need be. The +! Linux console and most other terminal emulators do this by default. + +*VT100.bellIsUrgent: true +! - Enable urgency hit for Window managers. + +*VT100.charClass: 45-47:48,58:48,64:48 +! - Set which characters are selected by double click. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! End. ! diff --git a/source/x/xterm/linux-console-xterm.ad b/source/x/xterm/linux-console-xterm.ad deleted file mode 100644 index bd0095f6d..000000000 --- a/source/x/xterm/linux-console-xterm.ad +++ /dev/null @@ -1,71 +0,0 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! These resources will, as much as possible, configure xterm to look -! like a linux console. -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -! Choose one below: -!XTerm.termName: xterm-new -!! Use the more featureful 'xterm-new' terminfo entry. -XTerm.termName: xterm -! Use the standard 'xterm' terminfo entry. - -XTerm.locale: true -! Enable conversion between the locale and utf-8 if necessary. -!XTerm.ptyInitialErase: false -! Set the tty erase setting to match the terminfo/cap definition for -! this terminal type. -!XTerm.backarrowKeyIsErase: true -! Send the erase character when the backarrow key (a.k.a. backspace) -! is pressed. -XTerm.vt100.metaSendsEscape: true -! Send meta-characters as a two-byte sequence prefixed with ESCAPE. -! "XTerm.vt100.eightBitInput: false" is an alternative approach -! but metaSendsEscape has a menu option in the ctrl-button1 -! popup menu, allowing the user to turn it off if need be. The -! Linux console and most other terminal emulators do this by default. -XTerm.vt100.bellIsUrgent: true -! Enable urgency hit for Window managers. -XTerm.vt100.renderFont: false -! Use bitmap fonts by default.User can switch to ttyfonts from menu, -! if required. -XTerm.vt100.font: -*-terminus-medium-r-normal-*-20-*-*-*-*-*-iso10646-1 -XTerm.vt100.font1: -*-terminus-medium-r-normal-*-12-*-*-*-*-*-iso10646-1 -XTerm.vt100.font2: -*-terminus-medium-r-normal-*-14-*-*-*-*-*-iso10646-1 -XTerm.vt100.font3: -*-terminus-medium-r-normal-*-16-*-*-*-*-*-iso10646-1 -XTerm.vt100.font4: -*-terminus-medium-r-normal-*-20-*-*-*-*-*-iso10646-1 -XTerm.vt100.font5: -*-terminus-medium-r-normal-*-24-*-*-*-*-*-iso10646-1 -XTerm.vt100.font6: -*-terminus-medium-r-normal-*-32-*-*-*-*-*-iso10646-1 - -XTerm.vt100.faceName: monospace -XTerm.vt100.faceSize: 14.0 -XTerm*Background: rgb:00/00/00 -XTerm*Foreground: rgb:aa/aa/aa -XTerm*cursorUnderLine: true -XTerm*cursorBlink: true -XTerm*boldMode: false -XTerm*colorULMode: true -XTerm*colorUL: rgb:00/aa/aa -XTerm*colorBDMode: true -XTerm*colorBD: rgb:ff/ff/ff -! CGA 16-colour palatte: -XTerm*color0: rgb:00/00/00 -XTerm*color1: rgb:aa/00/00 -XTerm*color2: rgb:00/aa/00 -XTerm*color3: rgb:aa/55/00 -XTerm*color4: rgb:00/00/aa -XTerm*color5: rgb:aa/00/aa -XTerm*color6: rgb:00/aa/aa -XTerm*color7: rgb:aa/aa/aa -XTerm*color8: rgb:55/55/55 -XTerm*color9: rgb:ff/55/55 -XTerm*color10: rgb:55/ff/55 -XTerm*color11: rgb:ff/ff/55 -XTerm*color12: rgb:55/55/ff -XTerm*color13: rgb:ff/55/ff -XTerm*color14: rgb:55/ff/ff -XTerm*color15: rgb:ff/ff/ff - -XTerm*charClass: 45-47:48,58:48,64:48 - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild index 53ec177ac..2dc82eee2 100755 --- a/source/x/xterm/xterm.SlackBuild +++ b/source/x/xterm/xterm.SlackBuild @@ -111,12 +111,14 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/share/applications cp xterm.desktop uxterm.desktop $PKG/usr/share/applications -# Install a default XTerm app-defaults that looks like the Linux console. +# Install a sample XTerm app-defaults that looks like the Linux console. # Thanks to GazL. -cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default -echo >> $PKG/etc/X11/app-defaults/XTerm -cat $CWD/linux-console-xterm.ad >> $PKG/etc/X11/app-defaults/XTerm -touch -r $PKG/etc/X11/app-defaults/XTerm.upstream.default $PKG/etc/X11/app-defaults/XTerm +cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm-upstream +cp -a $CWD/XTerm-console $PKG/etc/X11/app-defaults/XTerm-console +chown root:root $PKG/etc/X11/app-defaults/XTerm-console +chmod 644 $PKG/etc/X11/app-defaults/XTerm-console + +# Install app-defaults as .new: mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.new # Strip binaries: diff --git a/source/x/xterm/xterm.url b/source/x/xterm/xterm.url index 117aa3337..015c5b0e5 100644 --- a/source/x/xterm/xterm.url +++ b/source/x/xterm/xterm.url @@ -1 +1 @@ -ftp://ftp.invisible-island.net:/xterm +https://invisible-island.net/archives/xterm |