void-packages icon indicating copy to clipboard operation
void-packages copied to clipboard
verified publisher icon void-linux

New packages: Metric ton of kde framework

Open Johnnynator opened this issue 1 year ago • 20 comments

Highly WiP. ~60 templates build so far, nothing tested.

Todo (non framework things);

  • [ ] AppStream update to 1.0 or newer
  • [x] qt6 version of qca
  • [ ] qt6 version of libqmobipocket (optional)
  • [ ] kf6-kwallet does not get properly started by pam
  • [ ] rename kate5 to kate

Deps:

  • [ ] #49056
  • [ ] #49175

[ci skip] [skip ci]

Johnnynator avatar Feb 29 '24 23:02 Johnnynator

From Framework Release Notes

  • [x] frameworkintegration - needs AppStream 1.0. It needs a current release of PackageKit for the Qt 6 library.

Luciogi avatar Mar 01 '24 14:03 Luciogi

kf6-kwallet cant be build due to missing build dependency qca-qt6(Qca-qt6Config.cmake)

All other packages are building and passing tests on x86_64

diff --git a/common/shlibs b/common/shlibs
index df97345821c..d4c84164e9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1994,6 +1994,9 @@ libKF6PrisonScanner.so.6 kf6-prison-6.0.0_1
 libKF6SyntaxHighlighting.so.6 kf6-syntax-highlighting-6.0.0_1
 libKF6FileMetaData.so.3 kf6-kfilemetadata-6.0.0_1
 libKF6IdleTime.so.6 kf6-kidletime-6.0.0_1
+libKF6NewStuffCore.so.6 kf6-knewstuff-6.0.0_1
+libKF6SonnetUi.so.6 kf6-ksonnet-6.0.0_1
+libKF6SonnetCore.so.6 kf6-ksonnect-6.0.0_1
 
 liblxqt-qt5.so.0 liblxqt-0.8.0_1
 liblxqt-globalkeys-qt5.so.0 lxqt-globalkeys-0.8.0_1
diff --git a/srcpkgs/kf6-attica/template b/srcpkgs/kf6-attica/template
index abd30e69503..02d7d3380f3 100644
--- a/srcpkgs/kf6-attica/template
+++ b/srcpkgs/kf6-attica/template
@@ -16,6 +16,7 @@ kf6-attica-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
+		vmove usr/lib/pkgconfig
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
diff --git a/srcpkgs/kf6-baloo/template b/srcpkgs/kf6-baloo/template
index cad783eb323..f36d352b974 100644
--- a/srcpkgs/kf6-baloo/template
+++ b/srcpkgs/kf6-baloo/template
@@ -15,6 +15,12 @@ homepage="https://invent.kde.org/frameworks/baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=ea21e88d1fe252d2dc95e0b7ae8891594822ccdd898e7aa56d46ed9ecd626a41
 
+do_check() {
+	cd build
+	# disable failing text
+	ctest -E "filemonitortest"
+}
+
 kf6-baloo-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-bluez-qt/template b/srcpkgs/kf6-bluez-qt/template
index ef54a63433a..454cbd77dc1 100644
--- a/srcpkgs/kf6-bluez-qt/template
+++ b/srcpkgs/kf6-bluez-qt/template
@@ -2,18 +2,10 @@
 pkgname=kf6-bluez-qt
 version=6.0.0
 revision=1
-#archs="i686 x86_64"
-#build_wrksrc=
 build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base qt6-declarative-host-tools"
 makedepends="qt6-declarative-devel"
-#makedepend+=""
-depends=""
+checkdepends="dbus"
 short_desc="Qt wrapper for Bluez 5 DBus API"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
@@ -22,6 +14,11 @@ homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=36798f1e7a0a472607435beb2833f6cc77d65cb006decac1ec0b0a3a6f5142eb
 
+do_check() {
+	cd build
+	dbus-run-session ctest -E "bluezqt-managertest"
+}
+
 kf6-bluez-qt-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-frameworkintegration/template b/srcpkgs/kf6-frameworkintegration/template
index 49212d894d1..8a335e2d288 100644
--- a/srcpkgs/kf6-frameworkintegration/template
+++ b/srcpkgs/kf6-frameworkintegration/template
@@ -2,24 +2,15 @@
 pkgname=kf6-frameworkintegration
 version=6.0.0
 revision=1
-#archs="i686 x86_64"
-#build_wrksrc=
 build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base"
 makedepends="kf6-kcolorscheme-devel kf6-kconfig-devel kf6-ki18n-devel
- kf6-kiconthemes-devel"
-#makedepend+=""
-depends=""
+ kf6-kiconthemes-devel kf6-knewstuff-devel"
+makedepends+=" gettext"
 short_desc="Framework providing components to allow applications to integrate with a KDE Workspace"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
-#changelog=""
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=343efa4e4f7d1c804de2cb6a2cac7a980cf7f3787fd4f523fa2c2d2d15f65d9b
 
diff --git a/srcpkgs/kf6-kauth/template b/srcpkgs/kf6-kauth/template
index 052b451feb6..1589e9967ff 100644
--- a/srcpkgs/kf6-kauth/template
+++ b/srcpkgs/kf6-kauth/template
@@ -2,26 +2,22 @@
 pkgname=kf6-kauth
 version=6.0.0
 revision=1
-#archs="i686 x86_64"
-#build_wrksrc=
 build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
-hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base "
+hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base"
 makedepends="kf6-kcoreaddons-devel"
-#makedepend+=""
-depends=""
+checkdepends="dbus"
 short_desc="KDE Execute actions as privileged user"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
-#changelog=""
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=66046698d2584692d5397a6ec808b2c9f8b7882a0f85233be9cd69283d03c768
 
+do_check() {
+	cd build
+	dbus-run-session ctest
+}
+
 kf6-kauth-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kcalendarcore/template b/srcpkgs/kf6-kcalendarcore/template
index b8e10eda143..c247c4cec9e 100644
--- a/srcpkgs/kf6-kcalendarcore/template
+++ b/srcpkgs/kf6-kcalendarcore/template
@@ -3,8 +3,9 @@ pkgname=kf6-kcalendarcore
 version=6.0.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base "
+hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base"
 makedepends="qt6-base-devel libical-devel"
+checkdepends="perl"
 short_desc="Library for Interfacing with Calendars"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
@@ -12,6 +13,12 @@ homepage="https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=641356ac286c1a5287327ce8fa2529bf53048e439d1ff672c925d4ab7e0eb7c2
 
+do_check() {
+	cd build
+	# disable failing tests
+	ctest -E "testicaltimezones|Compat-AppleICal_1.5.ics|Compat-KOrganizer_3.1a.ics|Compat-Mozilla_1.0.ics"
+}
+
 kf6-kcalendarcore-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kcmutils/template b/srcpkgs/kf6-kcmutils/template
index b2e4b763361..5702573f569 100644
--- a/srcpkgs/kf6-kcmutils/template
+++ b/srcpkgs/kf6-kcmutils/template
@@ -5,7 +5,9 @@ revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base
  qt6-declarative-host-tools"
-makedepends="kf6-kconfigwidgets-devel kf6-kcoreaddons-devel kf6-kio-devel"
+makedepends="kf6-kconfigwidgets-devel kf6-kcoreaddons-devel kf6-kio-devel kf6-kxmlgui-devel"
+makedepends+=" gettext"
+checkdepends="kf6-kirigami"
 short_desc="Utilities for interacting with KCModules"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
diff --git a/srcpkgs/kf6-kconfig/template b/srcpkgs/kf6-kconfig/template
index e4c16af7cbb..7a1e738e9f4 100644
--- a/srcpkgs/kf6-kconfig/template
+++ b/srcpkgs/kf6-kconfig/template
@@ -22,6 +22,12 @@ homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=3f7c1e6b048df4ab3d67fbef01a5ad1dd0289c9b158644668fba0225c050c050
 
+do_check() {
+	cd build
+	# disable failing tests
+	ctest -E "kconfigcore-kconfigtest|kconfiggui-kstandardshortcutwatchertest"
+}
+
 kf6-kconfig-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kconfigwidgets/template b/srcpkgs/kf6-kconfigwidgets/template
index 4d006e38bc5..a5189be523c 100644
--- a/srcpkgs/kf6-kconfigwidgets/template
+++ b/srcpkgs/kf6-kconfigwidgets/template
@@ -14,6 +14,12 @@ homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=511bed0d95de186b3cf62c7192bbb6020450d4861f05c1a545356144f17de532
 
+do_check() {
+	cd build
+	# disable failing tests
+	ctest -E "kstandardactiontest"
+}
+
 kf6-kconfigwidgets-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kcontacts/template b/srcpkgs/kf6-kcontacts/template
index d58df42d4a1..4d623a48535 100644
--- a/srcpkgs/kf6-kcontacts/template
+++ b/srcpkgs/kf6-kcontacts/template
@@ -14,6 +14,12 @@ homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=179c6748e555c5c028b02a4b9b165ede13a09cf5eaf0ea012366c9727d230ec4
 
+do_check() {
+	cd build
+	# disable failing test
+	ctest -E "kcontacts-addresstest"
+}
+
 kf6-kcontacts-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kcoreaddons/template b/srcpkgs/kf6-kcoreaddons/template
index 9680e40c517..80fe0afe398 100644
--- a/srcpkgs/kf6-kcoreaddons/template
+++ b/srcpkgs/kf6-kcoreaddons/template
@@ -2,18 +2,9 @@
 pkgname=kf6-kcoreaddons
 version=6.0.0
 revision=1
-#archs="i686 x86_64"
-#build_wrksrc=
 build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base qt6-declarative-host-tools"
 makedepends="qt6-declarative-devel"
-#makedepend+=""
-depends=""
 short_desc="KCoreAddons"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
@@ -22,6 +13,12 @@ homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=eab838201b45ac98c412f64d234e89d62357f275ae9ae966d073a64c67a526ef
 
+do_check() {
+	cd build
+	# disable failing test
+	ctest -E "kformattest"
+}
+
 kf6-kcoreaddons-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kdbusaddons/template b/srcpkgs/kf6-kdbusaddons/template
index c917a106c85..cc8246cd7be 100644
--- a/srcpkgs/kf6-kdbusaddons/template
+++ b/srcpkgs/kf6-kdbusaddons/template
@@ -13,6 +13,7 @@ build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base "
 makedepends="qt6-base-devel"
 #makedepend+=""
+checkdepends="dbus"
 depends=""
 short_desc="KDBusAddons"
 maintainer="John <[email protected]>"
@@ -22,6 +23,11 @@ homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=11e70d0c7239bd818962d91cdb94aeba94748055c77003a4f64ff14dab0ae989
 
+do_check() {
+	cd build
+	dbus-run-session ctest
+}
+
 kf6-kdbusaddons-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kdeclarative/template b/srcpkgs/kf6-kdeclarative/template
index da65e7429c1..c3793fb5e21 100644
--- a/srcpkgs/kf6-kdeclarative/template
+++ b/srcpkgs/kf6-kdeclarative/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base
  qt6-declarative-host-tools gettext"
 makedepends="kf6-kconfig-devel kf6-kglobalaccel-devel kf6-ki18n-devel
- kwidgetsaddons-devel"
+ kf6-kwidgetsaddons-devel kf6-kguiaddons-devel qt6-shadertools-devel"
 short_desc="KDE Integration of QML and KDE work spaces"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
diff --git a/srcpkgs/kf6-kded/template b/srcpkgs/kf6-kded/template
index 699f09558a1..7ed88e9c86d 100644
--- a/srcpkgs/kf6-kded/template
+++ b/srcpkgs/kf6-kded/template
@@ -27,8 +27,6 @@ kf6-kded-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove usr/include
 		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/kf6-kguiaddons/template b/srcpkgs/kf6-kguiaddons/template
index 13e47f92653..3337150b27b 100644
--- a/srcpkgs/kf6-kguiaddons/template
+++ b/srcpkgs/kf6-kguiaddons/template
@@ -17,6 +17,7 @@ kf6-kguiaddons-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
+		vmove usr/lib/pkgconfig
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
diff --git a/srcpkgs/kf6-ki18n/template b/srcpkgs/kf6-ki18n/template
index 1780b05a557..4c89b32e2ef 100644
--- a/srcpkgs/kf6-ki18n/template
+++ b/srcpkgs/kf6-ki18n/template
@@ -14,6 +14,13 @@ homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=15cbfb73ef1d3954d6206755b6e6a9c86ea27be4b4db0c843d38494851bcc354
 
+do_check() {
+        cd build
+	# disable failing tests
+	ctest -E "kcountrytest|kcountrysubdivisiontest"
+
+}
+
 kf6-ki18n-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kimageformats-devel b/srcpkgs/kf6-kimageformats-devel
deleted file mode 120000
index f9865e21c6f..00000000000
--- a/srcpkgs/kf6-kimageformats-devel
+++ /dev/null
@@ -1 +0,0 @@
-kf6-kimageformats
\ No newline at end of file
diff --git a/srcpkgs/kf6-kimageformats/template b/srcpkgs/kf6-kimageformats/template
index 344d0513c37..7a74cb5ee3a 100644
--- a/srcpkgs/kf6-kimageformats/template
+++ b/srcpkgs/kf6-kimageformats/template
@@ -14,3 +14,9 @@ license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=1ddd28f2fb8ac2c95556f792418c2b6190a04050ac31b27aa82ea11c1af0879c
+
+do_check() {
+	cd build
+	# disable failing tests
+	ctest -E "kimageformats-read-psd|kimageformats-read-hej2"
+}
diff --git a/srcpkgs/kf6-kio/template b/srcpkgs/kf6-kio/template
index 8e3a439138e..736eab99547 100644
--- a/srcpkgs/kf6-kio/template
+++ b/srcpkgs/kf6-kio/template
@@ -10,6 +10,7 @@ makedepends="kf6-karchive-devel kf6-kauth-devel kf6-kbookmarks-devel
  kf6-kcompletion-devel kf6-kiconthemes-devel kf6-kitemviews-devel
  kf6-kjobwidgets-devel kf6-kwindowsystem-devel
  qt6-qt5compat-devel"
+checkdepends="dbus"
 short_desc="KDE Network transparent access to files and data"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
@@ -17,6 +18,28 @@ homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=4951adf043299e463803cc63ed33d5261b81bff969eb189dc13350f495cb4b42
 
+do_check() {
+	cd build
+	# disable failing tests
+	tests=("kpasswdservertest"
+		"kiocore-kmountpointtest"
+		"kiocore-jobtest"
+		"kiocore-kfileitemtest"
+		"kiocore-filefiltertest"
+		"kiogui-favicontest"
+		"kiogui-openurljobtest"
+		"applicationlauncherjob_servicetest"
+		"commandlauncherjob_servicetest"
+		"kiowidgets-kdirmodeltest"
+		"kiowidgets-kfileitemactionstest"
+		"kiowidgets-kurifiltertest-colon-separator"
+		"kiowidgets-kurifiltertest-space-separator"
+		"kiofilewidgets-kfilewidgettest"
+		"kiofilewidgets-kfileplacesmodeltest"
+		"kiowidgets-kdirlistertest")
+	dbus-run-session ctest -E "($( echo ${tests[@]} | tr " " "|"))"
+}
+
 kf6-kio-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kpeople/template b/srcpkgs/kf6-kpeople/template
index 2a7e7700e98..69fbb088fd7 100644
--- a/srcpkgs/kf6-kpeople/template
+++ b/srcpkgs/kf6-kpeople/template
@@ -14,6 +14,12 @@ homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=2119ac9dfa80f4d90d6cd044d544ed5e500e9ae487ce616f2475c58eaa906ec3
 
+do_check() {
+	cd build
+	# disable failing test
+	ctest -E "personsmodeltest"
+}
+
 kf6-kpeople-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-krunner/template b/srcpkgs/kf6-krunner/template
index 3cdd869a8ed..8c7ab018a60 100644
--- a/srcpkgs/kf6-krunner/template
+++ b/srcpkgs/kf6-krunner/template
@@ -7,6 +7,7 @@ hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base
  gettext"
 makedepends="kf6-kconfig-devel kf6-kcoreaddons-devel kf6-ki18n-devel
  kf6-kitemmodels-devel"
+checkdepends="dbus"
 short_desc="Framework for providing different actions given a string query"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
@@ -14,6 +15,11 @@ homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=22d33fd27567a350ae4edae4fe5662b748e8fabd539863441794558e68f3313d
 
+do_check() {
+	cd build
+	dbus-run-session ctest
+}
+
 kf6-krunner-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-ktextwidgets/template b/srcpkgs/kf6-ktextwidgets/template
index e2cbb001bdc..183ad9af782 100644
--- a/srcpkgs/kf6-ktextwidgets/template
+++ b/srcpkgs/kf6-ktextwidgets/template
@@ -7,7 +7,7 @@ hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base
  gettext"
 makedepends="kf6-kcompletion-devel kf6-kconfig-devel kf6-kconfigwidgets-devel
  qt6-speech-devel qt6-multimedia-devel qt6-speech-plugin-flite
- qt6-speech-plugin-mock qt6-speech-plugin-speechd"
+ qt6-speech-plugin-mock qt6-speech-plugin-speechd kf6-sonnet-devel"
 short_desc="KDE Text editing widgets"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
diff --git a/srcpkgs/kf6-kuserfeedback/template b/srcpkgs/kf6-kuserfeedback/template
index fb27c5470d6..56479ff43cc 100644
--- a/srcpkgs/kf6-kuserfeedback/template
+++ b/srcpkgs/kf6-kuserfeedback/template
@@ -12,6 +12,12 @@ homepage="https://invent.kde.org/frameworks/kuserfeedback"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=02f1af108e253c842526d31c997a1777b8f7a6e5b8698b5b1267ce1ec128af2b
 
+do_check() {
+	cd build
+	# disable failing test
+	ctest -E "openglinfosourcetest"
+}
+
 kf6-kuserfeedback-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kwallet/template b/srcpkgs/kf6-kwallet/template
index d80216e44f1..261d6e68913 100644
--- a/srcpkgs/kf6-kwallet/template
+++ b/srcpkgs/kf6-kwallet/template
@@ -7,7 +7,7 @@ hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base
  gettext"
 makedepends="kf6-kconfig-devel kf6-kcoreaddons-devel kf6-kdoctools-devel
  kf6-kwindowsystem-devel kf6-kcolorscheme-devel kf6-kdbusaddons-devel
- kf6-knotifications-devel kf6-kwidgetsaddons-devel"
+ kf6-knotifications-devel kf6-kwidgetsaddons-devel gpgmepp-devel"
 short_desc="KWallet: Credential Storage"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
diff --git a/srcpkgs/kf6-kwidgetsaddons/template b/srcpkgs/kf6-kwidgetsaddons/template
index 153cca5579b..42f336d10b9 100644
--- a/srcpkgs/kf6-kwidgetsaddons/template
+++ b/srcpkgs/kf6-kwidgetsaddons/template
@@ -12,6 +12,12 @@ homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=a7771c92310a21a8105ba64dd61c065ba74723899c7ccfc4de2b57b17e6a6b63
 
+do_check() {
+	cd build
+	# disable failing tests
+	ctest -E "ktooltipwidgettest|kwidgetsaddons-kcolumnresizertest"
+}
+
 kf6-kwidgetsaddons-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-kwindowsystem/template b/srcpkgs/kf6-kwindowsystem/template
index 57a55f35684..4acb97ee064 100644
--- a/srcpkgs/kf6-kwindowsystem/template
+++ b/srcpkgs/kf6-kwindowsystem/template
@@ -14,10 +14,31 @@ homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=1906caa53b7d58fc0c4d78a3c8d99f25aa056fc6d09c5fc121ed5e1f80396a94
 
+do_check() {
+	cd build
+	# disable failing tests
+	tests=("kwindowsystem-kmanagerselectiontest"
+		"kwindowsystem-kstartupinfo_unittest"
+		"kwindowsystem-kxmessages_unittest"
+		"kwindowsystem-kkeyserver_x11_unittest"
+		"kwindowsystem-kwindoweffectstest"
+		"kwindowsystem-kwindowinfox11test"
+		"kwindowsystem-kwindowsystemx11test"
+		"kwindowsystem-kwindowsystem_threadtest"
+		"kwindowsystem-netrootinfotestwm"
+		"kwindowsystem-netwininfotestclient"
+		"kwindowsystem-netwininfotestwm"
+		"kwindowsystem-kmanagerselectiontest"
+		"kwindowsystem-compositingenabled_test"
+		"kwindowsystem-compositingenabled_test")
+	ctest -E "($( echo ${tests[@]} | tr " " "|" ))"
+}
+
 kf6-kwindowsystem-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
+		vmove usr/lib/pkgconfig
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
diff --git a/srcpkgs/kf6-kxmlgui/template b/srcpkgs/kf6-kxmlgui/template
index 4c1e2ab93b2..bba33899945 100644
--- a/srcpkgs/kf6-kxmlgui/template
+++ b/srcpkgs/kf6-kxmlgui/template
@@ -14,6 +14,12 @@ homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=d26c62ce9f5be8643fed465531418fb67e4d13edf61797a946da301aeb9158f2
 
+do_check() {
+	cd build
+	# disable failing test
+	ctest -E "ktoolbar_unittest|kxmlgui_unittest"
+}
+
 kf6-kxmlgui-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-modemmanager-qt/template b/srcpkgs/kf6-modemmanager-qt/template
index b08218a4fbf..16998b865bc 100644
--- a/srcpkgs/kf6-modemmanager-qt/template
+++ b/srcpkgs/kf6-modemmanager-qt/template
@@ -6,6 +6,7 @@ build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base
  pkg-config"
 makedepends="qt6-base-devel ModemManager-devel"
+checkdepends="dbus"
 short_desc="Qt wrapper for ModemManager DBus API"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
@@ -13,6 +14,11 @@ homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=efd6ea3eae52b21279bdee38e80f667c35d98b977a442f4bd6b8a0a471f90ff3
 
+do_check() {
+	cd build
+	dbus-run-session ctest
+}
+
 kf6-modemmanager-qt-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-networkmanager-qt/template b/srcpkgs/kf6-networkmanager-qt/template
index 2697cd24785..d3802d5e211 100644
--- a/srcpkgs/kf6-networkmanager-qt/template
+++ b/srcpkgs/kf6-networkmanager-qt/template
@@ -13,6 +13,12 @@ homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=225fc9f44e11d06687ce2ca56be7c7452f0ad2cc850b22f5715c8b701dabb700
 
+do_check() {
+	cd build
+	# disable failing tests
+	ctest -E "managertest|settingstest|activeconnectiontest"
+}
+
 kf6-networkmanager-qt-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-purpose/template b/srcpkgs/kf6-purpose/template
index 62951712c94..4186afb368f 100644
--- a/srcpkgs/kf6-purpose/template
+++ b/srcpkgs/kf6-purpose/template
@@ -2,30 +2,19 @@
 pkgname=kf6-purpose
 version=6.0.0
 revision=1
-#archs="i686 x86_64"
-#build_wrksrc=
 build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base
  qt6-declarative-host-tools gettext"
 makedepends="qt6-declarative-devel kf6-kcoreaddons-devel kf6-ki18n-devel
- kf6-kirigami-devel kf6-knotifications-devel"
-#makedepend+=""
+ kf6-kirigami-devel kf6-knotifications-devel kf6-kio-devel"
 depends="accounts-qml-module kaccounts-providers"
 short_desc="Offers available actions for a specific purpose"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
-#changelog=""
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=4fa85cbd2d9dd49216eda6433b43e05bbb114249dac51df55242328f7eb8f97c
 
-broken="Needs some runtime deps as qt6"
-
 kf6-purpose-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/kf6-qqc2-desktop-style/template b/srcpkgs/kf6-qqc2-desktop-style/template
index ab7b966c3b3..8b5ff8e0b67 100644
--- a/srcpkgs/kf6-qqc2-desktop-style/template
+++ b/srcpkgs/kf6-qqc2-desktop-style/template
@@ -2,19 +2,10 @@
 pkgname=kf6-qqc2-desktop-style
 version=6.0.0
 revision=1
-#archs="i686 x86_64"
-#build_wrksrc=
 build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="extra-cmake-modules kcoreaddons qt6-tools qt6-base
  qt6-declarative-host-tools"
 makedepends="kf6-kcolorscheme-devel kf6-kiconthemes-devel kf6-kirigami-devel"
-#makedepend+=""
-depends=""
 short_desc="Qt Quick Controls 2: Desktop Style"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
@@ -23,6 +14,11 @@ homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=848305ff8880fdbad19bf57ed9f128e59cd71ecb8a36fbf920a55b60f68a2c93
 
+do_check() {
+	cd build
+	ctest -E "animationspeedmodifiertest"
+}
+
 kf6-qqc2-desktop-style-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

Luciogi avatar Mar 01 '24 16:03 Luciogi

  • [x] plasma-framework needs revbump for kwayland-6.0.0_1 (I guess it would be handled by single build cycle)

Luciogi avatar Mar 05 '24 15:03 Luciogi

you pushed wrong commit https://github.com/void-linux/void-packages/pull/49012/commits/7334ab41f3850859fc983097a2af2b7a3fb19c56

polkit-devel is required for flatpak-kcm

Luciogi avatar Mar 05 '24 16:03 Luciogi

you pushed wrong commit 7334ab4

polkit-devel is required for flatpak-kcm

See output of xbps-query -R flatpak-devel --cat /usr/lib/pkgconfig/flatpak.pc, it is listed in Requires.private

Johnnynator avatar Mar 05 '24 17:03 Johnnynator

Btw, AppStream 1.0.x should be done as a part of https://github.com/void-linux/void-packages/pull/49126 feel free to test that with kf6-frameworkintegration and let me know if there are any issues.

oreo639 avatar Mar 05 '24 21:03 oreo639

you pushed wrong commit 7334ab4 polkit-devel is required for flatpak-kcm

See output of xbps-query -R flatpak-devel --cat /usr/lib/pkgconfig/flatpak.pc, it is listed in Requires.private

hmm flatpak-kcm also need polkit-devel as makedepends=

diff --git a/srcpkgs/flatpak-kcm/template b/srcpkgs/flatpak-kcm/template
index e48f275e409..c8f44356201 100644
--- a/srcpkgs/flatpak-kcm/template
+++ b/srcpkgs/flatpak-kcm/template
@@ -7,7 +7,7 @@ configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config qt6-base qt5-tools
  gettext"
 makedepends="flatpak-devel kf6-kcmutils-devel kf6-kdeclarative-devel
- kf6-ki18n-devel kf6-kconfig-devel kf6-kitemmodels-devel"
+ kf6-ki18n-devel kf6-kconfig-devel kf6-kitemmodels-devel polkit-devel"
 short_desc="KDE Config Module for Flatpak Permissions"
 maintainer="John <[email protected]>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

Luciogi avatar Mar 06 '24 03:03 Luciogi

kf6-ktextwidgets remove unused makedepends

diff --git a/srcpkgs/kf6-ktexteditor/template b/srcpkgs/kf6-ktexteditor/template
index ba8b12e06b9..89f94acc7f7 100644
--- a/srcpkgs/kf6-ktexteditor/template
+++ b/srcpkgs/kf6-ktexteditor/template
@@ -5,9 +5,7 @@ revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt6-tools qt6-base
  qt6-declarative-host-tools gettext"
-makedepends="kf6-karchive-devel kf6-kauth-devel kf6-kconfig-devel
- kf6-kguiaddons-devel kf6-ki18n-devel kf6-kio-devel kf6-kxmlgui-devel
- kf6-kparts-devel kf6-sonnet-devel kf6-syntax-highlighting-devel
+makedepends="kf6-kparts-devel kf6-sonnet-devel kf6-syntax-highlighting-devel
  kf6-ktextwidgets-devel qt6-speech-devel qt6-multimedia-devel
  qt6-speech-plugin-flite qt6-speech-plugin-mock qt6-speech-plugin-speechd
  editorconfig-devel"

Luciogi avatar Mar 06 '24 05:03 Luciogi

Resolve conflict between kglobalacceld and kglobalaccel at /usr/lib/systemd/user/*.service

diff --git a/srcpkgs/kglobalacceld/template b/srcpkgs/kglobalacceld/template
index 9634d087c00..bc49e666fcb 100644
--- a/srcpkgs/kglobalacceld/template
+++ b/srcpkgs/kglobalacceld/template
@@ -14,6 +14,11 @@ homepage="https://invent.kde.org/plasma/kglobalacceld"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=aa7eb34f3dfafdc2f475bb20ed6a8563a2e9fbfb06470890e127dc9054f945aa
 
+post_install() {
+       # conflicts with kglobalaccel
+       rm ${DESTDIR}/usr/lib/systemd/user -r
+}
+
 kglobalacceld-devel_package() {
        depends="${sourcepkg}>=${version}_${revision}"
        short_desc+=" - development files"

Luciogi avatar Mar 06 '24 05:03 Luciogi

  • [x] plasma-workspace required Phonon4Qt6Config.cmake (phonon-qt6-devel) as makedepends= https://github.com/void-linux/void-packages/pull/49141

Luciogi avatar Mar 06 '24 06:03 Luciogi

yay everything now builds my working branch: https://github.com/Luciogi/void-packages/tree/kf6-template-luci

Luciogi avatar Mar 06 '24 14:03 Luciogi

  • [x] kf6-purpose has missing package (qt6-accounts-qml-module which need libaccounts-qt6) I cant make it work

Edit ok now working

Luciogi avatar Mar 07 '24 06:03 Luciogi

I have added more packages that are required for kf6-purpose checkout here https://github.com/Luciogi/void-packages/tree/kf6-template-luci

Luciogi avatar Mar 07 '24 13:03 Luciogi

rename kate5 to kate

Luciogi avatar Mar 07 '24 15:03 Luciogi

flatpak-kcm is broken apply below changes

diff --git a/srcpkgs/flatpak-kcm/template b/srcpkgs/flatpak-kcm/template
index fa4dad0e808..e048a24ebdb 100644
--- a/srcpkgs/flatpak-kcm/template
+++ b/srcpkgs/flatpak-kcm/template
@@ -4,10 +4,9 @@ version=6.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules pkg-config qt6-base qt5-tools
- gettext"
+hostmakedepends="extra-cmake-modules pkg-config qt6-base gettext"
 makedepends="flatpak-devel kf6-kcmutils-devel kf6-kdeclarative-devel
- kf6-ki18n-devel kf6-kconfig-devel kf6-kitemmodels-devel"
+ kf6-ki18n-devel kf6-kconfig-devel kf6-kitemmodels-devel polkit-devel"
 short_desc="KDE Config Module for Flatpak Permissions"
 maintainer="John <[email protected]>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

Luciogi avatar Mar 07 '24 16:03 Luciogi

plasma-activities-stats-devel

diff --git a/srcpkgs/plasma-activities-stats/template b/srcpkgs/plasma-activities-stats/template
index 3b5de8937b9..d04a75accc3 100644
--- a/srcpkgs/plasma-activities-stats/template
+++ b/srcpkgs/plasma-activities-stats/template
@@ -17,6 +17,7 @@ plasma-activities-stats-devel_package() {
        depends="${sourcepkg}>=${version}_${revision}"
        short_desc+=" - development files"
        pkg_install() {
+               vmove usr/lib/pkgconfig
                vmove usr/include
                vmove usr/lib/cmake
                vmove "usr/lib/*.so"

Luciogi avatar Mar 07 '24 17:03 Luciogi

fix conflict of kf6-kwallet and kwallet

  • [x] kf6-kwallet should not be in conflict with kwallet
  • [x] also remove -DBUILD_KWALLETD=OFF (as kwallet would have binary kwalletd5)
  • [x] kwallet should not depend on kf6-kwallet
diff --git a/srcpkgs/kf6-kwallet/template b/srcpkgs/kf6-kwallet/template
index 3308a0caa35..b1c8e27360d 100644
--- a/srcpkgs/kf6-kwallet/template
+++ b/srcpkgs/kf6-kwallet/template
@@ -15,7 +15,11 @@ license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz"
 checksum=bab43823de8b1b086dc4b2ad10d10bd6c4d0d2e1f8b5fd5fdd5f7d365fb8e5cc
-conflicts="kwallet<=5.115.0_1"
+
+post_install() {
+	# fix conflict
+	rm ${DESTDIR}/usr/share/dbus-1/services/org.kde.kwalletd5.service
+}
 
 kf6-kwallet-devel_package() {
 	depends="$makedepends ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index dfc363a45e8..9b3142ea32b 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -3,14 +3,12 @@ pkgname=kwallet
 version=5.115.0
 revision=2
 build_style=cmake
-configure_args="-DBUILD_TESTING=ON -DBUILD_KWALLETD=OFF
- -DBUILD_KWALLET_QUERY=OFF"
+configure_args="-DBUILD_TESTING=ON -DBUILD_KWALLET_QUERY=OFF"
 hostmakedepends="gettext kcoreaddons extra-cmake-modules
  qt5-host-tools qt5-qmake python3 kdoctools"
 makedepends="kdoctools-devel gpgmepp-devel libgcrypt-devel
  kservice-devel knotifications-devel kiconthemes-devel
  gpgmeqt-devel qca-qt5-devel"
-depends="kf6-kwallet"
 short_desc="KDE Safe desktop-wide storage for passwords"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"

plasma-integration was not using all kf6 packages, Fix by following patch

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 005834a2daf..2a96444a2e5 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -7,7 +7,7 @@ configure_args="-DBUILD_TESTING=OFF -DBUILD_QT5=OFF" # XXX: Add package for qt5
 hostmakedepends="extra-cmake-modules pkg-config qt6-base qt6-tools gettext"
 makedepends="kf6-kio-devel kf6-kxmlgui-devel kf6-kstatusnotifieritem-devel
  kwayland-devel libXcursor-devel breeze"
-depends="noto-fonts-ttf font-hack-ttf breeze qqc2-desktop-style"
+depends="noto-fonts-ttf font-hack-ttf breeze kf6-qqc2-desktop-style"
 short_desc="Theme integration plugins for the Plasma workspaces"
 maintainer="John <[email protected]>"
 license="LGPL-2.0-or-later"

Luciogi avatar Mar 07 '24 18:03 Luciogi

plasma-workspace

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 04e21fd2412..34b0911ec50 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DKF6_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config gettext
  qt6-base qt6-tools SPIRV-Tools"
 makedepends="qt6-declarative-devel libplasma-devel

Luciogi avatar Mar 07 '24 18:03 Luciogi

refreshed build depends kdeplasma-addons

diff --git a/srcpkgs/kdeplasma-addons/template b/srcpkgs/kdeplasma-addons/template
index 101d6c64216..3c408c81344 100644
--- a/srcpkgs/kdeplasma-addons/template
+++ b/srcpkgs/kdeplasma-addons/template
@@ -4,10 +4,12 @@ version=6.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules qt6-tools pkg-config
- kf6-kpackage-devel kf6-kconfig-devel kf6-kcoreaddons-devel kf6-kcmutils-devel gettext"
-makedepends="kross-devel kdesignerplugin-devel kf6-kdoctools-devel kf6-kholidays-devel
- plasma-workspace-devel kf6-purpose-devel NetworkManager-devel"
+hostmakedepends="extra-cmake-modules qt6-tools pkg-config gettext"
+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 <[email protected]>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

Luciogi avatar Mar 08 '24 13:03 Luciogi

refreshed depends of kgamma

diff --git a/srcpkgs/kgamma/template b/srcpkgs/kgamma/template
index e8d1d4d4d20..9caea4b3549 100644
--- a/srcpkgs/kgamma/template
+++ b/srcpkgs/kgamma/template
@@ -6,8 +6,8 @@ build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext kf6-kcoreaddons 
  kf6-kdoctools qt6-tools"
-makedepends="kdesignerplugin-devel kf6-kdoctools-devel
- libXxf86vm-devel"
+makedepends="kf6-kdoctools-devel libXxf86vm-devel libplasma-devel
+ kf6-kcmutils-devel kf6-kconfigwidgets"
 short_desc="KDE gamma adjustiment app"
 maintainer="Luciogi <[email protected]>"
 license="GPL-2.0-or-later"

Luciogi avatar Mar 08 '24 13:03 Luciogi

refresh deps for kf6-purpose and plasma-browser-integration

diff --git a/srcpkgs/kf6-purpose/template b/srcpkgs/kf6-purpose/template
index 27e910831ca..6ff255378d4 100644
--- a/srcpkgs/kf6-purpose/template
+++ b/srcpkgs/kf6-purpose/template
@@ -8,7 +8,7 @@ hostmakedepends="extra-cmake-modules qt6-tools qt6-base
 # kaccounts-integration-devel
 makedepends="qt6-declarative-devel kf6-kcoreaddons-devel kf6-ki18n-devel
  kf6-kirigami-devel kf6-knotifications-devel kf6-kio-devel"
-depends="qt6-accounts-qml-module kaccounts-providers"
+depends="qt6-accounts-qml-module"
 short_desc="Offers available actions for a specific purpose"
 maintainer="John <[email protected]>"
 license="LGPL-2.1-or-later"
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 0c045714c91..e3bc2a856fc 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -5,9 +5,11 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-hostmakedepends="extra-cmake-modules pkg-config kpackage gettext"
-makedepends="kf6-kio-devel kf6-ki18n-devel krunner-devel
- plasma-workspace-devel kf6-purpose-devel kf6-kfilemetadata-devel"
+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 <[email protected]>"
 license="GPL-3.0-or-later"

Luciogi avatar Mar 08 '24 14:03 Luciogi

fix conflicting dep in plasma-desktop

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 3febd625a27..2d573f2352d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -12,7 +12,7 @@ hostmakedepends="extra-cmake-modules pkg-config kf6-kcoreaddons kf6-kdoctools
 makedepends="ibus-devel plasma-activities-stats-devel kf6-kpeople-devel libcanberra-devel
  plasma-workspace-devel pulseaudio-devel xf86-input-evdev-devel
  xf86-input-synaptics-devel xf86-input-libinput-devel kf6-solid-devel
- kaccounts-integration-devel libaccounts-qt5-devel"
+ libaccounts-qt6-devel"
 depends="kmenuedit polkit-kde-agent powerdevil systemsettings
  accountsservice ksystemstats"
 short_desc="KDE Plasma Desktop"

Luciogi avatar Mar 08 '24 14:03 Luciogi

oxygen-qt6 fix building

diff --git a/srcpkgs/oxygen-qt6/template b/srcpkgs/oxygen-qt6/template
index dd62481f90c..6bed11b36a7 100644
--- a/srcpkgs/oxygen-qt6/template
+++ b/srcpkgs/oxygen-qt6/template
@@ -4,7 +4,7 @@ version=6.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DBUILD_QT5=OFF"
-hostmakedepends="extra-cmake-modules pkg-config qt6-base qt6-tools"
+hostmakedepends="extra-cmake-modules pkg-config qt6-base qt6-tools gettext"
 makedepends="kdecoration-devel kf6-frameworkintegration-devel kf6-kcmutils-devel
  libplasma-devel"
 short_desc="Oxygen visual style for the Plasma Desktop"

Luciogi avatar Mar 08 '24 15:03 Luciogi

https://github.com/Luciogi/void-packages/tree/temp-plasma6 this branch build kf6 and plasma6 without any conflicts

Luciogi avatar Mar 08 '24 15:03 Luciogi

  • [ ] libksysguard update will broke latte-dock

Luciogi avatar Mar 09 '24 09:03 Luciogi

@Luciogi re:kf6-kwallet, nothing should be removed from it, ideally, kwallet will be removed eventually, if kwallet needs anything in common, it should depends on kf6-kwallet.

sgn avatar Mar 10 '24 02:03 sgn

@Luciogi re:kf6-kwallet, nothing should be removed from it, ideally, kwallet will be removed eventually, if kwallet needs anything in common, it should depends on kf6-kwallet.

/usr/share/dbus-1/services/org.kde.kwalletd6.service is already available in kf6-kwallet

Luciogi avatar Mar 10 '24 05:03 Luciogi

@Luciogi re:kf6-kwallet, nothing should be removed from it, ideally, kwallet will be removed eventually, if kwallet needs anything in common, it should depends on kf6-kwallet.

/usr/share/dbus-1/services/org.kde.kwalletd6.service is already available in kf6-kwallet

I think the intention is kf6-kwallet will be invoked even if the caller call org.kde.kwalletd5

sgn avatar Mar 10 '24 07:03 sgn

What sgn is saying.

Some conflicts have to be added in templates to make sure that xbps does not allow partial updates. (They will also be needed for all the other framework packages that had files moved from kf5 to kf6 packages)

Johnnynator avatar Mar 10 '24 12:03 Johnnynator

What sgn is saying.

Some conflicts have to be added in templates to make sure that xbps does not allow partial updates. (They will also be needed for all the other framework packages that had files moved from kf5 to kf6 packages)

I have added this task on todo list

Luciogi avatar Mar 14 '24 17:03 Luciogi