From 675bafe00bc40cb7108d19121e2bd8f88fdd7b18 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 3 Mar 2024 19:20:55 +0100 Subject: [PATCH 01/72] kdecoration: update to 6.0.4 --- common/shlibs | 4 ++-- srcpkgs/kdecoration/template | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index 75e1249abcb264..e9edc287a9bcb3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -948,8 +948,8 @@ liblilv-0.so.0 liblilv-0.14.4_1 libsuil-0.so.0 suil-0.6.4_1 libmcpp.so.0 libmcpp-2.7.2_1 libjitterentropy.so.3 jitterentropy-3.0.0_1 -libkdecorations2.so.5 kdecoration-5.8.4_1 -libkdecorations2private.so.10 kdecoration-5.26.90_1 +libkdecorations2.so.6 kdecoration-6.0.0_1 +libkdecorations2private.so.11 kdecoration-6.0.0_1 libGlacier2.so.37 libIce-3.7.5_2 libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_2 libIce.so.37 libIce-3.7.5_2 diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template index 24753c6b8a4a52..db17ae46272712 100644 --- a/srcpkgs/kdecoration/template +++ b/srcpkgs/kdecoration/template @@ -1,18 +1,17 @@ # Template file for 'kdecoration' pkgname=kdecoration -version=5.27.11 +version=6.0.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-devel - kcoreaddons" -makedepends="qt5-devel ki18n-devel kcoreaddons-devel" +hostmakedepends="extra-cmake-modules gettext qt6-base qt6-tools" +makedepends="kf6-ki18n-devel kf6-kcoreaddons-devel" short_desc="KDE Plugin based library to create window decorations" maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kdecoration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=71c417461993923a2245b6f954ff72fb1737bc10db218ca9595194017cf1f838 +checksum=0fe53f1632f3fa86bc4d3e843efc9216b2a257020a7e55ab579f56b9e45bd57e kdecoration-devel_package() { short_desc+=" - development" @@ -20,6 +19,6 @@ kdecoration-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake - vmove usr/lib/*.so + vmove "usr/lib/*.so" } } From ada63e929d7d5049bd79042f223d018f1cf7bb03 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 3 Mar 2024 19:28:55 +0100 Subject: [PATCH 02/72] breeze: trun into metapackage --- srcpkgs/breeze-snow-cursor-theme | 1 - srcpkgs/breeze/template | 26 ++++---------------------- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 120000 srcpkgs/breeze-snow-cursor-theme diff --git a/srcpkgs/breeze-snow-cursor-theme b/srcpkgs/breeze-snow-cursor-theme deleted file mode 120000 index 3f3f5dad78c833..00000000000000 --- a/srcpkgs/breeze-snow-cursor-theme +++ /dev/null @@ -1 +0,0 @@ -breeze \ No newline at end of file diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template index 17c818d8a23e74..dfcd28fc098885 100644 --- a/srcpkgs/breeze/template +++ b/srcpkgs/breeze/template @@ -1,28 +1,10 @@ # Template file for 'breeze' pkgname=breeze -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 - gettext kcmutils-devel kpackage-devel kconfig-devel kcoreaddons-devel" -makedepends="frameworkintegration-devel kcmutils-devel kdecoration-devel - fftw-devel plasma-framework-devel" -depends="breeze-icons frameworkintegration breeze-snow-cursor-theme" +build_style=meta +depends="breeze-icons breeze-qt5 breeze-qt6" short_desc="Breeze visual style for the Plasma Desktop" maintainer="John " -license="GPL-2.0-or-later" +license="Public Domain" homepage="https://invent.kde.org/plasma/breeze" -distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=14756a2fe5bc3db11ca954ff0df9b98e8d78ada4b231111780c42ee627dd4cab - -if [ "$CROSS_BUILD" ]; then - configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake" -fi - -breeze-snow-cursor-theme_package() { - short_desc="Breeze Snow cursor theme" - pkg_install() { - vmove usr/share/icons/Breeze_Snow - } -} From e50e413902b4b33f09bb4c65467c25ce70ba0782 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 3 Mar 2024 19:29:27 +0100 Subject: [PATCH 03/72] New package: breeze-qt5-6.0.4 --- srcpkgs/breeze-qt5/template | 25 +++++++++++++++++++++++++ srcpkgs/breeze-qt5/update | 1 + 2 files changed, 26 insertions(+) create mode 100644 srcpkgs/breeze-qt5/template create mode 100644 srcpkgs/breeze-qt5/update diff --git a/srcpkgs/breeze-qt5/template b/srcpkgs/breeze-qt5/template new file mode 100644 index 00000000000000..2b49309adf9eab --- /dev/null +++ b/srcpkgs/breeze-qt5/template @@ -0,0 +1,25 @@ +# Template file for 'breeze-qt5' +pkgname=breeze-qt5 +version=6.0.4 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF -DBUILD_QT6=OFF" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools + gettext kcmutils-devel kpackage-devel kconfig-devel kcoreaddons-devel" +makedepends="frameworkintegration-devel kcmutils-devel fftw-devel plasma-framework-devel" +depends="breeze-icons frameworkintegration" +short_desc="Breeze visual style for the Plasma Desktop" +maintainer="John " +license="GPL-2.0-or-later" +homepage="https://invent.kde.org/plasma/breeze" +distfiles="${KDE_SITE}/plasma/${version}/${pkgname%-qt5}-${version}.tar.xz" +checksum=911979889191395c333219e09090208c658f943b9953e420fc629242fd5e5c76 +conflicts="breeze<6.0.0_1" + +if [ "$CROSS_BUILD" ]; then + configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake" +fi + +post_install() { + rm -rf ${DESTDIR}/usr/share +} diff --git a/srcpkgs/breeze-qt5/update b/srcpkgs/breeze-qt5/update new file mode 100644 index 00000000000000..ca038400e5797e --- /dev/null +++ b/srcpkgs/breeze-qt5/update @@ -0,0 +1 @@ +pkgname=${pkgname%-qt5} From 60fc6ac5970b90b837cb6cc3a69651651eb6ba91 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 3 Mar 2024 19:29:40 +0100 Subject: [PATCH 04/72] New package: breeze-qt6-6.0.4 --- srcpkgs/breeze-qt6/template | 23 +++++++++++++++++++++++ srcpkgs/breeze-qt6/update | 1 + 2 files changed, 24 insertions(+) create mode 100644 srcpkgs/breeze-qt6/template create mode 100644 srcpkgs/breeze-qt6/update diff --git a/srcpkgs/breeze-qt6/template b/srcpkgs/breeze-qt6/template new file mode 100644 index 00000000000000..73c562b0e7ab69 --- /dev/null +++ b/srcpkgs/breeze-qt6/template @@ -0,0 +1,23 @@ +# Template file for 'breeze-qt6' +pkgname=breeze-qt6 +version=6.0.4 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF -DBUILD_QT5=OFF + -DKF6_HOST_TOOLING=/usr/lib/cmake" +hostmakedepends="extra-cmake-modules gettext qt6-base qt6-tools + kf6-kcmutils-devel" +makedepends="kf6-kcoreaddons-devel kf6-kcolorscheme-devel + kf6-kconfig-devel kf6-kguiaddons-devel kf6-ki18n-devel + kf6-kiconthemes-devel kf6-kwindowsystem-devel kf6-kcmutils-devel + kf6-kirigami-devel kf6-frameworkintegration-devel fftw-devel + kdecoration-devel" +depends="breeze-icons kf6-frameworkintegration" +short_desc="Breeze visual style for the Plasma Desktop" +maintainer="John " +license="GPL-2.0-or-later" +homepage="https://invent.kde.org/plasma/breeze" +distfiles="${KDE_SITE}/plasma/${version}/${pkgname%-qt6}-${version}.tar.xz" +checksum=911979889191395c333219e09090208c658f943b9953e420fc629242fd5e5c76 +conflicts="breeze<6.0.0_1" +replaces="breeze-snow-cursor-theme>=0" diff --git a/srcpkgs/breeze-qt6/update b/srcpkgs/breeze-qt6/update new file mode 100644 index 00000000000000..e9586b55475ec7 --- /dev/null +++ b/srcpkgs/breeze-qt6/update @@ -0,0 +1 @@ +pkgname=${pkgname%-qt6} From 4fae0b4025825dcb17c018239b7396ba88ead6e9 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:24:43 +0100 Subject: [PATCH 05/72] New package: oxygen-qt5-6.0.4 --- srcpkgs/oxygen-qt5/template | 19 +++++++++++++++++++ srcpkgs/oxygen-qt5/update | 1 + 2 files changed, 20 insertions(+) create mode 100644 srcpkgs/oxygen-qt5/template create mode 100644 srcpkgs/oxygen-qt5/update diff --git a/srcpkgs/oxygen-qt5/template b/srcpkgs/oxygen-qt5/template new file mode 100644 index 00000000000000..e985f4a6b95829 --- /dev/null +++ b/srcpkgs/oxygen-qt5/template @@ -0,0 +1,19 @@ +# Template file for 'oxygen-qt5' +pkgname=oxygen-qt5 +version=6.0.4 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF -DBUILD_QT6=OFF" +hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake kconfig + gettext kcoreaddons" +makedepends="frameworkintegration-devel kwayland-devel kcmutils-devel kdoctools" +short_desc="Oxygen visual style for the Plasma Desktop" +maintainer="John " +license="LGPL-2.1-or-later, GPL-2.0-or-later" +homepage="https://invent.kde.org/plasma/oxygen" +distfiles="${KDE_SITE}/plasma/${version}/${pkgname%-qt5}-${version}.tar.xz" +checksum=9150e00989a72cff35bb46c5ac9af25cabcee4cc18299c8be707bee84c5e546f + +post_install() { + rm -rf ${DESTDIR}/usr/share +} diff --git a/srcpkgs/oxygen-qt5/update b/srcpkgs/oxygen-qt5/update new file mode 100644 index 00000000000000..ca038400e5797e --- /dev/null +++ b/srcpkgs/oxygen-qt5/update @@ -0,0 +1 @@ +pkgname=${pkgname%-qt5} From e104ec28e44ff08bceeff65883964f7522ea6c45 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:34:18 +0100 Subject: [PATCH 06/72] oxygen: update to 6.0.4 --- srcpkgs/oxygen/template | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template index 7876532c5f8926..80cd7dc80b08e4 100644 --- a/srcpkgs/oxygen/template +++ b/srcpkgs/oxygen/template @@ -1,16 +1,10 @@ # Template file for 'oxygen' pkgname=oxygen -version=5.27.11 +version=6.0.4 revision=1 -build_style=cmake -configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake kconfig - gettext kcoreaddons" -makedepends="kdecoration-devel frameworkintegration-devel kwayland-devel - kcmutils-devel kdoctools" +build_style=meta +depends="oxygen-qt5 oxygen-qt6" short_desc="Oxygen visual style for the Plasma Desktop" maintainer="John " -license="LGPL-2.1-or-later, GPL-2.0-or-later" +license="Public Domain" homepage="https://invent.kde.org/plasma/oxygen" -distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ba2f47033bd78b7c9f1bbda1faefca530453965999b4d7fad85b1ddd08b4f570 From 6e07f3bce2dca8286e3d9c5d15446c9ab4cfe812 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:34:23 +0100 Subject: [PATCH 07/72] New package: oxygen-qt6-6.0.4 --- srcpkgs/oxygen-qt6/template | 16 ++++++++++++++++ srcpkgs/oxygen-qt6/update | 1 + 2 files changed, 17 insertions(+) create mode 100644 srcpkgs/oxygen-qt6/template create mode 100644 srcpkgs/oxygen-qt6/update diff --git a/srcpkgs/oxygen-qt6/template b/srcpkgs/oxygen-qt6/template new file mode 100644 index 00000000000000..a6a6a5d2588431 --- /dev/null +++ b/srcpkgs/oxygen-qt6/template @@ -0,0 +1,16 @@ +# Template file for 'oxygen-qt6' +pkgname=oxygen-qt6 +version=6.0.4 +revision=1 +build_style=cmake +build_helper=qemu +configure_args="-DBUILD_TESTING=OFF -DBUILD_QT5=OFF" +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" +maintainer="John " +license="LGPL-2.1-or-later, GPL-2.0-or-later" +homepage="https://invent.kde.org/plasma/oxygen" +distfiles="${KDE_SITE}/plasma/${version}/${pkgname%-qt6}-${version}.tar.xz" +checksum=9150e00989a72cff35bb46c5ac9af25cabcee4cc18299c8be707bee84c5e546f diff --git a/srcpkgs/oxygen-qt6/update b/srcpkgs/oxygen-qt6/update new file mode 100644 index 00000000000000..e9586b55475ec7 --- /dev/null +++ b/srcpkgs/oxygen-qt6/update @@ -0,0 +1 @@ +pkgname=${pkgname%-qt6} From ae192bf0b45f716ca61384b5c148d796ba1670e4 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:17 +0100 Subject: [PATCH 08/72] plasma-sdk: update to 6.0.4 --- srcpkgs/plasma-sdk/template | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template index ee0ab9848fef9f..38a268104cf8bc 100644 --- a/srcpkgs/plasma-sdk/template +++ b/srcpkgs/plasma-sdk/template @@ -1,16 +1,19 @@ # Template file for 'plasma-sdk' pkgname=plasma-sdk -version=5.27.11.1 +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-qmake qt5-host-tools - gettext kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" -makedepends="plasma-framework-devel kdelibs4support-devel kdesignerplugin-devel - kitemmodels-devel knewstuff-devel ktexteditor-devel kdoctools-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 kf6-kdoctools + kf6-kconfig kf6-kpackage qt6-declarative-host-tools" +makedepends="kf6-kitemmodels-devel kf6-knewstuff-devel kf6-ktexteditor-devel + kf6-ksvg-devel libplasma-devel plasma5support-devel kf6-kdoctools-devel + kf6-kconfig-devel qt6-declarative-devel" short_desc="Plasma development applications" maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-sdk" -distfiles="${KDE_SITE}/plasma/${version%.1}/${pkgname}-${version}.tar.xz" -checksum=90a2a18b699a374362f870b22685d4ed3d5e00fe7fa27b768fd2e626361e0744 +distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" +checksum=6ba2ce4bd40b7554ef32ec37543fb6268cc3cb1f160d999f4cf0968dfd55b1e8 From b10cf18322e956696dd2f4d32e87183d20ed866c Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:34 +0100 Subject: [PATCH 09/72] bluedevil: update to 6.0.4 --- srcpkgs/bluedevil/template | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template index 6573239409b8e6..69d917e7bb02e4 100644 --- a/srcpkgs/bluedevil/template +++ b/srcpkgs/bluedevil/template @@ -1,17 +1,21 @@ # Template file for 'bluedevil' pkgname=bluedevil -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-qmake qt5-host-tools - kpackage-devel kconfig-devel kcoreaddons-devel gettext - kcmutils-devel" -makedepends="bluez-qt5-devel kded-devel kio-devel plasma-framework-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-bluez-qt-devel kf6-kded-devel kf6-kio-devel kf6-kcmutils-devel + kf6-ksvg-devel kf6-kpackage-devel libplasma-devel" short_desc="KDE Bluetooth integration" maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/bluedevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=b4d5a8bfd066d66a4572732fd41ad3b8aad0428e899582d381e0ac6642bd6484 +checksum=8c5616df3feb23c0b663beda3af09a62f6673db0ffe8ac8b38988b34d50f7e8c + +if [ $CROSS_BUILD ]; then + hostmakedepends+=" kf6-kcmutils-devel kf6-kpackage-devel" +fi From 86f47e7b00abb1db2f74f042ba589d557a799185 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:36 +0100 Subject: [PATCH 10/72] breeze-gtk: update to 6.0.4 --- srcpkgs/breeze-gtk/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template index 27eadf54f68733..006d15cd6df58d 100644 --- a/srcpkgs/breeze-gtk/template +++ b/srcpkgs/breeze-gtk/template @@ -1,13 +1,14 @@ # Template file for 'breeze-gtk' pkgname=breeze-gtk -version=5.27.11 +version=6.0.4.1 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules sassc python3 python3-cairo qt5-devel" -makedepends="qt5-devel breeze" +hostmakedepends="extra-cmake-modules sassc python3 python3-cairo + qt6-base qt6-tools" +makedepends="qt6-base-devel libplasma-devel breeze-qt6" short_desc="GTK Theme Built to Match KDE's Breeze" maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/breeze-gtk" -distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=dcbdd3bf87404dfeb5b05e220d0a8dd5b4168c7d4ce7650679f28c5accf67fee +distfiles="${KDE_SITE}/plasma/${version%.1}/${pkgname}-${version}.tar.xz" +checksum=4078e5c140d6a01ab6591833f9b342dab4dff2b5321d85c94d7d4a2d24fa8b62 From a2073c3b6671e3f77ee3fb14bae14f44807a2fe5 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:38 +0100 Subject: [PATCH 11/72] flatpak-kcm: update to 6.0.4 --- srcpkgs/flatpak-kcm/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/flatpak-kcm/template b/srcpkgs/flatpak-kcm/template index 47a3c8045d4cbe..67a8850f3b7217 100644 --- a/srcpkgs/flatpak-kcm/template +++ b/srcpkgs/flatpak-kcm/template @@ -1,16 +1,16 @@ # Template file for 'flatpak-kcm' pkgname=flatpak-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 - gettext kconfig-devel kcmutils-devel" -makedepends="flatpak-devel kcmutils-devel kdeclarative-devel - ki18n-devel kconfig-devel kitemmodels-devel" +configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake" +hostmakedepends="extra-cmake-modules pkg-config qt6-base gettext + kf6-kconfig kf6-kcmutils kf6-kpackage" +makedepends="flatpak-devel kf6-kcmutils-devel kf6-kdeclarative-devel + kf6-ki18n-devel kf6-kconfig-devel kf6-kitemmodels-devel polkit-devel" short_desc="KDE Config Module for Flatpak Permissions" maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/flatpak-kcm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=972c442b9447c072fb61496b39b8ed22949237ab823b44660a935de8d2ecdf4a +checksum=39c5a1cbbb12baca8014b72c70df01647cabb62c7d04c26fcea11f891489584d From da7aef77ed1c4841e9699a4ad0ad3a4145b70768 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:40 +0100 Subject: [PATCH 12/72] kactivitymanagerd: update to 6.0.4 --- srcpkgs/kactivitymanagerd/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template index 0cb98780e506cc..7ede65b90db4ea 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" +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 " 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 fcb0920c4ae4c06b5d875a0df51f2275418c0557 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:41 +0100 Subject: [PATCH 13/72] kde-cli-tools: update to 6.0.4 --- srcpkgs/kde-cli-tools/template | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template index 4a1d3e8cfcb4b8..781cb7feb41a3e 100644 --- a/srcpkgs/kde-cli-tools/template +++ b/srcpkgs/kde-cli-tools/template @@ -1,20 +1,24 @@ # 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" +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 " 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 291a2f88f024578e85101e95d75e053d20107ed1 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:43 +0100 Subject: [PATCH 14/72] kde-gtk-config5: update to 6.0.4 --- srcpkgs/kde-gtk-config5/template | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template index 83e6402da6ff99..17869cb3c97979 100644 --- a/srcpkgs/kde-gtk-config5/template +++ b/srcpkgs/kde-gtk-config5/template @@ -1,12 +1,12 @@ # Template file for 'kde-gtk-config5' pkgname=kde-gtk-config5 -version=5.27.11 +version=6.0.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools +hostmakedepends="extra-cmake-modules pkg-config qt6-base qt6-tools sassc gettext" -makedepends="kcmutils-devel knewstuff-devel gtk+-devel gtk+3-devel +makedepends="kf6-kcmutils-devel kf6-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" @@ -14,9 +14,4 @@ maintainer="John " 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 +checksum=884570500ced842f1e1c545edf6fdd5036673f83a7188644f8b9f761e2682f7e From 2b796291e75a38abb70a93189d14c7d889321904 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:45 +0100 Subject: [PATCH 15/72] kdeplasma-addons5: update to 6.0.4 --- srcpkgs/kdeplasma-addons5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template index 1f46281d8c6112..657328849cf67c 100644 --- a/srcpkgs/kdeplasma-addons5/template +++ b/srcpkgs/kdeplasma-addons5/template @@ -1,6 +1,6 @@ # Template file for 'kdeplasma-addons5' pkgname=kdeplasma-addons5 -version=5.27.11 +version=6.0.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake" @@ -13,4 +13,4 @@ maintainer="John " 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 +checksum=5a5e0bfcfb40d57a5ebb9fed5d238c642d18e7ed2d6ddbb1240b61c598bb0200 From 3104d18cb75ccc4b32048f51bb15bd8d6c6bf9e8 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:48 +0100 Subject: [PATCH 16/72] kinfocenter: update to 6.0.4 --- srcpkgs/kinfocenter/template | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template index e830265e8c2aaa..6be40fc969bd01 100644 --- a/srcpkgs/kinfocenter/template +++ b/srcpkgs/kinfocenter/template @@ -1,19 +1,18 @@ # 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" +hostmakedepends="extra-cmake-modules gettext pkg-config qt6-tools qt6-base + kf6-kdoctools kf6-kpackage-devel kf6-kcmutils-devel" +makedepends="libplasma-devel kf6-kcmutils-devel + kwayland-devel glu-devel pciutils-devel libraw1394-devel kf6-solid-devel" depends="hwids" short_desc="KDE Info Center" maintainer="John " 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 627e1fa8d9c96a50750d0ad31c127fcf9b169cb6 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:49 +0100 Subject: [PATCH 17/72] 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 " 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 6ded885fbf37bf3b618b52adc1b47d8f24d0ed8d Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:51 +0100 Subject: [PATCH 18/72] 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 e9edc287a9bcb3..63be291dcdc243 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1568,9 +1568,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..62d731798a8d77 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 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 " 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 7ec9f33d54391f84edb534101ca77788b94e3c4e Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:53 +0100 Subject: [PATCH 19/72] kscreen: update to 6.0.4 --- srcpkgs/kscreen/template | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template index 137f948e7a9dc2..75ddb44aa9c6f9 100644 --- a/srcpkgs/kscreen/template +++ b/srcpkgs/kscreen/template @@ -1,17 +1,22 @@ # 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" +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 " 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 0d5f71c24e53d987512c85c3bef451803ca4549f Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:54 +0100 Subject: [PATCH 20/72] kscreenlocker: update to 6.0.4 --- common/shlibs | 2 +- srcpkgs/kscreenlocker/template | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index 63be291dcdc243..3f14f8d2197dc9 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..0cff86893f93bd 100644 --- a/srcpkgs/kscreenlocker/template +++ b/srcpkgs/kscreenlocker/template @@ -1,27 +1,28 @@ # 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" +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 " 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 d5a289c010956a92ca71c2bc8f7f597db4f24485 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:58 +0100 Subject: [PATCH 21/72] ksystemstats: update to 6.0.4 --- srcpkgs/ksystemstats/template | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template index 63e5d8b885bb0a..a63a2ea1b41383 100644 --- a/srcpkgs/ksystemstats/template +++ b/srcpkgs/ksystemstats/template @@ -1,15 +1,19 @@ # 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" +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 " -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 2433549b4e096e7035bc7de1c113cc852bf85b9a Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:36:59 +0100 Subject: [PATCH 22/72] kwayland-integration: update to 6.0.4 --- srcpkgs/kwayland-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template index 036da2c8ae095c..fb02df3064c18e 100644 --- a/srcpkgs/kwayland-integration/template +++ b/srcpkgs/kwayland-integration/template @@ -1,6 +1,6 @@ # 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" @@ -13,4 +13,4 @@ maintainer="John " 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 5dc14675db6b79249916445d1fb39384b70eb679 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:02 +0100 Subject: [PATCH 23/72] kwin: update to 6.0.4 --- srcpkgs/kwin/patches/cross.patch | 10 +++++----- srcpkgs/kwin/template | 29 ++++++++++++++++------------- 2 files changed, 21 insertions(+), 18 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..0ceb46cd456833 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -1,29 +1,32 @@ # 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 + -DKF6_HOST_TOOLING=/usr/lib/cmake" +hostmakedepends="extra-cmake-modules gettext pkg-config + qt6-base qt6-tools libcap-progs" +makedepends="libplasma-devel kf6-kcmutils-devel kf6-knewstuff-devel + kscreenlocker-devel kglobalacceld-devel xcb-util-cursor-devel qt6-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" + 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 kwayland-devel libcap-devel libqaccessibilityclient-devel qt6-declarative-devel kf6-kirigami-devel kf6-kpackage-devel" +depends="breeze hicolor-icon-theme kglobalacceld hwids libcap-progs" short_desc="KDE Window manager" maintainer="John " 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-kpackage-devel kf6-kirigami-devel kf6-kcmutils-devel libcap-devel" +fi + kwin-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}-${version}_${revision}" From 41b16c2666c524c9d4d48c376ba4054b32673f13 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:04 +0100 Subject: [PATCH 24/72] kwrited: update to 6.0.4 --- srcpkgs/kwrited/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template index dd62bf234a17d1..5cd699575cb6d1 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" +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 " 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 2cee7e26e79ebe5ec3a3b038313bff54febe320f Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:06 +0100 Subject: [PATCH 25/72] 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 3f14f8d2197dc9..6484bbea608e95 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2262,7 +2262,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 " 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 8ddf19f8d1d32c84eb6ca346a35b985549716225 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:09 +0100 Subject: [PATCH 26/72] 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 6484bbea608e95..241b6f0b329c11 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 " 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 9b1f702dc521649b07568e8acf1bca27dc8b54aa Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:11 +0100 Subject: [PATCH 27/72] milou: update to 6.0.4 --- srcpkgs/milou/template | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template index 29925b84582034..2c32f13e573b7c 100644 --- a/srcpkgs/milou/template +++ b/srcpkgs/milou/template @@ -1,20 +1,16 @@ # Template file for 'milou' pkgname=milou -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 kdoctools kpackage qt5-host-tools - gettext qt5-qmake" -makedepends="krunner-devel kitemmodels-devel" +hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext" +makedepends="kf6-krunner-devel kf6-kitemmodels-devel kf6-ksvg-devel + kf6-kpackage-devel kf6-kwindowsystem-devel libplasma-devel" short_desc="KDE dedicated search application built on top of Baloo" maintainer="John " -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 deebe0879d37142e604e075455906a0b17020a24 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:13 +0100 Subject: [PATCH 28/72] oxygen-sounds: update to 6.0.4 --- srcpkgs/oxygen-sounds/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oxygen-sounds/template b/srcpkgs/oxygen-sounds/template index 66407b0ccb2696..39d805c4f1cda7 100644 --- a/srcpkgs/oxygen-sounds/template +++ b/srcpkgs/oxygen-sounds/template @@ -1,6 +1,6 @@ # Template file for 'oxygen-sounds' pkgname=oxygen-sounds -version=5.27.11 +version=6.0.4 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules" @@ -9,4 +9,4 @@ maintainer="John " license="LGPL-3.0-or-later" homepage="https://invent.kde.org/plasma/oxygen-sounds" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=6fa249c55a51941e023b982e20279e594279e216c53e065a928de6b4089df1de +checksum=e29fbe85304132aaeb9d65419e2e70f43c8def0ce4707819509d7540191ca319 From d3a9b9960a8c8bc698a14c791199a39f88ebe222 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:14 +0100 Subject: [PATCH 29/72] plasma-browser-integration: update to 6.0.4 --- srcpkgs/plasma-browser-integration/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template index fd54a756768696..35181b64dbe488 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" +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 " 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 5ec53097a6cd17675c8353f34da9c540051b5400 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:18 +0100 Subject: [PATCH 30/72] 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..6149dccdc24936 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" +hostmakedepends="extra-cmake-modules pkg-config intltool gettext qt6-base + qt6-tools wayland-protocols plasma-wayland-protocols kf6-kdoctools + kf6-kconfig" +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 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" short_desc="KDE Plasma Desktop" maintainer="John " 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-kcmutils-devel kf6-kpackage-devel + kf6-kirigami-devel kirigami-addons-devel kf6-qqc2-desktop-style-devel" +fi From 05a6d63c4d9ce09c72517fa8ff8656b79c1fa08d Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:20 +0100 Subject: [PATCH 31/72] plasma-disks: update to 6.0.4 --- srcpkgs/plasma-disks/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template index fd65c890a2feee..67c087da1c3c5e 100644 --- a/srcpkgs/plasma-disks/template +++ b/srcpkgs/plasma-disks/template @@ -1,16 +1,16 @@ # Template file for 'plasma-disks' pkgname=plasma-disks -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 qt5-qmake qt5-host-tools - kpackage gettext kcoreaddons kauth" -makedepends="plasma-framework-devel" +hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext" +makedepends="qt6-base-devel libplasma-devel" depends="smartmontools" short_desc="Hard disk health monitoring for KDE Plasma" maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-disks" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=98d074f772c71cbd06440cfb495e4ef3a559583e6981d431831a1eb80ca941cb +checksum=fd2f5d2303c3146eca2ef07514f2d02000a37ed899a1f9d17ff0367f87cd4fc0 From f5b9a74781e80cec3357a40b19384cba52c3f4b2 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:22 +0100 Subject: [PATCH 32/72] plasma-firewall: update to 6.0.4 --- srcpkgs/plasma-firewall/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template index e908ba7d637960..5ac35907831d6b 100644 --- a/srcpkgs/plasma-firewall/template +++ b/srcpkgs/plasma-firewall/template @@ -1,15 +1,15 @@ # Template file for 'plasma-firewall' pkgname=plasma-firewall -version=5.27.11 +version=6.0.4 revision=1 build_style=cmake -configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake" -hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools - kcmutils-devel kauth-devel kcoreaddons-devel gettext" -makedepends="kcmutils-devel plasma-framework-devel" +build_helper=qemu +configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake" +hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext" +makedepends="kf6-kcmutils-devel libplasma-devel plasma5support-devel" short_desc="Control Panel for ufw (Uncomplicated Firewall)" maintainer="John " -license="GPL-2.0-only OR GPL-3.0-only" +license="GPL-2.0-only, GPL-3.0-only" homepage="https://invent.kde.org/network/plasma-firewall" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=34cee9fdf4916bc51957bd223c70d7d6c59a7d0e89cbaa398233273d9320c105 +checksum=bd2f17ee45a5cf708e3172863e67177d946da9b124ae10fb625f8d3ef01243ae From 0ecd89c7ed4d7f8865ff6119752506bf2c31c71a Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:25 +0100 Subject: [PATCH 33/72] plasma-nm: update to 6.0.4 --- srcpkgs/plasma-nm/template | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template index 2f079dfc31d676..5173f4b1aa6b61 100644 --- a/srcpkgs/plasma-nm/template +++ b/srcpkgs/plasma-nm/template @@ -1,19 +1,32 @@ # Template file for 'plasma-nm' pkgname=plasma-nm -version=5.27.11 +version=6.0.4 revision=1 build_style=cmake -configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake" +build_helper=qemu +configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake + $(vopt_bool openconnect BUILD_OPENCONNECT)" hostmakedepends="extra-cmake-modules mobile-broadband-provider-info pkg-config - gettext qt5-qmake qt5-host-tools kpackage-devel kconfig-devel - kcoreaddons-devel plasma-framework kcmutils-devel" -makedepends="plasma-workspace-devel networkmanager-qt5-devel kdelibs4support-devel - kdesignerplugin-devel qca-qt5-devel modemmanager-qt5-devel kdoctools-devel - openconnect-devel ksolid-devel" + gettext qt6-base qt6-tools kf6-kdoctools" +makedepends="plasma-workspace-devel kf6-networkmanager-qt-devel + qca-qt6-devel kf6-modemmanager-qt-devel kf6-solid-devel kf6-kdoctools-devel + qcoro-qt6-devel $(vopt_if openconnect 'openconnect-devel qt6-webengine-devel')" depends="mobile-broadband-provider-info" short_desc="NetworkManager Plasma applet" maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-nm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ff6a819de2d48e17860d822b048de7157561742c067eb85a6dafa76e255e9e56 +checksum=64519d9d05fcb4f85c7b9c4708cc6f510e28fdc272b6d0e2a7a1efc03888c6df + +build_options="openconnect" + +if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then + if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then + build_options_default="openconnect" + fi +fi + +if [ $CROSS_BUILD ]; then + hostmakedepends+=" kf6-kpackage-devel kf6-kcmutils-devel" +fi From 45327c967f1fc897bcb6a02d98618de6a23afd03 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:27 +0100 Subject: [PATCH 34/72] plasma-pa: update to 6.0.4 --- srcpkgs/plasma-pa/template | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template index 33fdfcc8fdae04..b8b6b58fefef1e 100644 --- a/srcpkgs/plasma-pa/template +++ b/srcpkgs/plasma-pa/template @@ -1,18 +1,22 @@ # Template file for 'plasma-pa' pkgname=plasma-pa -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 kdoctools pkg-config qt5-qmake - kpackage-devel kconfig-devel kcoreaddons-devel gettext qt5-host-tools - kcmutils-devel" -makedepends="plasma-framework-devel kdoctools-devel pulseaudio-devel - kcmutils-devel libcanberra-devel" -depends="sound-theme-freedesktop" +build_helper=qemu +configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake -Wno-dev" +hostmakedepends="extra-cmake-modules pkg-config qt6-base gettext qt6-tools" +makedepends="libplasma-devel kf6-kdeclarative-devel kf6-kstatusnotifieritem-devel + pulseaudio-devel libcanberra-devel" +depends="sound-theme-freedesktop kf6-kirigami kf6-kitemmodels" short_desc="PulseAudio Plasma applet" maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-pa" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=3daa671ea7163b69846b9c96ddf310e791a41f71ba0b6381adb0c5dbb9a720b3 +checksum=329ad1c326798459beab145eced43e6ee962378d95299c1a64f5a929eabda601 + +if [ $CROSS_BUILD ]; then + hostmakedepends+=" kf6-kconfig-devel kf6-kcoreaddons-devel kf6-kcmutils-devel + kf6-kpackage-devel" +fi From 9733e44f3799924e791ab0d372c61e4f36e537eb Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:29 +0100 Subject: [PATCH 35/72] plasma-systemmonitor: update to 6.0.4 --- srcpkgs/plasma-systemmonitor/template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template index 0ca1b4fc1193ba..694964c7e2271b 100644 --- a/srcpkgs/plasma-systemmonitor/template +++ b/srcpkgs/plasma-systemmonitor/template @@ -1,16 +1,18 @@ # 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 +hostmakedepends="extra-cmake-modules gettext qt6-base qt6-tools kf6-kpackage + kf6-kconfig kf6-kcoreaddons" +makedepends="kf6-kirigami-devel libksysguard-devel kf6-kitemmodels-devel + kf6-knewstuff-devel kf6-kio-devel kf6-kdbusaddons-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 " -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 0f999ce9520883fd10ea0460bede92842c7e864e Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:30 +0100 Subject: [PATCH 36/72] plasma-thunderbolt: update to 6.0.4 --- srcpkgs/plasma-thunderbolt/template | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template index 5bf772861df352..497b9f347060fd 100644 --- a/srcpkgs/plasma-thunderbolt/template +++ b/srcpkgs/plasma-thunderbolt/template @@ -1,19 +1,22 @@ # Template file for 'plasma-thunderbolt' pkgname=plasma-thunderbolt -version=5.27.11 +version=6.0.4 revision=1 build_style=cmake -configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake" -hostmakedepends="extra-cmake-modules kcoreaddons-devel - kcmutils-devel gettext qt5-host-tools qt5-qmake" -makedepends="kcmutils-devel" +configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake" +hostmakedepends="extra-cmake-modules gettext qt6-tools qt6-base" +makedepends="kf6-kcmutils-devel" depends="bolt" short_desc="Plasma integration for controlling Thunderbolt devices" maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/plasma-thunderbolt" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=5fe7c2d6338bcdb234eecb31296ccd49cc3746626ac41c7bc65d2e76ab5a89fb +checksum=5a9713769db40f94fd8a0ab5d08e5eaa190768df16dfe848b391a34831d8661e + +if [ $CROSS_BUILD ]; then + hostmakedepends+=" kf6-kconfig-devel kf6-kcmutils-devel" +fi do_check() { : # Requires running dbus and bolt services From 071897659e38d459eb326fa279dd44ddcfebfce5 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:32 +0100 Subject: [PATCH 37/72] plasma-vault: update to 6.0.4 --- srcpkgs/plasma-vault/template | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template index 85c1c2908a7ab9..1873a15331c832 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 +configure_args="-DKF6_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" +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 " 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 861dd3e45f3dd74f871508915029fa8318576f07 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:50 +0100 Subject: [PATCH 38/72] 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 " 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 a0632dc8f05ff76b70a6fb2ea2ecd96c547a2636 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:54 +0100 Subject: [PATCH 39/72] plasma-workspace: update to 6.0.4 --- common/shlibs | 2 +- srcpkgs/plasma-workspace/template | 42 ++++++++++++++++++------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/common/shlibs b/common/shlibs index 241b6f0b329c11..ce97aa39ed1de3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1337,7 +1337,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..f1bee35c19d507 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,46 +1,54 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace -version=5.27.11 +version=6.0.4 revision=1 build_style=cmake +build_helper=qemu configure_args="-DBUILD_TESTING=OFF -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)" + -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 + 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 " 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" +if [ $CROSS_BUILD ]; then + hostmakedepends+=" kf6-kcmutils-devel kf6-kconfig-devel kf6-kpackage-devel" +fi + if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then makedepends+=" libxcrypt-devel" 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 fe2993b9170ecc54c05f33d3a1749c70f8f7dd41 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:56 +0100 Subject: [PATCH 40/72] polkit-kde-agent: update to 6.0.4 --- srcpkgs/polkit-kde-agent/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template index c0b6db61e451cf..10f0d783322902 100644 --- a/srcpkgs/polkit-kde-agent/template +++ b/srcpkgs/polkit-kde-agent/template @@ -1,15 +1,14 @@ # Template file for 'polkit-kde-agent' pkgname=polkit-kde-agent -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 gettext kcoreaddons" -makedepends="kcrash-devel kdbusaddons-devel kiconthemes-devel kdoctools-devel - polkit-qt5-devel" +hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext" +makedepends="kf6-kcrash-devel kf6-kdbusaddons-devel kf6-kiconthemes-devel + kf6-kwindowsystem-devel polkit-qt6-devel" short_desc="KDE PolKit auth agent" maintainer="John " license="GPL-2.0-or-later" homepage="https://commits.kde.org/polkit-kde-agent" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz" -checksum=c9e908894f101940b9152132b53ee4a5ebf348374c09aec05cd2a14458be5c1b +checksum=e0fcbb8a1cfab8be69b2713b2105b0235137381f1fdb6d465c3978e6b8626b24 From 16d8fd7d558000d32c65a3846ade28b4fbc61bfc Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:37:58 +0100 Subject: [PATCH 41/72] powerdevil: update to 6.0.4 --- srcpkgs/powerdevil/template | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template index a26b70d873090d..a6f0ac10cb889a 100644 --- a/srcpkgs/powerdevil/template +++ b/srcpkgs/powerdevil/template @@ -1,16 +1,24 @@ # 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" +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 " 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 ef8265e7babf7c2414e1f3e0aa10d7bc5141be12 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:38:00 +0100 Subject: [PATCH 42/72] sddm-kcm: update to 6.0.4 --- srcpkgs/sddm-kcm/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template index 16c01a9c7bedeb..d7f65f59a449d1 100644 --- a/srcpkgs/sddm-kcm/template +++ b/srcpkgs/sddm-kcm/template @@ -1,17 +1,17 @@ # 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" +hostmakedepends="extra-cmake-modules pkg-config qt6-tools qt6-base gettext + kf6-kcmutils-devel" +makedepends="kf6-kio-devel xcb-util-image-devel libXcursor-devel + kf6-kcmutils-devel kf6-knewstuff-devel" depends="sddm" short_desc="KDE Config Module for SDDM" maintainer="John " 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 aa9189bae1d17097b11474a23efdd58b27815209 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:38:01 +0100 Subject: [PATCH 43/72] systemsettings: update to 6.0.4 --- srcpkgs/systemsettings/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template index e2fe8d63695552..d6982210c050ad 100644 --- a/srcpkgs/systemsettings/template +++ b/srcpkgs/systemsettings/template @@ -1,17 +1,18 @@ # Template file for 'systemsettings' pkgname=systemsettings -version=5.27.11 +version=6.0.4 revision=1 build_style=cmake +build_helper=qemu 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" +hostmakedepends="python3 qt6-base qt6-tools kf6-kcmutils + extra-cmake-modules gettext kf6-kdoctools" +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 " 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 b19f0ab3102d9e3ce34b954e9834074c81738adf Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 13:38:03 +0100 Subject: [PATCH 44/72] 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..e00ae63f822302 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" +makedepends="kf6-kio-devel kf6-kdeclarative-devel kf6-kirigami-devel + kf6-kstatusnotifieritem-devel libplasma-devel 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 " 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 ff15c3d97e7539d1c256f13a21965af1d3e30d60 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Mar 2024 15:25:04 +0100 Subject: [PATCH 45/72] kwayland: update to 6.0.4 --- common/shlibs | 1 + srcpkgs/kwayland/template | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/common/shlibs b/common/shlibs index ce97aa39ed1de3..9c88349812d91f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2861,6 +2861,7 @@ libskk.so.0 libskk-1.0.2_1 libKF5WaylandServer.so.5 kwayland-5.26.0_1 libKF5WaylandClient.so.5 kwayland-5.26.0_1 libKWaylandClient.so.6 kf6-kwayland-6.0.0_1 +libKWaylandClient.so.6 kwayland-6.0.0_1 libKF5IdleTime.so.5 kidletime-5.26.0_1 libKF5Archive.so.5 karchive-5.26.0_1 libKF5Codecs.so.5 kcodecs-5.26.0_1 diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template index a4a3762d5f379c..7b12ab51e7b37c 100644 --- a/srcpkgs/kwayland/template +++ b/srcpkgs/kwayland/template @@ -1,19 +1,20 @@ # Template file for 'kwayland' +# XXX: kwayland5 miight be needed pkgname=kwayland -version=5.115.0 +version=6.0.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel - plasma-wayland-protocols qt5-wayland-devel wayland-devel" -makedepends="qt5-tools-devel MesaLib-devel wayland-devel wayland-protocols qt5-wayland-devel - libxkbcommon-devel" +hostmakedepends="kf6-kcoreaddons pkg-config extra-cmake-modules qt6-tools qt6-base + wayland-devel" +makedepends="qt6-tools-devel MesaLib-devel wayland-devel wayland-protocols qt6-wayland-devel + libxkbcommon-devel plasma-wayland-protocols" short_desc="Qt-style client and server library wrapper for Wayland libraries" maintainer="John " license="LGPL-2.1-or-later" -homepage="https://invent.kde.org/frameworks/kwayland" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=07b512d9ce51a1cacc6d13c1c26143b57372afed0e30bd1c100ad46861b4643c +homepage="https://invent.kde.org/plasma/kwayland" +distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" +checksum=42432e2644c4b997854e9ff48fa7fae5f6cc5117a96f23c60b5b1cf2b82be77a kwayland-devel_package() { short_desc+=" - development" @@ -21,7 +22,6 @@ kwayland-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake - vmove usr/lib/qt5/mkspecs vmove "usr/lib/*.so" } } From 28fd705d48caeba661be42c5646b3fe505db0d2f Mon Sep 17 00:00:00 2001 From: Luciogi Date: Wed, 6 Mar 2024 17:59:49 +0500 Subject: [PATCH 46/72] New package: kwayland5 --- common/shlibs | 1 + srcpkgs/kwayland-integration/template | 2 +- srcpkgs/kwayland5-devel | 1 + srcpkgs/kwayland5/template | 28 +++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/kwayland5-devel create mode 100644 srcpkgs/kwayland5/template diff --git a/common/shlibs b/common/shlibs index 9c88349812d91f..f25f9f4c672cb4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2861,6 +2861,7 @@ libskk.so.0 libskk-1.0.2_1 libKF5WaylandServer.so.5 kwayland-5.26.0_1 libKF5WaylandClient.so.5 kwayland-5.26.0_1 libKWaylandClient.so.6 kf6-kwayland-6.0.0_1 +libKF5WaylandClient.so.5 kwayland5-5.115.0_1 libKWaylandClient.so.6 kwayland-6.0.0_1 libKF5IdleTime.so.5 kidletime-5.26.0_1 libKF5Archive.so.5 karchive-5.26.0_1 diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template index fb02df3064c18e..3e0f688d708bf4 100644 --- a/srcpkgs/kwayland-integration/template +++ b/srcpkgs/kwayland-integration/template @@ -6,7 +6,7 @@ build_style=cmake configure_args="-DBUILD_TESTING=OFF" 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 +makedepends="kidletime-devel kwayland5-devel kwindowsystem-devel kguiaddons-devel libxkbcommon-devel" short_desc="Integration plugins for Kwayland" maintainer="John " diff --git a/srcpkgs/kwayland5-devel b/srcpkgs/kwayland5-devel new file mode 120000 index 00000000000000..a1695f16b01f72 --- /dev/null +++ b/srcpkgs/kwayland5-devel @@ -0,0 +1 @@ +kwayland5 \ No newline at end of file diff --git a/srcpkgs/kwayland5/template b/srcpkgs/kwayland5/template new file mode 100644 index 00000000000000..7cbb881013992d --- /dev/null +++ b/srcpkgs/kwayland5/template @@ -0,0 +1,28 @@ +# Template file for 'kwayland5' +pkgname=kwayland5 +version=5.115.0 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF" +hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel + plasma-wayland-protocols qt5-wayland-devel wayland-devel" +makedepends="qt5-tools-devel MesaLib-devel wayland-devel wayland-protocols qt5-wayland-devel + libxkbcommon-devel" +short_desc="Qt-style client and server library wrapper for Wayland libraries" +maintainer="John " +license="LGPL-2.1-or-later" +homepage="https://invent.kde.org/frameworks/kwayland" +distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" +checksum=07b512d9ce51a1cacc6d13c1c26143b57372afed0e30bd1c100ad46861b4643c + +kwayland5-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}-${version}_${revision}" + pkg_install() { + vmove usr/lib/pkgconfig + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt5/mkspecs + vmove "usr/lib/*.so" + } +} From 5dae45fdbc5f8e630562ec3e34cf521edb692e89 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Wed, 6 Mar 2024 19:59:25 +0500 Subject: [PATCH 47/72] 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 " 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 bf718688d0fd3f33c359203cef232ef31e34c777 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Wed, 6 Mar 2024 20:15:27 +0500 Subject: [PATCH 48/72] New package: kdeplasma-addons-6.0.4 --- srcpkgs/kdeplasma-addons/template | 28 ++++++++++++++++++++++++++++ srcpkgs/kdeplasma-addons/update | 1 + 2 files changed, 29 insertions(+) create mode 100644 srcpkgs/kdeplasma-addons/template create mode 100644 srcpkgs/kdeplasma-addons/update diff --git a/srcpkgs/kdeplasma-addons/template b/srcpkgs/kdeplasma-addons/template new file mode 100644 index 00000000000000..9c0c16f5844d99 --- /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 +configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake" +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 " +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 + +if [ $CROSS_BUILD ]; then + hostmakedepends+=" kf6-kcmutils-devel kf6-kpackage-devel" +fi + +kdeplasma-addons5_package() { + build_style=meta + short_desc+=" - (Dummy transistional package)" + depends="${sourcepkg}" +} diff --git a/srcpkgs/kdeplasma-addons/update b/srcpkgs/kdeplasma-addons/update new file mode 100644 index 00000000000000..9cf5a20c16ae29 --- /dev/null +++ b/srcpkgs/kdeplasma-addons/update @@ -0,0 +1 @@ +pkgname=${pkgname} From 745c61b68bedd5a3d21cbc3a0643ef3e59216a31 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Mar 2024 23:05:46 +0100 Subject: [PATCH 49/72] 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 " -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 3c38fe6358df19582357784efc78ae169d5c7ff2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 3 Mar 2024 15:48:13 +0100 Subject: [PATCH 50/72] kate5: update to 24.02.0. --- common/shlibs | 2 +- srcpkgs/kate5/template | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index f25f9f4c672cb4..4a3b42b2400677 100644 --- a/common/shlibs +++ b/common/shlibs @@ -472,7 +472,7 @@ libfsimage.so.1.0 xen-libs-4.10.0_1 libxenstat.so.4.14 xen-libs-4.14.0_1 libfam.so.0 gamin-0.1.10_1 libgamin-1.so.0 gamin-0.1.10_1 -libkateprivate.so.23.08.5 libkate-23.08.5_1 +libkateprivate.so.24.02.0 libkate-24.02.0_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 diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template index e838835d0ca3d8..effdb884bb54af 100644 --- a/srcpkgs/kate5/template +++ b/srcpkgs/kate5/template @@ -1,25 +1,20 @@ # Template file for 'kate5' pkgname=kate5 -version=23.08.5 +version=24.02.0 revision=1 build_style=cmake -configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules pkg-config kcoreaddons gettext" -makedepends="kitemmodels-devel knewstuff-devel ktexteditor-devel - plasma-framework-devel threadweaver-devel" +configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake" +hostmakedepends="extra-cmake-modules pkg-config gettext qt6-tools qt6-base + kf6-kconfig-devel kf6-kdoctools" +makedepends="kf6-kitemmodels-devel kf6-knewstuff-devel kf6-ktexteditor-devel + kf6-threadweaver-devel kf6-kuserfeedback-devel" depends="hicolor-icon-theme" short_desc="KDE Text editor" maintainer="John " license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://kde.org/applications/en/utilities/org.kde.kate" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz" -checksum=683c49d9c4b2abd4b4660b607b65249a2adfdc48418b0d18ab90810d1a8f4e37 - -if [ "$CROSS_BUILD" ]; then - configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake" - hostmakedepends+=" kauth-devel kconfig-devel kcoreaddons-devel - kpackage-devel kdoctools python3 qt5-host-tools qt5-qmake" -fi +checksum=9b1efcccf4e36efcdbc2eada6399cd8128ce187a19182400313062f75ee35f48 libkate_package() { pkg_install() { From e77904e6e6708c850acfae9009cb3994b3b5bb7a Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Mar 2024 00:34:10 +0100 Subject: [PATCH 51/72] krfb: update to 24.02.2. --- srcpkgs/krfb/template | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template index 62328395268763..d11d25c4832c19 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 +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 kwayland-devel pipewire-devel plasma-wayland-protocols kpipewire-devel" short_desc="KDE Desktop Sharing" maintainer="Orphaned " 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 5bf11a0a86a560f1e6b1e600f441b05e182998dd Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Mar 2024 12:48:52 +0100 Subject: [PATCH 52/72] konsole: update to 24.02.2. --- srcpkgs/konsole/template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template index 53e47ca85e5752..2c15322afc8127 100644 --- a/srcpkgs/konsole/template +++ b/srcpkgs/konsole/template @@ -1,20 +1,22 @@ # Template file for 'konsole' pkgname=konsole -version=23.08.5 +version=24.02.2 revision=1 build_style=cmake -configure_args="-DBUILD_TESTING=OFF - -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" -hostmakedepends="pkg-config extra-cmake-modules kcoreaddons qt5-devel - gettext qt5-qmake kdoctools kconfig" -makedepends="kinit-devel knewstuff-devel knotifyconfig-devel kparts-devel - kpty-devel qt5-multimedia-devel" +build_helper=qemu +configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake + -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" +hostmakedepends="pkg-config extra-cmake-modules qt6-base qt6-tools gettext + kf6-kdoctools kf6-kconfig" +makedepends="kf6-knewstuff-devel kf6-knotifyconfig-devel + kf6-kparts-devel kf6-kpty-devel kf6-ktextwidgets-devel qt6-multimedia-devel" +checkdepends="which" short_desc="KDE's Terminal Emulator" maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://kde.org/applications/en/system/org.kde.konsole" distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz" -checksum=c6fb20753ac27a46bce62e31f7b105b6b99497035830b34a7bba1bc60260c1ca +checksum=66467e336536d7df5c12bcad31a3ef0a2150c40351d87677047a40eae440ee2f replaces="konsole5>=0" konsole5_package() { From 46d4ad65b0c9509c927d75c6cb9e52beddd04fd4 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Tue, 26 Mar 2024 21:12:10 +0500 Subject: [PATCH 53/72] 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..316a27eaf45c99 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 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 " 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 858425f03293be50b5531795e0fb354340b19749 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Fri, 8 Mar 2024 11:59:41 +0500 Subject: [PATCH 54/72] New package: kate-24.02.2, replaces kate5 --- common/shlibs | 2 +- srcpkgs/{kate5 => kate}/template | 26 +++++++++++++++++++------- srcpkgs/{kate5 => kate}/update | 0 srcpkgs/kate5 | 1 + 4 files changed, 21 insertions(+), 8 deletions(-) rename srcpkgs/{kate5 => kate}/template (65%) rename srcpkgs/{kate5 => kate}/update (100%) create mode 120000 srcpkgs/kate5 diff --git a/common/shlibs b/common/shlibs index 4a3b42b2400677..625db3931b0c8f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -472,7 +472,7 @@ libfsimage.so.1.0 xen-libs-4.10.0_1 libxenstat.so.4.14 xen-libs-4.14.0_1 libfam.so.0 gamin-0.1.10_1 libgamin-1.so.0 gamin-0.1.10_1 -libkateprivate.so.24.02.0 libkate-24.02.0_1 +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 diff --git a/srcpkgs/kate5/template b/srcpkgs/kate/template similarity index 65% rename from srcpkgs/kate5/template rename to srcpkgs/kate/template index effdb884bb54af..e30c4db4b73993 100644 --- a/srcpkgs/kate5/template +++ b/srcpkgs/kate/template @@ -1,28 +1,34 @@ -# Template file for 'kate5' -pkgname=kate5 -version=24.02.0 +# Template file for 'kate' +pkgname=kate +version=24.02.2 revision=1 build_style=cmake -configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake" +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-tools qt6-base - kf6-kconfig-devel kf6-kdoctools" + kf6-kconfig kf6-kdoctools" makedepends="kf6-kitemmodels-devel kf6-knewstuff-devel kf6-ktexteditor-devel - kf6-threadweaver-devel kf6-kuserfeedback-devel" + kf6-threadweaver-devel kf6-kuserfeedback-devel kf6-kdoctools-devel + kf6-kconfig-devel" depends="hicolor-icon-theme" short_desc="KDE Text editor" maintainer="John " license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://kde.org/applications/en/utilities/org.kde.kate" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz" -checksum=9b1efcccf4e36efcdbc2eada6399cd8128ce187a19182400313062f75ee35f48 +checksum=1ddacb0939831a43e2b9c1abd8d7e5afefe76789842333263655370e99f5434d +replaces="kate5>=0" libkate_package() { + short_desc+=" - libraries" pkg_install() { vmove usr/lib/libkateprivate.so.* } } kwrite_package() { + short_desc+=" - kwrite" pkg_install() { vmove usr/bin/kwrite vmove usr/share/applications/org.kde.kwrite.desktop @@ -35,3 +41,9 @@ kwrite_package() { done } } + +kate5_package() { + short_desc+=" - (Dummy transitional package)" + build_style=meta + depends="kate-${version}_${revision}" +} diff --git a/srcpkgs/kate5/update b/srcpkgs/kate/update similarity index 100% rename from srcpkgs/kate5/update rename to srcpkgs/kate/update diff --git a/srcpkgs/kate5 b/srcpkgs/kate5 new file mode 120000 index 00000000000000..7f1f15d88464c5 --- /dev/null +++ b/srcpkgs/kate5 @@ -0,0 +1 @@ +kate \ No newline at end of file From 7da94ccc1a5c2b63e5f81bd748a02e83e948cedd Mon Sep 17 00:00:00 2001 From: Luciogi Date: Fri, 8 Mar 2024 12:13:01 +0500 Subject: [PATCH 55/72] New package: baloo-widgets-24.02.2, replaces baloo-widgets5 --- common/shlibs | 2 +- srcpkgs/baloo-widgets-devel | 1 + srcpkgs/baloo-widgets/template | 37 +++++++++++++++++++++++++++++++++ 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, 42 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 625db3931b0c8f..b260b835c56c76 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2429,7 +2429,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..6fbd9ce40f226b --- /dev/null +++ b/srcpkgs/baloo-widgets/template @@ -0,0 +1,37 @@ +# 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" +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 " +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 " -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 07c67290c241e85c7b9a96ff9a8cc6dbdc95c657 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Fri, 8 Mar 2024 12:27:02 +0500 Subject: [PATCH 56/72] New package: libkdcraw-24.02.2, libkdcraw5 update to 24.02.2 --- srcpkgs/libkdcraw-devel | 1 + srcpkgs/libkdcraw/template | 25 ++++++++++++++++++++++++ srcpkgs/{libkdcraw5 => libkdcraw}/update | 0 srcpkgs/libkdcraw5/template | 5 +++-- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/libkdcraw-devel create mode 100644 srcpkgs/libkdcraw/template rename srcpkgs/{libkdcraw5 => libkdcraw}/update (100%) diff --git a/srcpkgs/libkdcraw-devel b/srcpkgs/libkdcraw-devel new file mode 120000 index 00000000000000..dc476a7a8a484f --- /dev/null +++ b/srcpkgs/libkdcraw-devel @@ -0,0 +1 @@ +libkdcraw \ No newline at end of file diff --git a/srcpkgs/libkdcraw/template b/srcpkgs/libkdcraw/template new file mode 100644 index 00000000000000..e81ea91a4b6b23 --- /dev/null +++ b/srcpkgs/libkdcraw/template @@ -0,0 +1,25 @@ +# Template file for 'libkdcraw' +pkgname=libkdcraw +version=24.02.2 +revision=1 +build_style=cmake +configure_args="-DQT_MAJOR_VERSION=6" +hostmakedepends="extra-cmake-modules pkg-config qt6-tools + qt6-base gettext" +makedepends="qt6-base-devel libraw-devel" +short_desc="C++ interface around LibRaw library used to decode RAW" +maintainer="Luciogi " +license="GPL-2.0-or-later" +homepage="https://www.kde.org/applications/graphics/" +distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz" +checksum=7c6b4cb0af910857fdbed4dbfba6fcc5aee26aa31993eeab3219b7343c3192d6 + +libkdcraw-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/cmake + } +} diff --git a/srcpkgs/libkdcraw5/update b/srcpkgs/libkdcraw/update similarity index 100% rename from srcpkgs/libkdcraw5/update rename to srcpkgs/libkdcraw/update diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template index b447cf4c98e927..e7721be15b4ca9 100644 --- a/srcpkgs/libkdcraw5/template +++ b/srcpkgs/libkdcraw5/template @@ -1,6 +1,7 @@ # Template file for 'libkdcraw5' +# XXX: sync version with libkdcraw pkgname=libkdcraw5 -version=23.08.5 +version=24.02.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools @@ -11,7 +12,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/" distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz" -checksum=ab1080e449ff468032b7ba5f203fba1cdca3ab9958c4f9b5451ba0e2c0978f11 +checksum=7c6b4cb0af910857fdbed4dbfba6fcc5aee26aa31993eeab3219b7343c3192d6 libkdcraw5-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 461c23635bfa6f5475e4d703610a442fb3533b3e Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 9 Mar 2024 13:01:10 +0500 Subject: [PATCH 57/72] accounts-qml-modules: build with qt6, change distfiles --- .../patches/678c493a.patch | 241 ------------------ .../accounts-qml-module/patches/werror.patch | 11 - srcpkgs/accounts-qml-module/template | 21 +- 3 files changed, 15 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 -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..312c68d5c2661e 100644 --- a/srcpkgs/accounts-qml-module/template +++ b/srcpkgs/accounts-qml-module/template @@ -1,17 +1,26 @@ # 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 " 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 + +post_patch() { + if [ $CROSS_BUILD ]; then + vsed -i src/src.pro -e "s|\$\$\[QT_INSTALL_BINS\]|$XBPS_CROSS_BASE\$\$\[QT_INSTALL_BINS\]|" + fi +} post_install() { rm -rf $DESTDIR/usr/bin From 019b1760156e777cf44373abe33b87cd5b79714a Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 9 Mar 2024 13:15:54 +0500 Subject: [PATCH 58/72] signond: build with qt6 --- common/shlibs | 8 ++--- srcpkgs/signond/patches/cross.patch | 54 +++++++++++++++++++++++++---- srcpkgs/signond/template | 19 +++++----- 3 files changed, 61 insertions(+), 20 deletions(-) diff --git a/common/shlibs b/common/shlibs index b260b835c56c76..82fbf15fca2980 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2742,10 +2742,10 @@ libzimg.so.2 zimg-2.0.4_1 libvapoursynth.so vapoursynth-R32_2 libvapoursynth-script.so.0 vapoursynth-R32_1 libtwolame.so.0 twolame-0.3.13_1 -libsignon-plugins.so.1 signond-8.58_1 -libsignon-qt5.so.1 signond-8.58_1 -libsignon-plugins-common.so.1 signond-8.58_1 -libsignon-extension.so.1 signond-8.58_1 +libsignon-plugins.so.1 signond-8.61_2 +libsignon-qt6.so.1 signond-8.61_2 +libsignon-plugins-common.so.1 signond-8.61_2 +libsignon-extension.so.1 signond-8.61_2 libj4status-plugin.so.0 j4status-0.1_1 libvirglrenderer.so.1 virglrenderer-0.5.0_1 libglpk.so.40 glpk-4.60_1 diff --git a/srcpkgs/signond/patches/cross.patch b/srcpkgs/signond/patches/cross.patch index dfb1dd97b59966..ac73df20ae5617 100644 --- a/srcpkgs/signond/patches/cross.patch +++ b/srcpkgs/signond/patches/cross.patch @@ -1,14 +1,20 @@ ---- a/lib/SignOn/SignOnQt5Config.cmake.in 2018-09-17 18:28:27.000000000 +0200 -+++ b/lib/SignOn/SignOnQt5Config.cmake.in 2018-09-17 18:28:27.000000000 +0200 -@@ -2,6 +2,21 @@ +diff --git a/lib/SignOn/SignOnQt5Config.cmake.in b/lib/SignOn/SignOnQt5Config.cmake.in +index 128ee8d..bae7705 100644 +--- a/lib/SignOn/SignOnQt5Config.cmake.in ++++ b/lib/SignOn/SignOnQt5Config.cmake.in +@@ -2,6 +2,25 @@ # SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt # SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt -set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) -set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) -set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) -\ No newline at end of file ++# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) ++# Use original install prefix when loaded through a ++# cross-prefix symbolic link such as /lib -> /usr/lib. ++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH) ++get_filename_component(_realOrig "/usr/lib/cmake/SignOnQt5" REALPATH) +if(_realCurr STREQUAL _realOrig) + set(_IMPORT_PREFIX "/usr/lib/cmake/SignOnQt5") +endif() @@ -22,7 +28,41 @@ +endif() + +set(SIGNONQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so) -+set(SIGNONQT_LIBRARIES_STATIC ${_IMPORT_PREFIX}/lib/lib$${TARGET}.a) -+set(SIGNONQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}) ++set(SIGNONQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/) ++set(SIGNONQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so) ++set(SIGNONQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/) +diff --git a/lib/SignOn/SignOnQt6Config.cmake.in b/lib/SignOn/SignOnQt6Config.cmake.in +index 128ee8d..9222038 100644 +--- a/lib/SignOn/SignOnQt6Config.cmake.in ++++ b/lib/SignOn/SignOnQt6Config.cmake.in +@@ -2,6 +2,25 @@ + # SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt + # SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt + +-set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) +-set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) +-set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) ++# Compute the installation prefix relative to this file. ++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) ++# Use original install prefix when loaded through a ++# cross-prefix symbolic link such as /lib -> /usr/lib. ++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH) ++get_filename_component(_realOrig "/usr/lib/cmake/SignOnQt6" REALPATH) ++if(_realCurr STREQUAL _realOrig) ++ set(_IMPORT_PREFIX "/usr/lib/cmake/SignOnQt6") ++endif() ++unset(_realOrig) ++unset(_realCurr) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) ++if(_IMPORT_PREFIX STREQUAL "/") ++ set(_IMPORT_PREFIX "") ++endif() + -+set(_IMPORT_PREFIX) ++set(SIGNONQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so) ++set(SIGNONQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/) ++set(SIGNONQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so) ++set(SIGNONQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/) + + diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template index feccf39466acc0..2230f147a2fc3b 100644 --- a/srcpkgs/signond/template +++ b/srcpkgs/signond/template @@ -1,25 +1,26 @@ # Template file for 'signond' pkgname=signond version=8.61 -revision=1 +revision=2 +_commit="c8ad98249af541514ff7a81634d3295e712f1a39" build_style=qmake configure_args="LIBDIR=/usr/lib" conf_files="/etc/signond.conf" -hostmakedepends="pkg-config doxygen qt5-host-tools qt5-qmake" -makedepends="qt5-devel" -short_desc="Daemon providing SSO over D-Bus for the gSSO framework" +hostmakedepends="pkg-config doxygen qt6-base" +makedepends="qt6-base-devel" +short_desc="Daemon providing SSO over D-Bus for the gSSO framework - Qt6" maintainer="John Rowley " license="LGPL-2.1-only" homepage="https://gitlab.com/accounts-sso/signond" -distfiles="${homepage}/-/archive/VERSION_${version}/signond-VERSION_${version}.tar.gz" -checksum=3dd57c25e1bf1583b2cb857f96831e38e73d40264ff66ca43e63bb7233f76828 +distfiles="https://gitlab.com/accounts-sso/signond/-/archive/$_commit/signond-$_commit.tar.gz" +checksum=2c3dd97fcdb90f38bb9884f7e11d0fb9ba214f78bddaacb27e4969cefff7d690 pre_configure() { if [ "$CROSS_BUILD" ]; then - CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5" - for i in ${XBPS_CROSS_BASE}/usr/include/qt5/*; do + CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt6" + for i in ${XBPS_CROSS_BASE}/usr/include/qt6/*; do CXXFLAGS+=" -I$i" - done + done fi } From 775e17168e9e00b91f0459c5dab461c0f237b7a9 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 9 Mar 2024 13:40:51 +0500 Subject: [PATCH 59/72] signon-ui: build with qt6 --- srcpkgs/signon-ui/template | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/srcpkgs/signon-ui/template b/srcpkgs/signon-ui/template index 81209631fe0639..e8420474f6aada 100644 --- a/srcpkgs/signon-ui/template +++ b/srcpkgs/signon-ui/template @@ -1,18 +1,20 @@ # Template file for 'signon-ui' pkgname=signon-ui -version=0.15 +version=0.17 revision=1 +_commit="eef943f0edf3beee8ecb85d4a9dae3656002fc24" build_style=qmake -hostmakedepends="qt5-qmake pkg-config qt5-host-tools" -makedepends="libaccounts-qt5-devel libnotify-devel libproxy-devel - qt5-webkit-devel qt5-x11extras-devel signond-devel" +hostmakedepends="pkg-config qt6-base qt6-tools" +makedepends="libaccounts-qt6-devel libnotify-devel libproxy-devel + qt6-webengine-devel signond-devel" short_desc="Online Accounts Sign-on UI" maintainer="Piotr Wójcik " license="GPL-3.0-only" -homepage="https://launchpad.net/signon-ui" -distfiles="https://launchpad.net/signon-ui/trunk/${version}/+download/signon-ui-${version}.tar.bz2" -checksum=a14f0a82af129e33476e9d6839fa2d5e40c46a6e8bb71d7deb6255d995764af3 +homepage="https://gitlab.com/accounts-sso/signon-ui" +distfiles="https://gitlab.com/accounts-sso/signon-ui/-/archive/$_commit/signon-ui-$_commit.tar.gz" +checksum=0906a1adee88e331e9dcf1f2d5978c24f8564fb734f5c114c88bddb63196d3d4 -post_install() { - rm "${DESTDIR}/usr/bin/signon-ui-unittest" +post_patch() { + # Don't build tests, they still require Webkit + vsed -e "s|src \\\|src|" -e "/tests/d" -i signon-ui.pro } From a7b9da8e0d73602cbc21486ab70b7bc3a13bee71 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 9 Mar 2024 14:41:22 +0500 Subject: [PATCH 60/72] signon-plugin-oauth2: update to 0.25. --- srcpkgs/signon-plugin-oauth2/template | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/srcpkgs/signon-plugin-oauth2/template b/srcpkgs/signon-plugin-oauth2/template index faaa235fee4862..f8ebffc4f13929 100644 --- a/srcpkgs/signon-plugin-oauth2/template +++ b/srcpkgs/signon-plugin-oauth2/template @@ -1,31 +1,30 @@ # Template file for 'signon-plugin-oauth2' pkgname=signon-plugin-oauth2 -version=0.24 -revision=2 +version=0.25 +revision=1 +_commit=fab698862466994a8fdc9aa335c87b4f05430ce6 build_style=qmake configure_args="LIBDIR=/usr/lib" -hostmakedepends="pkg-config qt5-host-tools qt5-qmake" -makedepends="qt5-devel signond-devel" +hostmakedepends="pkg-config qt6-base" +makedepends="qt6-base-devel signond-devel" short_desc="OAuth 1.0/2.0 plugin for the SignOn daemon" maintainer="Piotr Wójcik " license="LGPL-2.1-only" homepage="https://gitlab.com/accounts-sso/signon-plugin-oauth2" -distfiles="https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/archive/VERSION_${version}/signon-plugin-oauth2-VERSION_${version}.tar.bz2" -checksum=d37f6c93b6cd2885b517fd93cdb2407b0164655454ded2ed56e41704f81f05c4 +#distfiles="https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/archive/VERSION_${version}/signon-plugin-oauth2-VERSION_${version}.tar.bz2" +distfiles="https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/archive/$_commit/signon-plugin-oauth2-$_commit.tar.gz" +checksum=5a1298cc49f504503f54f20f0f5f685e43f541244a654dd3da58951f43782625 pre_configure() { vsed -i common-project-config.pri -e 's/ -Werror/& -Wno-error=deprecated-declarations/' + # Don't install tests and example + echo 'INSTALLS =' >> tests/tests.pro + echo 'INSTALLS =' >> example/example.pro } if [ "$CROSS_BUILD" ]; then - CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5" - for i in ${XBPS_CROSS_BASE}/usr/include/qt5/*; do + CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt6" + for i in ${XBPS_CROSS_BASE}/usr/include/qt6/*; do CXXFLAGS+=" -I$i" done fi - -post_install() { - rm "${DESTDIR}/usr/bin/signon-oauth2plugin-tests" - # conflict with kaccounts-providers, this file is less useful - rm "${DESTDIR}/etc/signon-ui/webkit-options.d/www.facebook.com.conf" -} From a32815e4e566b47aa2b0fa9396d1e1e0dcf8c9f7 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 9 Mar 2024 16:25:39 +0500 Subject: [PATCH 61/72] signon-kwallet-extension: update to 24.02.2. --- srcpkgs/signon-kwallet-extension/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template index b9f370c8b160dc..bd88d699e6e496 100644 --- a/srcpkgs/signon-kwallet-extension/template +++ b/srcpkgs/signon-kwallet-extension/template @@ -1,14 +1,15 @@ # Template file for 'signon-kwallet-extension' pkgname=signon-kwallet-extension -version=23.08.5 +version=24.02.2 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake" -makedepends="kwallet-devel qt5-devel signond-devel" +configure_args="-DQT_MAJOR_VERSION=6" +hostmakedepends="extra-cmake-modules pkg-config qt6-base" +makedepends="kf6-kwallet-devel signond-devel" short_desc="KWallet integration for signon framework" maintainer="Piotr Wójcik " license="GPL-2.0-only" homepage="https://invent.kde.org/network/signon-kwallet-extension" changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension" distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz" -checksum=e556caad3efde683c6a626c2aaec5ec2cb157aba1a10c7d4ea5280005fe59bfc +checksum=373275e239d887d58ed4502c2ec0417b1ca14757e97bc6827dc0633322a976e2 From c0c3d47a0b440a2e9d2b96f2fa4f1610bbab39f9 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 9 Mar 2024 17:50:59 +0500 Subject: [PATCH 62/72] kaccounts-integration: update to 24.02.2. --- common/shlibs | 2 +- ...e-desktop-file-for-cross-compilation.patch | 18 -------------- srcpkgs/kaccounts-integration/template | 24 +++++++++++++------ 3 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/kaccounts-integration/patches/23.04.0--exchange-desktop-file-for-cross-compilation.patch diff --git a/common/shlibs b/common/shlibs index 82fbf15fca2980..9816e7b4032fb9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3694,7 +3694,7 @@ libOGDF.so libogdf-2018.03_1 libCOIN.so libogdf-2018.03_1 librocksdb.so.7 rocksdb-7.4.5_1 libfrr.so.0 libfrr-6.0_1 -libkaccounts.so.2 kaccounts-integration-20.04.3_1 +libkaccounts6.so.2 kaccounts-integration-24.02.0_1 libfrrospfapiclient.so.0 libfrrospfapiclient-6.0_1 liborocos-kdl.so.1.4 orocos-kdl-1.4.0_1 libibumad.so.3 rdma-core-22.1_1 diff --git a/srcpkgs/kaccounts-integration/patches/23.04.0--exchange-desktop-file-for-cross-compilation.patch b/srcpkgs/kaccounts-integration/patches/23.04.0--exchange-desktop-file-for-cross-compilation.patch deleted file mode 100644 index ed50c65b9640f2..00000000000000 --- a/srcpkgs/kaccounts-integration/patches/23.04.0--exchange-desktop-file-for-cross-compilation.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 2c95b707cafe08774c1b4d4fad7a7ab88982ea88 Mon Sep 17 00:00:00 2001 -From: Piotr Wójcik -Date: Sat, 22 Apr 2023 19:37:25 +0200 -Subject: exchange-desktop-file-for-cross-compilation - - -diff --git a/src/kcm/CMakeLists.txt b/src/kcm/CMakeLists.txt -index beb0a56..e3b6c4c 100644 ---- a/src/kcm/CMakeLists.txt -+++ b/src/kcm/CMakeLists.txt -@@ -8,4 +8,3 @@ target_link_libraries(kcm_kaccounts - ) - - kpackage_install_package(package kcm_kaccounts kcms) --kcmutils_generate_desktop_file(kcm_kaccounts) --- -2.40.0 - diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template index dcfe6137fd04c6..4391cf097d2e7a 100644 --- a/srcpkgs/kaccounts-integration/template +++ b/srcpkgs/kaccounts-integration/template @@ -1,22 +1,32 @@ # Template file for 'kaccounts-integration' pkgname=kaccounts-integration -version=23.08.5 +version=24.02.2 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake - kcoreaddons libaccounts-qt5-devel signond-devel gettext kpackage kcmutils" -makedepends="kcmutils-devel kparts-devel libaccounts-qt5-devel signond-devel qcoro-qt5-devel" -depends="kinit signon-ui signon-plugin-oauth2 signon-kwallet-extension" +build_helper=qemu +configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake + -DKDE_INSTALL_QMLDIR=lib/qt6/qml + -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" +hostmakedepends="extra-cmake-modules pkg-config qt6-base gettext + kf6-kpackage kf6-kcmutils qt6-declarative-host-tools" +makedepends="kf6-kcmutils-devel kf6-kparts-devel libaccounts-qt6-devel + signond-devel qcoro-qt6-devel kf6-ki18n-devel" +depends="signon-plugin-oauth2 signon-kwallet-extension" short_desc="Administer web accounts for sites and services across the KDE desktop" maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://invent.kde.org/network/kaccounts-integration" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration" distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz" -checksum=c02ee25495c387dfc9c7581babd4756e04d7c3dae68bffd1652cf418e1d129b9 +checksum=d50b3d790d8df6a24d1afe7660fa7c6e61c38159d777380f87b813c91d06d307 + +# depends on webengine +if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" = "64$XBPS_TARGET_WORDSIZE" ]; then + depends+=" signon-ui" +fi kaccounts-integration-devel_package() { - short_desc+=" - development" + short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include From 2337a62dde00fd935c353145dcc5bce0b3f586b5 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Wed, 6 Mar 2024 20:28:04 +0500 Subject: [PATCH 63/72] 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 | 17 ----------------- srcpkgs/kde-gtk-config5/update | 1 - srcpkgs/kde5/template | 2 +- 6 files changed, 27 insertions(+), 19 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..2a08b6a5553045 --- /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 + -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" +hostmakedepends="extra-cmake-modules pkg-config qt6-tools + sassc gettext kf6-kcoreaddons qt6-base" +makedepends="kf6-kcmutils-devel kf6-knewstuff-devel gtk+3-devel + kdecoration-devel gsettings-desktop-schemas-devel" +depends="kde-cli-tools gsettings-desktop-schemas" +short_desc="GTK+3 Configurator for KDE" +maintainer="Luciogi " +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 17869cb3c97979..00000000000000 --- a/srcpkgs/kde-gtk-config5/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'kde-gtk-config5' -pkgname=kde-gtk-config5 -version=6.0.2 -revision=1 -build_style=cmake -configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules pkg-config qt6-base qt6-tools - sassc gettext" -makedepends="kf6-kcmutils-devel kf6-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 " -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=884570500ced842f1e1c545edf6fdd5036673f83a7188644f8b9f761e2682f7e 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 86c3b383cec2f666d1e35e358911aebef08ded1d Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 9 Mar 2024 21:13:42 +0500 Subject: [PATCH 64/72] print-manager: update to 6.0.4 --- srcpkgs/print-manager/template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template index 77b75503f07cef..320988c03a7a9b 100644 --- a/srcpkgs/print-manager/template +++ b/srcpkgs/print-manager/template @@ -1,20 +1,20 @@ # Template file for 'print-manager' pkgname=print-manager -version=23.08.5 +reverts="23.08.5_1" +version=6.0.4 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools - kpackage-devel kcoreaddons-devel kconfig-devel kauth-devel - kcmutils-devel gettext" -makedepends="plasma-framework-devel kcmutils-devel cups-devel" -short_desc="Printing management for KDE 5" +build_helper=qemu +hostmakedepends="extra-cmake-modules qt6-base gettext" +makedepends="plasma-framework-devel kf6-kcmutils-devel cups-devel kf6-kirigami-devel libplasma-devel" +short_desc="Printing management for KDE Plasma" maintainer="Giuseppe Fierro " license="GPL-2.0-or-later" -homepage="https://kde.org/applications/en/print-manager" -changelog="https://kde.org/announcements/changelogs/gear/${version}/#print-manager" -distfiles="${KDE_SITE}/release-service/${version}/src/print-manager-${version}.tar.xz" -checksum=f7ed99b3afaf8ea1faa5c0649f3a704197ac992fcfa5dfc24622e5cf2cb85a4b +homepage="https://invent.kde.org/plasma/print-manager" +distfiles="${KDE_SITE}/plasma/${version}/print-manager-${version}.tar.xz" +checksum=40926cacb65c90c49dd4758f57b606ba571f49ea66ff42c031c69fdbe7221c08 if [ "$CROSS_BUILD" ]; then - configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake" + hostmakedepends+=" kf6-kconfig-devel kf6-kcmutils-devel kf6-kpackage-devel" + configure_args+=" -DKF6_HOST_TOOLING=/usr/lib/cmake" fi From 5667a839577b97232209b89a7baeea788476935c Mon Sep 17 00:00:00 2001 From: Luciogi Date: Wed, 13 Mar 2024 20:41:42 +0500 Subject: [PATCH 65/72] plasma-framework: rebuild with kwayland5 --- srcpkgs/plasma-framework/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template index a812a8dabb3b93..c3512adf0a748c 100644 --- a/srcpkgs/plasma-framework/template +++ b/srcpkgs/plasma-framework/template @@ -1,13 +1,15 @@ # Template file for 'plasma-framework' pkgname=plasma-framework version=5.115.0 -revision=1 +revision=2 build_style=cmake -configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" +build_helper=qemu +configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson + -DBUILD_DESKTOPTHEMES=OFF" hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kpackage kconfig python3 qt5-host-tools qt5-qmake gettext kdoctools" makedepends="kactivities5-devel kdeclarative-devel kdoctools-devel kirigami2-devel - $(vopt_if wayland kwayland-devel) kconfig-devel" + $(vopt_if wayland kwayland5-devel) kconfig-devel" depends="qt5-quickcontrols qt5-graphicaleffects qt5-multimedia" checkdepends="mesa-dri" short_desc="Foundational libraries, components, and tools of the Plasma workspaces" @@ -27,7 +29,7 @@ build_options="wayland" build_options_default="wayland" plasma-framework-devel_package() { - short_desc+=" - development" + short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include From cbc9874130a305f7021b29145873efe4dc531e0f Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sun, 17 Mar 2024 17:53:19 +0500 Subject: [PATCH 66/72] kdeplasma5: renamed to kdeplasma-addons --- srcpkgs/kdeplasma-addons/template | 3 ++- srcpkgs/kdeplasma-addons5 | 1 + srcpkgs/kdeplasma-addons5/template | 16 ---------------- srcpkgs/kdeplasma-addons5/update | 1 - 4 files changed, 3 insertions(+), 18 deletions(-) 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 index 9c0c16f5844d99..488eab2d7215f2 100644 --- a/srcpkgs/kdeplasma-addons/template +++ b/srcpkgs/kdeplasma-addons/template @@ -3,8 +3,9 @@ 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" -hostmakedepends="extra-cmake-modules qt6-tools pkg-config gettext" +hostmakedepends="extra-cmake-modules qt6-base 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 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 657328849cf67c..00000000000000 --- a/srcpkgs/kdeplasma-addons5/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'kdeplasma-addons5' -pkgname=kdeplasma-addons5 -version=6.0.2 -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 " -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=5a5e0bfcfb40d57a5ebb9fed5d238c642d18e7ed2d6ddbb1240b61c598bb0200 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 4a3271adb5bf6c2e7e9240768a996a8bb17dcc59 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sun, 17 Mar 2024 21:34:40 +0500 Subject: [PATCH 67/72] kcm-wacomtablet: update to 6.0.4 --- .../patches/QPainterPath.patch | 10 ------- srcpkgs/kcm-wacomtablet/template | 29 ++++++++++++------- 2 files changed, 18 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 - #include -+#include - #include - #include - #include diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template index dbb0cd51818c2f..c89529dcd67f8f 100644 --- a/srcpkgs/kcm-wacomtablet/template +++ b/srcpkgs/kcm-wacomtablet/template @@ -1,18 +1,25 @@ # 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" +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 " 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 58b489841cd902b756033020ded44f68ff971358 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sun, 17 Mar 2024 21:37:46 +0500 Subject: [PATCH 68/72] 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 " -license="GPL-2, LGPL-2.1, FDL" +license="Public Domain" homepage="https://kde.org/plasma-desktop" From ad6cdbacfe8e70dd897a5a3aa5eae73672b928e3 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Tue, 26 Mar 2024 21:12:09 +0500 Subject: [PATCH 69/72] 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 " 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 5aece392be33bd6abbf2032f68cc52ef9df7cf70 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Tue, 26 Mar 2024 22:04:16 +0500 Subject: [PATCH 70/72] 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 " -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 61ebbb68328c84e819c4746dfce940abe3016b1f Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 6 Apr 2024 09:12:44 +0500 Subject: [PATCH 71/72] libqaccessibilityclient: update to 0.6.0. --- common/shlibs | 2 +- srcpkgs/libqaccessibilityclient/template | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 9816e7b4032fb9..6f3868cfb96646 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3745,7 +3745,7 @@ libupb_textformat_lib.so.38 libgrpc-1.61.1_1 libutf8_range_lib.so.38 libgrpc-1.61.1_1 libircclient.so.1 libircclient-1.10_5 libFAudio.so.0 FAudio-19.05_1 -libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1 +libqaccessibilityclient-qt6.so.0 libqaccessibilityclient-0.6.0_1 libnitrokey.so.3 libnitrokey-3.4.1_1 libceres.so.3 ceres-solver-2.1.0_1 libgraphene-1.0.so.0 graphene-1.8.2_1 diff --git a/srcpkgs/libqaccessibilityclient/template b/srcpkgs/libqaccessibilityclient/template index 72cb9c963e2237..83b44ad64b5ae3 100644 --- a/srcpkgs/libqaccessibilityclient/template +++ b/srcpkgs/libqaccessibilityclient/template @@ -1,16 +1,17 @@ # Template file for 'libqaccessibilityclient' pkgname=libqaccessibilityclient -version=0.5.0 +version=0.6.0 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" -makedepends="qt5-devel" +configure_args="-DBUILD_WITH_QT6=ON" +hostmakedepends="extra-cmake-modules qt6-base qt6-tools" +makedepends="qt6-base-devel" short_desc="Library for accessibility clients such as screen readers" maintainer="Piotr Wójcik " license="LGPL-2.1-or-later" homepage="https://phabricator.kde.org/source/libqaccessibilityclient/" distfiles="${KDE_SITE}/libqaccessibilityclient/libqaccessibilityclient-${version}.tar.xz" -checksum=704772543a3b005b94061a53eaf9f9d64944e6818b04c59c0fb0a503c81ac4a0 +checksum=4c50c448622dc9c5041ed10da7d87b3e4e71ccb49d4831a849211d423c5f5d33 do_check() { : # requires xserver From 1c1e4d1e62422ececbe968f96392e54a4e29b6dc Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sun, 10 Mar 2024 00:29:31 +0500 Subject: [PATCH 72/72] kaccounts-providers: update to 24.02.2. --- srcpkgs/kaccounts-providers/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template index 77c47ccbe0b82a..b9b39691c4362e 100644 --- a/srcpkgs/kaccounts-providers/template +++ b/srcpkgs/kaccounts-providers/template @@ -1,22 +1,22 @@ # 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" +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 kaccounts-integration-devel + glib-devel libaccounts-qt6-devel signond-devel" short_desc="KDE Accounts Providers" maintainer="Piotr Wójcik " 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 +25,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