Sun Feb 5 20:39:36 UTC 202320230205203936

ap/htop-3.2.2-x86_64-1.txz:  Upgraded.
l/fuse3-3.13.1-x86_64-1.txz:  Upgraded.
l/pangomm-2.46.3-x86_64-1.txz:  Upgraded.
l/tevent-0.14.1-x86_64-1.txz:  Upgraded.
n/dnsmasq-2.89-x86_64-1.txz:  Upgraded.
x/libX11-1.8.4-x86_64-1.txz:  Upgraded.
x/xkeyboard-config-2.38-noarch-1.txz:  Upgraded.
x/xvidtune-1.0.4-x86_64-1.txz:  Upgraded.

4 files changed, 54 insertions, 2 deletions

diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog
index b9cb22dda..d8746414c 100644
--- a/source/l/FTBFSlog
+++ b/source/l/FTBFSlog
@@ -1,3 +1,6 @@
+Sun Feb  5 20:29:10 UTC 2023
+  qt5-webkit: Fix build with ruby-3.2.0. Thanks to nobodino and marav.
++--------------------------+
 Tue Nov  1 18:49:18 UTC 2022
   glibc: fix build with make-4.4. Thanks to nobodino and marav.
 +--------------------------+
diff --git a/source/l/pangomm/pangomm.SlackBuild b/source/l/pangomm/pangomm.SlackBuild
index 957d36808..3e8ccc990 100755
--- a/source/l/pangomm/pangomm.SlackBuild
+++ b/source/l/pangomm/pangomm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pangomm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild
index d13457aac..be52d842f 100755
--- a/source/l/qt5-webkit/qt5-webkit.SlackBuild
+++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2015  Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2016, 2017, 2018, 2019  Eric Hameleers, Eindhoven, NL
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2020, 2023  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -103,6 +103,9 @@ zcat $CWD/qt5-webkit.bison27.patch.gz | patch -p1 --verbose || exit 1
 # Fix for glib-2.68.0:
 zcat $CWD/qt5-webkit.glib-2.68.0.diff.gz | patch -p1 --verbose || exit 1
 
+# Fix for Ruby 3.2.x:
+zcat $CWD/webkit-offlineasm-warnings-ruby27.patch | patch -p1 --verbose || exit 1
+
 # -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise.
 
 export CFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1"
diff --git a/source/l/qt5-webkit/webkit-offlineasm-warnings-ruby27.patch b/source/l/qt5-webkit/webkit-offlineasm-warnings-ruby27.patch
new file mode 100644
index 000000000..d25c3b1d6
--- /dev/null
+++ b/source/l/qt5-webkit/webkit-offlineasm-warnings-ruby27.patch
@@ -0,0 +1,46 @@
+From c7d19a492d97f9282a546831beb918e03315f6ef Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Wed, 15 Jan 2020 22:15:38 +0000
+Subject: [PATCH] Offlineasm warnings with newer Ruby versions
+ https://bugs.webkit.org/show_bug.cgi?id=206233
+
+Reviewed by Yusuke Suzuki.
+
+Avoid a warning about using Object#=~ on Annotation instances, which
+has been deprecated in Ruby 2.7.
+
+* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator
+to Annotation instances, which do not define it.
+
+
+Canonical link: https://commits.webkit.org/219400@main
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/JavaScriptCore/ChangeLog            | 13 +++++++++++++
+ Source/JavaScriptCore/offlineasm/parser.rb |  6 +++---
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb
+index 791c81a9868d..f14c873e2dbd 100644
+--- a/Source/JavaScriptCore/offlineasm/parser.rb
++++ b/Source/JavaScriptCore/offlineasm/parser.rb
+@@ -628,9 +628,7 @@ def parseSequence(final, comment)
+         firstCodeOrigin = @tokens[@idx].codeOrigin
+         list = []
+         loop {
+-            if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
+-                break
+-            elsif @tokens[@idx].is_a? Annotation
++            if @tokens[@idx].is_a? Annotation
+                 # This is the only place where we can encounter a global
+                 # annotation, and hence need to be able to distinguish between
+                 # them.
+@@ -644,6 +642,8 @@ def parseSequence(final, comment)
+                 list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string)
+                 @annotation = nil
+                 @idx += 2 # Consume the newline as well.
++            elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
++                break
+             elsif @tokens[@idx] == "\n"
+                 # ignore
+                 @idx += 1