[packages/qt5-qtbase] up to 5.15.16

[atler]

commit 47f07610726818fe9b78d51d6a11d74b978d70f8
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Nov 18 11:30:16 2024 +0100

    up to 5.15.16

 libxkbcommon1.6.patch | 42 ------------------------------------------
 qt5-qtbase.spec       |  9 ++++-----
 2 files changed, 4 insertions(+), 47 deletions(-)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 7117e83..5487d36 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -70,19 +70,18 @@
 Summary:	Qt5 - base components
 Summary(pl.UTF-8):	Biblioteka Qt5 - podstawowe komponenty
 Name:		qt5-%{orgname}
-Version:	5.15.15
+Version:	5.15.16
 Release:	1
 License:	LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:		X11/Libraries
 Source0:	https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-opensource-src-%{version}.tar.xz
-# Source0-md5:	82c5bc7d214292e9b5b4c8f2667b62ce
+# Source0-md5:	5eb20e6fec405125777496a2e1e53038
 Source1:	https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-opensource-src-%{version}.tar.xz
-# Source1-md5:	bb7689f5db3fc1352180f385e2df677b
+# Source1-md5:	2f9320ff53b3cb51482cd45eec25a470
 Patch0:		%{name}-system_cacerts.patch
 Patch1:		parallel-install.patch
 Patch2:		egl-x11.patch
 Patch4:		CVE-2024-39936-qtbase-5.15.patch
-Patch9:		libxkbcommon1.6.patch
 Patch10:	CVE-2023-51714.patch
 URL:		https://www.qt.io/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
@@ -119,6 +118,7 @@ BuildRequires:	mtdev-devel
 BuildRequires:	openssl-devel >= 1.1.1
 %{?with_oci:BuildRequires:	oracle-instantclient-devel}
 BuildRequires:	pcre2-16-devel >= 10.20
+BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 %{?with_qm:BuildRequires:	qt5-linguist >= 5.2}
@@ -1180,7 +1180,6 @@ Generator plików makefile dla aplikacji Qt5.
 %patch1 -p1
 %patch2 -p1
 %patch4 -p1
-%patch9 -p1
 %patch10 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf
diff --git a/libxkbcommon1.6.patch b/libxkbcommon1.6.patch
deleted file mode 100644
index f711713..0000000
--- a/libxkbcommon1.6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi at qt.io>
-Date: Tue, 10 Oct 2023 14:08:48 +0200
-Subject: xkb: fix build with libxkbcommon 1.6.0 and later
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A few XKB_KEY_dead_* defines got removed from 1.6.0. See also
-https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14
-https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08
-
-Pick-to: 6.6 6.5 6.2 5.15
-Fixes: QTBUG-117950
-Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo at qt.io>
----
- src/platformsupport/input/xkbcommon/qxkbcommon.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
-index 26d87c5ff5..7b611790c6 100644
---- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
-+++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
-@@ -237,10 +237,14 @@ static constexpr const auto KeyTbl = qMakeArray(
-         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
-+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
-+   The define check is kind of version check here. */
-+#ifdef XKB_KEY_dead_lowline
-         Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
-         Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
-         Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
-         Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-+#endif
- 
-         // Special keys from X.org - This include multimedia keys,
-         // wireless/bluetooth/uwb keys, special launcher keys, etc.
--- 
-cgit v1.2.3
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtbase.git/commitdiff/47f07610726818fe9b78d51d6a11d74b978d70f8