From 1c53e74a88186cb357b03c0edd791e243907558f Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Sun, 5 Feb 2023 13:13:51 -0600 Subject: [PATCH] compose-tables: new at 1.8.4 --- wayland/compose-tables/README | 21 +++++ wayland/compose-tables/build | 13 +++ wayland/compose-tables/checksums | 2 + .../compose-tables/patches/compose-only.patch | 85 +++++++++++++++++++ wayland/compose-tables/sources | 2 + wayland/compose-tables/version | 1 + 6 files changed, 124 insertions(+) create mode 100644 wayland/compose-tables/README create mode 100755 wayland/compose-tables/build create mode 100644 wayland/compose-tables/checksums create mode 100644 wayland/compose-tables/patches/compose-only.patch create mode 100644 wayland/compose-tables/sources create mode 100644 wayland/compose-tables/version diff --git a/wayland/compose-tables/README b/wayland/compose-tables/README new file mode 100644 index 00000000..41379cb8 --- /dev/null +++ b/wayland/compose-tables/README @@ -0,0 +1,21 @@ +compose-tables +________________________________________________________________________________ + +X.Org Compose Key tables from libX11 + + +[000] Index +________________________________________________________________________________ + +* Installation ........................................................... [001] + + +[001] Installation +________________________________________________________________________________ + ++------------------------------------------------------------------------------+ +| | +| $ kiss b compose-tables | +| | ++------------------------------------------------------------------------------+ + diff --git a/wayland/compose-tables/build b/wayland/compose-tables/build new file mode 100755 index 00000000..17602cb6 --- /dev/null +++ b/wayland/compose-tables/build @@ -0,0 +1,13 @@ +#!/bin/sh -e + +patch -p1 < compose-only.patch + +./configure \ + --prefix=/usr \ + --disable-specs \ + --disable-xkb \ + --without-fop \ + --without-xmlto + +make -C nls +make -C nls install diff --git a/wayland/compose-tables/checksums b/wayland/compose-tables/checksums new file mode 100644 index 00000000..1a10b938 --- /dev/null +++ b/wayland/compose-tables/checksums @@ -0,0 +1,2 @@ +fc9b5872df09a0f5e4e8e27831b3ea0d3b762c5fbb564d753cc2e50213d9a88308 +c83dadd1c36fc8fb5f129e26fe02cf28f3bf57125ff096ab4bf6a7bde2979aedf8 diff --git a/wayland/compose-tables/patches/compose-only.patch b/wayland/compose-tables/patches/compose-only.patch new file mode 100644 index 00000000..77fd15e2 --- /dev/null +++ b/wayland/compose-tables/patches/compose-only.patch @@ -0,0 +1,85 @@ +diff --git a/configure b/configure +index a835433..050de0a 100755 +--- a/configure ++++ b/configure +@@ -20864,36 +20864,6 @@ $as_echo "#define USE_POLL 1" >>confdefs.h + fi + + +-# +-# Find keysymdef.h +-# +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking keysym definitions" >&5 +-$as_echo_n "checking keysym definitions... " >&6; } +- +-# Check whether --with-keysymdefdir was given. +-if test "${with_keysymdefdir+set}" = set; then : +- withval=$with_keysymdefdir; KEYSYMDEFDIR=$withval +-else +- KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 +-fi +- +- +-if test ! -d "$KEYSYMDEFDIR"; then +- as_fn_error $? "$KEYSYMDEFDIR doesn't exist or isn't a directory" "$LINENO" 5 +-fi +- +-FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" +-for i in $FILES; do +- if test -f "$KEYSYMDEFDIR/$i"; then +- KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i" +- elif test "x$i" = "xkeysymdef.h"; then +- as_fn_error $? "Cannot find keysymdef.h" "$LINENO" 5 +- fi +-done +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5 +-$as_echo "$KEYSYMDEFS" >&6; } +- +- + # Check whether --enable-xcms was given. + if test "${enable_xcms+set}" = set; then : + enableval=$enable_xcms; XCMS=$enableval +@@ -21464,43 +21434,6 @@ _ACEOF + + + pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 +-$as_echo_n "checking for X11... " >&6; } +- +-if test -n "$X11_CFLAGS"; then +- pkg_cv_X11_CFLAGS="$X11_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "$X11_REQUIRES" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$X11_LIBS"; then +- pkg_cv_X11_LIBS="$X11_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "$X11_REQUIRES" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi + + + diff --git a/wayland/compose-tables/sources b/wayland/compose-tables/sources new file mode 100644 index 00000000..cbb7d26b --- /dev/null +++ b/wayland/compose-tables/sources @@ -0,0 +1,2 @@ +https://x.org/releases/individual/lib/libX11-VERSION.tar.xz +patches/compose-only.patch diff --git a/wayland/compose-tables/version b/wayland/compose-tables/version new file mode 100644 index 00000000..1f6f900a --- /dev/null +++ b/wayland/compose-tables/version @@ -0,0 +1 @@ +1.8.4 1