From 8e72b6254de51f514334e9db665feb5114fee0bc Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Tue, 10 May 2022 09:06:45 -0500
Subject: [PATCH] xkeyboard-config: stop using Alpine packages

---
 wayland/xkeyboard-config/build                | 33 ++++++-
 wayland/xkeyboard-config/checksums            |  6 +-
 wayland/xkeyboard-config/depends              |  1 +
 wayland/xkeyboard-config/files/xml2lst        | 49 +++++++++++
 .../patches/compose-only.patch                | 85 +++++++++++++++++++
 wayland/xkeyboard-config/sources              |  6 +-
 6 files changed, 172 insertions(+), 8 deletions(-)
 create mode 100644 wayland/xkeyboard-config/depends
 create mode 100755 wayland/xkeyboard-config/files/xml2lst
 create mode 100644 wayland/xkeyboard-config/patches/compose-only.patch

diff --git a/wayland/xkeyboard-config/build b/wayland/xkeyboard-config/build
index 389ea229..394de06c 100755
--- a/wayland/xkeyboard-config/build
+++ b/wayland/xkeyboard-config/build
@@ -1,8 +1,33 @@
 #!/bin/sh -e
 
-cd "$1"
+(
+    cd libX11
 
-tar xf "$OLDPWD/xkeyboard-config-"*.apk
-tar xf "$OLDPWD/libx11-"*.apk
+    patch -p1 < ../compose-only.patch
 
-rm -rf usr/lib .PKGINFO .*.pub
+    ./configure \
+        --prefix=/usr \
+        --disable-specs \
+        --disable-xkb \
+        --without-fop \
+        --without-xmlto
+
+    make -C nls
+    make -C nls install
+)
+
+# Swap to shell script instead of perl script
+# for conversion of rules files. See files/xml2lst.
+sed 's/xml2lst\.pl/xml2lst/' rules/meson.build > _
+mv -f _ rules/meson.build
+
+# Remove po/ dir.
+sed "/subdir('po')/d" meson.build > _
+mv -f _ meson.build
+
+meson setup \
+    -Dprefix=/usr \
+    output
+
+ninja -C output
+ninja -C output install
diff --git a/wayland/xkeyboard-config/checksums b/wayland/xkeyboard-config/checksums
index 6604628b..dd069102 100644
--- a/wayland/xkeyboard-config/checksums
+++ b/wayland/xkeyboard-config/checksums
@@ -1,2 +1,4 @@
-88ce0b2748670550fa034de4ba6c056c8cfa05a5c3643b72d422aa1a0a804c67
-8e7e1c4e80657a1104547f96105d8d218a49c1c97df67b40666c5dba3b45f859
+18ce50ff0c74ae6093062bce1aeab3d363913ea35162fe271f8a0ce399de85cc
+081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4
+441932e963ed1c8eae327bc6f328ad419df72d12a8b0241d7860fdda1c7a75d4
+e1ecd235757fe2afdd06c7cb2f94461fac8db3544ba8248275d18b06a3b2d51d
diff --git a/wayland/xkeyboard-config/depends b/wayland/xkeyboard-config/depends
new file mode 100644
index 00000000..69856447
--- /dev/null
+++ b/wayland/xkeyboard-config/depends
@@ -0,0 +1 @@
+meson build
diff --git a/wayland/xkeyboard-config/files/xml2lst b/wayland/xkeyboard-config/files/xml2lst
new file mode 100755
index 00000000..d04c084d
--- /dev/null
+++ b/wayland/xkeyboard-config/files/xml2lst
@@ -0,0 +1,49 @@
+#!/bin/sh
+# converts the <rules>.xml file to the old format <rules>.lst file
+# Usage: xml2lst < filename.xml > filename.lst
+
+[ "$1" ] && "$0" < "$1" && exit
+
+var=0 com=0 nam=''
+
+printf '! model\n'
+while read -r l || [ "$l" ]; do case $l in
+    *'<name>'*)         n=${l#*>} n=${n%<*};;
+    *'<description>'*)  l=${l#*>}; printf '  %-15s %s\n' "$n" "${l%<*}" ;;
+    *'</modelList>'*)   break
+esac; done
+
+printf '\n! layout\n'
+while read -r l || [ "$l" ]; do case $l in
+    *'<variantList>'*)  var=1;;
+    *'</variantList>'*) var=0;;
+    *'</layoutList>'*)  break;;
+
+    *'<name>'*)
+        l="${l#*>}"
+        [ "$var" -eq 0 ] && ln=${l%<*} || n=${l%<*}
+    ;;
+
+    *'<description>'*)
+        l=${l#*>}
+
+        case $var in
+            0) printf '  %-15s %s\n' "${ln}" "${l%<*}" ;;
+            *) nam="${nam%x}  $(printf '%-15s %s: %s\nx' "$n" "$ln" "${l%<*}")"
+        esac
+    ;;
+esac; done
+
+printf '\n! variant\n%s\n! option\n' "${nam%x}"
+while read -r l || [ "$l" ]; do case $l in
+    *'-->'*)            com=0;;
+    *'<!--'*)           com=1;;
+    *'</optionList>'*)  break;;
+    *'<name>'*)         n=${l#*>} n=${n%<*} ;;
+
+    *'<description>'*)
+        l=${l#*>}
+
+        [ "$com" -ne 0 ] || printf '  %-20s %s\n' "$n" "${l%<*}"
+    ;;
+esac; done
diff --git a/wayland/xkeyboard-config/patches/compose-only.patch b/wayland/xkeyboard-config/patches/compose-only.patch
new file mode 100644
index 00000000..2a633297
--- /dev/null
+++ b/wayland/xkeyboard-config/patches/compose-only.patch
@@ -0,0 +1,85 @@
+diff --git a/configure b/configure
+index aa8de21..916c65c 100755
+--- a/configure
++++ b/configure
+@@ -21015,36 +21015,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
+@@ -21615,43 +21585,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/xkeyboard-config/sources b/wayland/xkeyboard-config/sources
index 6bdd3325..f4a3474f 100644
--- a/wayland/xkeyboard-config/sources
+++ b/wayland/xkeyboard-config/sources
@@ -1,2 +1,4 @@
-https://alpine.global.ssl.fastly.net/alpine/edge/main/x86_64/xkeyboard-config-VERSION-r0.apk
-https://alpine.global.ssl.fastly.net/alpine/edge/main/x86_64/libx11-1.7.5-r0.apk
+https://x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-VERSION.tar.xz
+https://x.org/releases/individual/lib/libX11-1.8.tar.xz libX11
+files/xml2lst rules
+patches/compose-only.patch