diff --git a/wayland/xkeyboard-config/build b/wayland/xkeyboard-config/build index 394de06c..c87d783e 100755 --- a/wayland/xkeyboard-config/build +++ b/wayland/xkeyboard-config/build @@ -1,21 +1,5 @@ #!/bin/sh -e -( - cd libX11 - - patch -p1 < ../compose-only.patch - - ./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 > _ diff --git a/wayland/xkeyboard-config/checksums b/wayland/xkeyboard-config/checksums index 76d15b5f..4d7b1ffc 100644 --- a/wayland/xkeyboard-config/checksums +++ b/wayland/xkeyboard-config/checksums @@ -1,4 +1,2 @@ -f690ca002bd7671a8e255fe1e647dd319787e5d99b6deacae3f215d6074e1cf78c -6a202c737779fe53673c90ee972cf0301114dd8dd31f8f9c79d4c271bdaac3ceec +6d8bf92df873f51bf7e8bdfeab27e71296596f08025e6d825246aa772f15092662 8d0bf1d8cb3080585adc0fd1c1521ed2c4cdfbfc3046e5ea0c98e3a1c81e9e2446 -7dac66372576711ff63ccbc3ec4a458fcf770e3a5a2fb29a356b2cab938fa2b1e7 diff --git a/wayland/xkeyboard-config/depends b/wayland/xkeyboard-config/depends index 69856447..fee6ff80 100644 --- a/wayland/xkeyboard-config/depends +++ b/wayland/xkeyboard-config/depends @@ -1 +1,2 @@ -meson build +compose-tables +meson make diff --git a/wayland/xkeyboard-config/patches/compose-only.patch b/wayland/xkeyboard-config/patches/compose-only.patch deleted file mode 100644 index 7f1c65ff..00000000 --- a/wayland/xkeyboard-config/patches/compose-only.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/configure b/configure -index 68fb781..dccee41 100755 ---- a/configure -+++ b/configure -@@ -22250,37 +22250,6 @@ printf "%s\n" "#define USE_POLL 1" >>confdefs.h - fi - - --# --# Find keysymdef.h --# --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking keysym definitions" >&5 --printf %s "checking keysym definitions... " >&6; } -- --# Check whether --with-keysymdefdir was given. --if test ${with_keysymdefdir+y} --then : -- withval=$with_keysymdefdir; KEYSYMDEFDIR=$withval --else $as_nop -- 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 --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5 --printf "%s\n" "$KEYSYMDEFS" >&6; } -- -- - # Check whether --enable-xcms was given. - if test ${enable_xcms+y} - then : -@@ -22848,43 +22817,6 @@ printf "%s\n" "#define X11_LIBDIR \"$ax_define_dir\"" >>confdefs.h - - - pkg_failed=no --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 --printf %s "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" && \ -- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5 -- ac_status=$? -- printf "%s\n" "$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" && \ -- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5 -- ac_status=$? -- printf "%s\n" "$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 e579c5fb..3cf9e87e 100644 --- a/wayland/xkeyboard-config/sources +++ b/wayland/xkeyboard-config/sources @@ -1,4 +1,2 @@ https://x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-VERSION.tar.xz -https://x.org/releases/individual/lib/libX11-1.8.3.tar.xz libX11 files/xml2lst rules -patches/compose-only.patch diff --git a/wayland/xkeyboard-config/version b/wayland/xkeyboard-config/version index 7fdf9fb1..2f916e2d 100644 --- a/wayland/xkeyboard-config/version +++ b/wayland/xkeyboard-config/version @@ -1 +1 @@ -2.37 3 +2.38 1