From 396bde757f1bb5ff0f0cad27eb0e5ea6cfc55d69 Mon Sep 17 00:00:00 2001
From: Raven <raven@sysadmins.ws>
Date: Mon, 2 Sep 2024 16:26:14 +0600
Subject: [PATCH] qt6 fixes

---
 .../python-pyqt6-webengine.spec                       |  2 +-
 base/qt6/python-pyqt6/python-pyqt6.spec               |  4 ++--
 base/qt6/qt6-qtwayland/qt6-qtwayland.spec             | 11 ++++++++++-
 base/qt6/qt6/qt6.spec                                 |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/base/qt6/python-pyqt6-webengine/python-pyqt6-webengine.spec b/base/qt6/python-pyqt6-webengine/python-pyqt6-webengine.spec
index dcebe34..1dce599 100644
--- a/base/qt6/python-pyqt6-webengine/python-pyqt6-webengine.spec
+++ b/base/qt6/python-pyqt6-webengine/python-pyqt6-webengine.spec
@@ -80,7 +80,7 @@ done
 
 
 %files -n python%{python3_pkgversion}-pyqt6-webengine
-%doc README
+#doc README
 %license LICENSE
 %{python3_sitearch}/PyQt6_WebEngine-%{version}.dist-info/
 %{python3_sitearch}/PyQt6/QtWebEngineCore.*
diff --git a/base/qt6/python-pyqt6/python-pyqt6.spec b/base/qt6/python-pyqt6/python-pyqt6.spec
index f6e6bfc..16bb549 100644
--- a/base/qt6/python-pyqt6/python-pyqt6.spec
+++ b/base/qt6/python-pyqt6/python-pyqt6.spec
@@ -243,10 +243,10 @@ sed -i \
 
 %changelog
 * Mon May 27 2024 Raven <raven@sysadmins.ws> - 6.7.0-3
-- rebuilt for qt 6.7.2
+- rebuilt for qt 6.7.2 (el8)
 
 * Mon May 27 2024 Raven <raven@sysadmins.ws> - 6.7.0-2
-- rebuilt for qt 6.7.1
+- rebuilt for qt 6.7.1 (el8)
 
 * Fri Apr 26 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
 - Update to 6.7.0
diff --git a/base/qt6/qt6-qtwayland/qt6-qtwayland.spec b/base/qt6/qt6-qtwayland/qt6-qtwayland.spec
index aee935a..476f960 100644
--- a/base/qt6/qt6-qtwayland/qt6-qtwayland.spec
+++ b/base/qt6/qt6-qtwayland/qt6-qtwayland.spec
@@ -43,7 +43,7 @@ BuildRequires: qt6-qtdeclarative-devel
 
 BuildRequires: pkgconfig(xkbcommon)
 BuildRequires: pkgconfig(wayland-scanner)
-BuildRequires: pkgconfig(wayland-server)
+BuildRequires: pkgconfig(wayland-server) >= 1.22
 BuildRequires: pkgconfig(wayland-client)
 BuildRequires: pkgconfig(wayland-cursor)
 BuildRequires: pkgconfig(wayland-egl)
@@ -56,6 +56,10 @@ BuildRequires: pkgconfig(libinput)
 
 BuildRequires:  libXext-devel
 
+Requires: (libwayland-server >= 1.22 or rx-libwayland-server)
+Requires: (libwayland-client >= 1.22 or rx-libwayland-client)
+Requires: (libwayland-cursor >= 1.22 or rx-libwayland-cursor)
+Requires: (libwayland-egl >= 1.22 or rx-libwayland-egl)
 
 %description
 %{summary}.
@@ -84,6 +88,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %build
 %enable_devtoolset13
 
+%if 0%{?rhel} == 8
+export PKG_CONFIG_PATH=/opt/rx/%{_lib}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
+export LDFLAGS="-L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/ %{__global_ldflags}"
+%endif
+
 %cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
 
 %cmake_build
diff --git a/base/qt6/qt6/qt6.spec b/base/qt6/qt6/qt6.spec
index a095f89..f5057f7 100644
--- a/base/qt6/qt6/qt6.spec
+++ b/base/qt6/qt6/qt6.spec
@@ -1,7 +1,7 @@
 
 Name: qt6
 Version: 6.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Qt6 meta package
 License: GPL-3.0-only
 URL: https://getfedora.org/