Wed Nov 2 20:01:17 UTC 202220221102200117

a/hwdata-0.364-noarch-1.txz:  Upgraded.
ap/inxi-3.3.23_1-noarch-1.txz:  Upgraded.
ap/mpg123-1.31.1-x86_64-1.txz:  Upgraded.
d/cmake-3.24.3-x86_64-1.txz:  Upgraded.
l/SDL2-2.24.2-x86_64-1.txz:  Upgraded.
l/liburing-2.3-x86_64-1.txz:  Upgraded.
l/speech-dispatcher-0.11.4-x86_64-1.txz:  Upgraded.
n/irssi-1.4.3-x86_64-1.txz:  Upgraded.
n/stunnel-5.67-x86_64-1.txz:  Upgraded.
x/ibus-table-1.16.13-x86_64-1.txz:  Upgraded.
x/pixman-0.42.2-x86_64-1.txz:  Upgraded.
x/xorg-server-xwayland-22.1.5-x86_64-1.txz:  Upgraded.

5 files changed, 108 insertions, 53 deletions

diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog
index 98f4a837c..b9cb22dda 100644
--- a/source/l/FTBFSlog
+++ b/source/l/FTBFSlog
@@ -1,3 +1,6 @@
+Tue Nov  1 18:49:18 UTC 2022
+  glibc: fix build with make-4.4. Thanks to nobodino and marav.
++--------------------------+
 Sun Oct  9 20:08:52 UTC 2022
   clucene: add #include <ctime>. Thanks to nobodino.
 +--------------------------+
diff --git a/source/l/glibc/glibc-2.35-make-4.4-MAKEFLAGS.patch b/source/l/glibc/glibc-2.35-make-4.4-MAKEFLAGS.patch
new file mode 100644
index 000000000..51fbe5f54
--- /dev/null
+++ b/source/l/glibc/glibc-2.35-make-4.4-MAKEFLAGS.patch
@@ -0,0 +1,102 @@
+https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2d7ed98add14f75041499ac189696c9bd3d757fe
+https://bugs.gentoo.org/869263
+
+From 2d7ed98add14f75041499ac189696c9bd3d757fe Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Tue, 13 Sep 2022 13:39:13 -0400
+Subject: [PATCH] Makerules: fix MAKEFLAGS assignment for upcoming make-4.4
+ [BZ# 29564]
+
+make-4.4 will add long flags to MAKEFLAGS variable:
+
+    * WARNING: Backward-incompatibility!
+      Previously only simple (one-letter) options were added to the MAKEFLAGS
+      variable that was visible while parsing makefiles.  Now, all options
+      are available in MAKEFLAGS.
+
+This causes locale builds to fail when long options are used:
+
+    $ make --shuffle
+    ...
+    make  -C localedata install-locales
+    make: invalid shuffle mode: '1662724426r'
+
+The change fixes it by passing eash option via whitespace and dashes.
+That way option is appended to both single-word form and whitespace
+separated form.
+
+While at it fixed --silent mode detection in $(MAKEFLAGS) by filtering
+out --long-options. Otherwise options like --shuffle flag enable silent
+mode unintentionally. $(silent-make) variable consolidates the checks.
+
+Resolves: BZ# 29564
+
+CC: Paul Smith <psmith@gnu.org>
+CC: Siddhesh Poyarekar <siddhesh@gotplt.org>
+Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
+Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -43,6 +43,22 @@ else
+ $(error objdir must be defined by the build-directory Makefile)
+ endif
+ 
++# Did we request 'make -s' run? "yes" or "no".
++# Starting from make-4.4 MAKEFLAGS now contains long
++# options like '--shuffle'. To detect presence of 's'
++# we pick first word with short options. Long options
++# are guaranteed to come after whitespace. We use '-'
++# prefix to always have a word before long options
++# even if no short options were passed.
++# Typical MAKEFLAGS values to watch for:
++#   "rs --shuffle=42" (silent)
++#   " --shuffle" (not silent)
++ifeq ($(findstring s, $(firstword -$(MAKEFLAGS))),)
++silent-make := no
++else
++silent-make := yes
++endif
++
+ # Root of the sysdeps tree.
+ sysdep_dir := $(..)sysdeps
+ export sysdep_dir := $(sysdep_dir)
+@@ -917,7 +933,7 @@ endif
+ # umpteen zillion filenames along with it (we use `...' instead)
+ # but we don't want this echoing done when the user has said
+ # he doesn't want to see commands echoed by using -s.
+-ifneq	"$(findstring s,$(MAKEFLAGS))" ""	# if -s
++ifeq ($(silent-make),yes)			# if -s
+ +cmdecho	:= echo >/dev/null
+ else						# not -s
+ +cmdecho	:= echo
+--- a/Makerules
++++ b/Makerules
+@@ -794,7 +794,7 @@ endif
+ # Maximize efficiency by minimizing the number of rules.
+ .SUFFIXES:	# Clear the suffix list.  We don't use suffix rules.
+ # Don't define any builtin rules.
+-MAKEFLAGS := $(MAKEFLAGS)r
++MAKEFLAGS := $(MAKEFLAGS) -r
+ 
+ # Generic rule for making directories.
+ %/:
+@@ -811,7 +811,7 @@ MAKEFLAGS := $(MAKEFLAGS)r
+ .PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c))
+ 
+ # Use the verbose option of ar and tar when not running silently.
+-ifeq	"$(findstring s,$(MAKEFLAGS))" ""	# if not -s
++ifeq ($(silent-make),no)			# if not -s
+ verbose := v
+ else	   					# -s
+ verbose	:=
+--- a/elf/rtld-Rules
++++ b/elf/rtld-Rules
+@@ -52,7 +52,7 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs),\
+ 	mv -f $@T $@
+ 
+ # Use the verbose option of ar and tar when not running silently.
+-ifeq	"$(findstring s,$(MAKEFLAGS))" ""	# if not -s
++ifeq ($(silent-make),no)			# if not -s
+ verbose := v
+ else						# -s
+ verbose	:=
diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild
index 208bc8d82..9147c68ce 100755
--- a/source/l/glibc/glibc.SlackBuild
+++ b/source/l/glibc/glibc.SlackBuild
@@ -153,6 +153,8 @@ apply_patches() {
   zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1
   # Don't use AM/PM format for date(1). That's just plain crazy.
   zcat $CWD/glibc-2.32.en_US.no.am.pm.date.format.diff.gz | patch -p1 --verbose || exit 1
+  # Fix build with make-4.4:
+  zcat $CWD/glibc-2.35-make-4.4-MAKEFLAGS.patch.gz | patch -p1 --verbose || exit 1
   # Other regression fixes from git:
   for git_patch in $CWD/patches/*.patch.gz ; do
     zcat $git_patch | patch -p1 --verbose || exit 1
diff --git a/source/x/xorg-server-xwayland/987.patch b/source/x/xorg-server-xwayland/987.patch
deleted file mode 100644
index 2133ee171..000000000
--- a/source/x/xorg-server-xwayland/987.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 914e2276df86b7e93ca37e4e87346d38cb80db05 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 24 Oct 2022 09:24:01 +0200
-Subject: [PATCH] xwayland/input: Do not ignore leave events
-
-Commit 8a5f3ddb2 ("set tag on our surface") introduced the use of tags
-to differentiate our own surfaces, and commit a1d14aa8c ("Clear the
-"xwl-window" tag on unrealize") removed the tags before the surfaces are
-actually destroyed.
-
-Xwayland would then rely on these tags on the surface to decide whether
-to ignore or to process the Wayland event in various places.
-
-However, in doing so, it also checked for the tag on keyboard leave
-events.
-
-As a result, if the keyboard leave events is received after the X11
-window is unrealized, keyboard_handle_leave() would not queue the
-LeaveNotify events for the DIX to proceed, and the key repeat would
-kick in and repeat the key event indefinitely.
-
-To avoid the issue, process events regardless of the tag as before
-in keyboard_handle_leave().
-
-Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
-Fixes: 8a5f3ddb2 - "xwayland: set tag on our surface"
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1395
-Tested-by: Renan Guilherme Lebre Ramos <japareaggae@gmail.com>
-Tested-by: Stefan Dirsch <sndirsch@suse.de>
----
- hw/xwayland/xwayland-input.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
-index 240eb0139..9eda1ef71 100644
---- a/hw/xwayland/xwayland-input.c
-+++ b/hw/xwayland/xwayland-input.c
-@@ -1147,9 +1147,6 @@ keyboard_handle_leave(void *data, struct wl_keyboard *keyboard,
-     struct xwl_seat *xwl_seat = data;
-     uint32_t *k;
- 
--    if (surface != NULL && !is_surface_from_xwl_window(surface))
--        return;
--
-     xwl_seat->xwl_screen->serial = serial;
- 
-     wl_array_for_each(k, &xwl_seat->keys)
--- 
-GitLab
-
diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
index 10fe3585e..06948306c 100755
--- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
+++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=xorg-server-xwayland
 SRCNAM=xwayland
 VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # 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"
@@ -80,8 +80,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/987.patch.gz | patch -p1 --verbose || exit 1
-
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"