Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Plasma6
Date: Sun, 12 May 2024 17:26:25 +0200	[thread overview]
Message-ID: <20240512152625.EEE61240D7@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50060@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/Luciogi/void-packages plasma6-luci
https://github.com/void-linux/void-packages/pull/50060

Plasma6
#### Testing the changes
- I tested the changes in this PR: **yes"

- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

[skip ci]
[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/50060.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-plasma6-luci-50060.patch --]
[-- Type: text/x-diff, Size: 98882 bytes --]

From 80120b4b498a8396215dae7e88b005bbd8bb9527 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:40 +0100
Subject: [PATCH 01/38] kactivitymanagerd: update to 6.0.4

---
 srcpkgs/kactivitymanagerd/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 0cb98780e506cc..7ddca7d035df45 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,16 +1,16 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
 build_helper="qemu"
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons"
-makedepends="kio-devel boost-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
+configure_args="-DBUILD_TESTING=OFF -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext qt6-base qt6-tools"
+makedepends="kf6-kio-devel kf6-kglobalaccel-devel kf6-kxmlgui-devel
+ boost-devel"
 short_desc="Manage user's activities and track the usage patterns"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b2bb77b309850c6df61093cdbaf66faad122bf3be91428a3f42baeb907c45cd5
+checksum=2ccd6a04677322adfaa011130179d4efdd3708422b798c4fe3e664f49a33ac2f

From 5c250091f1d6757f63f8acab5fab3a5468a5e6b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:41 +0100
Subject: [PATCH 02/38] kde-cli-tools: update to 6.0.4

---
 srcpkgs/kde-cli-tools/template | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 4a1d3e8cfcb4b8..a6f64ed4dac516 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,20 +1,25 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules gettext pkg-config kcmutils-devel
- kpackage-devel kdoctools kcoreaddons-devel python3 qt5-host-tools qt5-qmake"
-makedepends="kactivities5-devel kcmutils-devel kdelibs4support-devel
- kdesu-devel plasma-workspace-devel"
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext"
+makedepends="plasma-activities-devel kf6-kcmutils-devel kf6-kdesu-devel
+ plasma-workspace-devel kf6-ki18n-devel"
 depends="xdg-utils"
 short_desc="KDE CLI tools"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a25f8fea64e5a7fd5a798041cab920217630eea809adfa07b9d111142b28255
+checksum=39d6e93ee2e274d3a4b878d46b761be7cb338ee261325f326ce291a0ec95ae6d
+
+if [ $CROSS_BUILD ]; then
+	hostmakedepends+=" kf6-kconfig-devel kf6-kcmutils-devel"
+fi
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 36e2bed590dad305134a3ee15f44083ffc0708aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:43 +0100
Subject: [PATCH 03/38] New package: kde-gtk-config-6.0.4

---
 srcpkgs/kde-gtk-config/template  | 24 ++++++++++++++++++++++++
 srcpkgs/kde-gtk-config/update    |  1 +
 srcpkgs/kde-gtk-config5          |  1 +
 srcpkgs/kde-gtk-config5/template | 22 ----------------------
 srcpkgs/kde-gtk-config5/update   |  1 -
 srcpkgs/kde5/template            |  2 +-
 6 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 srcpkgs/kde-gtk-config/template
 create mode 100644 srcpkgs/kde-gtk-config/update
 create mode 120000 srcpkgs/kde-gtk-config5
 delete mode 100644 srcpkgs/kde-gtk-config5/template
 delete mode 100644 srcpkgs/kde-gtk-config5/update

diff --git a/srcpkgs/kde-gtk-config/template b/srcpkgs/kde-gtk-config/template
new file mode 100644
index 00000000000000..8d934ac412d08a
--- /dev/null
+++ b/srcpkgs/kde-gtk-config/template
@@ -0,0 +1,24 @@
+# Template file for 'kde-gtk-config'
+pkgname=kde-gtk-config
+version=6.0.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_TESTING=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules pkg-config qt6-tools
+ sassc gettext kf6-kcoreaddons qt6-base"
+makedepends="kf6-kcmutils-devel kf6-knewstuff-devel gtk+3-devel
+ kf6-kdecoration-devel gsettings-desktop-schemas-devel"
+depends="kde-cli-tools gsettings-desktop-schemas"
+short_desc="GTK+3 Configurator for KDE"
+maintainer="Luciogi <lucigithubcommit@skiff.com>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://invent.kde.org/plasma/kde-gtk-config"
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=fd5491c2b0e887dc204e1661ac7f364f2c0965085ce4f50fa22857e0ed285dbd
+
+kde-gtk-config5_package() {
+	short_desc+=" - (Dummy transitional package)"
+	build_style=meta
+	depends="kde-gtk-config-${version}_${revision}"
+}
diff --git a/srcpkgs/kde-gtk-config/update b/srcpkgs/kde-gtk-config/update
new file mode 100644
index 00000000000000..9cf5a20c16ae29
--- /dev/null
+++ b/srcpkgs/kde-gtk-config/update
@@ -0,0 +1 @@
+pkgname=${pkgname}
diff --git a/srcpkgs/kde-gtk-config5 b/srcpkgs/kde-gtk-config5
new file mode 120000
index 00000000000000..5b0feeba40b05e
--- /dev/null
+++ b/srcpkgs/kde-gtk-config5
@@ -0,0 +1 @@
+kde-gtk-config
\ No newline at end of file
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
deleted file mode 100644
index 83e6402da6ff99..00000000000000
--- a/srcpkgs/kde-gtk-config5/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'kde-gtk-config5'
-pkgname=kde-gtk-config5
-version=5.27.11
-revision=1
-build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
- sassc gettext"
-makedepends="kcmutils-devel knewstuff-devel gtk+-devel gtk+3-devel
- kdecoration-devel gsettings-desktop-schemas-devel"
-depends="kde-cli-tools gsettings-desktop-schemas"
-short_desc="GTK2 and GTK3 Configurator for KDE"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://invent.kde.org/plasma/kde-gtk-config"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a48915b5077b8b3a520549f2dc739886685868c94d9e832eeadb9bbb4bf10d0a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kcoreaddons"
-	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-fi
diff --git a/srcpkgs/kde-gtk-config5/update b/srcpkgs/kde-gtk-config5/update
deleted file mode 100644
index 04f7336c75ac38..00000000000000
--- a/srcpkgs/kde-gtk-config5/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=${pkgname%5}
diff --git a/srcpkgs/kde5/template b/srcpkgs/kde5/template
index 08991643cc415f..548ea5d3e40fb3 100644
--- a/srcpkgs/kde5/template
+++ b/srcpkgs/kde5/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meta
 depends="bluedevil>=${version}
  breeze-gtk>=${version}
- kde-gtk-config5>=${version}
+ kde-gtk-config>=${version}
  kdeplasma-addons5>=${version}
  kgamma5>=${version}
  kinfocenter>=${version}

From 28f1be93efc734a2b9d816431a5013080003b5fc Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 20:15:27 +0500
Subject: [PATCH 04/38] New package: kdeplasma-addons-6.0.4

---
 srcpkgs/kdeplasma-addons/template  | 28 ++++++++++++++++++++++++++++
 srcpkgs/kdeplasma-addons5          |  1 +
 srcpkgs/kdeplasma-addons5/template | 16 ----------------
 srcpkgs/kdeplasma-addons5/update   |  1 -
 4 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/kdeplasma-addons/template
 create mode 120000 srcpkgs/kdeplasma-addons5
 delete mode 100644 srcpkgs/kdeplasma-addons5/template
 delete mode 100644 srcpkgs/kdeplasma-addons5/update

diff --git a/srcpkgs/kdeplasma-addons/template b/srcpkgs/kdeplasma-addons/template
new file mode 100644
index 00000000000000..4b4398029f8228
--- /dev/null
+++ b/srcpkgs/kdeplasma-addons/template
@@ -0,0 +1,28 @@
+# Template file for 'kdeplasma-addons'
+pkgname=kdeplasma-addons
+version=6.0.4
+revision=1
+build_style=cmake
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QMLDIR=lib/qt6/qml -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools pkg-config gettext
+ qt6-declarative-host-tools
+ kf6-kcmutils kf6-kpackage"
+makedepends="kf6-kdeclarative-devel kf6-kholidays-devel kf6-krunner-devel
+ kf6-sonnet-devel kf6-kunitconversion-devel kf6-knewstuff-devel
+ plasma5support-devel qt6-qt5compat-devel kf6-kio-devel
+ kf6-knotifications-devel kf6-kservice-devel kf6-kxmlgui-devel
+ kf6-kcmutils-devel libplasma-devel"
+short_desc="Various Plasma addons"
+maintainer="Luciogi <lucigithubcommit@skiff.com>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://invent.kde.org/plasma/kdeplasma-addons"
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=6d2d6df4775ba6939b43b438d7de9ab1fc611a212a7eedf470de4d56986b3b18
+
+kdeplasma-addons5_package() {
+	build_style=meta
+	short_desc+=" - (Dummy transistional package)"
+	depends="${sourcepkg}"
+}
diff --git a/srcpkgs/kdeplasma-addons5 b/srcpkgs/kdeplasma-addons5
new file mode 120000
index 00000000000000..d1dcec33a1dc15
--- /dev/null
+++ b/srcpkgs/kdeplasma-addons5
@@ -0,0 +1 @@
+kdeplasma-addons
\ No newline at end of file
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
deleted file mode 100644
index 1f46281d8c6112..00000000000000
--- a/srcpkgs/kdeplasma-addons5/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'kdeplasma-addons5'
-pkgname=kdeplasma-addons5
-version=5.27.11
-revision=1
-build_style=cmake
-configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools pkg-config
- kpackage-devel kconfig-devel kcoreaddons-devel kcmutils-devel gettext"
-makedepends="kross-devel kdesignerplugin-devel kdoctools-devel kholidays-devel
- plasma-workspace-devel purpose-devel NetworkManager-devel"
-short_desc="Various Plasma addons"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://invent.kde.org/plasma/kdeplasma-addons"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=e52068ba50b22c564c9fce262bd6713b435f5b3e1a650c2899d23f529ed3cd04
diff --git a/srcpkgs/kdeplasma-addons5/update b/srcpkgs/kdeplasma-addons5/update
deleted file mode 100644
index 04f7336c75ac38..00000000000000
--- a/srcpkgs/kdeplasma-addons5/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=${pkgname%5}

From 45a0482470d8dff750795a9e6462ad7c5df5781e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:48 +0100
Subject: [PATCH 05/38] kinfocenter: update to 6.0.4

---
 srcpkgs/kinfocenter/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index e830265e8c2aaa..38742971580eac 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,19 +1,19 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake
- kauth kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel
- kcmutils-devel"
-makedepends="kdoctools plasma-framework-devel kdesignerplugin-devel kcmutils-devel
- kdelibs4support-devel kwayland-devel glu-devel pciutils-devel libraw1394-devel
- ksolid-devel"
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QMLDIR=lib/qt6/qml -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext pkg-config qt6-tools qt6-base
+ kf6-kdoctools kf6-kpackage kf6-kcmutils kf6-kconfig kf6-kauth-tools"
+makedepends="libplasma-devel kf6-kcmutils-devel
+ kf6-kwayland-devel glu-devel pciutils-devel libraw1394-devel kf6-solid-devel"
 depends="hwids"
 short_desc="KDE Info Center"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=29a743152bf3007059b752c2e09ca969ff49f151dabf4bff40ce85bce9f40d07
+checksum=5af1ab7fd5c54f95221537bd4ee913dfa067ddff3a1cb4b5d486de539a48268e

From 85a58a7fdb0fbd4a427941d5f882967e660af375 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:49 +0100
Subject: [PATCH 06/38] kmenuedit: update to 6.0.4

---
 srcpkgs/kmenuedit/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 73a0faf41c6a8a..a98c0f997b9546 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,16 +1,18 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools
- gettext kcoreaddons"
-makedepends="kdelibs4support-devel kdesignerplugin-devel kdoctools"
-depends="khotkeys"
+build_helper=qemu
+configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
+ kf6-kdoctools kf6-kconfig"
+makedepends="kf6-sonnet-devel kf6-kio-devel kf6-ki18n-devel
+ kf6-kiconthemes-devel kf6-kdbusaddons-devel kf6-kglobalaccel-devel
+ kf6-kxmlgui-devel kf6-kdoctools-devel"
 short_desc="KDE Menu editor"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=904dde062c0651dd5296659f4c409d621f31c93ab5527d2cdf9a9e395cc43b57
+checksum=2d45c151baf0408fbb9d76e158bab1b85c53995af319336e4244b87b5fd6e5c8

From 767ec721f8b924edcc22fdc9de45a792516eb154 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:51 +0100
Subject: [PATCH 07/38] kpipewire: update to 6.0.4

---
 common/shlibs              |  6 +++---
 srcpkgs/kpipewire/template | 21 ++++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index aed2d02e32d6ba..c4367102ccf1e0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1570,9 +1570,9 @@ libKPim5Mime.so.5 kmime-23.04.0_1
 libKF5Kirigami2.so.5 kirigami2-5.47.0_1
 libtaskmanager.so.6 plasma-workspace-5.8.4_1
 libnotificationmanager.so.1 plasma-workspace-5.15.90_1
-libKPipeWire.so.5 kpipewire-5.26.0_1
-libKPipeWireRecord.so.5 kpipewire-5.27.0_1
-libKPipeWireDmaBuf.so.5 kpipewire-5.27.0_1
+libKPipeWire.so.6 kpipewire-6.0.0_1
+libKPipeWireRecord.so.6 kpipewire-6.0.0_1
+libKPipeWireDmaBuf.so.6 kpipewire-6.0.0_1
 libZXing.so.3 zxing-cpp-2.0.0_1
 libfreerdp-client2.so.2 libfreerdp-2.2.0_3
 libfreerdp2.so.2 libfreerdp-2.2.0_3
diff --git a/srcpkgs/kpipewire/template b/srcpkgs/kpipewire/template
index 24f5f152749c97..826af070468b65 100644
--- a/srcpkgs/kpipewire/template
+++ b/srcpkgs/kpipewire/template
@@ -1,19 +1,26 @@
 # Template file for 'kpipewire'
 pkgname=kpipewire
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules plasma-wayland-protocols gettext
- qt5-qmake qt5-host-tools pkg-config wayland-devel kcoreaddons
- kwayland-devel"
-makedepends="ffmpeg-devel kcoreaddons-devel kwayland-devel ki18n-devel
- libepoxy-devel pipewire-devel"
+build_helper=qemu
+configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml"
+hostmakedepends="extra-cmake-modules gettext qt6-base qt6-tools pkg-config
+ pipewire qt6-wayland-tools wayland-devel qt6-declarative-host-tools"
+makedepends="ffmpeg-devel kf6-kcoreaddons-devel kf6-kwayland-devel
+ kf6-ki18n-devel libva-devel libepoxy-devel pipewire-devel qt6-wayland-devel
+ wayland-devel qt6-declarative-devel"
 short_desc="Components relating to Flatpak 'pipewire' use in Plasma"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kpipewire"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ac9a0f24942eb8dc2521376f234a2e37485223b68e4ed1227e46808f8bff4cc0
+checksum=a17442fb4f719f154de10158b9da0791a9a4b7da2d0b6f82303fb3b7a2f46836
+
+do_check() {
+	cd build
+	ctest -E "mediamonitortest"
+}
 
 kpipewire-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 25b230e82ff5d69d7fb1bb817aab95921995abcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:53 +0100
Subject: [PATCH 08/38] kscreen: update to 6.0.4

---
 srcpkgs/kscreen/template | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 137f948e7a9dc2..577eda85075502 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,17 +1,23 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake
- kpackage-devel kconfig-devel kcoreaddons-devel gettext kcmutils-devel"
-makedepends="kxmlgui-devel libkscreen-devel plasma-framework-devel
- layer-shell-qt-devel qt5-sensors-devel kcmutils-devel"
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QMLDIR=lib/qt6/qml -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext"
+makedepends="kf6-kxmlgui-devel kf6-kcmutils-devel kf6-ksvg-devel
+ kf6-kpackage-devel libkf6screen-devel layer-shell-qt-devel libplasma-devel
+ qt6-sensors-devel "
 depends="hicolor-icon-theme"
 short_desc="KDE screen management software"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7e7f7a8ef4e7d5c8567653b8278c3412ff28bbb55d37a28ad890be144acbc753
+checksum=68d03d8bb285bd59396c6417ef49bf0051874f8de256a8baac6af24f8dcf8000
+
+if [ $CROSS_BUILD ]; then
+	hostmakedepends+=" kf6-kcmutils-devel kf6-kpackage-devel"
+fi

From b485911c180f45010f0cad62c88264467ed00a03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:54 +0100
Subject: [PATCH 09/38] kscreenlocker: update to 6.0.4

---
 common/shlibs                  |  2 +-
 srcpkgs/kscreenlocker/template | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c4367102ccf1e0..edee2f8ee4268d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -442,7 +442,7 @@ libsensors.so.5 libsensors-3.5.0_1
 libcap-ng.so.0 libcap-ng-0.6.2_1
 libphysfs.so.1 physfs-2.0.0_1
 libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1
-libKScreenLocker.so.5 kscreenlocker-5.8.4_1
+libKScreenLocker.so.6 kscreenlocker-6.0.0_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.89 ntfs-3g-2021.8.22_1
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 5822c7e39137af..cbcb34220f6595 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,27 +1,29 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules pkg-config kcoreaddons-devel
- qt5-qmake wayland-devel qt5-host-tools gettext kcmutils-devel"
-makedepends="kdeclarative-devel kidletime-devel kcmutils-devel
- libSM-devel kwayland-devel libXi-devel pam-devel libXcursor-devel
- layer-shell-qt-devel libkscreen-devel"
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules pkg-config qt6-base qt6-tools gettext
+ elogind wayland-devel kf6-kpackage kf6-kcmutils"
+makedepends="kf6-kdeclarative-devel kf6-kpackage-devel kf6-kidletime-devel kf6-kcmutils-devel
+ kf6-ksvg-devel kf6-kpackage-devel pam-devel layer-shell-qt-devel libkf6screen-devel
+ libplasma-devel wayland-devel xcb-util-keysyms-devel libxcb-devel"
 short_desc="KDE Library and components for secure lock screen architecture"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=33b8ceea3b4240354d87f55d67659a542bf5933947550aff7530c6a1eb77d6df
+checksum=3c18a86d260df081dc2cbcebaa2c5c851a9c957719c5e12d43004fc7c32debd5
 
 kscreenlocker-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }

From 5b728ea904db95b1284eaff993d070dfb1fa240d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:58 +0100
Subject: [PATCH 10/38] ksystemstats: update to 6.0.4

---
 srcpkgs/ksystemstats/template | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 63e5d8b885bb0a..089d84f5d32e12 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,15 +1,21 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-qmake gettext
- kcoreaddons pkg-config qt5-host-tools"
-makedepends="qt5-devel networkmanager-qt5-devel ksolid-devel libnl3-devel
- kio-devel kdbusaddons-devel libksysguard-devel libsensors-devel"
+configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext pkg-config"
+makedepends="kf6-networkmanager-qt-devel kf6-solid-devel libnl3-devel
+ kf6-kio-devel kf6-kdbusaddons-devel libksysguard-devel libsensors-devel"
 short_desc="Plugin based system monitoring daemon"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
+license="GPL-3.0-only,LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=378e5fc88899d538bde930a8f20fc22e7d4067ecfd63dfce47a1e7c722825cd5
+checksum=a4a1a20a32ee7b4b03d4f9b4a3c01c45c85bead6dc1321b6836d2e7713b387fa
+
+do_check() {
+	cd build
+	ctest -E "ksystemstatstest"
+}

From dbfef4f542a59eda831907ef8ae72884530e8a1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:36:59 +0100
Subject: [PATCH 11/38] kwayland-integration: update to 6.0.4

---
 srcpkgs/kwayland-integration/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 036da2c8ae095c..50d6765bf86ddb 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,9 +1,9 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
+configure_args="-DBUILD_TESTING=OFF -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake wayland-devel
  pkg-config wayland-protocols qt5-wayland-devel"
 makedepends="kidletime-devel kwayland-devel kwindowsystem-devel kguiaddons-devel
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b4947bbe67b4a03ec5338763fab52407eb7419ca63db09ebdc7e8c2eb68bcb6
+checksum=e203dbd2060fa0f9343136f763a955f3da10a4ea465045bca1f30487b09e15ea

From 883397a1c6604843b5598b55a1981a4d43f73b55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:02 +0100
Subject: [PATCH 12/38] kwin: update to 6.0.4

---
 srcpkgs/kwin/patches/cross.patch | 10 ++++-----
 srcpkgs/kwin/template            | 35 +++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/kwin/patches/cross.patch b/srcpkgs/kwin/patches/cross.patch
index da051cc59ec1e7..d0693b78d89e68 100644
--- a/srcpkgs/kwin/patches/cross.patch
+++ b/srcpkgs/kwin/patches/cross.patch
@@ -1,11 +1,11 @@
---- kwin-5.25.1/src/wayland/tools/CMakeLists.txt	2022-06-26 00:46:39.113938615 +0200
-+++ -	2022-06-26 00:47:07.556852317 +0200
-@@ -12,7 +12,7 @@
+--- kwin-6.0.0/src/wayland/tools/CMakeLists.txt	2024-02-22 10:52:24.000000000 +0100
++++ -	2024-03-05 14:58:18.547351388 +0100
+@@ -13,7 +13,7 @@
  if(CMAKE_CROSSCOMPILING AND QTWAYLANDSCANNER_KDE_EXECUTABLE)
      add_executable(qtwaylandscanner_kde IMPORTED GLOBAL)
      set_target_properties(qtwaylandscanner_kde PROPERTIES IMPORTED_LOCATION ${QTWAYLANDSCANNER_KDE_EXECUTABLE})
 -elseif(CMAKE_CROSSCOMPILING)
 +elseif(CMAKE_CROSSCOMPILING AND NOT FORCE_CROSSCOMPILED_TOOLS)
-     if (NOT KF5_HOST_TOOLING)
-         message(FATAL_ERROR "Please provide a prefix with a native Qt build and pass -DKF5_HOST_TOOLING=path")
+     if (NOT KF6_HOST_TOOLING)
+         message(FATAL_ERROR "Please provide a prefix with a native Qt build and pass -DKF6_HOST_TOOLING=path")
      endif()
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index a82866018317bd..314bfd89467991 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,29 +1,36 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules gettext breeze pkg-config
- qt5-qmake qt5-host-tools kcoreaddons kconfig-devel qt5-wayland
- kwayland-devel kpackage-devel kservice-devel kcmutils-devel"
-makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel
- kscreenlocker-devel kinit-devel xcb-util-cursor-devel qt5-multimedia-devel
- kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel
- libICE-devel xcb-util-wm-devel qt5-sensors-devel lcms2-devel
- pipewire-devel krunner-devel xorg-server-xwayland libxcvt-devel hwids"
-depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.16.0
- hwids libcap-progs"
+ -DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext pkg-config kf6-kauth-tools
+ qt6-base qt6-tools libcap-progs kf6-kconfig kf6-kpackage kf6-kcmutils
+ qt6-wayland-tools"
+makedepends="libplasma-devel kf6-kcmutils-devel kf6-knewstuff-devel
+ kscreenlocker-devel kglobalacceld-devel xcb-util-cursor-devel qt6-wayland-devel
+ qt6-multimedia-devel kf6-kdecoration-devel libxkbcommon-devel libinput-devel
+ libSM-devel libICE-devel xcb-util-wm-devel qt6-sensors-devel lcms2-devel
+ pipewire-devel kf6-krunner-devel xorg-server-xwayland libxcvt-devel hwids
+ libdisplay-info-devel breeze-qt6 kf6-kwayland-devel libcap-devel
+ libqaccessibilityclient-devel qt6-declarative-devel kf6-kirigami-devel
+ kf6-kpackage-devel kf6-kauth-devel kf6-kconfig-devel"
+depends="breeze hicolor-icon-theme kglobalacceld hwids libcap-progs"
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8902b23b29bd54cd26590fe04abfe58fe334a5bf9c0dfd1f7dc5aacc4191b56f
+distfiles="${KDE_SITE}/plasma/${version:0:5}/${pkgname}-${version}.tar.xz"
+checksum=f5552f8c5b179e272fee33a19249686573eabffddd5541bc31f8fd7069baa82b
 replaces="kwayland-server>=0"
 
+if [ $CROSS_BUILD ]; then
+	hostmakedepends+=" kf6-kirigami-devel libcap-devel"
+fi
+
 kwin-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From 74ffa575c076ec1be39b0d263750fbd2abc5356a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:04 +0100
Subject: [PATCH 13/38] kwrited: update to 6.0.4

---
 srcpkgs/kwrited/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index dd62bf234a17d1..2f92065f6b07e2 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,14 +1,14 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-devel qt5-qmake"
-makedepends="kdbusaddons-devel knotifications-devel kpty-devel kdoctools"
+configure_args="-DBUILD_TESTING=OFF -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons qt6-base qt6-tools"
+makedepends="kf6-kdbusaddons-devel kf6-knotifications-devel kf6-kpty-devel"
 short_desc="KDE daemon listening for wall and write messages"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0711c5ac7e24355e952be6ce75c6a846bca2e4a1aedd0277d47d4ea13c29c0a1
+checksum=898029fbf195c170d9e5e143628d6d228819300f92019eab3c138042d31f153a

From 2874dc7c7979f79686a6e4ac581ba9f854f04f8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:06 +0100
Subject: [PATCH 14/38] layer-shell-qt: update to 6.0.4

---
 common/shlibs                   |  2 +-
 srcpkgs/layer-shell-qt/template | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index edee2f8ee4268d..615b240a670a34 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2265,7 +2265,7 @@ libd0_blind_id.so.0 xonotic-0.8.0_1
 libuecc.so.0 libuecc-5_1
 libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
 libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
-libLayerShellQtInterface.so.5 layer-shell-qt-5.21.90_1
+libLayerShellQtInterface.so.6 layer-shell-qt-6.0.0_1
 liblxqt.so.1 liblxqt-1.0.0_1
 liblxqt-globalkeys.so.1 lxqt-globalkeys-1.0.0_1
 liblxqt-globalkeys-ui.so.1 lxqt-globalkeys-1.0.0_1
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 8b1cd8f914af96..5497fcd676ecc2 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,19 +1,20 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake pkg-config
- qt5-wayland wayland-devel"
-makedepends="qt5-wayland-devel qt5-declarative-devel libxkbcommon-devel
+configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-tools qt6-base pkg-config
+ qt6-wayland-tools wayland-devel qt6-declarative-host-tools"
+makedepends="qt6-wayland-devel qt6-declarative-devel libxkbcommon-devel
  wayland-protocols wayland-devel"
 short_desc="Qt component exposing Wayland wl-layer-shell protocol"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f4c321091619c9aeffe9e3568ff22ba4434538dcb3e89e6e23f5950d1e76d350
+checksum=432c8866307ce1ba14c3cfda5ac7976fe5e09e45a4fa0b35cc96e467e94b0626
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From cd1a002842215a27aa2b7890f09291b2e663342c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:09 +0100
Subject: [PATCH 15/38] libksysguard: update to 6.0.4

---
 common/shlibs                 | 13 +++++--------
 srcpkgs/libksysguard/template | 32 +++++++++++++++++---------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 615b240a670a34..a794f29b26c70f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -448,14 +448,11 @@ libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.89 ntfs-3g-2021.8.22_1
 libruby.so.3.2 ruby-3.2.0_1
 librw.so.0 rankwidth-0.9_1
-libprocessui.so.9 libksysguard-5.18.90_1
-libksignalplotter.so.9 libksysguard-5.18.90_1
-libksgrd.so.9 libksysguard-5.18.90_1
-libprocesscore.so.9 libksysguard-5.18.90_1
-liblsofui.so.9 libksysguard-5.18.90_1
-libKSysGuardSensorFaces.so.1 libksysguard-5.18.90_1
-libKSysGuardFormatter.so.1 libksysguard-5.19.5_1
-libKSysGuardSystemStats.so.1 libksysguard-5.22.0_1
+libKSysGuardFormatter.so.2 libksysguard-6.0.0_1
+libKSysGuardSensorFaces.so.2 libksysguard-6.0.0_1
+libprocesscore.so.10 libksysguard-6.0.0_1
+libKSysGuardSystemStats.so.2 libksysguard-6.0.0_1
+libKSysGuardSensors.so.2 libksysguard-6.0.0_1
 libxenctrl.so.4.14 xen-libs-4.14.0_1
 libxenfsimage.so.4.14 xen-libs-4.14.0_1
 libxenguest.so.4.14 xen-libs-4.14.0_1
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 67ebddb58b7e84..154cf7954d24a2 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,34 +1,36 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
- kpackage"
-makedepends="plasma-framework-devel qt5-webchannel-devel knewstuff-devel
- libcap-devel libnl3-devel libsensors-devel ki18n-devel kconfig-devel kiconthemes-devel
- $(vopt_if webengine 'qt5-webengine-devel qt5-location-devel')"
+configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext pkg-config qt6-tools qt6-base
+ kf6-kauth-tools kf6-kpackage kf6-kconfig"
+makedepends="qt6-webchannel-devel kf6-knewstuff-devel libpcap-devel libcap-devel
+ libcap-devel libnl3-devel libsensors-devel kf6-ki18n-devel kf6-kconfig-devel
+ kf6-kiconthemes-devel kf6-kauth-devel kf6-solid-devel kf6-kservice-devel
+ $(vopt_if webengine 'qt6-webengine-devel qt6-location-devel')"
 short_desc="KDE libksysguard"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21f4f54cdde8cda10a5ab2f05ebb22b67c375a1d47cf6a0c0fecc0f0cacb9659
+checksum=566ac2f0603012892b2291aa6d4663b06ea654c3db366f65a59e32503bfa8dea
 
 build_options="webengine"
 
-if [ "$XBPS_TARGET_ENDIAN" = "le" ] && [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
-	# qt5-webengine cannot be built for armv5tel
-	case "$XBPS_TARGET_MACHINE" in
-		armv5tel*) ;;
-		*) build_options_default=webengine ;;
-	esac
+if [ "$XBPS_TARGET_ENDIAN" = "le" ] &&
+   [ "$XBPS_WORDSIZE" = 64 ] &&
+   [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+	build_options_default=webengine
 fi
 
 libksysguard-devel_package() {
 	short_desc+=" - development"
-	depends="plasma-framework-devel qt5-devel libsensors-devel ki18n-devel
-	 kconfig-devel kiconthemes-devel
+	depends="libsensors-devel kf6-ki18n-devel
+	 kf6-kconfig-devel kf6-kiconthemes-devel
 	 ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 357d539a2b754ba52a882ab018b519f00b3c274a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:11 +0100
Subject: [PATCH 16/38] milou: update to 6.0.4

---
 srcpkgs/milou/template | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 29925b84582034..cf98ee0a58c62a 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,20 +1,18 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules kdoctools kpackage qt5-host-tools
- gettext qt5-qmake"
-makedepends="krunner-devel kitemmodels-devel"
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKDE_INSTALL_QMLDIR=lib/qt6/qml"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
+ qt6-declarative-host-tools"
+makedepends="kf6-krunner-devel kf6-kitemmodels-devel kf6-ksvg-devel
+ qt6-declarative-devel
+ kf6-kpackage-devel kf6-kwindowsystem-devel libplasma-devel"
 short_desc="KDE dedicated search application built on top of Baloo"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, LPGL-2.1-or-later"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b816940dc7adb2921f7af1befb79f6ee611cbef067dc7cf40bfa760bf583e1a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
-	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
-fi
+checksum=1c8c3e0449e10dc7c77cf905eaa6c7e04de6036bbb84629b22a13adc423ce1ff

From ab02ae07b679a83d55b457fff2c798177ce87795 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:14 +0100
Subject: [PATCH 17/38] plasma-browser-integration: update to 6.0.4

---
 srcpkgs/plasma-browser-integration/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index fd54a756768696..ef218fff10acd5 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,17 +1,18 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-hostmakedepends="extra-cmake-modules pkg-config kcoreaddons qt5-host-tools
- kpackage gettext qt5-qmake"
-makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel
- plasma-workspace-devel purpose-devel kfilemetadata5-devel"
-short_desc="Integration of web browsers with the KDE Plasma 5 desktop"
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext"
+makedepends="kf6-kio-devel kf6-ki18n-devel kf6-krunner-devel
+ kf6-knotifications-devel kf6-kfilemetadata-devel
+ kf6-kstatusnotifieritem-devel kf6-kconfig-devel kf6-purpose-devel
+ plasma-activities-devel plasma-workspace-devel"
+short_desc="Integration of web browsers with the KDE Plasma 6 desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c4e6aa1c6986ae88fa0d6bd590834da6a11ce4b193fc8538ee61bfba215c124c
+checksum=2c1034ff8439e833044bc70025ce42d9e949e0ea4983ea1f41cdf42d18a02b17

From 0ec23fd32ef93fa01061ed022ddabe45510d3166 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:18 +0100
Subject: [PATCH 18/38] plasma-desktop: update to 6.0.4

---
 srcpkgs/plasma-desktop/template | 38 ++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 7d5cd32900263c..c33307c8f16775 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,25 +1,39 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DBUILD_TESTING=OFF
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules pkg-config kcoreaddons kdoctools
- kconfig-devel kcoreaddons-devel kded kpackage-devel kcmutils-devel
- plasma-framework intltool gettext qt5-qmake qt5-host-tools
- wayland-protocols plasma-wayland-protocols"
-makedepends="ibus-devel kactivities5-stats-devel kpeople-devel libcanberra-devel
- plasma-workspace-devel pulseaudio-devel xf86-input-evdev-devel
- xf86-input-synaptics-devel xf86-input-libinput-devel ksolid-devel
- kaccounts-integration-devel libaccounts-qt5-devel"
+ -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QMLDIR=lib/qt6/qml -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules pkg-config intltool gettext qt6-base
+ qt6-tools wayland-protocols plasma-wayland-protocols kf6-kdoctools
+ kf6-kconfig kf6-kcmutils kf6-kpackage kf6-kauth-tools"
+makedepends="kf6-kauth-devel kf6-kcrash-devel kf6-kdoctools-devel
+ kf6-ki18n-devel kf6-kcmutils-devel kf6-knewstuff-devel
+ kf6-kio-devel kf6-knotifications-devel kf6-knotifyconfig-devel
+ kf6-attica-devel kf6-krunner-devel kf6-kglobalaccel-devel
+ kf6-kcoreaddons-devel kf6-kguiaddons-devel kf6-kdbusaddons-devel
+ kf6-kconfig-devel kf6-kwidgetsaddons-devel kf6-kcodecs-devel kf6-sonnet-devel
+ kf6-kpackage-devel kf6-kiconthemes-devel kf6-kxmlgui-devel kf6-ksvg-devel
+ kf6-kirigami-devel kirigami-addons-devel kf6-qqc2-desktop-style-devel
+ plasma5support-devel libplasma-devel plasma-activities-devel
+ plasma-activities-stats-devel kf6-kaccounts-integration-devel
+ libaccounts-qt6-devel signon-plugin-oauth2 SDL2-devel plasma-workspace-devel
+ ibus-devel libXcursor-devel libXi-devel libxkbfile-devel libxkbcommon-devel
+ xf86-input-evdev-devel xf86-input-libinput-devel"
 depends="kmenuedit polkit-kde-agent powerdevil systemsettings
- accountsservice ksystemstats"
+ accountsservice ksystemstats xdg-user-dirs noto-fonts-emoji"
 short_desc="KDE Plasma Desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d09f1e576251e7b4b6fde20407bdbfb018e495eba604487b0a05f4f011fc44a3
+checksum=862152ae971e7d2e4dc07cc5f830ef121319e16f8e8299d407494e730cfdc5be
 replaces="user-manager>=0"
 python_version=3
+
+if [ $CROSS_BUILD ]; then
+	hostmakedepends+=" kf6-kirigami-devel kirigami-addons-devel kf6-qqc2-desktop-style-devel"
+fi

From 78f34109edb302369e56baef887a163536030b2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:29 +0100
Subject: [PATCH 19/38] plasma-systemmonitor: update to 6.0.4

---
 srcpkgs/plasma-systemmonitor/template | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0ca1b4fc1193ba..c5229d7db4d6bf 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,16 +1,20 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
- kpackage kconfig kcoreaddons"
-makedepends="kirigami2-devel libksysguard-devel kitemmodels-devel
- knewstuff-devel"
-depends="kirigami2 qqc2-desktop-style kquickcharts ksystemstats"
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QMLDIR=lib/qt6/qml"
+hostmakedepends="extra-cmake-modules gettext qt6-base qt6-tools kf6-kpackage
+ kf6-kconfig kf6-kcoreaddons qt6-declarative-host-tools kf6-kconfig"
+makedepends="kf6-kirigami-devel libksysguard-devel kf6-kitemmodels-devel
+ kf6-knewstuff-devel kf6-kio-devel kf6-kdbusaddons-devel kf6-kconfig-devel
+ kf6-kservice-devel kf6-kglobalaccel-devel kirigami-addons-devel"
+depends="kirigami2 kf6-qqc2-desktop-style kf6-kquickcharts ksystemstats"
 short_desc="Application for monitoring system resources"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
+license="GPL-2.0-only, GPL-3.0-only, LGPL-2.1-only, LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0acacbbd921b5d43e72a8e0e26635bab50e0aab7ca3f40d83dee7a28736b5dfd
+checksum=acf5860a15d73b7727ddc69c271fe4dc56c2704dacf3a02e2c7b545689fce245

From 09ae8d57a1f958399e35e7b2a390eec41c522f27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:32 +0100
Subject: [PATCH 20/38] plasma-vault: update to 6.0.4

---
 srcpkgs/plasma-vault/template | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index 85c1c2908a7ab9..94dec4e3bd0b19 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,17 +1,21 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
- -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
- pkg-config gettext kpackage-devel kconfig-devel kcoreaddons-devel
- plasma-framework"
-makedepends="plasma-framework-devel libksysguard-devel networkmanager-qt5-devel"
+configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools
+ pkg-config gettext"
+makedepends="libplasma-devel libksysguard-devel
+ kf6-kitemmodels-devel kf6-networkmanager-qt-devel"
 short_desc="Plasma applet and services for creating encrypted vaults"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b599d79d7f728bcc1517b30d0462894dc2186fa76601628d3d0f2198c2276c2
+checksum=b797b59329c02509f58bd0fa978cc444fded676a37d36c9e4f5c5c6f1ec90cbe
+
+if [ $CROSS_BUILD ]; then
+	hostmakedepends+=" kf6-kconfig-devel kf6-kpackage-devel"
+fi

From 2d28c996763212f4f7b215c4119b3e612c9125ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:50 +0100
Subject: [PATCH 21/38] plasma-workspace-wallpapers: update to 6.0.4

---
 srcpkgs/plasma-workspace-wallpapers/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 361f4f84a91bf3..4ceff1f908991e 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,13 +1,13 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
+hostmakedepends="extra-cmake-modules"
 short_desc="KDE Plasma wallpapers"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=223c27fc68127afd6fc21d06ec11a3e37ce86e172375c906bda390474a4de50a
+checksum=c8b30887936475de7f0c5ce0806fe02ade5594cf93c1cde9cdb72fbfb2766f14

From 8e26a1a63fbb4ff262f4995123d599ef4067b641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:54 +0100
Subject: [PATCH 22/38] plasma-workspace: update to 6.0.4

---
 common/shlibs                     |  2 +-
 srcpkgs/plasma-workspace/template | 42 ++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a794f29b26c70f..845d6f7a76f5b5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1339,7 +1339,7 @@ libzzip-0.so.13 zziplib-0.13.62_1
 libzzipfseeko-0.so.13 zziplib-0.13.62_1
 libzzipwrap-0.so.13 zziplib-0.13.62_1
 libzzipmmapped-0.so.13 zziplib-0.13.62_1
-libkworkspace5.so.5 kworkspace-5.14.5_2
+libkworkspace6.so.6 kworkspace-6.0.0_1
 libdb-5.3.so libdb-5.3.21_1
 libdb_cxx-5.3.so libdb-cxx-5.3.21_1
 libcares.so.2 c-ares-1.10.0_1
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index d4cb47358806ad..53af43463634a0 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,29 +1,35 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKDE_INSTALL_QMLDIR=lib/qt6/qml
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
- qt5-wayland plasma-wayland-protocols gettext wayland-devel
- kcmutils-devel kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
-makedepends="qt5-devel qt5-declarative-devel qt5-script-devel plasma-framework-devel
- krunner-devel kjsembed-devel knotifyconfig-devel kdesu-devel knewstuff-devel
- kcmutils-devel kidletime-devel kdelibs4support-devel libksysguard-devel
- baloo5-devel ktexteditor-devel kwin-devel libxcb-devel libXtst-devel
- libqalculate-devel prison-devel kholidays-devel ksolid-devel kpeople-devel
- libXft-devel libkscreen-devel kactivities5-stats-devel
- $(vopt_if pipewire kpipewire-devel)"
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DKF6_HOST_TOOLING=/usr/lib/cmake"
+hostmakedepends="extra-cmake-modules iso-codes pkg-config gettext
+ qt6-base qt6-tools SPIRV-Tools qt6-shadertools kf6-kcmutils kf6-kconfig
+ qt6-declarative-host-tools
+ kf6-kpackage kf6-kauth-tools wayland-devel qt6-wayland-tools"
+makedepends="qt6-declarative-devel libplasma-devel
+ kf6-krunner-devel kf6-knotifyconfig-devel kf6-kdesu-devel kf6-knewstuff-devel
+ kf6-kcmutils-devel kf6-kidletime-devel libksysguard-devel
+ kf6-baloo-devel kf6-ktexteditor-devel kwin-devel libxcb-devel libXtst-devel
+ libqalculate-devel kf6-prison-devel kf6-kholidays-devel kf6-solid-devel
+ kf6-kpeople-devel kf6-kunitconversion-devel kf6-kstatusnotifieritem-devel
+ libXft-devel libkf6screen-devel plasma5support-devel
+ plasma-activities-stats-devel kf6-kwallet-devel plasma-activities-devel
+ kf6-kded-devel kf6-networkmanager-qt-devel kf6-kirigami-devel
+ kf6-kuserfeedback-devel phonon-devel polkit-qt6-devel
+ $(vopt_if pipewire kpipewire-devel) kirigami-addons-devel libkexiv2-devel"
 depends="kactivitymanagerd kwin iso-codes milou plasma-integration
- kquickcharts qt5-wayland xorg-server-xwayland qt5-tools"
+ qt6-wayland xorg-server-xwayland qt6-tools kf6-kquickcharts kirigami-addons"
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=07d69bc43660ec5335f250abb34c1059cef6cc64833838a7f0f749a4b4ee7add
+checksum=7f2c2871c966e66d5de2d63bcb1a554fe00b4da6bde93f69700bd1b1f60dc567
 
 build_options="pipewire"
 build_options_default="pipewire"
@@ -33,14 +39,14 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 kworkspace_package() {
-	short_desc="Plasma Workspace Library for KF5"
+	short_desc="Plasma Workspace Library for KF6"
 	pkg_install() {
-		vmove "usr/lib/libkworkspace5.so.5*"
+		vmove "usr/lib/libkworkspace6.so.6*"
 	}
 }
 
 plasma-workspace-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development files"
 	depends="${makedepends} kworkspace>=${version}_${revision}
 	 ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {

From 7dec323d047b5d571f95d21066a0a8c928edbfc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:37:58 +0100
Subject: [PATCH 23/38] powerdevil: update to 6.0.4

---
 srcpkgs/powerdevil/template | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a26b70d873090d..cea98b31a549b4 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,16 +1,25 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules pkg-config kdoctools kauth-devel
- gettext kconfig-devel kcmutils-devel qt5-qmake qt5-host-tools"
-makedepends="bluez-qt5-devel libkscreen-devel networkmanager-qt5-devel
- kdesignerplugin-devel kdoctools-devel plasma-workspace-devel ksolid-devel"
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules pkg-config gettext qt6-base qt6-tools
+ kf6-kdoctools kf6-kcmutils kf6-kauth-tools"
+makedepends="kf6-bluez-qt-devel libkf6screen-devel kf6-networkmanager-qt-devel
+ kf6-solid-devel kf6-kcmutils-devel kf6-kauth-devel kf6-kdoctools-devel
+ kf6-kidletime-devel kf6-kxmlgui-devel kf6-knotifications-devel kf6-kio-devel
+ kf6-kirigami-devel kf6-kitemmodels-devel plasma-activities-devel
+ plasma-workspace-devel ddcutil"
 short_desc="Power consumption settings of a Plasma"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=28d2ab2e05bcbd39b8f5e5eafef2860c94efd5c7562fc5a4e81d5e5ab36c7573
+checksum=1773b62181909831d24c9141a3fdd8e96a09cf08bd435a9d9a8605946b0f2559
+
+if [ $CROSS_BUILD ]; then
+	hostmakedepends+=" kf6-kcmutils-devel kf6-kirigami-devel"
+fi

From 2ac105e5d1e079f035ffad3e2b2e0b88b0117a15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:38:00 +0100
Subject: [PATCH 24/38] sddm-kcm: update to 6.0.4

---
 srcpkgs/sddm-kcm/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 16c01a9c7bedeb..3693f3ddb6ca76 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,17 +1,18 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake
- kpackage-devel gettext kauth-devel kconfig-devel kcmutils-devel"
-makedepends="kio-devel xcb-util-image-devel libXcursor-devel
- kcmutils-devel knewstuff-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules pkg-config qt6-tools qt6-base gettext
+ kf6-kcmutils kf6-kconfig kf6-kauth-tools"
+makedepends="kf6-kio-devel xcb-util-image-devel libXcursor-devel kf6-kconfig-devel
+ kf6-kcmutils-devel kf6-knewstuff-devel kf6-kauth-devel"
 depends="sddm"
 short_desc="KDE Config Module for SDDM"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3b9bfe81359be12eb7aeee492160877bf29d1a6ff6ed381c6afcbd0c8b7874c0
+checksum=2795a0d47a8d7586600274b9dc656e5e8d1f8d637e502cc48cc8bc28d33d3d39

From f3147c6098c294b98903272ddf25fd0a7ecfc9b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:38:01 +0100
Subject: [PATCH 25/38] systemsettings: update to 6.0.4

---
 srcpkgs/systemsettings/template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index e2fe8d63695552..6e7cd967074983 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,17 +1,19 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="python3 qt5-qmake qt5-host-tools kconfig
- kpackage kcoreaddons kdoctools extra-cmake-modules gettext"
-makedepends="kcmutils-devel kdoctools khtml-devel kactivities5-stats-devel
- kirigami2-devel plasma-workspace-devel"
-depends="kirigami2 setxkbmap xrdb"
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="python3 qt6-base qt6-tools kf6-kcmutils kf6-kauth-tools
+ extra-cmake-modules gettext kf6-kdoctools qt6-declarative-host-tools"
+makedepends="kf6-kcmutils-devel kf6-kirigami-devel plasma-workspace-devel
+ kf6-kdoctools-devel"
+depends="kf6-kirigami setxkbmap xrdb"
 short_desc="KDE System settings"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0f5f24279e44ad567f1ad3f2f9368f0e5c13c29f9f3de8078afcdae1181f924a
+checksum=18c8016230083d8f2ec98d33c0157756060c5a136e8995769dbf7ef326c402ed

From a2bd7cab167020b31914cb07c2ef81f7bda59698 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 13:38:03 +0100
Subject: [PATCH 26/38] xdg-desktop-portal-kde: update to 6.0.4

---
 srcpkgs/xdg-desktop-portal-kde/template | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 782817cec9155c..236ead996cdb4f 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,16 +1,25 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons gettext
- kpackage wayland-devel plasma-wayland-protocols pkg-config qt5-wayland"
-makedepends="glib-devel kio-devel kwayland-devel libepoxy-devel pipewire-devel
- plasma-framework-devel kdeclarative-devel kirigami2-devel"
-short_desc="Backend implementation for xdg-desktop-portal that is using Qt/KF5"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
+ wayland-devel plasma-wayland-protocols pkg-config qt6-wayland-tools"
+makedepends="kf6-kio-devel kf6-kdeclarative-devel kf6-kirigami-devel
+ kf6-kstatusnotifieritem-devel libplasma-devel kf6-kwayland-devel
+ libepoxy-devel pipewire-devel glib-devel"
+depends="xdg-desktop-portal"
+checkdepends="dbus xdg-desktop-portal-kde python3-gobject"
+short_desc="Backend implementation for xdg-desktop-portal that is using Qt/KF6"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
-homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
+homepage="https://invent.kde.org/plasma/xdg-desktop-portal-kde"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3676898b1e145447a5e2d26fbe95a6b2f75c323e7e5e8645077db72c9916d9b3
+checksum=91e55a794f00fdb75305ed05f72a1ce310e228b115886f72471473c9c7c88960
+
+do_check() {
+	cd build
+	dbus-run-session ctest
+}

From aaf89e6c0473f19eb1529e8faf1f021cf730b48f Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 19:59:25 +0500
Subject: [PATCH 27/38] kirigami-addons: update to 1.0.1, add subpkg -devel

---
 srcpkgs/kirigami-addons-devel    |  1 +
 srcpkgs/kirigami-addons/template | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/kirigami-addons-devel

diff --git a/srcpkgs/kirigami-addons-devel b/srcpkgs/kirigami-addons-devel
new file mode 120000
index 00000000000000..9459083fb0a7e1
--- /dev/null
+++ b/srcpkgs/kirigami-addons-devel
@@ -0,0 +1 @@
+kirigami-addons
\ No newline at end of file
diff --git a/srcpkgs/kirigami-addons/template b/srcpkgs/kirigami-addons/template
index ab432ec9520c28..f52fe7cb68de39 100644
--- a/srcpkgs/kirigami-addons/template
+++ b/srcpkgs/kirigami-addons/template
@@ -1,15 +1,25 @@
 # Template file for 'kirigami-addons'
 pkgname=kirigami-addons
-version=0.10.0
+version=1.1.0
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF -DBUILD_QCH=ON"
-hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools"
-makedepends="ki18n-devel kirigami2-devel"
-depends="kirigami2"
+configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DBUILD_TESTING=OFF -DBUILD_QCH=ON"
+hostmakedepends="extra-cmake-modules gettext qt6-base qt6-tools
+ qt6-declarative-host-tools"
+makedepends="kf6-ki18n-devel kf6-kirigami-devel"
+depends="kf6-kirigami"
 short_desc="Add-ons for the Kirigami framework"
 maintainer="José Santos <agarimos@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/libraries/kirigami-addons"
 distfiles="https://github.com/KDE/kirigami-addons/archive/refs/tags/v${version}.tar.gz"
-checksum=b7b90324fcefcedc6a8a861af85f74423b6cb840586deb3e97a3977d22d77fb3
+checksum=f1bea130b8e190702b6f8dfe9f940cca1550e1e86e0d043fb931be47d15b4ecb
+
+kirigami-addons-devel_package() {
+	depends="$makedepends ${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/cmake
+	}
+}

From 0999f5ab8f2e637e6335e4a2474a6b07daafc295 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Mar 2024 23:05:46 +0100
Subject: [PATCH 28/38] khotkeys: remove package

---
 srcpkgs/khotkeys/template         | 19 -------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 srcpkgs/khotkeys/template

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
deleted file mode 100644
index 900e5d785c36a0..00000000000000
--- a/srcpkgs/khotkeys/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'khotkeys'
-pkgname=khotkeys
-version=5.27.11
-revision=1
-build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules kdoctools kcoreaddons qt5-qmake
- gettext qt5-host-tools"
-makedepends="kdesignerplugin-devel kdoctools plasma-workspace-devel"
-short_desc="KDE Hotkeys"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only, LGPL-2.0-or-later"
-homepage="https://invent.kde.org/plasma/khotkeys"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b497c68e546874feb9350f1f17df5b285d5c41d2cb4c1fd8e4e665f84804459
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf0f95cf75ed4..76482075d691eb 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,7 @@ replaces="
  keepassx2<=2.0.3_2
  keepassx<=0.4.4_2
  key-mon<=1.17_5
+ khotkeys<=5.27.11_1
  ladish-devel<=1_11
  ladish<=1_11
  laditools<=1.1.0_3

From ee266c37c1f864a14f78b14e0de52a2810ecddab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Mar 2024 00:34:10 +0100
Subject: [PATCH 29/38] krfb: update to 24.02.2.

---
 srcpkgs/krfb/template | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 62328395268763..25685b61520ec7 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,19 +1,22 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
- kconfig pkg-config kcoreaddons gettext wayland-devel qt5-wayland"
-makedepends="qt5-devel qt5-x11extras-devel ki18n-devel kcompletion-devel
- kconfig-devel kcoreaddons-devel kcrash-devel kdbusaddons-devel kdnssd-devel
- kdoctools-devel knotifications-devel kwallet-devel kwidgetsaddons-devel
- kxmlgui-devel libvncserver-devel libXtst-devel xcb-util-image-devel
- kwayland-devel pipewire-devel plasma-wayland-protocols kpipewire-devel"
+build_helper=qemu
+configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools pkg-config gettext
+ qt6-wayland-tools kf6-kdoctools kf6-kconfig wayland-devel"
+makedepends="kf6-ki18n-devel kf6-kcompletion-devel kf6-kconfig-devel
+ kf6-kcoreaddons-devel kf6-kcrash-devel kf6-kdbusaddons-devel kf6-kdnssd-devel
+ kf6-knotifications-devel kf6-kwallet-devel kf6-kdoctools-devel
+ kf6-kwidgetsaddons-devel kf6-kstatusnotifieritem-devel
+ kf6-kxmlgui-devel libvncserver-devel libXtst-devel xcb-util-image-devel
+ kf6-kwayland-devel pipewire-devel plasma-wayland-protocols kpipewire-devel"
 short_desc="KDE Desktop Sharing"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=86e40aa758683bc15cc637c68052dd46b70edf9d13919d6d580a23405efeb376
+checksum=cf92dfc7867e33604757a59ff8d288693bbf5fbb0cf0bc379c3f975d0e4e98e4

From b8c252de5600016ed6cda0686126faa70ca60b62 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Tue, 26 Mar 2024 21:12:10 +0500
Subject: [PATCH 30/38] spectacle: update to 24.02.2.

---
 srcpkgs/spectacle/template | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index a115ede999bde1..dda7a859f19c96 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,19 +1,20 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules kdoctools python3 qt5-host-tools qt5-qmake
- qt5-wayland kconfig gettext kcoreaddons wayland-devel"
-makedepends="kColorPicker-devel kImageAnnotator-devel kdeclarative-devel
- knewstuff-devel kwayland-devel libkipi5-devel purpose-devel
- xcb-util-cursor-devel xcb-util-image-devel kpipewire-devel
- pipewire-devel wayland-devel"
-depends="qt5-tools"
+build_helper=qemu
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake"
+hostmakedepends="extra-cmake-modules qt6-tools qt6-base qt6-wayland-tools
+ qt6-declarative-host-tools gettext wayland-devel kf6-kdoctools kf6-kconfig"
+makedepends="kf6-kdeclarative-devel kf6-kxmlgui-devel
+ kf6-knewstuff-devel kf6-kwayland-devel kf6-purpose-devel
+ xcb-util-cursor-devel xcb-util-image-devel kf6-kdoctools-devel
+ layer-shell-qt-devel kpipewire-devel qt6-wayland-devel
+ pipewire-devel wayland-devel qt6-multimedia-devel"
 short_desc="KDE screenshot capture utility"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=54f830ef6db284a7f482575f7793eb4a98915c4612b5b165885b5c29881d763c
+checksum=4118f7355eb0584deb2a88ce46ece7b616880397f0ab2b810cbe4cbc21742152

From ddaafc679f692029f67221ff1e6515d86b0be69c Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Fri, 8 Mar 2024 12:13:01 +0500
Subject: [PATCH 31/38] New package: baloo-widgets-24.02.2, replaces
 baloo-widgets5

---
 common/shlibs                   |  2 +-
 srcpkgs/baloo-widgets-devel     |  1 +
 srcpkgs/baloo-widgets/template  | 38 +++++++++++++++++++++++++++++++++
 srcpkgs/baloo-widgets/update    |  1 +
 srcpkgs/baloo-widgets5          |  1 +
 srcpkgs/baloo-widgets5-devel    |  2 +-
 srcpkgs/baloo-widgets5/template | 25 ----------------------
 srcpkgs/baloo-widgets5/update   |  1 -
 8 files changed, 43 insertions(+), 28 deletions(-)
 create mode 120000 srcpkgs/baloo-widgets-devel
 create mode 100644 srcpkgs/baloo-widgets/template
 create mode 100644 srcpkgs/baloo-widgets/update
 create mode 120000 srcpkgs/baloo-widgets5
 delete mode 100644 srcpkgs/baloo-widgets5/template
 delete mode 100644 srcpkgs/baloo-widgets5/update

diff --git a/common/shlibs b/common/shlibs
index 845d6f7a76f5b5..d6ac34b16b0f7d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2432,7 +2432,7 @@ libgnunettransportapplication.so.0 gnunet-0.12.2_1
 libgnunettransportcore.so.0 gnunet-0.12.2_1
 libgnunettransportcommunicator.so.0 gnunet-0.12.2_1
 libskarnet.so.2.13 skalibs-2.13.0.0_1
-libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
+libKF6BalooWidgets.so.6 baloo-widgets-24.02.0_1
 libtidy.so.58 libtidy5-5.8.0_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
 libinjeqt.so.1 injeqt-1.1.0_1
diff --git a/srcpkgs/baloo-widgets-devel b/srcpkgs/baloo-widgets-devel
new file mode 120000
index 00000000000000..f2ce1efd4f9389
--- /dev/null
+++ b/srcpkgs/baloo-widgets-devel
@@ -0,0 +1 @@
+baloo-widgets
\ No newline at end of file
diff --git a/srcpkgs/baloo-widgets/template b/srcpkgs/baloo-widgets/template
new file mode 100644
index 00000000000000..25b2fe0658993e
--- /dev/null
+++ b/srcpkgs/baloo-widgets/template
@@ -0,0 +1,38 @@
+# Template file for 'baloo-widgets'
+pkgname=baloo-widgets
+version=24.02.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules python3 kf6-kcoreaddons qt6-base qt6-tools
+ gettext"
+makedepends="qt6-base-devel kf6-kconfig-devel kf6-kcoreaddons-devel kf6-kfilemetadata-devel kf6-ki18n-devel kf6-kio-devel kf6-kservice-devel kf6-kwidgetsaddons-devel kf6-baloo-devel"
+short_desc="Baloo widgets"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-2.1-or-later, GPL-2.0-or-later"
+homepage="https://invent.kde.org/libraries/baloo-widgets"
+distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
+checksum=276b557c363da367d1c6950eb0e1ab2cae389aab7b53daf6a9e2431f87deea15
+
+baloo-widgets-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}
+
+baloo-widgets5_package() {
+	short_desc+=" - (Dummy transitional package)"
+	build_style=meta
+	depends="baloo-widgets-${version}_${revision}"
+}
+
+baloo-widgets5-devel_package() {
+	short_desc+=" - (Dummy transitional package)"
+	build_style=meta
+	depends="baloo-widgets-devel-${version}_${revision}"
+}
diff --git a/srcpkgs/baloo-widgets/update b/srcpkgs/baloo-widgets/update
new file mode 100644
index 00000000000000..9cf5a20c16ae29
--- /dev/null
+++ b/srcpkgs/baloo-widgets/update
@@ -0,0 +1 @@
+pkgname=${pkgname}
diff --git a/srcpkgs/baloo-widgets5 b/srcpkgs/baloo-widgets5
new file mode 120000
index 00000000000000..f2ce1efd4f9389
--- /dev/null
+++ b/srcpkgs/baloo-widgets5
@@ -0,0 +1 @@
+baloo-widgets
\ No newline at end of file
diff --git a/srcpkgs/baloo-widgets5-devel b/srcpkgs/baloo-widgets5-devel
index 698afa24a7ba64..f2ce1efd4f9389 120000
--- a/srcpkgs/baloo-widgets5-devel
+++ b/srcpkgs/baloo-widgets5-devel
@@ -1 +1 @@
-baloo-widgets5
\ No newline at end of file
+baloo-widgets
\ No newline at end of file
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
deleted file mode 100644
index 25d143686d5d9e..00000000000000
--- a/srcpkgs/baloo-widgets5/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'baloo-widgets5'
-pkgname=baloo-widgets5
-version=23.08.5
-revision=1
-build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules python3 kcoreaddons qt5-host-tools
- qt5-qmake gettext"
-makedepends="baloo5-devel"
-short_desc="Baloo widgets"
-maintainer="John <me@johnnynator.dev>"
-license="LGPL-2.1-or-later, GPL-2.0-or-later"
-homepage="https://invent.kde.org/libraries/baloo-widgets"
-distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=49196c7f74dfeb38b90ab388b35ee3542302ab89fc7b6ded4a3bfaa7f03938d4
-
-baloo-widgets5-devel_package() {
-	short_desc+=" - development"
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/baloo-widgets5/update b/srcpkgs/baloo-widgets5/update
deleted file mode 100644
index 04f7336c75ac38..00000000000000
--- a/srcpkgs/baloo-widgets5/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=${pkgname%5}

From 064e9b5a50e282f63b5009e535bf601099dcdece Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sat, 9 Mar 2024 13:01:10 +0500
Subject: [PATCH 32/38] accounts-qml-modules: build with qt6, change distfiles

---
 .../patches/678c493a.patch                    | 241 ------------------
 .../accounts-qml-module/patches/werror.patch  |  11 -
 srcpkgs/accounts-qml-module/template          |  30 ++-
 3 files changed, 24 insertions(+), 258 deletions(-)
 delete mode 100644 srcpkgs/accounts-qml-module/patches/678c493a.patch
 delete mode 100644 srcpkgs/accounts-qml-module/patches/werror.patch

diff --git a/srcpkgs/accounts-qml-module/patches/678c493a.patch b/srcpkgs/accounts-qml-module/patches/678c493a.patch
deleted file mode 100644
index 7c9956cfee1408..00000000000000
--- a/srcpkgs/accounts-qml-module/patches/678c493a.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 678c493a083a92d1fda2375f5d2e37c00c7b9a7e Mon Sep 17 00:00:00 2001
-From: Alberto Mardegan <mardy@users.sourceforge.net>
-Date: Tue, 9 Jan 2018 18:23:57 +0300
-Subject: [PATCH] Build: add qmltypes file to repository
-
-Generating the file at build time is troublesome when cross-compiling.
-It's better to add the generated file to the repository and add a make
-target to rebuild it.
----
- src/plugin.qmltypes | 187 ++++++++++++++++++++++++++++++++++++++++++++
- src/src.pro         |  19 +----
- 2 files changed, 191 insertions(+), 15 deletions(-)
- create mode 100644 src/plugin.qmltypes
-
-diff --git a/src/plugin.qmltypes b/src/plugin.qmltypes
-new file mode 100644
-index 0000000..8481efe
---- /dev/null
-+++ b/src/plugin.qmltypes
-@@ -0,0 +1,187 @@
-+import QtQuick.tooling 1.2
-+
-+// This file describes the plugin-supplied types contained in the library.
-+// It is used for QML tooling purposes only.
-+//
-+// This file was auto-generated by:
-+// 'qmlplugindump -notrelocatable Ubuntu.OnlineAccounts 0.1 .'
-+
-+Module {
-+    dependencies: ["QtQuick 2.8"]
-+    Component {
-+        name: "OnlineAccounts::Account"
-+        prototype: "QObject"
-+        exports: ["Ubuntu.OnlineAccounts/Account 0.1"]
-+        exportMetaObjectRevisions: [0]
-+        Enum {
-+            name: "RemovalOption"
-+            values: {
-+                "RemoveAccountOnly": 0,
-+                "RemoveCredentials": 1
-+            }
-+        }
-+        Enum {
-+            name: "RemovalOptions"
-+            values: {
-+                "RemoveAccountOnly": 0,
-+                "RemoveCredentials": 1
-+            }
-+        }
-+        Property { name: "objectHandle"; type: "QObject"; isPointer: true }
-+        Property { name: "enabled"; type: "bool"; isReadonly: true }
-+        Property { name: "provider"; type: "QVariantMap"; isReadonly: true }
-+        Property { name: "displayName"; type: "string"; isReadonly: true }
-+        Property { name: "accountId"; type: "uint"; isReadonly: true }
-+        Property { name: "accountServiceHandle"; type: "QObject"; isReadonly: true; isPointer: true }
-+        Signal { name: "synced" }
-+        Signal { name: "removed" }
-+        Method {
-+            name: "updateDisplayName"
-+            Parameter { name: "displayName"; type: "string" }
-+        }
-+        Method {
-+            name: "updateEnabled"
-+            Parameter { name: "enabled"; type: "bool" }
-+        }
-+        Method { name: "sync" }
-+        Method {
-+            name: "remove"
-+            Parameter { name: "options"; type: "RemovalOptions" }
-+        }
-+        Method { name: "remove" }
-+    }
-+    Component {
-+        name: "OnlineAccounts::AccountService"
-+        prototype: "QObject"
-+        exports: ["Ubuntu.OnlineAccounts/AccountService 0.1"]
-+        exportMetaObjectRevisions: [0]
-+        Enum {
-+            name: "ErrorCode"
-+            values: {
-+                "NoError": 0,
-+                "NoAccountError": 1,
-+                "UserCanceledError": 2,
-+                "PermissionDeniedError": 3,
-+                "NetworkError": 4,
-+                "SslError": 5,
-+                "InteractionRequiredError": 6
-+            }
-+        }
-+        Property { name: "objectHandle"; type: "QObject"; isPointer: true }
-+        Property { name: "enabled"; type: "bool"; isReadonly: true }
-+        Property { name: "serviceEnabled"; type: "bool"; isReadonly: true }
-+        Property { name: "provider"; type: "QVariantMap"; isReadonly: true }
-+        Property { name: "service"; type: "QVariantMap"; isReadonly: true }
-+        Property { name: "displayName"; type: "string"; isReadonly: true }
-+        Property { name: "accountId"; type: "uint"; isReadonly: true }
-+        Property { name: "settings"; type: "QVariantMap"; isReadonly: true }
-+        Property { name: "authData"; type: "QVariantMap"; isReadonly: true }
-+        Property { name: "autoSync"; type: "bool" }
-+        Property { name: "credentials"; type: "QObject"; isPointer: true }
-+        Signal {
-+            name: "authenticated"
-+            Parameter { name: "reply"; type: "QVariantMap" }
-+        }
-+        Signal {
-+            name: "authenticationError"
-+            Parameter { name: "error"; type: "QVariantMap" }
-+        }
-+        Method {
-+            name: "authenticate"
-+            Parameter { name: "sessionData"; type: "QVariantMap" }
-+        }
-+        Method { name: "authenticate" }
-+        Method { name: "cancelAuthentication" }
-+        Method {
-+            name: "updateServiceEnabled"
-+            Parameter { name: "enabled"; type: "bool" }
-+        }
-+        Method {
-+            name: "updateSettings"
-+            Parameter { name: "settings"; type: "QVariantMap" }
-+        }
-+    }
-+    Component {
-+        name: "OnlineAccounts::AccountServiceModel"
-+        prototype: "QAbstractListModel"
-+        exports: ["Ubuntu.OnlineAccounts/AccountServiceModel 0.1"]
-+        exportMetaObjectRevisions: [0]
-+        Property { name: "count"; type: "int"; isReadonly: true }
-+        Property { name: "includeDisabled"; type: "bool" }
-+        Property { name: "accountId"; type: "uint" }
-+        Property { name: "account"; type: "QObject"; isPointer: true }
-+        Property { name: "applicationId"; type: "string" }
-+        Property { name: "provider"; type: "string" }
-+        Property { name: "serviceType"; type: "string" }
-+        Property { name: "service"; type: "string" }
-+        Method {
-+            name: "get"
-+            type: "QVariant"
-+            Parameter { name: "row"; type: "int" }
-+            Parameter { name: "roleName"; type: "string" }
-+        }
-+    }
-+    Component {
-+        name: "OnlineAccounts::ApplicationModel"
-+        prototype: "QAbstractListModel"
-+        exports: ["Ubuntu.OnlineAccounts/ApplicationModel 0.1"]
-+        exportMetaObjectRevisions: [0]
-+        Property { name: "count"; type: "int"; isReadonly: true }
-+        Property { name: "service"; type: "string" }
-+        Method {
-+            name: "get"
-+            type: "QVariant"
-+            Parameter { name: "row"; type: "int" }
-+            Parameter { name: "roleName"; type: "string" }
-+        }
-+    }
-+    Component {
-+        name: "OnlineAccounts::Credentials"
-+        prototype: "QObject"
-+        exports: ["Ubuntu.OnlineAccounts/Credentials 0.1"]
-+        exportMetaObjectRevisions: [0]
-+        Property { name: "credentialsId"; type: "uint" }
-+        Property { name: "caption"; type: "string" }
-+        Property { name: "userName"; type: "string" }
-+        Property { name: "secret"; type: "string" }
-+        Property { name: "storeSecret"; type: "bool" }
-+        Property { name: "acl"; type: "QStringList" }
-+        Property { name: "methods"; type: "QVariantMap" }
-+        Signal { name: "synced" }
-+        Signal { name: "removed" }
-+        Method { name: "sync" }
-+        Method { name: "remove" }
-+    }
-+    Component {
-+        name: "OnlineAccounts::Manager"
-+        prototype: "QObject"
-+        exports: ["Ubuntu.OnlineAccounts/Manager 0.1"]
-+        isCreatable: false
-+        isSingleton: true
-+        exportMetaObjectRevisions: [0]
-+        Method {
-+            name: "loadAccount"
-+            type: "QObject*"
-+            Parameter { name: "accountId"; type: "uint" }
-+        }
-+        Method {
-+            name: "createAccount"
-+            type: "QObject*"
-+            Parameter { name: "providerName"; type: "string" }
-+        }
-+    }
-+    Component {
-+        name: "OnlineAccounts::ProviderModel"
-+        prototype: "QAbstractListModel"
-+        exports: ["Ubuntu.OnlineAccounts/ProviderModel 0.1"]
-+        exportMetaObjectRevisions: [0]
-+        Property { name: "applicationId"; type: "string" }
-+        Property { name: "count"; type: "int"; isReadonly: true }
-+        Method {
-+            name: "get"
-+            type: "QVariant"
-+            Parameter { name: "row"; type: "int" }
-+            Parameter { name: "roleName"; type: "string" }
-+        }
-+    }
-+}
-diff --git a/src/src.pro b/src/src.pro
-index 8b26639..abfc851 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -61,22 +61,11 @@ PLUGIN_INSTALL_BASE = $$[QT_INSTALL_QML]/$$replace(API_URI, \\., /)
- target.path = $${PLUGIN_INSTALL_BASE}
- INSTALLS += target
- 
--qmldir.files = $${DESTDIR}/qmldir
-+qmldir.files = $${DESTDIR}/qmldir plugin.qmltypes
- qmldir.path = $${PLUGIN_INSTALL_BASE}
- INSTALLS += qmldir
- 
--generateQmlTypes.output = $${DESTDIR}/plugin.qmltypes
--generateQmlTypes.input = QML_PLUGINS
--generateQmlTypes.commands = export LD_PRELOAD=${QMAKE_FILE_IN}; $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable $${API_URI} 0.1 . > ${QMAKE_FILE_OUT}
--generateQmlTypes.name = Generate ${QMAKE_FILE_OUT}
--generateQmlTypes.CONFIG += no_link
--generateQmlTypes.variable_out = QML_TYPES
--QMAKE_EXTRA_COMPILERS += generateQmlTypes
--
- QML_PLUGINS += $${DESTDIR}/lib$${TARGET}.so
--
--qmltypes.path = $${PLUGIN_INSTALL_BASE}
--qmltypes.files = $${DESTDIR}/plugin.qmltypes
--qmltypes.depends = $${DESTDIR}/plugin.qmltypes
--qmltypes.CONFIG += no_check_exist
--INSTALLS += qmltypes
-+qmltypes.commands = export LD_PRELOAD=$${QML_PLUGINS}; $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable $${API_URI} 0.1 . > $$PWD/plugin.qmltypes
-+qmltypes.depends = $${QML_PLUGINS}
-+QMAKE_EXTRA_TARGETS += qmltypes
--- 
-GitLab
-
diff --git a/srcpkgs/accounts-qml-module/patches/werror.patch b/srcpkgs/accounts-qml-module/patches/werror.patch
deleted file mode 100644
index 130d37e3744499..00000000000000
--- a/srcpkgs/accounts-qml-module/patches/werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/common-project-config.pri	2016-06-08 09:26:26.000000000 +0200
-+++ -	2021-06-19 10:48:56.476598499 +0200
-@@ -3,7 +3,7 @@
- #-----------------------------------------------------------------------------
- 
- # we don't like warnings...
--QMAKE_CXXFLAGS += -Werror -Wno-write-strings
-+QMAKE_CXXFLAGS += -Wno-write-strings
- # Disable RTTI
- QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
- # Use C++11
diff --git a/srcpkgs/accounts-qml-module/template b/srcpkgs/accounts-qml-module/template
index da93b894e435a2..8eb6e9973e4d07 100644
--- a/srcpkgs/accounts-qml-module/template
+++ b/srcpkgs/accounts-qml-module/template
@@ -1,18 +1,36 @@
 # Template file for 'accounts-qml-module'
 pkgname=accounts-qml-module
 version=0.7
-revision=1
+revision=2
+_commit="05e79ebbbf3784a87f72b7be571070125c10dfe3"
 build_style=qmake
-make_install_target="install_subtargets"
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
-makedepends="signond-devel libaccounts-qt5-devel qt5-declarative-devel"
+build_helper=qemu
+configure_args="CONFIG+=no_docs"
+hostmakedepends="pkg-config qt6-base"
+makedepends="signond-devel libaccounts-qt6-devel qt6-declarative-devel"
 short_desc="Expose the Online Accounts API to QML applications"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://gitlab.com/accounts-sso/accounts-qml-module"
-distfiles="https://gitlab.com/accounts-sso/accounts-qml-module/-/archive/VERSION_$version/accounts-qml-module-VERSION_$version.tar.gz"
-checksum=550a6c684bf4b4f6460a35bac0cf3afbb9090a5cf4038b880c6b86c2e9ea0195
+#distfiles="https://gitlab.com/accounts-sso/accounts-qml-module/-/archive/VERSION_$version/accounts-qml-module-VERSION_$version.tar.gz"
+distfiles="https://gitlab.com/accounts-sso/accounts-qml-module/-/archive/$_commit/accounts-qml-module-$_commit.tar.gz"
+checksum=1a53a6d8a3a56694244bc24bdab844d91420483744822d08ae8517ff7df84763
+export QT=qt6
+
+if [ $CROSS_BUILD ]; then
+	hostmakedepends+=" accounts-qml-module"
+fi
+
+post_patch() {
+	if [ $CROSS_BUILD ]; then
+		vsed -i src/src.pro -e '/^INSTALLS [+]= qmltypes_gen/d'
+	fi
+}
 
 post_install() {
 	rm -rf $DESTDIR/usr/bin
+	if [ $CROSS_BUILD ]; then
+		vinstall /usr/lib/qt6/qml/SSO/OnlineAccounts/plugin.qmltypes 644 \
+			usr/lib/qt6/qml/SSO/OnlineAccounts/
+	fi
 }

From 162c178beee5ed48eba9479670d0e1c454731fc7 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sun, 17 Mar 2024 21:34:40 +0500
Subject: [PATCH 33/38] kcm-wacomtablet: update to 6.0.4

---
 .../patches/QPainterPath.patch                | 10 -------
 srcpkgs/kcm-wacomtablet/template              | 30 ++++++++++++-------
 2 files changed, 19 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/kcm-wacomtablet/patches/QPainterPath.patch

diff --git a/srcpkgs/kcm-wacomtablet/patches/QPainterPath.patch b/srcpkgs/kcm-wacomtablet/patches/QPainterPath.patch
deleted file mode 100644
index a307202077aba3..00000000000000
--- a/srcpkgs/kcm-wacomtablet/patches/QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/kcmodule/pressurecurvewidget.cpp	2019-07-21 20:35:36.000000000 +0200
-+++ b/src/kcmodule/pressurecurvewidget.cpp	2020-09-02 16:40:32.608875141 +0200
-@@ -22,6 +22,7 @@
- //Qt includes
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QResizeEvent>
- #include <QTabletEvent>
diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template
index dbb0cd51818c2f..1c5795791d19f1 100644
--- a/srcpkgs/kcm-wacomtablet/template
+++ b/srcpkgs/kcm-wacomtablet/template
@@ -1,18 +1,26 @@
 # Template file for 'kcm-wacomtablet'
 pkgname=kcm-wacomtablet
-version=3.2.0
-revision=3
+version=6.0.4
+revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="pkg-config gettext extra-cmake-modules qt5-qmake qt5-host-tools
- kdoctools kcoreaddons kpackage"
-makedepends="qt5-devel qt5-x11extras-devel qt5-declarative-devel
- plasma-workspace-devel libwacom-devel xf86-input-wacom-devel libinput-devel"
+build_helper=qemu
+configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config gettext extra-cmake-modules qt6-base qt6-tools
+ kf6-kcmutils-devel kf6-kpackage-devel"
+makedepends="qt6-declarative-devel plasma-workspace-devel libwacom-devel
+ xf86-input-wacom-devel libinput-devel"
 depends="xf86-input-wacom"
+checkdepends="dbus"
 short_desc="GUI for the Wacom Linux Drivers"
 maintainer="Piraty <mail@piraty.dev>"
 license="GPL-2.0-or-later"
-homepage="https://invent.kde.org/system/wacomtablet"
-distfiles="${KDE_SITE}/wacomtablet/${version}/wacomtablet-${version}.tar.xz"
-checksum=c80ce63a41f6fcbb50ac4c2130ed2f8273c4b744e62e33d4b714bf83e8e5f7a4
-make_check=no # FIXME
+homepage="https://invent.kde.org/plasma/wacomtablet"
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname#kcm-}-${version}.tar.xz"
+checksum=86cc6dc6eafbfd48448ad0568206357d5ca82dbf9c1473b3d1507c8778ad958e
+
+do_check() {
+	cd build
+	# disable failing tests
+	dbus-run-session ctest -E "Test.KDED.TabletHandler|Test.KDED.XInputAdaptor|Test.KDED.XsetWacomAdaptor"
+}

From 1608f3bb258edd2811da4094bcd99036d3861604 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sun, 17 Mar 2024 21:37:46 +0500
Subject: [PATCH 34/38] kde5: update to 6.0.4.

---
 srcpkgs/kde5/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kde5/template b/srcpkgs/kde5/template
index 548ea5d3e40fb3..cf6a621b00b37b 100644
--- a/srcpkgs/kde5/template
+++ b/srcpkgs/kde5/template
@@ -1,13 +1,13 @@
 # Template file for 'kde5'
 pkgname=kde5
-version=5.27.5
+version=6.0.4
 revision=1
 build_style=meta
 depends="bluedevil>=${version}
  breeze-gtk>=${version}
  kde-gtk-config>=${version}
- kdeplasma-addons5>=${version}
- kgamma5>=${version}
+ kdeplasma-addons>=${version}
+ kgamma>=${version}
  kinfocenter>=${version}
  kscreen>=${version}
  ksshaskpass>=${version}
@@ -27,7 +27,7 @@ depends="bluedevil>=${version}
  elogind
  upower
  udisks2"
-short_desc="The KDE Plasma Desktop meta-package for Void Linux"
+short_desc="KDE Plasma Desktop meta-package for Void Linux"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2, LGPL-2.1, FDL"
+license="Public Domain"
 homepage="https://kde.org/plasma-desktop"

From 6e1ff1dec8ae5e3186a1584907865ba8da8e58ba Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Tue, 26 Mar 2024 21:12:09 +0500
Subject: [PATCH 35/38] libkexiv25: update to 24.02.2.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index a42b462e52b6fe..ebe7ce1092d9a4 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=31413030799065faf17ecbe46e6a4ce4c11758f5c1d590eb296c52f4fc1a9bf2
+checksum=ae60226f489394b239140a4266a2db470a0bcc1a6d77b03c71ae1e3eeff308dc
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From b5bbe9e152ad8bf8e863f756201df00283213e3d Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Tue, 26 Mar 2024 22:04:16 +0500
Subject: [PATCH 36/38] Remove package: libkipi5

---
 srcpkgs/libkipi5-devel    |  1 -
 srcpkgs/libkipi5/template | 26 --------------------------
 srcpkgs/libkipi5/update   |  1 -
 3 files changed, 28 deletions(-)
 delete mode 120000 srcpkgs/libkipi5-devel
 delete mode 100644 srcpkgs/libkipi5/template
 delete mode 100644 srcpkgs/libkipi5/update

diff --git a/srcpkgs/libkipi5-devel b/srcpkgs/libkipi5-devel
deleted file mode 120000
index aa1542ae7df5d9..00000000000000
--- a/srcpkgs/libkipi5-devel
+++ /dev/null
@@ -1 +0,0 @@
-libkipi5
\ No newline at end of file
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
deleted file mode 100644
index ce5c24f9faa492..00000000000000
--- a/srcpkgs/libkipi5/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libkipi5'
-pkgname=libkipi5
-version=23.08.5
-revision=1
-build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
- gettext kcoreaddons"
-makedepends="kxmlgui-devel"
-short_desc="Interface to use kipi-plugins from a KDE application"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later"
-homepage="https://invent.kde.org/graphics/libkipi"
-distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=724014ae75c6b5c39b92368a63d38b94353e41610c12804f96f190c5f1606285
-conflicts="libkipi"
-
-libkipi5-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libkipi5/update b/srcpkgs/libkipi5/update
deleted file mode 100644
index 04f7336c75ac38..00000000000000
--- a/srcpkgs/libkipi5/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=${pkgname%5}

From b6ba082bc28be62a7fa7161eb5e17d9a06f632d0 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sun, 10 Mar 2024 00:29:31 +0500
Subject: [PATCH 37/38] kaccounts-providers: update to 24.02.2.

---
 srcpkgs/kaccounts-providers/template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 77c47ccbe0b82a..9ca8e073ee335a 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,22 +1,24 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
- kpackage pkg-config kcoreaddons libaccounts-qt5-devel signond-devel"
-makedepends="kparts-devel kaccounts-integration-devel glib-devel
- libaccounts-qt5-devel qt5-location-devel signond-devel"
+configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules intltool qt6-tools
+ kf6-kpackage pkg-config kf6-kcoreaddons libaccounts-qt6-devel signond-devel"
+makedepends="kf6-kparts-devel kf6-kpackage-devel kf6-kaccounts-integration-devel
+ glib-devel libaccounts-qt6-devel signond-devel"
 short_desc="KDE Accounts Providers"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kaccounts-providers"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=083d80039e817906e5349aef3bd8024ac84f427ad37820a5349861aa1499e5c5
+checksum=4e2f6e8a854fb61ab19f00f8ff676c8fd97b1a12b70485e6652b74afa3749c18
 
 build_options="nextcloud"
-desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
+desc_option_nextcloud="Build nextcloud support (needs Qt6 WebEngine)"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
@@ -25,5 +27,5 @@ if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 fi
 
 if [ "$build_option_nextcloud" ]; then
-	makedepends+=" qt5-webchannel-devel qt5-webengine-devel"
+	makedepends+=" qt6-webchannel-devel qt6-webengine-devel"
 fi

From 7ce98f1c520bd11a71ae39f353d1e531480341a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 12 May 2024 09:19:53 +0700
Subject: [PATCH 38/38] New package: kf6-grantleetheme-24.02.2

---
 common/shlibs                      |  1 +
 srcpkgs/kf6-grantleetheme-devel    |  1 +
 srcpkgs/kf6-grantleetheme/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/kf6-grantleetheme-devel
 create mode 100644 srcpkgs/kf6-grantleetheme/template

diff --git a/common/shlibs b/common/shlibs
index d6ac34b16b0f7d..7718d21953f107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -476,6 +476,7 @@ libkateprivate.so.24.02.2 libkate-24.02.2_1
 libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
 libKPim5Libkleo.so.5 libkleo-23.04.0_1
 libKPim5GrantleeTheme.so.5 grantleetheme-23.04.0_1
+libKPim6GrantleeTheme.so.6 kf6-grantleetheme-24.02.2_1
 libKPim5IMAP.so.5 kimap-23.04.0_1
 libKPim5Ldap.so.5 kldap-23.04.0_1
 libKF5CalendarCore.so.5 kcalendarcore-5.63.0_1
diff --git a/srcpkgs/kf6-grantleetheme-devel b/srcpkgs/kf6-grantleetheme-devel
new file mode 120000
index 00000000000000..781440ff7dd89b
--- /dev/null
+++ b/srcpkgs/kf6-grantleetheme-devel
@@ -0,0 +1 @@
+kf6-grantleetheme
\ No newline at end of file
diff --git a/srcpkgs/kf6-grantleetheme/template b/srcpkgs/kf6-grantleetheme/template
new file mode 100644
index 00000000000000..bf9fff292cfa9e
--- /dev/null
+++ b/srcpkgs/kf6-grantleetheme/template
@@ -0,0 +1,26 @@
+# Template file for 'kf6-grantleetheme'
+pkgname=kf6-grantleetheme
+version=24.02.2
+revision=1
+build_style=cmake
+configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base python3
+ gettext kf6-kcoreaddons"
+makedepends="grantlee5-devel kf6-ki18n-devel kf6-kiconthemes-devel kf6-knewstuff-devel
+ kf6-kxmlgui-devel kf6-ktexttemplate-devel"
+short_desc="Library for Grantlee theming support"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://community.kde.org/KDE_PIM"
+distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
+checksum=54895f25516d274c4bfcf7cf59109d5cd2e3f7ad3619968a7e54a73a7eb5a958
+
+kf6-grantleetheme-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

  parent reply	other threads:[~2024-05-12 15:26 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-27 17:13 [PR PATCH] Plasma6 Luciogi
2024-04-27 17:15 ` [PR PATCH] [Updated] Plasma6 Luciogi
2024-04-27 17:20 ` Luciogi
2024-04-27 17:23 ` Plasma6 Luciogi
2024-04-29  6:45 ` Plasma6 sgn
2024-04-29 15:34 ` Plasma6 Luciogi
2024-04-29 15:34 ` Plasma6 Luciogi
2024-05-01 12:18 ` Plasma6 Luciogi
2024-05-01 12:18 ` [PR PATCH] [Updated] Plasma6 Luciogi
2024-05-04 16:04 ` Luciogi
2024-05-04 18:47 ` Luciogi
2024-05-04 18:58 ` Plasma6 Luciogi
2024-05-06  8:43 ` [PR PATCH] [Updated] Plasma6 Luciogi
2024-05-06  8:45 ` Luciogi
2024-05-06  8:46 ` Plasma6 Luciogi
2024-05-06  8:48 ` [PR PATCH] [Updated] Plasma6 Luciogi
2024-05-06  9:29 ` Luciogi
2024-05-09 17:29 ` Luciogi
2024-05-09 17:47 ` Luciogi
2024-05-09 17:49 ` Luciogi
2024-05-10  4:00 ` Luciogi
2024-05-10  4:12 ` Luciogi
2024-05-10 13:03 ` sgn
2024-05-10 13:04 ` sgn
2024-05-10 13:05 ` sgn
2024-05-10 13:09 ` sgn
2024-05-10 13:11 ` sgn
2024-05-10 13:39 ` sgn
2024-05-10 13:40 ` sgn
2024-05-10 13:41 ` sgn
2024-05-10 13:42 ` sgn
2024-05-10 13:58 ` sgn
2024-05-10 14:00 ` sgn
2024-05-11 14:24 ` sgn
2024-05-12 15:26 ` sgn [this message]
2024-05-12 15:27 ` [PR PATCH] [Merged]: Plasma6 sgn
2024-05-13 13:56 ` Plasma6 TinfoilSubmarine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240512152625.EEE61240D7@inbox.vuxu.org \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).