From 3cf1a25c7785c09623761932b83aa5698cf83d88 Mon Sep 17 00:00:00 2001
From: Steve Cossette <farchord@gmail.com>
Date: Thu, 23 Nov 2023 14:19:21 -0500
Subject: [PATCH] Git update for qt6 compatibility

---
 .gitignore         |  1 +
 pulseaudio-qt.spec | 93 ++++++++++++++++++++++++++++++++++++----------
 sources            |  2 +-
 3 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d55767..74866cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /pulseaudio-qt-1.2.tar.xz
 /pulseaudio-qt-1.3.tar.xz
+/pulseaudio-qt-36f5625141cbb4e1707e0f4ed9ece0ce0c2c0cc9.tar.gz
diff --git a/pulseaudio-qt.spec b/pulseaudio-qt.spec
index 12a5fe3..eafd3c1 100644
--- a/pulseaudio-qt.spec
+++ b/pulseaudio-qt.spec
@@ -1,16 +1,25 @@
+%global commit0 36f5625141cbb4e1707e0f4ed9ece0ce0c2c0cc9
+%global shortcommit %(c=%{commit0}; echo ${c:0:7})
+%global gitdate 20231120.081305
+
 Name:    pulseaudio-qt
 Summary: Qt bindings for PulseAudio
-Version: 1.3
-Release: 5%{?dist}
+Version: 1.3^%{gitdate}.%{shortcommit}
+Release: 1%{?dist}
 
-License: LGPLv2+
+License: CC0-1.0 AND LGPL-2.1-only AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-LGPL
 URL:     https://invent.kde.org/libraries/pulseaudio-qt
-Source:  https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
+Source:  https://invent.kde.org/libraries/pulseaudio-qt/-/archive/%{commit0}/pulseaudio-qt-%{commit0}.tar.gz
 
-BuildRequires:  extra-cmake-modules >= 5.44.0
+BuildRequires:  extra-cmake-modules
+BuildRequires:  kf6-rpm-macros
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6Qml)
+BuildRequires:  cmake(Qt6Test)
+BuildRequires:  cmake(Qt6DBus)
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5Qml)
 BuildRequires:  cmake(Qt5Test)
@@ -19,41 +28,87 @@ BuildRequires:  cmake(Qt5DBus)
 %description
 Pulseaudio-Qt is a library providing Qt bindings to PulseAudio.
 
-%package devel
-Summary: Development files for %{name}
+%package qt5-devel
+Summary: Development files for %{name} (Qt5)
 Requires: %{name}%{?_isa} = %{version}-%{release}
-%description devel
+Provides: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+%description qt5-devel
 %{summary}.
 
+%package qt5
+Summary: Qt5 bindings for PulseAudio
+Provides: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+%description qt5
+%{summary}.
 
-%prep
-%autosetup
+%package qt6-devel
+Summary: Development files for %{name} (Qt6)
+Requires: %{name}-qt6%{?_isa} = %{version}-%{release}
+%description qt6-devel
+%{summary}.  
 
+%package qt6
+Summary: Qt6 bindings for PulseAudio
+%description qt6
+%{summary}.
 
-%build
-%cmake_kf5
 
-%cmake_build
 
+%prep
+%autosetup -n %{name}-%{commit0}
+
+%build
+mkdir %{name}_qt5
+pushd %{name}_qt5
+%cmake_kf5 -DQT_MAJOR_VERSION=5 -S../
+%cmake_build
+popd
+mkdir %{name}_qt6
+pushd %{name}_qt6
+%cmake_kf6 -DQT_MAJOR_VERSION=6 -S../
+%cmake_build
+popd
 
 %install
+pushd %{name}_qt5
 %cmake_install
+popd
+pushd %{name}_qt6
+%cmake_install
+popd
+rm %{buildroot}%{_kf6_includedir}/pulseaudioqt_version.h
+rm %{buildroot}%{_kf5_includedir}/pulseaudioqt_version.h
 
-
-%files
+%files qt5
 %license LICENSES/*.txt
 %doc README.md
-%{_kf5_libdir}/libKF5PulseAudioQt.so.3
-%{_kf5_libdir}/libKF5PulseAudioQt.so.%{version}.0
+%{_kf5_libdir}/libKF5PulseAudioQt.so.4
+%{_kf5_libdir}/libKF5PulseAudioQt.so.1.3.0
 
-%files devel
+%files qt5-devel
 %{_kf5_includedir}/KF5PulseAudioQt/
 %{_kf5_libdir}/libKF5PulseAudioQt.so
-%{_kf5_includedir}/pulseaudioqt_version.h
 %{_kf5_libdir}/cmake/KF5PulseAudioQt/
+%{_kf5_libdir}/pkgconfig/KF5PulseAudioQt.pc
 
+%files qt6
+%license LICENSES/*.txt
+%doc README.md
+%{_kf6_libdir}/libKF6PulseAudioQt.so.4
+%{_kf6_libdir}/libKF6PulseAudioQt.so.1.3.0
+
+%files qt6-devel
+%{_kf6_includedir}/KF6PulseAudioQt/
+%{_kf6_libdir}/libKF6PulseAudioQt.so
+%{_kf6_libdir}/cmake/KF6PulseAudioQt/
+%{_kf6_libdir}/pkgconfig/KF6PulseAudioQt.pc
 
 %changelog
+* Tue Nov 21 2023 Steve Cossette <farchord@gmail.com> - 1.3^20231120.081305.36f5625-1
+- Qt6 Build
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 6aa7809..abfbfa8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pulseaudio-qt-1.3.tar.xz) = 2326277fd37327db29a5984056949fcf935c36e7b39184d1307a5d0a891efed4f0e4f32e783f3f7da2c7e6b7409eb908b2521064c6d24a28561ed38db9f8d4e8
+SHA512 (pulseaudio-qt-36f5625141cbb4e1707e0f4ed9ece0ce0c2c0cc9.tar.gz) = 0e2c5ab2d8f0ab07497176162fc6ddcb14763d4045b6257e6dbb2d313456e23a2b76510ff8e9d24d7631bb8be4a986491f770ac6116e3716f3afa7ee8ec6f726