From 467a2a08aee7df3a125aef7fc6479d633e901840 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Tue, 2 Apr 2024 15:48:11 +0200
Subject: [PATCH] Update rpm and arch packages for Qt6

---
 dist/arch/gnome/PKGBUILD                |  6 ++----
 dist/arch/kde/PKGBUILD                  | 10 ++++------
 dist/arch/minimal/PKGBUILD              |  6 ++----
 dist/rpm/gnome/systray-x-gnome.spec     | 12 ++++++++++--
 dist/rpm/kde/systray-x.spec             | 16 +++++++++++++---
 dist/rpm/minimal/systray-x-minimal.spec | 12 ++++++++++--
 6 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD
index fe5b5aa..f52c6a7 100644
--- a/dist/arch/gnome/PKGBUILD
+++ b/dist/arch/gnome/PKGBUILD
@@ -9,8 +9,7 @@ arch=(x86_64)
 url=https://github.com/Ximi1970/systray-x
 license=(MPL-2.0)
 depends=(
-  'qt5-base'
-  'qt5-x11extras'
+  'qt6-base'
   'gnome-shell-extension-appindicator'
   'thunderbird>=91'
   'thunderbird<121'
@@ -20,8 +19,7 @@ makedepends=(
   'unzip'
   'zip'
   'libx11'
-  'qt5-base'
-  'qt5-x11extras'
+  'qt6-base'
 )
 provides=(
   'systray-x'
diff --git a/dist/arch/kde/PKGBUILD b/dist/arch/kde/PKGBUILD
index 3e602c4..1cd839e 100644
--- a/dist/arch/kde/PKGBUILD
+++ b/dist/arch/kde/PKGBUILD
@@ -9,9 +9,8 @@ arch=(x86_64)
 url=https://github.com/Ximi1970/systray-x
 license=(MPL-2.0)
 depends=(
-  'qt5-base'
-  'qt5-x11extras'
-  'knotifications5'
+  'qt-base'
+  'kf6-knotifications'
   'thunderbird>=91'
   'thunderbird<121'
 )
@@ -20,9 +19,8 @@ makedepends=(
   'unzip'
   'zip'
   'libx11'
-  'qt5-base'
-  'qt5-x11extras'
-  'knotifications5'
+  'qt6-base'
+  'kf6-knotifications'
 )
 provides=(
   'systray-x'
diff --git a/dist/arch/minimal/PKGBUILD b/dist/arch/minimal/PKGBUILD
index 94e7ee3..db090fb 100644
--- a/dist/arch/minimal/PKGBUILD
+++ b/dist/arch/minimal/PKGBUILD
@@ -9,8 +9,7 @@ arch=(x86_64)
 url=https://github.com/Ximi1970/systray-x
 license=(MPL-2.0)
 depends=(
-  'qt5-base'
-  'qt5-x11extras'
+  'qt6-base'
   'thunderbird>=91'
   'thunderbird<121'
 )
@@ -19,8 +18,7 @@ makedepends=(
   'unzip'
   'zip'
   'libx11'
-  'qt5-base'
-  'qt5-x11extras'
+  'qt6-base'
 )
 provides=(
   'systray-x'
diff --git a/dist/rpm/gnome/systray-x-gnome.spec b/dist/rpm/gnome/systray-x-gnome.spec
index 179b936..a6bf07b 100644
--- a/dist/rpm/gnome/systray-x-gnome.spec
+++ b/dist/rpm/gnome/systray-x-gnome.spec
@@ -26,18 +26,26 @@ Source0:        %{name}-%{version}.tar.xz
 Source1:        VERSION
 BuildRequires:  unzip
 BuildRequires:  zip
+%if 0%{?suse_version} > 1600
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Widgets)
+%else
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5X11Extras)
+%if 0%{?fedora_version} || 0%{?centos_version}
+BuildRequires:  qt5-qtx11extras-devel
+%else
+BuildRequires:  libqt5-qtx11extras-devel
+%endif
+%endif
 BuildRequires:  pkgconfig(x11)
 Requires:       gnome-shell-extension-appindicator
 %if 0%{?fedora_version} || 0%{?centos_version}
-BuildRequires:  qt5-qtx11extras-devel
 Requires:       thunderbird >= 91
 Requires:       thunderbird < 121
 %else
-BuildRequires:  libqt5-qtx11extras-devel
 Requires:       MozillaThunderbird >= 91
 Requires:       MozillaThunderbird < 121
 %endif
diff --git a/dist/rpm/kde/systray-x.spec b/dist/rpm/kde/systray-x.spec
index c903683..da3f9f3 100644
--- a/dist/rpm/kde/systray-x.spec
+++ b/dist/rpm/kde/systray-x.spec
@@ -26,21 +26,31 @@ Source0:        %{name}-%{version}.tar.xz
 Source1:        VERSION
 BuildRequires:  unzip
 BuildRequires:  zip
+%if 0%{?suse_version} > 1600
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Widgets)
+BuildRequires:  kf6-knotifications-devel
+Requires:       libKF6Notifications6
+%else
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5X11Extras)
-BuildRequires:  pkgconfig(x11)
 %if 0%{?fedora_version} || 0%{?centos_version}
 BuildRequires:  qt5-qtx11extras-devel
 BuildRequires:  kf5-knotifications-devel
 Requires:       kf5-knotifications
-Requires:       thunderbird >= 91
-Requires:       thunderbird < 121
 %else
 BuildRequires:  libqt5-qtx11extras-devel
 BuildRequires:  knotifications-devel
 Requires:       libKF5Notifications5
+%endif
+%endif
+BuildRequires:  pkgconfig(x11)
+%if 0%{?fedora_version} || 0%{?centos_version}
+Requires:       thunderbird >= 91
+Requires:       thunderbird < 121
+%else
 Requires:       MozillaThunderbird >= 91
 Requires:       MozillaThunderbird < 121
 %endif
diff --git a/dist/rpm/minimal/systray-x-minimal.spec b/dist/rpm/minimal/systray-x-minimal.spec
index bbc1fac..4a3bfdf 100644
--- a/dist/rpm/minimal/systray-x-minimal.spec
+++ b/dist/rpm/minimal/systray-x-minimal.spec
@@ -26,17 +26,25 @@ Source0:        %{name}-%{version}.tar.xz
 Source1:        VERSION
 BuildRequires:  unzip
 BuildRequires:  zip
+%if 0%{?suse_version} > 1600
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Widgets)
+%else
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5X11Extras)
-BuildRequires:  pkgconfig(x11)
 %if 0%{?fedora_version} || 0%{?centos_version}
 BuildRequires:  qt5-qtx11extras-devel
+%else
+BuildRequires:  libqt5-qtx11extras-devel
+%endif
+%endif
+BuildRequires:  pkgconfig(x11)
+%if 0%{?fedora_version} || 0%{?centos_version}
 Requires:       thunderbird >= 91
 Requires:       thunderbird < 121
 %else
-BuildRequires:  libqt5-qtx11extras-devel
 Requires:       MozillaThunderbird >= 91
 Requires:       MozillaThunderbird < 121
 %endif