From 93c43cb5608a0e965225082f76044dd51732197b Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 17:06:06 +0100
Subject: [PATCH] update to 5.15.2.20220127git [release
 5.15.2.20220127git-1mamba;Wed Feb 02 2022]

---
 ...15.2.20220127git-revert-version-bump.patch |  8 +++++++
 qt5-qtbase.spec                               | 21 +++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 qt5-qtbase-5.15.2.20220127git-revert-version-bump.patch

diff --git a/qt5-qtbase-5.15.2.20220127git-revert-version-bump.patch b/qt5-qtbase-5.15.2.20220127git-revert-version-bump.patch
new file mode 100644
index 0000000..9fc04f6
--- /dev/null
+++ b/qt5-qtbase-5.15.2.20220127git-revert-version-bump.patch
@@ -0,0 +1,8 @@
+--- qtbase-5.15.2.20220127git/.qmake.conf.orig	2022-02-02 14:48:03.803797860 +0100
++++ qtbase-5.15.2.20220127git/.qmake.conf	2022-02-02 14:48:15.508732250 +0100
+@@ -6,4 +6,4 @@
+ QT_SOURCE_TREE = $$PWD
+ QT_BUILD_TREE = $$shadowed($$PWD)
+ 
+-MODULE_VERSION = 5.15.3
++MODULE_VERSION = 5.15.2
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 6271562..57ea846 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -18,15 +18,16 @@
 %endif
 
 Name:          qt5-qtbase
-Version:       5.15.2
-Release:       2mamba
+Version:       5.15.2.20220127git
+Release:       1mamba
 Summary:       A multiplatform, C++ GUI application development framework
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://www.qt.io/
-Source0:       https://download.qt.io/official_releases/qt/%{majver}/%{version}/submodules/qtbase-everywhere-src-%{version}.tar.xz
+Source0:       https://invent.kde.org/qt/qt/qtbase.git/kde%2F5.15/qtbase-%{version}.tar.bz2
+#Source0:       https://download.qt.io/official_releases/qt/%{majver}/%{version}/submodules/qtbase-everywhere-src-%{version}.tar.xz
 Source1:       libqt5-profile.sh
 Source2:       libqt5-profile.csh
 Source10:      libqt5-qt5logo-icon64x64.png
@@ -39,6 +40,7 @@ Patch3:        libqt5-5.5.1-vlc.patch
 Patch4:        libqt5-5.11.2-glibc-2.28.patch
 Patch5:        libqt5-5.15.0-arm-missing-math-include.patch
 Patch6:        qt5-qtbase-5.15.2-gcc11.patch
+Patch7:        qt5-qtbase-5.15.2.20220127git-revert-version-bump.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -84,7 +86,6 @@ BuildRequires: libxcb-devel
 BuildRequires: libxcb-image-devel
 BuildRequires: libxcb-keysyms-devel
 BuildRequires: libxcb-render-util-devel
-BuildRequires: libxcb-util-devel
 BuildRequires: libxcb-util-wm-devel
 BuildRequires: libxkbcommon-devel
 BuildRequires: libz-devel
@@ -410,11 +411,15 @@ This package contains the Sybase and Microsoft SQL plugin.
 %debug_package
 
 %prep
-%setup -q -n qtbase-everywhere-src-%{version}
+%setup -q -n qtbase-%{version}
 #-D -T
 #:<< _EOF
 #%patch5 -p1
 %patch6 -p1 -b .gcc11
+%patch7 -p1 -b .revert-version-bump
+
+# .git required for confiugre to call syncqt and generate includes dir
+touch .git
 
 %build
 #:<< _EOF
@@ -629,10 +634,11 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_qt5_plugindir}/platforminputcontexts/
 %{_qt5_plugindir}/platforms/
 %{_qt5_plugindir}/platformthemes/
-%ifnarch arm
 %dir %{_qt5_plugindir}/xcbglintegrations
+%ifnarch arm
 %{_qt5_plugindir}/xcbglintegrations/libqxcb-glx-integration.so
 %endif
+%{_qt5_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
 %exclude %{_qt5_plugindir}/platformthemes/libqgtk3.so
 #%ifarch arm
 #%{_qt5_plugindir}/video/videonode/libeglvideonode.so
@@ -777,6 +783,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 %endif
 
 %changelog
+* Wed Feb 02 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.2.20220127git-1mamba
+- update to 5.15.2.20220127git
+
 * Thu Nov 04 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.2-2mamba
 - first build as submodule