diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-27 01:03:27 +0000 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-27 01:03:27 +0000 |
commit | e2f5fb8fd2d151baeb97c2f8fb1b7b56a41eddd4 (patch) | |
tree | a3d7ccf0b97b147478cb769ebec33c19d77aca92 | |
parent | c58edf8b9ac4367e08cad2a15987550d4e4a849a (diff) | |
download | packages-e2f5fb8fd2d151baeb97c2f8fb1b7b56a41eddd4.tar.gz packages-e2f5fb8fd2d151baeb97c2f8fb1b7b56a41eddd4.tar.bz2 packages-e2f5fb8fd2d151baeb97c2f8fb1b7b56a41eddd4.tar.xz packages-e2f5fb8fd2d151baeb97c2f8fb1b7b56a41eddd4.zip |
user/[KDE Plasma]: Plasma 5.18 Beta
42 files changed, 402 insertions, 726 deletions
diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD index 051d2d187..3d04239ce 100644 --- a/user/breeze-gtk/APKBUILD +++ b/user/breeze-gtk/APKBUILD @@ -1,17 +1,17 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze-gtk -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="GTK+ style that matches KDE Breeze" url="https://www.kde.org/" arch="all" license="LGPL-2.1-only" -depends="gtk+2.0" -makedepends="cmake extra-cmake-modules qt5-qtbase-dev" +depends="breeze gtk+2.0" +makedepends="breeze-dev cmake extra-cmake-modules py3-pycairo qt5-qtbase-dev sassc" # XXX should be installed if breeze and gtk+3.0 are installed, as well install_if="breeze~$pkgver gtk+2.0" -source="https://download.kde.org/stable/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5937f564c2c82274740f8df6447d57ca43243dfbd492fb620430d2b8dc2bf216c1c3c51e78bd616fa224363d4b1b53ccbbb94e72a1908865fe5d8269ce46130e breeze-gtk-5.12.9.tar.xz" +sha512sums="1b7326a2ad7789b3afd5a5dbe80dbcd65ba871b2b691f617c26c569d0f623de8d4094acda011144d3a733b2b32e5b16a1dd3272a455f7a31f66d981a583dccc8 breeze-gtk-5.17.90.tar.xz" diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD index e286aeada..88819fbc7 100644 --- a/user/breeze/APKBUILD +++ b/user/breeze/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Default KDE Plasma 5 style" url="https://www.kde.org/" @@ -13,7 +13,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 kcmutils-dev kconfigwidgets-dev kcoreaddons-dev kdecoration-dev kguiaddons-dev ki18n-dev kpackage-dev frameworkintegration-dev kwindowsystem-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/breeze-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="48c2bb00512114218df6331617043bf3d457b52d53339031835315ef1c33ea9154967689f4e65990dab59cf40d2094db064451fc6c05e4d028dc5f01e04bbf18 breeze-5.12.9.tar.xz" +sha512sums="13d601003764bc600bb78262034f8c02d8984e6e79fea16cfc85b62da08967b96c6614c0d52dbd4ad2bcfd2d1a252fd241f371a0d4c92bd3a1f00ddb43ff032e breeze-5.17.90.tar.xz" diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD index c2e8a5a3d..941eb5000 100644 --- a/user/kactivitymanagerd/APKBUILD +++ b/user/kactivitymanagerd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kactivitymanagerd -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Service to manage KDE Plasma activities" url="https://www.kde.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev boost-dev python3 kconfig-dev kcoreaddons-dev kwindowsystem-dev kio-dev kglobalaccel-dev kxmlgui-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/kactivitymanagerd-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/kactivitymanagerd-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="066e32cb94901b947c30116d3bd6c8c0df1e0637d1993be91c801adabf02f8ff4823eb4faa6791acd083710cc6cde2164bbb3d64abb4b56b899a65618d988754 kactivitymanagerd-5.12.9.tar.xz" +sha512sums="43de13451f39eaa385f07c30867dffbce2d02d519f131d5936ac19087cffd53ce5b24405ad5672262197f826539c4bca83d95c4a63602aabead708d44dbbb151 kactivitymanagerd-5.17.90.tar.xz" diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD index 7878b7dea..ab39964c1 100644 --- a/user/kde-cli-tools/APKBUILD +++ b/user/kde-cli-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-cli-tools -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="KDE command-like utilities" url="https://www.kde.org/" @@ -12,10 +12,10 @@ depends="" checkdepends="shared-mime-info" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev qt5-qtx11extras-dev kactivities-dev kcmutils-dev kconfig-dev - kdelibs4support-dev kdesu-dev kdoctools-dev ki18n-dev kiconthemes-dev - kinit-dev kio-dev kwindowsystem-dev" + kdeclarative-dev kdesu-dev kdoctools-dev ki18n-dev kiconthemes-dev + kinit-dev kio-dev kservice-dev kwindowsystem-dev libkworkspace-dev" subpackages="$pkgname-lang $pkgname-doc" -source="https://download.kde.org/stable/plasma/$pkgver/kde-cli-tools-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/kde-cli-tools-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09c0e62421273d72fb51e1db476b3625f8db79f4046003a6fca2698e3462da03c48259347eb14360fb7a8cd2d70b981a5c7e975c4ff86e9697be9c8a0e3ecfba kde-cli-tools-5.12.9.tar.xz" +sha512sums="165794a2e97a31d35f5b81deadf88604b5522481aaaa8361eecee3eb596ee0befb3e67f41e99f0bbb8533393ec0cef1f1c290e426bf158536b812e3621bb37ce kde-cli-tools-5.17.90.tar.xz" diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD index bbbe3a78b..1704c93d0 100644 --- a/user/kde-gtk-config/APKBUILD +++ b/user/kde-gtk-config/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-gtk-config -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="KDE System Settings panel for configuring GTK+ application styles" url="https://www.kde.org/" @@ -11,8 +11,8 @@ depends="gsettings-desktop-schemas" makedepends="cmake extra-cmake-modules qt5-qtbase-dev gtk+2.0-dev gtk+3.0-dev karchive-dev kcmutils-dev kconfigwidgets-dev ki18n-dev kiconthemes-dev kio-dev knewstuff-dev gsettings-desktop-schemas-dev" -subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/kde-gtk-config-$pkgver.tar.xz" +subpackages="" +source="https://download.kde.org/unstable/plasma/$pkgver/kde-gtk-config-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ffe0fb1509c4c5f6a1b385f6523661bf7171b4e127c8719296a008fb0af33ee41bc2aaf55243be062065c194fc291c29729a64f226c6d200e8d38b4fc9df9d45 kde-gtk-config-5.12.9.tar.xz" +sha512sums="e0838b9906272b53d7de1c925ae30f8df1d5d0467e566bfbd841fc6d39badff9dae5a097b8740da07d3cb98b5f749b58cc01cc9bdce29d713b0053d92a091634 kde-gtk-config-5.17.90.tar.xz" diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD index e25617ecd..8f53a27c7 100644 --- a/user/kdecoration/APKBUILD +++ b/user/kdecoration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdecoration -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Window decoration plugin library" url="https://www.kde.org/" @@ -10,9 +10,9 @@ options="!check" # Requires running X11 display license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev" -makedepends="$depends_dev cmake extra-cmake-modules" -subpackages="$pkgname-dev" -source="https://download.kde.org/stable/plasma/$pkgver/kdecoration-$pkgver.tar.xz" +makedepends="$depends_dev cmake extra-cmake-modules ki18n-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/unstable/plasma/$pkgver/kdecoration-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f4c97bc64707d8c3863e519bb9efc6b324e818ec0e73f184191824a80c9d7140e5d102a0e4557246ec93726456c235d062a219da749ceb6aa186197e1e5f2618 kdecoration-5.12.9.tar.xz" +sha512sums="9946f2ad3c1433beff94831e7c129b85974f53b81bf67b877a2e54c2d3fa500bd2b6199c1e6192a91860d9e624141f6d6d506731190003c6eff9823be2249558 kdecoration-5.17.90.tar.xz" diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD index fe73e8d36..a4eaeba4f 100644 --- a/user/kdeplasma-addons/APKBUILD +++ b/user/kdeplasma-addons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdeplasma-addons -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Extra applets and toys for KDE Plasma" url="https://www.kde.org/" @@ -11,12 +11,10 @@ depends="qt5-qtquickcontrols qt5-qtquickcontrols2" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev kactivities-dev kconfig-dev kconfigwidgets-dev kcmutils-dev kcoreaddons-dev kdoctools-dev ki18n-dev knewstuff-dev - kross-dev krunner-dev kservice-dev kunitconversion-dev - kdelibs4support-dev plasma-framework-dev plasma-workspace-dev" + kross-dev krunner-dev kservice-dev kunitconversion-dev kholidays-dev + plasma-framework-dev plasma-workspace-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz - headers.patch - " +source="https://download.kde.org/unstable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -43,5 +41,4 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="82293bb79e88c998b9b052142e2a00de5bdf155c690b61fccca70d9c0c893e123a2b047ed8064a3473877763a72bc9408bfc7df17b3797e99f60e99f1a546756 kdeplasma-addons-5.12.9.tar.xz -3419d34fa752bf64433eadba37b223aae28272642f49cb97ae8df0b094be7cfb255c1383b467913285e96946fe7376dc8dec50cc7ff8da9465614faf7c2b0050 headers.patch" +sha512sums="1254682f9a1d5b2e42aa19a9ba1eefcfa09a857180cb1c3a45693918ad44a125f40e7d114d1f96067678273892044ea1b3ae1099ff39a6e92ee1fd6834faefec kdeplasma-addons-5.17.90.tar.xz" diff --git a/user/kdeplasma-addons/headers.patch b/user/kdeplasma-addons/headers.patch deleted file mode 100644 index 9b2fc7592..000000000 --- a/user/kdeplasma-addons/headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 959443f85ec94d0748d536a07edfa5a68c7d254b Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Tue, 6 Aug 2019 14:11:34 -0600 -Subject: Fix build The QMutex include in AbstractRunner was removed in - https://cgit.kde.org/krunner.git/commit/?id=ac6814b1387bc0c790928ec5b62f43c1764994d6 - -So now each runner needs to include it itself - -CCMAIL: montel@kde.org ---- - runners/spellchecker/spellcheck.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/runners/spellchecker/spellcheck.h b/runners/spellchecker/spellcheck.h -index 609f7fd..9fcffee 100644 ---- a/runners/spellchecker/spellcheck.h -+++ b/runners/spellchecker/spellcheck.h -@@ -22,6 +22,7 @@ - #include <sonnet/speller.h> - - #include <KRunner/AbstractRunner> -+#include <QMutex> - #include <QSharedPointer> - - /** --- -cgit v1.1 - diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD index 61c34979d..c7d0347d5 100644 --- a/user/kgamma5/APKBUILD +++ b/user/kgamma5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kgamma5 -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Control monitor gamma from KDE 5" url="https://www.KDE.org/" @@ -11,7 +11,7 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kconfigwidgets-dev kdoctools-dev ki18n-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/kgamma5-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/kgamma5-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5aae045849a8a223d4f54d88c86d9e87ff094d48ebf1f9de31179cb105206e3b251f057aab7217c14b7c31c5fa35fea04c435a3aa263268b856bc2e35ef484d1 kgamma5-5.12.9.tar.xz" +sha512sums="f725805b5f82429f0690dc4b4afbfcd28047ebf1ffa6d0d7070f6f1228d8ce0c9ed8b3da725faab12e23396135aa67b97fa74d716fc704a119efd34fd1c9e2e3 kgamma5-5.17.90.tar.xz" diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD index fb88574bd..2c95b4184 100644 --- a/user/khotkeys/APKBUILD +++ b/user/khotkeys/APKBUILD @@ -1,21 +1,18 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=khotkeys -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Hot key mapping for KDE Plasma 5" url="https://www.KDE.org/" arch="all" license="LGPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev libx11-dev kdbusaddons-dev kdelibs4support-dev kglobalaccel-dev ki18n-dev kio-dev - kxmlgui-dev libice-dev libx11-dev plasma-framework-dev - plasma-workspace-dev" + kxmlgui-dev libice-dev libkworkspace-dev plasma-framework-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$pkgver.tar.xz - cmake-fixes.patch - " +source="https://download.kde.org/unstable/plasma/$pkgver/khotkeys-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -40,5 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c2d047b0d7a461f5a1bfa3bdea7e93c40238251e6c1a3edec710f044de02c2f69287a8f2d6cf6f166d448e306d8f7be9199a710ab0e5d1c3d1e2af8a0c234398 khotkeys-5.12.9.tar.xz -1c2558d8b142bc1de236e35b8f55a825f55d4c38c2b5cb2fbf02dcae1128325f45b15246f9c9d874d1afd2a4483df8501877121c6052b6d067892c5fbeca1dc5 cmake-fixes.patch" +sha512sums="2a31751706a68c3481291a7e925225d6310fdc2838cc841ce31f0f15a2f38d52f91d49489aec2e3796a87ba27036959080bb9d099e12590c7266e72730404558 khotkeys-5.17.90.tar.xz" diff --git a/user/khotkeys/cmake-fixes.patch b/user/khotkeys/cmake-fixes.patch deleted file mode 100644 index 6f6bfcc5d..000000000 --- a/user/khotkeys/cmake-fixes.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ae5743738245437332b1bb670b9a3f8c429211e2 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 10 Feb 2019 20:26:25 +0100 -Subject: Harmonize usage of HAVE_X11, using #if and #cmakedefine01. - ---- - CMakeLists.txt | 1 + - config-X11.h.cmake | 2 +- - libkhotkeysprivate/conditions/existing_window_condition.h | 1 - - 3 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a96e3b..0955f4e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -37,6 +37,7 @@ find_package(LibKWorkspace CONFIG REQUIRED) - if(X11_FOUND) - find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras ) - set(HAVE_XTEST ${X11_XTest_FOUND}) -+ set(HAVE_X11 1) - endif() - - configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -diff --git a/config-X11.h.cmake b/config-X11.h.cmake -index 60286dd..ae8978a 100644 ---- a/config-X11.h.cmake -+++ b/config-X11.h.cmake -@@ -41,4 +41,4 @@ - #cmakedefine HAS_RANDR_1_3 1 - - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -\ No newline at end of file -+#cmakedefine01 HAVE_X11 -diff --git a/libkhotkeysprivate/conditions/existing_window_condition.h b/libkhotkeysprivate/conditions/existing_window_condition.h -index 92815eb..b6a4278 100644 ---- a/libkhotkeysprivate/conditions/existing_window_condition.h -+++ b/libkhotkeysprivate/conditions/existing_window_condition.h -@@ -26,7 +26,6 @@ - - #include <KConfig> // Needed because of some Qt Status redefinitions - #include <KConfigGroup> // Needed because of some Qt Status redefinitions --#include <config-kwindowsystem.h> // Needed for HAVE_X11 - #include <config-X11.h> - #include <kdemacros.h> - --- -cgit v1.1 - diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD index 03bc42992..d000f5ed1 100644 --- a/user/kinfocenter/APKBUILD +++ b/user/kinfocenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kinfocenter -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Information about the running computer" url="https://www.kde.org/applications/system/kinfocenter/" @@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev kservice-dev solid-dev kwidgetsaddons-dev kxmlgui-dev kdeclarative-dev kpackage-dev libraw1394-dev pciutils-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/kinfocenter-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/kinfocenter-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e1e963af00d5d0dea5d1e5612fd3174c119f2ee9dd3661455fb935c8955046ea5b013c604dee2fbc03a39eebaccd592eeb6fb983595a6a231aaa66c282c00f31 kinfocenter-5.12.9.tar.xz" +sha512sums="f20934e3c043992c9e90354ba9656d005e20c1105d56fc5bdaa629af2339b351f1274cc26b059f5b7ae1bb03d1e377ed0263d5d9dc31689ad2159552b8c7a9cd kinfocenter-5.17.90.tar.xz" diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD index 370e6ab73..4dddf6f67 100644 --- a/user/kmenuedit/APKBUILD +++ b/user/kmenuedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kmenuedit -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Menu editor for Plasma 5" url="https://www.KDE.org/" @@ -9,9 +9,10 @@ arch="all" license="GPL-2.0+ AND GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev - kiconthemes-dev kio-dev kxmlgui-dev sonnet-dev kdelibs4support-dev" + kiconthemes-dev kglobalaccel-dev kinit-dev kio-dev kitemviews-dev kxmlgui-dev + sonnet-dev kdoctools-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/kmenuedit-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/kmenuedit-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9d9ab72b270f517bc797926c54d38c0f96d88d6b535055d52d800a06384b65edd086dc064801381e18697e4a79d04b27c7213a0c397084ab157f5a98d8a66427 kmenuedit-5.12.9.tar.xz" +sha512sums="51749e07f377188649e53706d473a346547a0b8761af92a5a75d76728b24625a0e5e43650b9e71dd32e388c692dad03ded07543929a1a730152eeff708a7b7a0 kmenuedit-5.17.90.tar.xz" diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD index 5362f2062..626296d01 100644 --- a/user/kscreenlocker/APKBUILD +++ b/user/kscreenlocker/APKBUILD @@ -1,22 +1,23 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kscreenlocker -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Secure X11 screen locker" url="https://www.kde.org/" arch="all" options="!check" # requires loginctl license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+" -depends="linux-pam" +depends="consolekit2 linux-pam qdbus" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev libxcb-dev libxcursor-dev libxext-dev libxi-dev linux-pam-dev qt5-qtdeclarative-dev kcmutils-dev kcrash-dev kdeclarative-dev kglobalaccel-dev ki18n-dev kidletime-dev knotifications-dev - ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev" + ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev + consolekit2-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz +source="https://download.kde.org/unstable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz kde.pam kde-np.pam " @@ -46,6 +47,6 @@ package() { install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np } -sha512sums="411df584f7579368beed02340de673b510acb56b5b63475c60f8acc1e1437ae19643a7cdf8fd6880aec49ddb7cff769ce588b850506c411c5d390a53fbc016c4 kscreenlocker-5.12.9.tar.xz +sha512sums="8eb19f5b9cd23ec50ee460de8df248b404d12e6c176101da0d3c5f3080f242342edd713b546d03992cf942665937a7f5228ca021715f0904b77f6e804b77c50c kscreenlocker-5.17.90.tar.xz 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam" diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD index 3bbf2524f..30bf4b843 100644 --- a/user/ksshaskpass/APKBUILD +++ b/user/ksshaskpass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksshaskpass -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Plasma integration for SSH agents" url="https://www.KDE.org/" @@ -11,7 +11,7 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kdoctools-dev ki18n-dev kwallet-dev kwidgetsaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/ksshaskpass-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/ksshaskpass-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="79d75e2394cce5e24120c6fee7fbe698069f1146b3c27c9f97b29eaeba03f32233eeea4daf0e2a26b050cb3407c06bcc817fc8ca952fabf1c99061ed8cedd79a ksshaskpass-5.12.9.tar.xz" +sha512sums="068847737ba1d5dc49158e1b5eff3e2c23d9573b0ee6868c986f7464d16703a807acf57dfde183395fcf29ef5b26f3b61d9f905a0c25b820f264780d40d21994 ksshaskpass-5.17.90.tar.xz" diff --git a/user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch b/user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch deleted file mode 100644 index 8828736f3..000000000 --- a/user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d6fa7c0ab6c3a6b1494ffd12b93ee5cc2e4d3d5c Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Mon, 18 Mar 2019 14:34:26 -0500 -Subject: [PATCH] Linux softraid: define _GNU_SOURCE for pipe2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In a strict POSIX compilation environment, pipe2 is not defined. Use -the _GNU_SOURCE FTM to expose it. - -Fixes a failure to build ksysguard on Adélie Linux. ---- - ksysguardd/Linux/softraid.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ksysguardd/Linux/softraid.c b/ksysguardd/Linux/softraid.c -index c2123fb7..96eb373e 100644 ---- a/ksysguardd/Linux/softraid.c -+++ b/ksysguardd/Linux/softraid.c -@@ -27,6 +27,7 @@ - #include <sys/types.h> /* for open */ - #include <sys/stat.h> /* for open */ - #include <fcntl.h> /* for open */ -+#define _GNU_SOURCE /* pipe2 */ - #include <unistd.h> /* for read, close, exec, fork */ - #include <stdlib.h> /* for exit */ - #include <sys/wait.h> /* for wait :) */ --- -2.19.2 - diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD index c17fe4220..65fce4869 100644 --- a/user/ksysguard/APKBUILD +++ b/user/ksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksysguard -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="KDE system monitor utility" url="https://www.kde.org/" @@ -13,9 +13,8 @@ makedepends="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev kio-dev knotifications-dev kwindowsystem-dev libksysguard-dev cmake extra-cmake-modules kdoctools-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/ksysguard-$pkgver.tar.xz +source="https://download.kde.org/unstable/plasma/$pkgver/ksysguard-$pkgver.tar.xz ksysguard-5.6.5-rindex-header.patch - 0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch " build() { @@ -41,6 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bce502bd5f5c1473372875e969900c01728e4192eb9097643985dc3c8b9a8ce08f602f3cf954da622fee9925056121643be601bf75c318a65cb07b6c4713799c ksysguard-5.12.9.tar.xz -13a26451c459cff1d3b00af27c953d10c55e7e8f43ef7a6f0f54dd05dcb612546545c0170089e9499bb041f004cdacf19cb112d247a8ccf8fd4e77fea0d1c8bc ksysguard-5.6.5-rindex-header.patch -0a424bb5e23f283d0cccfe86c0a6c2915f563a82e27a1dc16be8b4dc4b3d90ce116c4eb448dd1d5dc07602225468880206a5eb70c1b66d1e19e9a405fae7aa88 0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch" +sha512sums="223a0ba86b9d7dbcb465245a500fa6c3106d40ea0010d8b5e3a34fd6a75c031f07bc8717f7309c45dceabb2b3cf1d5fc0aa0d73ff75eecdb03e54644e0c55cea ksysguard-5.17.90.tar.xz +75e07b80c647bc6fdfb092ad3855813ef6bfe91b0ad03562dacfe4e680cfdee201364a2e452db162822045684635c1791ab2392c47d8e5c560c9e617a970cf39 ksysguard-5.6.5-rindex-header.patch" diff --git a/user/ksysguard/ksysguard-5.6.5-rindex-header.patch b/user/ksysguard/ksysguard-5.6.5-rindex-header.patch index 423da608c..7b900d751 100644 --- a/user/ksysguard/ksysguard-5.6.5-rindex-header.patch +++ b/user/ksysguard/ksysguard-5.6.5-rindex-header.patch @@ -1,6 +1,6 @@ --- ksysguard-5.6.5/ksysguardd/Linux/diskstat.c.old 2016-06-14 11:09:02.000000000 +0100 +++ ksysguard-5.6.5/ksysguardd/Linux/diskstat.c 2016-08-07 02:51:53.101362572 +0100 -@@ -24,6 +24,7 @@ +@@ -26,6 +26,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/user/kuserfeedback/APKBUILD b/user/kuserfeedback/APKBUILD new file mode 100644 index 000000000..ce5f10b6b --- /dev/null +++ b/user/kuserfeedback/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kuserfeedback +pkgver=0.9.90 +pkgrel=0 +pkgdesc="User feedback agent for KDE" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires X11. +license="MIT" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev + qt5-qtsvg-dev qt5-qttools-dev bison flex" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/unstable/kuserfeedback/kuserfeedback-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + # Requires OpenGL accelerated desktop. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E openglinfosourcetest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="a4f5ee35d54479d0ed8c8e142c6d600a95f6a5e0179398953ef9e9b439b5f286ca90306577797478d53b07da258070710a442b227d6f70e4f2f372dd13b60aae kuserfeedback-0.9.90.tar.xz" diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD index 452cb11ed..5a048d986 100644 --- a/user/kwin/APKBUILD +++ b/user/kwin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kwin -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Modern, stylish window manager (requires OpenGL)" url="https://www.kde.org/" @@ -17,14 +17,14 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev python3 libdrm-dev libinput-dev libx11-dev libxi-dev libxkbcommon-dev mesa-dev wayland-dev xcb-util-cursor-dev xcb-util-image-dev xcb-util-wm-dev - breeze-dev kactivities-dev kcompletion-dev kconfigwidgets-dev - kcmutils-dev kcrash-dev kdeclarative-dev kdecoration-dev + breeze breeze-dev kactivities-dev kcompletion-dev kconfigwidgets-dev + kcmutils-dev kcrash-dev kdeclarative-dev kdecoration-dev kirigami2-dev kglobalaccel-dev ki18n-dev kiconthemes-dev kidletime-dev kinit-dev kio-dev knewstuff-dev knotifications-dev kpackage-dev kscreenlocker-dev kservice-dev ktextwidgets-dev kwayland-dev kwidgetsaddons-dev - kxmlgui-dev plasma-framework-dev" + kxmlgui-dev plasma-framework-dev qt5-qtvirtualkeyboard-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/kwin-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,6 +37,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING=OFF \ ${CMAKE_CROSSOPTS} . make } @@ -49,4 +50,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c0df1234c118bed3dc70fbbf72dbcab4afae54857310da781d43f8967902369d5516f1710ac19f545b04a449e10dd9d91de803110f764094abc823614f78191 kwin-5.12.9.tar.xz" +sha512sums="f7a1fa4cc1dfd333d7de26ad5aa76c01358111980cd5d818b1eae1609c82de45c2ea682936db79083b1000a1384f01559a86c3822ecb039a61798f81d7b03a63 kwin-5.17.90.tar.xz" diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index 47412df05..e6435daeb 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libkscreen -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="KDE Plasma screen management software" url="https://www.kde.org/" @@ -11,9 +11,9 @@ license="LGPL-2.1+ AND GPL-2.0+ AND (GPL-2.0-only OR GPL-3.0-only)" depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtx11extras-dev - kwayland-dev" -subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-wayland" -source="https://download.kde.org/stable/plasma/$pkgver/libkscreen-$pkgver.tar.xz" + qt5-qttools-dev kwayland-dev doxygen" +subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-doc $pkgname-wayland" +source="https://download.kde.org/unstable/plasma/$pkgver/libkscreen-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -26,6 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_QCH:BOOL=ON \ ${CMAKE_CROSSOPTS} . make } @@ -52,4 +53,4 @@ wayland() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/ } -sha512sums="9785ca62889bc0d60fa9fdf5872e64205ed1a8f6921a4ebeddb1c46bad486badb81d69fc30c0438faf412d547e05908d8225705af7176e036a1ba32c86dadea0 libkscreen-5.12.9.tar.xz" +sha512sums="6af4c59c9a8212eb6dc50ce3aa6476227aac1a5ceb078b665b432a2cdc586af9fe45d8fe214f15a46af673e54bbc145ecb5da5db1de756bb4a12f8dd6cfec46f libkscreen-5.17.90.tar.xz" diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD index 22d5633d1..24ff1f831 100644 --- a/user/libksysguard/APKBUILD +++ b/user/libksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libksysguard -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="KDE system monitor library" url="https://www.kde.org/" @@ -13,9 +13,10 @@ depends_dev="qt5-qtbase-dev kconfig-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev zlib-dev qt5-qtscript-dev ki18n-dev kauth-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kiconthemes-dev plasma-framework-dev kservice-dev - kwindowsystem-dev kwidgetsaddons-dev" + kwindowsystem-dev kwidgetsaddons-dev qt5-qtwebchannel-dev kio-dev + kglobalaccel-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/libksysguard-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/libksysguard-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -40,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7f3f8740d6add7edcea9b40e819e1c4a0cfdf40e6ba57b646cfdd68b6de5801259632f95e21226dae2c8336c0ef3f955a14b727fc2ba014f9fec44117b93e628 libksysguard-5.12.9.tar.xz" +sha512sums="d25bd17324a97aa32c7115ab9b761d9510118364945f5bf5d3766c92925e9bf3f2e9bc608cbd786fd69aebc3c065faffe8e2bbe53417f9640fc4ea20d81db94b libksysguard-5.17.90.tar.xz" diff --git a/user/libkworkspace/APKBUILD b/user/libkworkspace/APKBUILD new file mode 100644 index 000000000..fa3532c07 --- /dev/null +++ b/user/libkworkspace/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> +pkgname=libkworkspace +pkgver=5.17.90 +pkgrel=0 +pkgdesc="KDE Plasma 5 workspace library" +url="https://www.kde.org/plasma-desktop" +arch="all" +options="!check" # Test requires X11 accelration. +license="(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1+ AND GPL-2.0+ AND MIT AND LGPL-2.1-only AND LGPL-2.0+ AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-only" +depends="" +depends_dev="qt5-qtbase-dev" +makedepends="cmake extra-cmake-modules libice-dev libsm-dev libxau-dev + kcoreaddons-dev ki18n-dev kscreenlocker-dev kwin-dev kwindowsystem-dev + plasma-framework-dev" +subpackages="$pkgname-dev" +source="https://download.kde.org/unstable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz + header-generation.patch + session.patch + standalone.patch + " +builddir="$srcdir"/plasma-workspace-$pkgver/libkworkspace + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING=OFF \ + ${CMAKE_CROSSOPTS} . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="8fc014e90dca30b54122ef0e83c08faabbb41a3ba5a511e4713db3898acd18faf53652ff766ffbaa70d1da3053618b70882255afeca060cd92e06d0bdf4e1934 plasma-workspace-5.17.90.tar.xz +3f72f33219999bc39c52c143c047df37eb34b4149bf479ec9aee64ce14c78946635cf20cf120858f10a676a2b7c00cef0b95aa696e8e71b7412d936fbdd7e755 header-generation.patch +1c7a23a4bb13030b992b8bde125548f104dbc6db489b60a6c40d91e2b793b208f35f88cca9ad90a9cc116d92b902d5c536b0e643805799b07286fbc82a0dafe8 session.patch +6b3a19a53c36b518d2f5719b1ce0f86cb8ece763e4e02eb455882af73344d26b46f7cdf9edc93c6394767d51f0e5a326ab33c44f04a0b9cfc6cf5b281c087d46 standalone.patch" diff --git a/user/libkworkspace/header-generation.patch b/user/libkworkspace/header-generation.patch new file mode 100644 index 000000000..c78fad092 --- /dev/null +++ b/user/libkworkspace/header-generation.patch @@ -0,0 +1,17 @@ +[ 26%] Generating consolekit_manager_interface.cpp, consolekit_manager_interface.h +[ 29%] Generating login1_manager_interface.moc +moc: /usr/src/packages/user/libkworkspace/src/plasma-workspace-5.17.90/libkworkspace/login1_manager_interface.h: No such file + +--- libkworkspace/CMakeLists.txt.old 2020-01-26 23:49:13.514087630 +0000 ++++ libkworkspace/CMakeLists.txt 2020-01-26 23:49:50.290062909 +0000 +@@ -79,8 +79,8 @@ + endif() + + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" +- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" +- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Session.xml" ++ "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Seat.xml" ++ "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Session.xml" + PROPERTIES INCLUDE "loginddbustypes.h" ) + + qt5_add_dbus_interface(kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" login1_manager_interface) diff --git a/user/libkworkspace/session.patch b/user/libkworkspace/session.patch new file mode 100644 index 000000000..ec29807c1 --- /dev/null +++ b/user/libkworkspace/session.patch @@ -0,0 +1,23 @@ +--- libkworkspace/sessionmanagementbackend.cpp.old 2020-01-16 12:37:11.000000000 +0000 ++++ libkworkspace/sessionmanagementbackend.cpp 2020-01-26 23:48:25.419351063 +0000 +@@ -77,6 +77,11 @@ + + /*********************************************************************************/ + ++bool LogindSessionBackend::exists() ++{ ++ return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1")); ++} ++ + LogindSessionBackend::LogindSessionBackend() + { + m_login1 = new OrgFreedesktopLogin1ManagerInterface(QStringLiteral("org.freedesktop.login1"), QStringLiteral("/org/freedesktop/login1"), QDBusConnection::systemBus(), this); +@@ -199,7 +204,7 @@ + + bool ConsoleKitSessionBackend::exists() + { +- return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1")); ++ return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConosleKit")); + } + + ConsoleKitSessionBackend::ConsoleKitSessionBackend() diff --git a/user/libkworkspace/standalone.patch b/user/libkworkspace/standalone.patch new file mode 100644 index 000000000..de6ec93bb --- /dev/null +++ b/user/libkworkspace/standalone.patch @@ -0,0 +1,111 @@ +From 7e2bf26af99f5b242b2e4bb2ee5e62914d5d5861 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 10 Jul 2019 11:38:44 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + CMakeLists.txt | 70 +++++++++++++++++++++++++++++++++--- + 1 file changed, 66 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3c4c47870..53bc780b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,56 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++ set(PROJECT_VERSION "5.17.90") ++ set(PROJECT_VERSION_MAJOR 5) ++ ++ cmake_minimum_required(VERSION 3.0) ++ ++ set(QT_MIN_VERSION "5.12.0") ++ set(KF5_MIN_VERSION "5.58.0") ++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) ++ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) ++ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++ include(KDEInstallDirs) ++ include(KDECMakeSettings) ++ include(KDECompilerSettings NO_POLICY_SCOPE) ++ include(ECMMarkNonGuiExecutable) ++ include(CMakePackageConfigHelpers) ++ include(WriteBasicConfigVersionFile) ++ include(CheckIncludeFiles) ++ include(FeatureSummary) ++ include(ECMQtDeclareLoggingCategory) ++ include(KDEPackageAppTemplates) ++ include(ECMMarkAsTest) ++ include(GenerateExportHeader) ++ ++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem) ++ ++ find_package(KWinDBusInterface CONFIG REQUIRED) ++ find_package(KScreenLocker 5.13.80 REQUIRED) ++ find_package(ScreenSaverDBusInterface CONFIG REQUIRED) ++ ++ find_package(X11) ++ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++ URL "http://www.x.org" ++ TYPE OPTIONAL ++ PURPOSE "Required for X11 support") ++ ++ if(X11_FOUND) ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) ++ set(HAVE_X11 1) ++ endif() ++ ++ if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++ endif() ++ ++ check_include_files(unistd.h HAVE_UNISTD_H) ++ ++ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++endif() + + set(kworkspace_LIB_SRCS kdisplaymanager.cpp + kworkspace.cpp +@@ -14,8 +67,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") ++endif() + + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" + "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" +@@ -31,11 +92,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte + qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) + +-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) + qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) +- +-set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") +- + qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface ) + + +@@ -101,3 +158,8 @@ if(BUILD_TESTING) + add_subdirectory(autotests) + add_subdirectory(tests) + endif() ++ ++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ++ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel ) ++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ++endif() +-- +2.22.0 + diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD index ed8cd7bd9..2520bb45d 100644 --- a/user/milou/APKBUILD +++ b/user/milou/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=milou -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Search and launch plasmoid" url="https://www.kde.org/" @@ -9,9 +9,9 @@ arch="all" license="GPL-2.0+ AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)" depends="" makedepends="cmake extra-cmake-modules python3 kcoreaddons-dev kdeclarative-dev - ki18n-dev krunner-dev kservice-dev plasma-framework-dev" + ki18n-dev kitemmodels-dev krunner-dev kservice-dev plasma-framework-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/milou-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="24e61d7e209a5e563d0d8da3db013c127ecd2b59fde7ea90893daae5a9de8f02315832a985eab2f6ed1a5eae891ce33c18548e56e98d79a25b848e46527e3ee8 milou-5.12.9.tar.xz" +sha512sums="ce5d13440bde18916dbc14db703b05fc62aa1c64b85cfaba1aea1d29cf83e5904e21eec9ecbae9d2e27b18b0b44640d2c30f81c1aff667f19ec9ecf005623cf8 milou-5.17.90.tar.xz" diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD index 1747dd4f6..4b5ce7f2b 100644 --- a/user/oxygen/APKBUILD +++ b/user/oxygen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=oxygen -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="'Oxygen' theme for KDE" url="https://www.kde.org/" @@ -12,8 +12,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev frameworkintegration-dev kcmutils-dev kcompletion-dev kconfig-dev kdecoration-dev kguiaddons-dev ki18n-dev kservice-dev kwidgetsaddons-dev kwindowsystem-dev" -subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/oxygen-$pkgver.tar.xz" +subpackages="$pkgname-lang" +source="https://download.kde.org/unstable/plasma/$pkgver/oxygen-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a4c292742e48c2ede86d254ed1d456249e11a5b88102dee34fce7e96dbc0fdeb561661c383c1c39f4d9ab9ebf133a4c432118d1e4933245280279593e6edf4b oxygen-5.12.9.tar.xz" +sha512sums="0003051d9e84b41b6f40d6c802d4e16d62591afde2797cddcab404a993806e847e8ff0177c15a9c0a3a7af260f49f980775e90413ce641db80f5210a992c85f3 oxygen-5.17.90.tar.xz" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index 6d3b2d33d..afa6daf78 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-desktop -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" url="https://www.kde.org/plasma-desktop" @@ -9,26 +9,25 @@ arch="all" options="!check" # Test suite fails due to keyboard layouts license="GPL-2.0 LGPL-2.1" # theme/visual dependencies -depends="breeze breeze-icons oxygen ttf-liberation" +depends="breeze breeze-icons kirigami2 oxygen qt5-qtquickcontrols2 + ttf-liberation" # shell/QML dependencies depends="$depends kde-cli-tools kded kwin qt5-qtgraphicaleffects setxkbmap" # Good Ideas™ to have depends="$depends consolekit2 kdeclarative" makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev qt5-qtsvg-dev kdelibs4support-dev xf86-input-synaptics-dev - kauth-dev plasma-framework-dev kdoctools-dev ki18n-dev + kauth-dev plasma-framework-dev kdoctools-dev ki18n-dev libkworkspace-dev kcmutils-dev knewstuff-dev knotifications-dev knotifyconfig-dev attica-dev kwallet-dev krunner-dev kglobalaccel-dev kdeclarative-dev kpeople-dev kdbusaddons-dev kactivities-dev kactivities-stats-dev kconfig-dev kitemmodels-dev plasma-workspace-dev xf86-input-evdev-dev libxkbcommon-dev pulseaudio-dev libcanberra-dev libxkbfile-dev xorg-server-dev kwin-dev kscreenlocker-dev baloo-dev xcb-util-image-dev - xf86-input-libinput-dev breeze-dev xkeyboard-config extra-cmake-modules" + xf86-input-libinput-dev breeze-dev xkeyboard-config extra-cmake-modules + kirigami2-dev libksysguard-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz - cmake-fixes.patch - headers.patch - " +source="https://download.kde.org/unstable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -54,6 +53,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0fea993cb522f3e17ccae95e47ed4f4d44f91e9288e962f95fd7b410f09fbf8a8e7b0d20505d3d8bcc8805a38824b52a9c9c718b6e895db14a6c753dabedd824 plasma-desktop-5.12.9.tar.xz -45119bbd7b6f7803323410acac6c5cb2be232f776e6009938e932976091ca188f4a52ba0bca814212353856a8eb87700d86b2452d9cb925c4f6f1bf3577065b7 cmake-fixes.patch -38711ee002c1d5e38175cf010fc21e86348c2824a20f39616c87c295f4dd62b6fe4a1ea19aa9057502b6a7af095d1341cbca33c3fab8ff13264120164602787d headers.patch" +sha512sums="8d62506fbe2c276e26a21e107efa192661c9839b94762595b465f515867ba13b17265a3f193ccab2523812c62da5c6c4900fa8f25c50f9ae63e1a5883db97c1b plasma-desktop-5.17.90.tar.xz" diff --git a/user/plasma-desktop/cmake-fixes.patch b/user/plasma-desktop/cmake-fixes.patch deleted file mode 100644 index c6457351a..000000000 --- a/user/plasma-desktop/cmake-fixes.patch +++ /dev/null @@ -1,174 +0,0 @@ -From bcd8015eaf3638fca0e369955aa1a4290d079ef8 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 31 Mar 2019 19:49:40 +0200 -Subject: Harmonize use of HAVE_X11, using cmakedefine01. - -Fixes: config-X11.h:44:18: warning: "TRUE" is not defined, evaluates to 0 [-Wundef] - -It should *all* be ported to cmakedefine01... ---- - CMakeLists.txt | 3 +++ - config-X11.h.cmake | 2 +- - kcms/fonts/fonts.cpp | 4 ++-- - kcms/fonts/fonts.h | 4 ++-- - 4 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 036d781..df43295 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,6 +88,9 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" - TYPE REQUIRED - PURPOSE "Required for building the X11 based workspace" - ) -+if(X11_FOUND) -+ set(HAVE_X11 1) -+endif() - - find_package(UDev) - set_package_properties(UDev PROPERTIES DESCRIPTION "UDev library" -diff --git a/config-X11.h.cmake b/config-X11.h.cmake -index 60286dd..ae8978a 100644 ---- a/config-X11.h.cmake -+++ b/config-X11.h.cmake -@@ -41,4 +41,4 @@ - #cmakedefine HAS_RANDR_1_3 1 - - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -\ No newline at end of file -+#cmakedefine01 HAVE_X11 -diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp -index f336518..218c3eb 100644 ---- a/kcms/fonts/fonts.cpp -+++ b/kcms/fonts/fonts.cpp -@@ -224,7 +224,7 @@ - } - - /**** FontAASettings ****/ --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - FontAASettings::FontAASettings(QWidget *parent) - : QDialog(parent), - changesMade(false) -@@ -501,13 +501,13 @@ - - void FontAASettings::changed() - { --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - changesMade = true; - enableWidgets(); - #endif - } - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - int FontAASettings::exec() - { - const int i = QDialog::exec(); -@@ -643,7 +643,7 @@ - QGridLayout *lay = new QGridLayout(); - layout->addLayout(lay); - lay->setColumnStretch(3, 10); --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - QLabel *label = 0L; - label = new QLabel(i18n("Use a&nti-aliasing:"), this); - label->setAlignment(Qt::AlignRight | Qt::AlignVCenter); -@@ -692,7 +692,7 @@ - lay->addWidget(spinboxDpi, 1, 1); - layout->addStretch(1); - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - aaSettings = new FontAASettings(this); - #endif - -@@ -720,7 +720,7 @@ - fontUseList.at(i)->setDefault(); - } - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - useAA = AASystem; - cbAA->setCurrentIndex(useAA); - aaSettings->defaults(); -@@ -739,7 +739,7 @@ - (*it)->readFont(); - } - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - useAA_original = useAA = aaSettings->load() ? AAEnabled : AADisabled; - cbAA->setCurrentIndex(useAA); - #endif -@@ -762,7 +762,7 @@ - spinboxDpi->setValue(dpicfg); - dpi_original = dpicfg; - }; --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - if (cfgfonts.readEntry("dontChangeAASettings", true)) { - useAA_original = useAA = AASystem; - cbAA->setCurrentIndex(useAA); -@@ -791,7 +791,7 @@ - } else { - cfgfonts.writeEntry("forceFontDPI", dpi); - } --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - cfgfonts.writeEntry("dontChangeAASettings", cbAA->currentIndex() == AASystem); - #endif - cfgfonts.sync(); -@@ -817,7 +817,7 @@ - // Don't overwrite global settings unless explicitly asked for - e.g. the system - // fontconfig setup may be much more complex than this module can provide. - // TODO: With AASystem the changes already made by this module should be reverted somehow. --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - bool aaSave = false; - if (cbAA->currentIndex() == AAEnabled ) { - aaSave = aaSettings->save(KXftConfig::AntiAliasing::Enabled); -@@ -870,7 +870,7 @@ - - void KFonts::slotUseAntiAliasing() - { --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - useAA = static_cast< AASetting >(cbAA->currentIndex()); - aaSettingsButton->setEnabled(useAA == AAEnabled); - emit changed(true); -@@ -879,7 +879,7 @@ - - void KFonts::slotCfgAa() - { --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - if (aaSettings->exec()) { - emit changed(true); - } -diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h -index f7ade6b..d760e52 100644 ---- a/kcms/fonts/fonts.h -+++ b/kcms/fonts/fonts.h -@@ -80,7 +80,7 @@ - - public: - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - FontAASettings(QWidget *parent); - - bool save(KXftConfig::AntiAliasing::State aaState); -@@ -135,7 +135,7 @@ - void slotCfgAa(); - - private: --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - enum AASetting { AAEnabled, AASystem, AADisabled }; - AASetting useAA, useAA_original; - QComboBox *cbAA; --- -cgit v1.1 diff --git a/user/plasma-desktop/headers.patch b/user/plasma-desktop/headers.patch deleted file mode 100644 index b68ef8436..000000000 --- a/user/plasma-desktop/headers.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 18001c2926dc7d8f57060e34114283d6c2138471 Mon Sep 17 00:00:00 2001 -From: Frederik Gladhorn <gladhorn@kde.org> -Date: Thu, 18 Jul 2019 09:55:00 +0200 -Subject: Fix build, include QTime - -Summary: The type is used, but was not directly included. Fixes build with Qt 5.13. - -Reviewers: #plasma, broulik - -Reviewed By: #plasma, broulik - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D22522 ---- - kcms/dateandtime/dtime.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kcms/dateandtime/dtime.h b/kcms/dateandtime/dtime.h -index cceb071..965b487 100644 ---- a/kcms/dateandtime/dtime.h -+++ b/kcms/dateandtime/dtime.h -@@ -26,6 +26,7 @@ - - #include <QSpinBox> - #include <QComboBox> -+#include <QTime> - #include <QTimer> - #include <QWidget> - #include <QCheckBox> --- -cgit v1.1 - diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD index a80f633e6..3b4116ae0 100644 --- a/user/plasma-integration/APKBUILD +++ b/user/plasma-integration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-integration -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Qt platform theme plugin for Plasma" url="https://www.kde.org/" @@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules python3 qt5-qtbase-dev libxcursor-dev kiconthemes-dev knotifications-dev kwayland-dev kwidgetsaddons-dev kwindowsystem-dev breeze-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/plasma-integration-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/plasma-integration-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="903779e7a4a5c06c5f0754ed76d6eab339a293ad2e1695356ac6c3587b029b656711f684e40adbd8b4ebc732afa833fe4f0ae43681870d59c9609119140a1033 plasma-integration-5.12.9.tar.xz" +sha512sums="a958c1d5817cc36ba6b62184d6b9ce7cc486a47334e93d00b50404d2a9940985eab616e58c1aceba0d20f81480baaf5804cbc160c3efcd60c35ac705fe6d51c9 plasma-integration-5.17.90.tar.xz" diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD index d0e9ce146..b1321d956 100644 --- a/user/plasma-workspace-wallpapers/APKBUILD +++ b/user/plasma-workspace-wallpapers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace-wallpapers -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Default wallpapers from KDE" url="https://www.KDE.org/" @@ -10,7 +10,7 @@ license="LGPL-3.0-only" depends="" makedepends="cmake extra-cmake-modules" subpackages="" -source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-wallpapers-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/plasma-workspace-wallpapers-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="10ea940f4a0ae0379bbba6fc5128acf8fbc961a6fd6f96b89f9b0f76e76828642627cebf6521e825f0b5b1925a71e6a2ec25f8d181d0eedeac64fbb53f65250c plasma-workspace-wallpapers-5.12.9.tar.xz" +sha512sums="71b6df604d868038b59bc12e649404e460e34d969c2fd3648b98afb936c9d3c6f9370c35ccded208fa728a409ae5d5dd107419ff2366b192a60ee35baa01ecf8 plasma-workspace-wallpapers-5.17.90.tar.xz" diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index 0bb3216e4..971458789 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" @@ -21,19 +21,18 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kdelibs4support-dev kitemmodels-dev kservice-dev kwindowsystem-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev iso-codes-dev libdbusmenu-qt-dev libqalculate-dev libxtst-dev - xcb-util-image-dev + xcb-util-image-dev libkworkspace-dev baloo-dev kactivities-dev kcmutils-dev kcrash-dev kdbusaddons-dev kdeclarative-dev kdesu-dev kdoctools-dev kglobalaccel-dev kholidays-dev kidletime-dev kjsembed-dev knewstuff-dev knotifyconfig-dev kpackage-dev krunner-dev kscreenlocker-dev ktexteditor-dev ktextwidgets-dev kwallet-dev kwayland-dev kwin-dev kxmlrpcclient-dev libksysguard-dev - plasma-framework-dev prison-dev" + plasma-framework-dev prison-dev kactivities-stats-dev kpeople-dev + kirigami2-dev kuserfeedback-dev libkscreen-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz - cmake-fixes.patch - header.patch - session-conflict.patch +source="https://download.kde.org/unstable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz + libkworkspace.patch " build() { @@ -60,7 +59,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d96df6642f8d4c134381d8b186ec8766f0dffa3ebeb11f32242817d500e805e4d6c8df1471b1bdeb95a7778b6e9cd0daf1f72c04f834cc35bd14f1be9749e705 plasma-workspace-5.12.9.tar.xz -148195f34938c8f2ffd80d25bc07725e4e2a64296ec6292f7d8e739f1ab535f676683aa5d0ad41e1e085394ce733f5d25727cf44d55010488b8139ca9c9af135 cmake-fixes.patch -9934721c58ed514e55365a9b2e0410ee76fcf444a660ce9086d3aa46ca9fea708866e53c2f33a33a79ea4af13edee102a8bea9ca0bd280a6306527b6e5f46dd5 header.patch -2212bcafc53d6c9688265aed8ebceddeec23f6e73804ece955ac4006beb862dccbd93076ab357bbbef2d0953976a3347c8a1e5d2fa2654b5a7120abc288ea8ba session-conflict.patch" +sha512sums="8fc014e90dca30b54122ef0e83c08faabbb41a3ba5a511e4713db3898acd18faf53652ff766ffbaa70d1da3053618b70882255afeca060cd92e06d0bdf4e1934 plasma-workspace-5.17.90.tar.xz +f58b88928fd68518bc0524db35388cb0f0dbc2a55d85fc47e92ce7fcbaf9b155482736e282bd84104ceecc625406845840128c8d0fcd2a4d5a854673964cd94f libkworkspace.patch" diff --git a/user/plasma-workspace/cmake-fixes.patch b/user/plasma-workspace/cmake-fixes.patch deleted file mode 100644 index 68ad943f1..000000000 --- a/user/plasma-workspace/cmake-fixes.patch +++ /dev/null @@ -1,89 +0,0 @@ -From c534fdf1ba34d0ea8a08b9b5266384a3243271e0 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 10 Feb 2019 20:21:57 +0100 -Subject: Harmonize usage of HAVE_X11, using #if and #cmakedefine01 everywhere - -I got "#define HAVE_X11 TRUE" and errors because of that where #if was -used. - -This also obeys the logic that HAVE_X11 is set (in the toplevel -CMakeLists.txt) not only when X11_FOUND but also when XCB is found. ---- - appmenu/appmenu.cpp | 2 +- - config-X11.h.cmake | 2 +- - libkworkspace/config-libkworkspace.h.cmake | 2 +- - runners/windows/config-windowsrunner.h.cmake | 2 +- - shell/scripting/appinterface.cpp | 2 +- - soliduiserver/soliduiserver.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/appmenu/appmenu.cpp b/appmenu/appmenu.cpp -index 7c956c6..4ab7106 100644 ---- a/appmenu/appmenu.cpp -+++ b/appmenu/appmenu.cpp -@@ -106,7 +106,7 @@ AppMenuModule::~AppMenuModule() = default; - - void AppMenuModule::slotWindowRegistered(WId id, const QString &serviceName, const QDBusObjectPath &menuObjectPath) - { --#ifdef HAVE_X11 -+#if HAVE_X11 - if (KWindowSystem::isPlatformX11()) { - auto *c = QX11Info::connection(); - -diff --git a/config-X11.h.cmake b/config-X11.h.cmake -index 60286dd..ae8978a 100644 ---- a/config-X11.h.cmake -+++ b/config-X11.h.cmake -@@ -41,4 +41,4 @@ - #cmakedefine HAS_RANDR_1_3 1 - - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -+#cmakedefine01 HAVE_X11 -diff --git a/libkworkspace/config-libkworkspace.h.cmake b/libkworkspace/config-libkworkspace.h.cmake -index 36a826e..c3ae6d7 100644 ---- a/libkworkspace/config-libkworkspace.h.cmake -+++ b/libkworkspace/config-libkworkspace.h.cmake -@@ -1,2 +1,2 @@ - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -\ No newline at end of file -+#cmakedefine01 HAVE_X11 -diff --git a/runners/windows/config-windowsrunner.h.cmake b/runners/windows/config-windowsrunner.h.cmake -index 36a826e..c3ae6d7 100644 ---- a/runners/windows/config-windowsrunner.h.cmake -+++ b/runners/windows/config-windowsrunner.h.cmake -@@ -1,2 +1,2 @@ - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -\ No newline at end of file -+#cmakedefine01 HAVE_X11 -diff --git a/shell/scripting/appinterface.cpp b/shell/scripting/appinterface.cpp -index bd66cd2..a0ad73c 100644 ---- a/shell/scripting/appinterface.cpp -+++ b/shell/scripting/appinterface.cpp -@@ -37,7 +37,7 @@ - #include <windows.h> - #endif - --#ifdef HAVE_X11 -+#if HAVE_X11 - #include <X11/Xlib.h> - #include <fixx11h.h> - #endif -diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp -index 3ec09c0..d06a1e6 100644 ---- a/soliduiserver/soliduiserver.cpp -+++ b/soliduiserver/soliduiserver.cpp -@@ -222,7 +222,7 @@ void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appI - - KWindowSystem::setMainWindow(dialog, wId); // correct, set dialog parent - --#ifdef HAVE_X11 -+#if HAVE_X11 - if (modal) { - KWindowSystem::setState(dialog->winId(), NET::Modal); - } else { --- -cgit v1.1 - diff --git a/user/plasma-workspace/header.patch b/user/plasma-workspace/header.patch deleted file mode 100644 index ea82bd7f0..000000000 --- a/user/plasma-workspace/header.patch +++ /dev/null @@ -1,97 +0,0 @@ -From a788ab3d08a8a68ed232f81a2110f447080451ec Mon Sep 17 00:00:00 2001 -From: Laurent Montel <montel@kde.org> -Date: Thu, 8 Aug 2019 13:54:17 +0200 -Subject: Add missing include - ---- - shell/shellcorona.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp -index 90fd4f9..5c94e32 100644 ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -30,6 +30,7 @@ - #include <QQmlContext> - #include <QDBusConnection> - #include <QUrl> -+#include <QScreen> - - #include <QJsonObject> - #include <QJsonDocument> --- -cgit v1.1 - -From b98a399bdcdb7f0ca84298bad96b1a13ed8b5d1f Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Thu, 8 Aug 2019 07:54:35 -0600 -Subject: Fix build failure in the CI - ---- - runners/windows/windowsrunner.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/runners/windows/windowsrunner.cpp b/runners/windows/windowsrunner.cpp -index 70856f7..4fc4aaf 100644 ---- a/runners/windows/windowsrunner.cpp -+++ b/runners/windows/windowsrunner.cpp -@@ -24,6 +24,7 @@ - - #include <QDebug> - #include <QIcon> -+#include <QMutexLocker> - #include <KWindowSystem> - #include <KLocalizedString> - --- -cgit v1.1 - -From 0c4ec1c4af05aa1f6e36c934881cf6f427f7241a Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Tue, 6 Aug 2019 13:29:56 -0600 -Subject: Fix compilation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Summary: -Without this patch, plasma-workspace fails to compile for me with the following error: -``` -In file included from /home/nate/kde/build/plasma-workspace/runners/windows/krunner_windows_autogen/EWIEGA46WW/moc_windowsrunner.cpp:10, - from /home/nate/kde/build/plasma-workspace/runners/windows/krunner_windows_autogen/mocs_compilation.cpp:2: -/home/nate/kde/build/plasma-workspace/runners/windows/krunner_windows_autogen/EWIEGA46WW/../../../../../../src/plasma-workspace/runners/windows/windowsrunner.h:61:9: error: ‘QMutex’ does not name a type - 61 | QMutex m_mutex; - | ^~~~~~ -``` - -Test Plan: It compiles now - -Reviewers: #plasma, aacid - -Reviewed By: aacid - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D22976 ---- - runners/windows/windowsrunner.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/runners/windows/windowsrunner.h b/runners/windows/windowsrunner.h -index 016b7c4..a106af8 100644 ---- a/runners/windows/windowsrunner.h -+++ b/runners/windows/windowsrunner.h -@@ -21,6 +21,8 @@ - - #include <KRunner/AbstractRunner> - -+#include <QMutex> -+ - class KWindowInfo; - - class WindowsRunner : public Plasma::AbstractRunner --- -cgit v1.1 - diff --git a/user/plasma-workspace/libkworkspace.patch b/user/plasma-workspace/libkworkspace.patch new file mode 100644 index 000000000..e8e3d93b6 --- /dev/null +++ b/user/plasma-workspace/libkworkspace.patch @@ -0,0 +1,35 @@ +From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Mon, 22 Oct 2018 10:35:10 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + CMakeLists.txt | 6 +++- + 1 file changed, 5 insertions(+), 1 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e587a386..d1a63527 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,6 +63,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" + + find_package(KF5TextEditor) + find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(LibKWorkspace 5.17.90) + + find_package(KScreenLocker 5.17.90 REQUIRED) + find_package(ScreenSaverDBusInterface CONFIG REQUIRED) +@@ -151,7 +151,10 @@ endif() + add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + + add_subdirectory(doc) +-add_subdirectory(libkworkspace) ++if(NOT LibKWorkspace_FOUND) ++ message(STATUS "System LibKWorkspace not found, using bundled.") ++ add_subdirectory(libkworkspace) ++endif() + add_subdirectory(libdbusmenuqt) + add_subdirectory(appmenu) + +-- +2.19.1 diff --git a/user/plasma-workspace/session-conflict.patch b/user/plasma-workspace/session-conflict.patch deleted file mode 100644 index 667a7187b..000000000 --- a/user/plasma-workspace/session-conflict.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 36bc9bfd9661f88039a8945688e07b0626b48610 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 15 Oct 2019 18:33:45 +0200 -Subject: [PATCH 1/2] Fix Name conflict between plasma.desktop and - plasmawayland.desktop - -Summary: -SDDM until 0.18.1 appends " (Wayland)" to the name of any session file it -finds in wayland-sessions dir, and Plasma is relying on that behaviour to -distinguish between its X11 and Wayland sessions. This leads to duplicate -"Plasma" entries on any other DM not applying the same hack, e.g. lightdm, -and users are lost without downstream patching. - -SDDM in 0.19 only appends " (Wayland)" in case the session name does -not already end with this, to avoid duplicating it. - -CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409 -See also: https://github.com/sddm/sddm/pull/997 - -Reviewers: #plasma, davidedmundson, fvogt, ngraham - -Reviewed By: #plasma, davidedmundson, fvogt, ngraham - -Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D22210 ---- - login-sessions/plasmawayland.desktop.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plasmawayland.desktop.cmake b/plasmawayland.desktop.cmake -index 64f997ea4..3e9b46bc9 100644 ---- a/plasmawayland.desktop.cmake -+++ b/plasmawayland.desktop.cmake -@@ -2,51 +2,7 @@ - Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland - TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland - DesktopNames=KDE --Name=Plasma --Name[ar]=بلازما --Name[bs]=Plazma --Name[ca]=Plasma --Name[ca@valencia]=Plasma --Name[cs]=Plasma --Name[da]=Plasma --Name[de]=Plasma --Name[el]=Plasma --Name[en_GB]=Plasma --Name[es]=Plasma --Name[et]=Plasma --Name[eu]=Plasma --Name[fi]=Plasma --Name[fr]=Plasma --Name[gl]=Plasma --Name[he]=פלזמה --Name[hu]=Plasma --Name[id]=Plasma --Name[is]=Plasma --Name[it]=Plasma --Name[ja]=プラズマ --Name[ko]=Plasma --Name[lt]=Plasma --Name[nb]=Plasma --Name[nds]=Plasma --Name[nl]=Plasma --Name[nn]=Plasma --Name[pa]=ਪਲਾਜ਼ਮਾ --Name[pl]=Plazma --Name[pt]=Plasma --Name[pt_BR]=Plasma --Name[ru]=Plasma --Name[sk]=Plasma --Name[sl]=Plasma --Name[sr]=Плазма --Name[sr@ijekavian]=Плазма --Name[sr@ijekavianlatin]=Plasma --Name[sr@latin]=Plasma --Name[sv]=Plasma --Name[tr]=Plama --Name[uk]=Плазма --Name[x-test]=xxPlasmaxx --Name[zh_CN]=Plasma --Name[zh_TW]=Plasma -+Name=Plasma (Wayland) - Comment=Plasma by KDE - Comment[ar]=بلازما كدي - Comment[bs]=Plazma od strane KDe --- -2.23.0 diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD index 90eba4c2b..7059472ba 100644 --- a/user/powerdevil/APKBUILD +++ b/user/powerdevil/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=powerdevil -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="KDE Plasma power management utilities" url="https://www.kde.org/" @@ -11,9 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev kactivities-dev kauth-dev kconfig-dev kdbusaddons-dev kglobalaccel-dev ki18n-dev kidletime-dev kio-dev knotifyconfig-dev kdelibs4support-dev - kwayland-dev libkscreen-dev plasma-workspace-dev solid-dev eudev-dev" + kwayland-dev libkscreen-dev libkworkspace-dev solid-dev eudev-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/powerdevil-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/powerdevil-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f92476160f0c66fbcab4008bee2d307f2f8dc25767eaf4b63ab1971bd230774df49dc5c8361e952a1efc7e2587c6f5cedfed8ef9d286d4d1f91c913f33f58e0b powerdevil-5.12.9.tar.xz" +sha512sums="4ec525ffa16727b419377851c668d3c18f0acde116c025e2b9247e2c55c86594e8c9b37bfd1871b64f894425d4ceefeb290fe80b09abdb274b60f94a70cbdcda powerdevil-5.17.90.tar.xz" diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD index 6f10587a7..d4311745f 100644 --- a/user/sddm-kcm/APKBUILD +++ b/user/sddm-kcm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=sddm-kcm -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="KDE configuration applet for SDDM" url="https://www.kde.org/" @@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev knewstuff-dev" install_if="systemsettings sddm" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7f05a5bcd08b74591bece6bf9af65e3132e834c528107d911af2fd6e30c227ba6048fa1297b0d90444db499deed64899c026ceaf2e3d4bd56096068d60b4f37 sddm-kcm-5.12.9.tar.xz" +sha512sums="1ab200061efd664c81182595a7884f8c03242822ca8d03bba2275a73d204675278c6b474555e106db98071e3aa48472401f1269c10005b40e5a25bea4a981d49 sddm-kcm-5.17.90.tar.xz" diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD index 94ef3ed76..74bcde3af 100644 --- a/user/systemsettings/APKBUILD +++ b/user/systemsettings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=systemsettings -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="KDE system settings configuration utility" url="https://www.kde.org/" @@ -12,9 +12,10 @@ depends_dev="qt5-qtbase-dev kitemviews-dev kservice-dev kwidgetsaddons-dev" makedepends="$depends_dev cmake extra-cmake-modules kactivities-stats-dev kactivities-dev kauth-dev kcmutils-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev khtml-dev ki18n-dev - kiconthemes-dev kio-dev kirigami2-dev kwindowsystem-dev kxmlgui-dev" + kiconthemes-dev kitemmodels-dev kio-dev kirigami2-dev kwindowsystem-dev + kxmlgui-dev libkworkspace-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/systemsettings-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/systemsettings-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="620704f2b74a81e151933cac62d3ac09ad085db6094a2cd96f20337ba056ac7b908bf7f9a6b0a6532cc15ff3e55a7299b06357b3f41ad224f4aaa53db5b765f7 systemsettings-5.12.9.tar.xz" +sha512sums="cd6f8df1eba6252e229044bc5275fbd15dfef0e30c17db63d2331540c4ee3fb4b6adc8f73db502343699259f2b062dcc9332f1f037131c55ef7ae0080618b2a1 systemsettings-5.17.90.tar.xz" diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD index b4e10a6c6..e17b47f01 100644 --- a/user/user-manager/APKBUILD +++ b/user/user-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=user-manager -pkgver=5.12.9 +pkgver=5.17.90 pkgrel=0 pkgdesc="Manage user accounts from KDE" url="https://www.KDE.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kauth-dev kcmutils-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev kiconthemes-dev kio-dev kwidgetsaddons-dev libpwquality-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/user-manager-$pkgver.tar.xz" +source="https://download.kde.org/unstable/plasma/$pkgver/user-manager-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="52a7b213fb69aec57284fa53e2ec800b0d47adacabddf774707a2eb434da083adbde6ff93300f831ac83f804dd6faab2c00d10e76a41581e3607b98cb615cc1b user-manager-5.12.9.tar.xz" +sha512sums="c22259a978fa377a87770002463962dc18ae4dc61696671d75bde878280baa9da24f65f416714509fb4275a44d47b9b445e7e9cb59172aa546407f1b954b40dc user-manager-5.17.90.tar.xz" |