diff --git a/wayland/compose-tables/checksums b/wayland/compose-tables/checksums index 1a10b938..577227e1 100644 --- a/wayland/compose-tables/checksums +++ b/wayland/compose-tables/checksums @@ -1,2 +1,2 @@ -fc9b5872df09a0f5e4e8e27831b3ea0d3b762c5fbb564d753cc2e50213d9a88308 -c83dadd1c36fc8fb5f129e26fe02cf28f3bf57125ff096ab4bf6a7bde2979aedf8 +fddf5eb1be7c02a5806bb16b471d8bfbb8af4d7ef50cbd56b53c3fc49dab71c8c4 +9ece8c085a10a19946adc4b0e34da8fc1a82628457dfafb6c90a9aed9d3de2b033 diff --git a/wayland/compose-tables/patches/compose-only.patch b/wayland/compose-tables/patches/compose-only.patch index 77fd15e2..7ac45623 100644 --- a/wayland/compose-tables/patches/compose-only.patch +++ b/wayland/compose-tables/patches/compose-only.patch @@ -1,21 +1,22 @@ diff --git a/configure b/configure -index a835433..050de0a 100755 +index a9ae12d..627a69b 100755 --- a/configure +++ b/configure -@@ -20864,36 +20864,6 @@ $as_echo "#define USE_POLL 1" >>confdefs.h +@@ -22211,37 +22211,6 @@ printf "%s\n" "#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; } +-{ 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+set}" = set; then : +-if test ${with_keysymdefdir+y} +-then : - withval=$with_keysymdefdir; KEYSYMDEFDIR=$withval --else +-else $as_nop - KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -fi - @@ -32,28 +33,28 @@ index a835433..050de0a 100755 - 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; } +-{ 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+set}" = set; then : - enableval=$enable_xcms; XCMS=$enableval -@@ -21464,43 +21434,6 @@ _ACEOF + if test ${enable_xcms+y} + then : +@@ -22809,43 +22778,6 @@ printf "%s\n" "#define X11_LIBDIR \"$ax_define_dir\"" >>confdefs.h pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 --$as_echo_n "checking for X11... " >&6; } +-{ 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" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5 +- { { 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=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- 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 @@ -67,10 +68,10 @@ index a835433..050de0a 100755 - 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 +- { { 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=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- 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 diff --git a/wayland/compose-tables/sources b/wayland/compose-tables/sources index 179dd68d..94034554 100644 --- a/wayland/compose-tables/sources +++ b/wayland/compose-tables/sources @@ -1,2 +1,2 @@ -https://x.org/releases/individual/lib/libX11-1.8.4.tar.xz +https://x.org/releases/individual/lib/libX11-1.8.5.tar.xz patches/compose-only.patch diff --git a/wayland/compose-tables/version b/wayland/compose-tables/version index 1f6f900a..3ca77ed0 100644 --- a/wayland/compose-tables/version +++ b/wayland/compose-tables/version @@ -1 +1 @@ -1.8.4 1 +1.8.5 1