user/[KDE Plasma]: Plasma 5.18 Beta

3 files changed, 8 insertions, 220 deletions

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
-