user/[Plasma]: bump to 5.12.2

author: A. Wilcox <AWilcox@Wilcox-Tech.com> 2018-03-04 15:05:51 -0600
committer: A. Wilcox <AWilcox@Wilcox-Tech.com> 2018-03-04 15:05:51 -0600
commit: aa78da47b45ff1d7016d79400253a6e45b265ebe (patch)
tree: 027ff1920d0abf697389303ef04aaaa3d87ff708 /user
parent: cd8822ac3987a2f52dc313081ade2bf631954d92 (diff)
download: packages-aa78da47b45ff1d7016d79400253a6e45b265ebe.tar.gz
packages-aa78da47b45ff1d7016d79400253a6e45b265ebe.tar.bz2
packages-aa78da47b45ff1d7016d79400253a6e45b265ebe.tar.xz
packages-aa78da47b45ff1d7016d79400253a6e45b265ebe.zip
28 files changed, 58 insertions, 1030 deletions
diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD
index 4c89cd53e..e0b946fe7 100644
--- a/user/breeze/APKBUILD
+++ b/user/breeze/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=breeze
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="Default KDE Plasma 5 style"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2c2081994de9a3580de4cef13689d9fe8118c826c1f753600066939aaf8978dac100815d9110ee45e09dcf3778128849d96ad10fb6f731c18b79b03bbae33c1e  breeze-5.8.7.tar.xz"
+sha512sums="2bdc27ca2a1df0234f22ebb1c56723b2ad1345417889b5fc2e66bebef4e2ad1592b78f4391b38a1b2a994f414390789bcbbe213c80f29e1440827bf2bc3d2ead  breeze-5.12.2.tar.xz"
diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD
index 636e217d0..2f13e2b92 100644
--- a/user/kactivitymanagerd/APKBUILD
+++ b/user/kactivitymanagerd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kactivitymanagerd
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="Service to manage KDE Plasma activities"
 url="https://www.kde.org/"
@@ -47,4 +47,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cba671eaca863e80bb2e92fd0f1fc84121a9670ba8c48a14e13ac874bd830deedb215228c29b4f7e249843591ba12ab1acd81612d462bf26edeebab28eb082d8  kactivitymanagerd-5.8.7.tar.xz"
+sha512sums="c8ea26b4948898cd1734bde5a5fe50991c7d61f997fe4539b819e2ef90e3a1c0fb57dec3331106f42616f9ce0485b81bf61a462832a46a35dcbe87050ecc3c08  kactivitymanagerd-5.12.2.tar.xz"
diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD
index a85d55916..8b7fcef04 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@adelielinux.org>
 pkgname=kde-cli-tools
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="KDE command-like utilities"
 url="https://www.kde.org/"
@@ -11,7 +11,7 @@ options="!check"  # MIME types for some reason think .doc == .txt
 depends=""
 makedepends="qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kiconthemes-dev kinit-dev
 	ki18n-dev kcmutils-dev kio-dev kwindowsystem-dev kdelibs4support-dev
-	kdesu-dev qt5-qtx11extras-dev
+	kactivities-dev kdesu-dev qt5-qtx11extras-dev
 	cmake extra-cmake-modules kdoctools-dev"
 install=""
 subpackages="$pkgname-lang $pkgname-doc"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3be34730ba417c80a6acf23c5428a16912270ea7dc0731a2e03670ae8b8350250280973342fc41f933f6f5db9f97947db97164cf4fb40ee0774a339daeb3479d  kde-cli-tools-5.8.7.tar.xz"
+sha512sums="2dc5be967d7888abda1b28af465754ae1530a3cd8cb919a77dc65d8566f961faa17e0c2d351b20fb3fcd4fd08d06f65bbe169cb20e78735d9ad3d7cc8664003e  kde-cli-tools-5.12.2.tar.xz"
diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD
index 9285f2562..3673e4bff 100644
--- a/user/kdecoration/APKBUILD
+++ b/user/kdecoration/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdecoration
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="Window decoration plugin library"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ef1f7f3eb09872f0ceb0552300493f2701fdb6fb262dec00cad2f06a2ac034a7e278815a90220e94ab366956b0e62157b7c1e0f4fd743a6d5fa7c77931fd54e8  kdecoration-5.8.7.tar.xz"
+sha512sums="12440920014d703156665d80a1c43f3bbbd0aea534f2a79d51536609aa5a50b3419015c1455a8b5c591d15aafc5a317c1a4b0a360e62be0fadcec0785788242c  kdecoration-5.12.2.tar.xz"
diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD
index 4e9bba38f..b3e1bd295 100644
--- a/user/kinfocenter/APKBUILD
+++ b/user/kinfocenter/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kinfocenter
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="Information about the running computer"
 url="https://www.kde.org/applications/system/kinfocenter/"
@@ -44,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="37da25c445d8315dac7bb4cf33124cd73de9c84644920238a2ec66d54650b62106cd4022a76a64cd1b59dee3843a9ba58ecd27d979b2394bd1feb2b86875a452  kinfocenter-5.8.7.tar.xz"
+sha512sums="7150e3376d515d6e542deeb3834bcdb5a253629755e2a3ccc826db84cfd1ef7477119c318ba5a28a6c3b8800a1aa1b6d95e40b99b669d254bf21beec6109ff9b  kinfocenter-5.12.2.tar.xz"
diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD
index da64afab3..98ac6e058 100644
--- a/user/kscreenlocker/APKBUILD
+++ b/user/kscreenlocker/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kscreenlocker
-pkgver=5.8.7
-pkgrel=3
+pkgver=5.12.2
+pkgrel=0
 pkgdesc="Secure X11 screen locker"
 url="https://www.kde.org/"
 arch="all"
@@ -18,7 +18,6 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 gettext-dev
 install=""
 subpackages="$pkgname-dev $pkgname-lang"
 source="http://download.kde.org/stable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz
-	kscreenlocker-5.8.5-stop-using-getpass.patch
 	kde.pam
 	kde-np.pam"
 builddir="$srcdir/kscreenlocker-$pkgver"
@@ -51,7 +50,6 @@ package() {
 	install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np
 }
 
-sha512sums="cee66e85efaafd5629c9e2b1eea1522cff960d7b9922be7b6d5f767c231fcb762cf80585d5528fdb5fc3684881bf2fa4a59da3136a1d23341ceb218da3f69e11  kscreenlocker-5.8.7.tar.xz
-44bbf365555668f7ef2f354a06d08b4b83c556f6e78ead028acd727363c287cfecc2e3eb4d0bb137feb2939da0fa21db694af6b10f8a3878d7071ad4e3b8d4e8  kscreenlocker-5.8.5-stop-using-getpass.patch
+sha512sums="cb293d69bc56fc3b2cde20b4088277a8d578896429dae2f66a8496ebb8750c23a32d56dcecad047d5a9a9180fa1c3a1a42ad12943fc937a009dcd8be4e7e08c3  kscreenlocker-5.12.2.tar.xz
 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3  kde.pam
 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd  kde-np.pam"
diff --git a/user/kscreenlocker/kscreenlocker-5.8.5-stop-using-getpass.patch b/user/kscreenlocker/kscreenlocker-5.8.5-stop-using-getpass.patch
deleted file mode 100644
index f10789f88..000000000
--- a/user/kscreenlocker/kscreenlocker-5.8.5-stop-using-getpass.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- kscreenlocker-5.8.5/kcheckpass/kcheckpass.c.old	2016-12-27 11:25:36.000000000 +0000
-+++ kscreenlocker-5.8.5/kcheckpass/kcheckpass.c	2017-01-31 04:32:44.858227055 +0000
-@@ -56,6 +56,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <time.h>
-+#include <termios.h>
- 
- #include <config-kscreenlocker.h>
- #if HAVE_SYS_PRCTL_H
-@@ -75,9 +76,41 @@
- static int havetty, sfd = -1, nullpass;
- 
- static char *
-+better_getpass (void)
-+{
-+    char                *password = NULL, *nl;
-+    size_t              buf_len = 0;
-+    ssize_t             pass_len;
-+    struct termios      ti;
-+
-+    tcgetattr(STDIN_FILENO, &ti);
-+    ti.c_lflag &= ~ECHO;
-+    tcsetattr(STDIN_FILENO, TCSANOW, &ti);
-+
-+    pass_len = getdelim(&password, &buf_len, '\n', stdin);
-+
-+    if (pass_len < 0) {
-+        free(password);
-+        return NULL;
-+    }
-+
-+    ti.c_lflag |= ECHO;
-+    tcsetattr(STDIN_FILENO, TCSANOW, &ti);
-+
-+    /* Do not include the \n at the end */
-+    nl = strchr(password, '\n');
-+    if (nl) {
-+        *nl = '\0';
-+    }
-+
-+    return password;
-+}
-+
-+
-+static char *
- conv_legacy (ConvRequest what, const char *prompt)
- {
--    char		*p, *p2;
-+    char		*p2;
-     int			len;
-     char		buf[1024];
- 
-@@ -99,13 +132,10 @@
- 	return strdup(buf);
-     case ConvGetHidden:
- 	if (havetty) {
--#ifdef HAVE_GETPASSPHRASE
--	    p = getpassphrase(prompt ? prompt : "Password: ");
--#else
--	    p = getpass(prompt ? prompt : "Password: ");
--#endif
--	    p2 = strdup(p);
--	    memset(p, 0, strlen(p));
-+	    fputs(prompt ? prompt : "Password: ", stdout);
-+	    fflush(stdout);
-+	    p2 = better_getpass();
-+	    printf("\n");
- 	    return p2;
- 	} else {
- 	    if (prompt)
diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD
index 70fa61852..a5f522cee 100644
--- a/user/ksysguard/APKBUILD
+++ b/user/ksysguard/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ksysguard
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="KDE system monitor utility"
 url="https://www.kde.org/"
@@ -14,9 +14,7 @@ makedepends="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev kio-dev
 	cmake extra-cmake-modules kdoctools-dev"
 install=""
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/Attic/plasma/$pkgver/ksysguard-$pkgver.tar.xz
-	ksysguard-5.5.5-netstat-use-a-real-type.patch
-	ksysguard-5.6.5-processlist-gnu_source.patch
+source="https://download.kde.org/stable/plasma/$pkgver/ksysguard-$pkgver.tar.xz
 	ksysguard-5.6.5-rindex-header.patch
 	"
 builddir="$srcdir/ksysguard-$pkgver"
@@ -47,7 +45,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="320e02cf94768f9d63e12dfb46ab0728bf64e60636242b9a6f57517b3ca329bfa2d99f4999e2b071a6cd2849d14e807d9a2070cd9d0f51dbdf32fccfec423bb5  ksysguard-5.8.7.tar.xz
-078c9d3e13ee0960a8cc68e3ee6ef4f9fc78640fae71d66dd5579f9d031895aec7cf1c2dbc4b03f84edfb9456163dcf6124c6da936f90eef3e664c4267660ab9  ksysguard-5.5.5-netstat-use-a-real-type.patch
-818d2d603d7113b163cabbf27f0082bd8b482a8e66a1b8f569f353c84f3d031c742708b2f376f962f1ed360594fb6c6506195d9071d070b5c0ac4816d5e0cad4  ksysguard-5.6.5-processlist-gnu_source.patch
+sha512sums="19c4f18845b6e8103630469986f2316e50883ef68014a3221a6772d15a359c64b93dcd4874d4d927fcf8acdf884bc801f2a01f27cb95a176cec1605b50b5b670  ksysguard-5.12.2.tar.xz
 13a26451c459cff1d3b00af27c953d10c55e7e8f43ef7a6f0f54dd05dcb612546545c0170089e9499bb041f004cdacf19cb112d247a8ccf8fd4e77fea0d1c8bc  ksysguard-5.6.5-rindex-header.patch"
diff --git a/user/ksysguard/ksysguard-5.5.5-netstat-use-a-real-type.patch b/user/ksysguard/ksysguard-5.5.5-netstat-use-a-real-type.patch
deleted file mode 100644
index d3543f3ce..000000000
--- a/user/ksysguard/ksysguard-5.5.5-netstat-use-a-real-type.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ksysguard-5.5.5/ksysguardd/Linux/netstat.old	2016-03-01 14:35:05.000000000 +0100
-+++ ksysguard-5.5.5/ksysguardd/Linux/netstat.c	2016-07-22 03:46:19.016064987 +0100
-@@ -264,10 +264,10 @@
- {
- 	FILE *netstat;
- 	char buffer[1024];
--	uint local_addr, local_port;
--	uint remote_addr, remote_port;
-+	unsigned int local_addr, local_port;
-+	unsigned int remote_addr, remote_port;
- 	int uid;
--	uint state;
-+	unsigned int state;
- 	SocketInfo *socket_info;
- 
- 	if (strstr(cmd, "tcp")) {
diff --git a/user/ksysguard/ksysguard-5.6.5-processlist-gnu_source.patch b/user/ksysguard/ksysguard-5.6.5-processlist-gnu_source.patch
deleted file mode 100644
index e68fc7b2b..000000000
--- a/user/ksysguard/ksysguard-5.6.5-processlist-gnu_source.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ksysguard-5.6.5/ksysguardd/Linux/ProcessList.c.old	2016-06-14 11:09:02.000000000 +0100
-+++ ksysguard-5.6.5/ksysguardd/Linux/ProcessList.c	2016-08-07 03:14:25.158991313 +0100
-@@ -28,7 +28,9 @@
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <time.h>
-+#define _GNU_SOURCE
- #include <unistd.h>
-+#undef _GNU_SOURCE
- #include <sys/ptrace.h>
- #include <asm/unistd.h>
- 
diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD
index cc9a1cf80..41ec2ecce 100644
--- a/user/kwin/APKBUILD
+++ b/user/kwin/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kwin
-pkgver=5.8.7
-pkgrel=1
+pkgver=5.12.2
+pkgrel=0
 pkgdesc="Modern, stylish window manager (requires OpenGL)"
 url="https://www.kde.org/"
 arch="all"
@@ -18,14 +18,12 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtscript-dev kcrash-dev
 	kdecoration-dev kscreenlocker-dev wayland-dev mesa-dev libepoxy-dev
 	eudev-dev libdrm-dev libx11-dev libxcb-dev xcb-util-cursor-dev
 	xcb-util-image-dev xcb-util-wm-dev libxkbcommon-dev libinput-dev
-	freetype-dev fontconfig-dev qt5-qtmultimedia-dev breeze-dev"
+	freetype-dev fontconfig-dev qt5-qtmultimedia-dev breeze-dev
+	qt5-qtsensors-dev"
 makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev python3"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="http://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz
-	kwin-5.8-stop-depending-on-qt5-internals.patch
-	kwin-5.8-respect-uint.patch
-	kwin-backport-gallium-version-detection.patch"
+source="http://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz"
 builddir="$srcdir/kwin-$pkgver"
 
 build() {
@@ -54,7 +52,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f1f3b01f85378e663385887add8dd5b2f40076cfc57f7cf638e83e2424fedb576b4b431b14151422ea43c535677131e61b8d9e7fe60e5a5f4ea06520c895bd1e  kwin-5.8.7.tar.xz
-7186dd317204612ba26f11315238f527949424d08f32dc0dab8c1391d642529433cfd7091dc2a057fe849976dee70eed7aab3c8be55b20b8c0655da57976b48e  kwin-5.8-stop-depending-on-qt5-internals.patch
-aaefa9951ec1475adf00784b202d0ca9f92a60634a869387432411e8b7928d9f10b46968998a4ada47228834e8c7f6c9bf1c8dd988673b22619e8e1295e086c7  kwin-5.8-respect-uint.patch
-9c8cdb884defc3e16444b41de0c53e10774cef6d8d0a461376ba64cc3457dfe19579e13ce45df721e32643dddf518df7d787ee36bcba840ef1bf2b7009d9b1ab  kwin-backport-gallium-version-detection.patch"
+sha512sums="8df904f86c50cc9a578122b88a5c768652c09564f6ae048ae6989a55c0e3e886da2f3080b9601885c27ffa3313a7fcc3389c63e61a7125ceb650a8aaa2af12c4  kwin-5.12.2.tar.xz"
diff --git a/user/kwin/kwin-5.8-respect-uint.patch b/user/kwin/kwin-5.8-respect-uint.patch
deleted file mode 100644
index 839d84d2e..000000000
--- a/user/kwin/kwin-5.8-respect-uint.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 404f2675f8ca5496a5e528825078b1ce27669cd7 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 20 Mar 2017 17:01:39 +0100
-Subject: fix compilation on old gcc
-
-same as https://phabricator.kde.org/D5083,
-gcc 4.8.5 (opensuse leap) fails building modeltest with
-CMakeFiles/testHistoryModel.dir/modeltest.cpp.o: In function `ModelTest::data()':
-modeltest.cpp:(.text+0x5a57): undefined reference to `bool QTest::qCompare<int, unsigned int>(int const&, unsigned int const&, char const*, char const*, char const*, int)'
----
- kcmkwin/kwincompositing/test/modeltest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcmkwin/kwincompositing/test/modeltest.cpp b/kcmkwin/kwincompositing/test/modeltest.cpp
-index d356b26..c077d9b 100644
---- a/kcmkwin/kwincompositing/test/modeltest.cpp
-+++ b/kcmkwin/kwincompositing/test/modeltest.cpp
-@@ -453,7 +453,7 @@ void ModelTest::data()
-     // Check that the alignment is one we know about
-     QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
-     if ( textAlignmentVariant.isValid() ) {
--        int alignment = textAlignmentVariant.toInt();
-+        unsigned int alignment = textAlignmentVariant.toUInt();
-         QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
-     }
- 
--- 
-cgit v0.11.2
-
diff --git a/user/kwin/kwin-5.8-stop-depending-on-qt5-internals.patch b/user/kwin/kwin-5.8-stop-depending-on-qt5-internals.patch
deleted file mode 100644
index 7b77e9c57..000000000
--- a/user/kwin/kwin-5.8-stop-depending-on-qt5-internals.patch
+++ /dev/null
@@ -1,479 +0,0 @@
-From 052fa2e4ee329810f62c29e546254fb45bf8a375 Mon Sep 17 00:00:00 2001
-From: Takahiro Hashimoto <kenya888@gmail.com>
-Date: Thu, 27 Oct 2016 09:43:21 +0900
-Subject: [PATCH] [plugins/qpa] support use of modularized qtplatformsupport
- from Qt 5.8
-
-REVIEW: 129268
----
- CMakeLists.txt                                    |   9 +-
- cmake/modules/FindQt5EventDispatcherSupport.cmake | 122 ++++++++++++++++++++++
- cmake/modules/FindQt5FontDatabaseSupport.cmake    | 122 ++++++++++++++++++++++
- cmake/modules/FindQt5ThemeSupport.cmake           | 122 ++++++++++++++++++++++
- plugins/qpa/CMakeLists.txt                        |  15 ++-
- plugins/qpa/integration.cpp                       |   7 ++
- 6 files changed, 394 insertions(+), 3 deletions(-)
- create mode 100644 cmake/modules/FindQt5EventDispatcherSupport.cmake
- create mode 100644 cmake/modules/FindQt5FontDatabaseSupport.cmake
- create mode 100644 cmake/modules/FindQt5ThemeSupport.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d2883fea..bf90ab0f1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -241,7 +241,14 @@ set_package_properties(X11_XCB PROPERTIES
-                        TYPE OPTIONAL)
- 
- # dependencies for QPA plugin
--find_package(Qt5PlatformSupport REQUIRED)
-+if(Qt5Core_VERSION VERSION_LESS "5.8.0")
-+    find_package(Qt5PlatformSupport REQUIRED)
-+else()
-+    find_package(Qt5FontDatabaseSupport REQUIRED)
-+    find_package(Qt5ThemeSupport REQUIRED)
-+    find_package(Qt5EventDispatcherSupport REQUIRED)
-+endif()
-+
- find_package(Freetype REQUIRED)
- set_package_properties(Freetype PROPERTIES DESCRIPTION "A font rendering engine"
-                        URL "http://www.freetype.org"
-diff --git a/cmake/modules/FindQt5EventDispatcherSupport.cmake b/cmake/modules/FindQt5EventDispatcherSupport.cmake
-new file mode 100644
-index 000000000..948efe0d3
---- /dev/null
-+++ b/cmake/modules/FindQt5EventDispatcherSupport.cmake
-@@ -0,0 +1,122 @@
-+#.rst:
-+# FindQt5EventDispatcherSupport
-+# -------
-+#
-+# Try to find Qt5EventDispatcherSupport on a Unix system.
-+#
-+# This will define the following variables:
-+#
-+# ``Qt5EventDispatcherSupport_FOUND``
-+#     True if (the requested version of) Qt5EventDispatcherSupport is available
-+# ``Qt5EventDispatcherSupport_VERSION``
-+#     The version of Qt5EventDispatcherSupport
-+# ``Qt5EventDispatcherSupport_LIBRARIES``
-+#     This can be passed to target_link_libraries() instead of the ``Qt5EventDispatcherSupport::Qt5EventDispatcherSupport``
-+#     target
-+# ``Qt5EventDispatcherSupport_INCLUDE_DIRS``
-+#     This should be passed to target_include_directories() if the target is not
-+#     used for linking
-+# ``Qt5EventDispatcherSupport_DEFINITIONS``
-+#     This should be passed to target_compile_options() if the target is not
-+#     used for linking
-+#
-+# If ``Qt5EventDispatcherSupport_FOUND`` is TRUE, it will also define the following imported target:
-+#
-+# ``Qt5EventDispatcherSupport::Qt5EventDispatcherSupport``
-+#     The Qt5EventDispatcherSupport library
-+#
-+# In general we recommend using the imported target, as it is easier to use.
-+# Bear in mind, however, that if the target is in the link interface of an
-+# exported library, it must be made available by the package config file.
-+
-+#=============================================================================
-+# Copyright 2014 Alex Merry <alex.merry@kde.org>
-+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
-+# Copyright 2016 Takahiro Hashimoto <kenya888@gmail.com>
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+if(CMAKE_VERSION VERSION_LESS 2.8.12)
-+    message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5EventDispatcherSupport.cmake")
-+endif()
-+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
-+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5EventDispatcherSupport.cmake")
-+endif()
-+
-+# Use pkg-config to get the directories and then use these values
-+# in the FIND_PATH() and FIND_LIBRARY() calls
-+find_package(PkgConfig)
-+pkg_check_modules(PKG_Qt5EventDispatcherSupport QUIET Qt5Gui)
-+
-+set(Qt5EventDispatcherSupport_DEFINITIONS ${PKG_Qt5EventDispatcherSupport_CFLAGS_OTHER})
-+set(Qt5EventDispatcherSupport_VERSION ${PKG_Qt5EventDispatcherSupport_VERSION})
-+
-+find_path(Qt5EventDispatcherSupport_INCLUDE_DIR
-+    NAMES
-+        QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h
-+    HINTS
-+        ${PKG_Qt5EventDispatcherSupport_INCLUDEDIR}/QtEventDispatcherSupport/${PKG_Qt5EventDispatcherSupport_VERSION}/
-+)
-+find_library(Qt5EventDispatcherSupport_LIBRARY
-+    NAMES
-+        Qt5EventDispatcherSupport
-+    HINTS
-+        ${PKG_Qt5EventDispatcherSupport_LIBRARY_DIRS}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Qt5EventDispatcherSupport
-+    FOUND_VAR
-+        Qt5EventDispatcherSupport_FOUND
-+    REQUIRED_VARS
-+        Qt5EventDispatcherSupport_LIBRARY
-+        Qt5EventDispatcherSupport_INCLUDE_DIR
-+    VERSION_VAR
-+        Qt5EventDispatcherSupport_VERSION
-+)
-+
-+if(Qt5EventDispatcherSupport_FOUND AND NOT TARGET Qt5EventDispatcherSupport::Qt5EventDispatcherSupport)
-+    add_library(Qt5EventDispatcherSupport::Qt5EventDispatcherSupport UNKNOWN IMPORTED)
-+    set_target_properties(Qt5EventDispatcherSupport::Qt5EventDispatcherSupport PROPERTIES
-+        IMPORTED_LOCATION "${Qt5EventDispatcherSupport_LIBRARY}"
-+        INTERFACE_COMPILE_OPTIONS "${Qt5EventDispatcherSupport_DEFINITIONS}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${Qt5EventDispatcherSupport_INCLUDE_DIR}"
-+    )
-+endif()
-+
-+mark_as_advanced(Qt5EventDispatcherSupport_LIBRARY Qt5EventDispatcherSupport_INCLUDE_DIR)
-+
-+# compatibility variables
-+set(Qt5EventDispatcherSupport_LIBRARIES ${Qt5EventDispatcherSupport_LIBRARY})
-+set(Qt5EventDispatcherSupport_INCLUDE_DIRS ${Qt5EventDispatcherSupport_INCLUDE_DIR})
-+set(Qt5EventDispatcherSupport_VERSION_STRING ${Qt5EventDispatcherSupport_VERSION})
-+
-+
-+include(FeatureSummary)
-+set_package_properties(Qt5EventDispatcherSupport PROPERTIES
-+    URL "http://www.qt.io"
-+    DESCRIPTION "Qt EventDispatcherSupport module."
-+)
-+
-diff --git a/cmake/modules/FindQt5FontDatabaseSupport.cmake b/cmake/modules/FindQt5FontDatabaseSupport.cmake
-new file mode 100644
-index 000000000..d3e66cd30
---- /dev/null
-+++ b/cmake/modules/FindQt5FontDatabaseSupport.cmake
-@@ -0,0 +1,122 @@
-+#.rst:
-+# FindQt5FontDatabaseSupport
-+# -------
-+#
-+# Try to find Qt5FontDatabaseSupport on a Unix system.
-+#
-+# This will define the following variables:
-+#
-+# ``Qt5FontDatabaseSupport_FOUND``
-+#     True if (the requested version of) Qt5FontDatabaseSupport is available
-+# ``Qt5FontDatabaseSupport_VERSION``
-+#     The version of Qt5FontDatabaseSupport
-+# ``Qt5FontDatabaseSupport_LIBRARIES``
-+#     This can be passed to target_link_libraries() instead of the ``Qt5FontDatabaseSupport::Qt5FontDatabaseSupport``
-+#     target
-+# ``Qt5FontDatabaseSupport_INCLUDE_DIRS``
-+#     This should be passed to target_include_directories() if the target is not
-+#     used for linking
-+# ``Qt5FontDatabaseSupport_DEFINITIONS``
-+#     This should be passed to target_compile_options() if the target is not
-+#     used for linking
-+#
-+# If ``Qt5FontDatabaseSupport_FOUND`` is TRUE, it will also define the following imported target:
-+#
-+# ``Qt5FontDatabaseSupport::Qt5FontDatabaseSupport``
-+#     The Qt5FontDatabaseSupport library
-+#
-+# In general we recommend using the imported target, as it is easier to use.
-+# Bear in mind, however, that if the target is in the link interface of an
-+# exported library, it must be made available by the package config file.
-+
-+#=============================================================================
-+# Copyright 2014 Alex Merry <alex.merry@kde.org>
-+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
-+# Copyright 2016 Takahiro Hashimoto <kenya888@gmail.com>
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+if(CMAKE_VERSION VERSION_LESS 2.8.12)
-+    message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5FontDatabaseSupport.cmake")
-+endif()
-+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
-+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5FontDatabaseSupport.cmake")
-+endif()
-+
-+# Use pkg-config to get the directories and then use these values
-+# in the FIND_PATH() and FIND_LIBRARY() calls
-+find_package(PkgConfig)
-+pkg_check_modules(PKG_Qt5FontDatabaseSupport QUIET Qt5Gui)
-+
-+set(Qt5FontDatabaseSupport_DEFINITIONS ${PKG_Qt5FontDatabaseSupport_CFLAGS_OTHER})
-+set(Qt5FontDatabaseSupport_VERSION ${PKG_Qt5FontDatabaseSupport_VERSION})
-+
-+find_path(Qt5FontDatabaseSupport_INCLUDE_DIR
-+    NAMES
-+        QtFontDatabaseSupport/private/qfontconfigdatabase_p.h
-+    HINTS
-+        ${PKG_Qt5FontDatabaseSupport_INCLUDEDIR}/QtFontDatabaseSupport/${PKG_Qt5FontDatabaseSupport_VERSION}/
-+)
-+find_library(Qt5FontDatabaseSupport_LIBRARY
-+    NAMES
-+        Qt5FontDatabaseSupport
-+    HINTS
-+        ${PKG_Qt5FontDatabaseSupport_LIBRARY_DIRS}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Qt5FontDatabaseSupport
-+    FOUND_VAR
-+        Qt5FontDatabaseSupport_FOUND
-+    REQUIRED_VARS
-+        Qt5FontDatabaseSupport_LIBRARY
-+        Qt5FontDatabaseSupport_INCLUDE_DIR
-+    VERSION_VAR
-+        Qt5FontDatabaseSupport_VERSION
-+)
-+
-+if(Qt5FontDatabaseSupport_FOUND AND NOT TARGET Qt5FontDatabaseSupport::Qt5FontDatabaseSupport)
-+    add_library(Qt5FontDatabaseSupport::Qt5FontDatabaseSupport UNKNOWN IMPORTED)
-+    set_target_properties(Qt5FontDatabaseSupport::Qt5FontDatabaseSupport PROPERTIES
-+        IMPORTED_LOCATION "${Qt5FontDatabaseSupport_LIBRARY}"
-+        INTERFACE_COMPILE_OPTIONS "${Qt5FontDatabaseSupport_DEFINITIONS}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${Qt5FontDatabaseSupport_INCLUDE_DIR}"
-+    )
-+endif()
-+
-+mark_as_advanced(Qt5FontDatabaseSupport_LIBRARY Qt5FontDatabaseSupport_INCLUDE_DIR)
-+
-+# compatibility variables
-+set(Qt5FontDatabaseSupport_LIBRARIES ${Qt5FontDatabaseSupport_LIBRARY})
-+set(Qt5FontDatabaseSupport_INCLUDE_DIRS ${Qt5FontDatabaseSupport_INCLUDE_DIR})
-+set(Qt5FontDatabaseSupport_VERSION_STRING ${Qt5FontDatabaseSupport_VERSION})
-+
-+
-+include(FeatureSummary)
-+set_package_properties(Qt5FontDatabaseSupport PROPERTIES
-+    URL "http://www.qt.io"
-+    DESCRIPTION "Qt FontDatabaseSupport module."
-+)
-+
-diff --git a/cmake/modules/FindQt5ThemeSupport.cmake b/cmake/modules/FindQt5ThemeSupport.cmake
-new file mode 100644
-index 000000000..5588a7666
---- /dev/null
-+++ b/cmake/modules/FindQt5ThemeSupport.cmake
-@@ -0,0 +1,122 @@
-+#.rst:
-+# FindQt5ThemeSupport
-+# -------
-+#
-+# Try to find Qt5ThemeSupport on a Unix system.
-+#
-+# This will define the following variables:
-+#
-+# ``Qt5ThemeSupport_FOUND``
-+#     True if (the requested version of) Qt5ThemeSupport is available
-+# ``Qt5ThemeSupport_VERSION``
-+#     The version of Qt5ThemeSupport
-+# ``Qt5ThemeSupport_LIBRARIES``
-+#     This can be passed to target_link_libraries() instead of the ``Qt5ThemeSupport::Qt5ThemeSupport``
-+#     target
-+# ``Qt5ThemeSupport_INCLUDE_DIRS``
-+#     This should be passed to target_include_directories() if the target is not
-+#     used for linking
-+# ``Qt5ThemeSupport_DEFINITIONS``
-+#     This should be passed to target_compile_options() if the target is not
-+#     used for linking
-+#
-+# If ``Qt5ThemeSupport_FOUND`` is TRUE, it will also define the following imported target:
-+#
-+# ``Qt5ThemeSupport::Qt5ThemeSupport``
-+#     The Qt5ThemeSupport library
-+#
-+# In general we recommend using the imported target, as it is easier to use.
-+# Bear in mind, however, that if the target is in the link interface of an
-+# exported library, it must be made available by the package config file.
-+
-+#=============================================================================
-+# Copyright 2014 Alex Merry <alex.merry@kde.org>
-+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
-+# Copyright 2016 Takahiro Hashimoto <kenya888@gmail.com>
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+if(CMAKE_VERSION VERSION_LESS 2.8.12)
-+    message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5ThemeSupport.cmake")
-+endif()
-+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
-+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5ThemeSupport.cmake")
-+endif()
-+
-+# Use pkg-config to get the directories and then use these values
-+# in the FIND_PATH() and FIND_LIBRARY() calls
-+find_package(PkgConfig)
-+pkg_check_modules(PKG_Qt5ThemeSupport QUIET Qt5Gui)
-+
-+set(Qt5ThemeSupport_DEFINITIONS ${PKG_Qt5ThemeSupport_CFLAGS_OTHER})
-+set(Qt5ThemeSupport_VERSION ${PKG_Qt5ThemeSupport_VERSION})
-+
-+find_path(Qt5ThemeSupport_INCLUDE_DIR
-+    NAMES
-+        QtThemeSupport/private/qgenericunixthemes_p.h
-+    HINTS
-+        ${PKG_Qt5ThemeSupport_INCLUDEDIR}/QtThemeSupport/${PKG_Qt5ThemeSupport_VERSION}/
-+)
-+find_library(Qt5ThemeSupport_LIBRARY
-+    NAMES
-+        Qt5ThemeSupport
-+    HINTS
-+        ${PKG_Qt5ThemeSupport_LIBRARY_DIRS}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Qt5ThemeSupport
-+    FOUND_VAR
-+        Qt5ThemeSupport_FOUND
-+    REQUIRED_VARS
-+        Qt5ThemeSupport_LIBRARY
-+        Qt5ThemeSupport_INCLUDE_DIR
-+    VERSION_VAR
-+        Qt5ThemeSupport_VERSION
-+)
-+
-+if(Qt5ThemeSupport_FOUND AND NOT TARGET Qt5ThemeSupport::Qt5ThemeSupport)
-+    add_library(Qt5ThemeSupport::Qt5ThemeSupport UNKNOWN IMPORTED)
-+    set_target_properties(Qt5ThemeSupport::Qt5ThemeSupport PROPERTIES
-+        IMPORTED_LOCATION "${Qt5ThemeSupport_LIBRARY}"
-+        INTERFACE_COMPILE_OPTIONS "${Qt5ThemeSupport_DEFINITIONS}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${Qt5ThemeSupport_INCLUDE_DIR}"
-+    )
-+endif()
-+
-+mark_as_advanced(Qt5ThemeSupport_LIBRARY Qt5ThemeSupport_INCLUDE_DIR)
-+
-+# compatibility variables
-+set(Qt5ThemeSupport_LIBRARIES ${Qt5ThemeSupport_LIBRARY})
-+set(Qt5ThemeSupport_INCLUDE_DIRS ${Qt5ThemeSupport_INCLUDE_DIR})
-+set(Qt5ThemeSupport_VERSION_STRING ${Qt5ThemeSupport_VERSION})
-+
-+
-+include(FeatureSummary)
-+set_package_properties(Qt5ThemeSupport PROPERTIES
-+    URL "http://www.qt.io"
-+    DESCRIPTION "Qt ThemeSupport module."
-+)
-+
-diff --git a/plugins/qpa/CMakeLists.txt b/plugins/qpa/CMakeLists.txt
-index 1a91a0ff1..4094ae7d2 100644
---- a/plugins/qpa/CMakeLists.txt
-+++ b/plugins/qpa/CMakeLists.txt
-@@ -1,6 +1,5 @@
- include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS})
- include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
--add_definitions(-DQ_FONTCONFIGDATABASE)
- 
- set(QPA_SOURCES
-     abstractplatformcontext.cpp
-@@ -19,10 +18,22 @@ include(ECMQtDeclareLoggingCategory)
- ecm_qt_declare_logging_category(QPA_SOURCES HEADER logging.h IDENTIFIER KWIN_QPA CATEGORY_NAME kwin_qpa_plugin DEFAULT_SEVERITY Critical)
- 
- add_library(KWinQpaPlugin MODULE ${QPA_SOURCES})
-+
-+if(Qt5Core_VERSION VERSION_LESS "5.8.0")
-+    add_definitions(-DQ_FONTCONFIGDATABASE)
-+    set(QT5PLATFORMSUPPORT_LIBS Qt5PlatformSupport::Qt5PlatformSupport)
-+else()
-+    set(QT5PLATFORMSUPPORT_LIBS
-+        Qt5FontDatabaseSupport::Qt5FontDatabaseSupport
-+        Qt5ThemeSupport::Qt5ThemeSupport
-+        Qt5EventDispatcherSupport::Qt5EventDispatcherSupport
-+)
-+endif()
-+
- target_link_libraries(KWinQpaPlugin
-     kwin
-     KF5::WaylandClient
--    Qt5PlatformSupport::Qt5PlatformSupport
-+    ${QT5PLATFORMSUPPORT_LIBS}
-     ${FONTCONFIG_LIBRARIES}
-     ${FREETYPE_LIBRARIES}
- )
-diff --git a/plugins/qpa/integration.cpp b/plugins/qpa/integration.cpp
-index 8913bf0a1..fcca48f79 100644
---- a/plugins/qpa/integration.cpp
-+++ b/plugins/qpa/integration.cpp
-@@ -46,9 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <qpa/qplatforminputcontextfactory_p.h>
- #include <qpa/qwindowsysteminterface.h>
- #include <QtCore/private/qeventdispatcher_unix_p.h>
-+
-+#if QT_VERSION >= 0x050800
-+#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
-+#include <QtThemeSupport/private/qgenericunixthemes_p.h>
-+#include <QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h>
-+#else
- #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
- #include <QtPlatformSupport/private/qgenericunixthemes_p.h>
- #include <QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h>
-+#endif
- 
- namespace KWin
- {
diff --git a/user/kwin/kwin-backport-gallium-version-detection.patch b/user/kwin/kwin-backport-gallium-version-detection.patch
deleted file mode 100644
index 8c021c4e6..000000000
--- a/user/kwin/kwin-backport-gallium-version-detection.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From e302f87598de6853147c872b631e9a1fe4864f42 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sat, 23 Dec 2017 23:30:07 +0100
-Subject: Properly detect Gallium drivers with newer Mesa
-
-Summary:
-The renderer string does not contain "Gallium 0.4 on" anymore,
-instead it directly contains the gallium driver's name.
-So assume that every unknown renderer is a gallium driver.
-
-Test Plan: Added a testcase, it succeeds only with this patch.
-
-Reviewers: #plasma, graesslin
-
-Subscribers: kwin, plasma-devel, #kwin
-
-Tags: #kwin
-
-Differential Revision: https://phabricator.kde.org/D9495
----
- .../libkwineffects/data/glplatform/llvmpipe-5.0    |  22 ++++
- libkwineffects/kwinglplatform.cpp                  | 114 +++++++++++----------
- 2 files changed, 82 insertions(+), 54 deletions(-)
- create mode 100644 autotests/libkwineffects/data/glplatform/llvmpipe-5.0
-
-diff --git a/autotests/libkwineffects/data/glplatform/llvmpipe-5.0 b/autotests/libkwineffects/data/glplatform/llvmpipe-5.0
-new file mode 100644
-index 0000000..56aa352
---- /dev/null
-+++ b/autotests/libkwineffects/data/glplatform/llvmpipe-5.0
-@@ -0,0 +1,22 @@
-+[Driver]
-+Vendor=VMware, Inc.
-+Renderer=llvmpipe (LLVM 5.0, 256 bits)
-+Version=3.0 Mesa 17.2.6
-+ShadingLanguageVersion=1.30
-+
-+[Settings]
-+LooseBinding=true
-+GLSL=true
-+TextureNPOT=true
-+Mesa=true
-+Gallium=true
-+SoftwareEmulation=true
-+GLVersion=3,0
-+GLSLVersion=1,30
-+MesaVersion=17,2,6
-+GalliumVersion=0,4
-+DriverVersion=17,2,6
-+Driver=12
-+ChipClass=99999
-+Compositor=9
-+
-diff --git a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp
-index 2b7b9a4..f5febc0 100644
---- a/libkwineffects/kwinglplatform.cpp
-+++ b/libkwineffects/kwinglplatform.cpp
-@@ -702,14 +702,69 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
-         m_chipClass = detectIntelClass(chipset);
-     }
- 
-+    // Properietary drivers
-+    // ====================================================
-+    else if (m_vendor == "ATI Technologies Inc.") {
-+        m_chipClass = detectRadeonClass(m_renderer);
-+        m_driver = Driver_Catalyst;
-+
-+        if (versionTokens.count() > 1 && versionTokens.at(2)[0] == '(')
-+            m_driverVersion = parseVersionString(versionTokens.at(1));
-+        else if (versionTokens.count() > 0)
-+            m_driverVersion = parseVersionString(versionTokens.at(0));
-+        else
-+            m_driverVersion = 0;
-+    }
-+
-+    else if (m_vendor == "NVIDIA Corporation") {
-+        m_chipClass = detectNVidiaClass(m_renderer);
-+        m_driver = Driver_NVidia;
-+
-+        int index = versionTokens.indexOf("NVIDIA");
-+        if (versionTokens.count() > index)
-+            m_driverVersion = parseVersionString(versionTokens.at(index + 1));
-+        else
-+            m_driverVersion = 0;
-+    }
-+
-+    else if (m_vendor == "Qualcomm") {
-+        m_driver = Driver_Qualcomm;
-+        m_chipClass = detectQualcommClass(m_renderer);
-+    }
-+
-+    else if (m_renderer == "Software Rasterizer") {
-+        m_driver = Driver_Swrast;
-+    }
-+
-+    // Virtual Hardware
-+    // ====================================================
-+    else if (m_vendor == "Humper" && m_renderer == "Chromium") {
-+        // Virtual Box
-+        m_driver = Driver_VirtualBox;
-+
-+        const int index = versionTokens.indexOf("Chromium");
-+        if (versionTokens.count() > index)
-+            m_driverVersion = parseVersionString(versionTokens.at(index + 1));
-+        else
-+            m_driverVersion = 0;
-+    }
-+
-     // Gallium drivers
-     // ====================================================
--    else if (m_renderer.contains("Gallium")) {
--        // Sample renderer string: Gallium 0.4 on AMD RV740
-+    else {
-         const QList<QByteArray> tokens = m_renderer.split(' ');
--        m_galliumVersion = parseVersionString(tokens.at(1));
--        m_chipset = (tokens.at(3) == "AMD" || tokens.at(3) == "ATI") ?
--                    tokens.at(4) : tokens.at(3);
-+        if (m_renderer.contains("Gallium")) {
-+            // Sample renderer string: Gallium 0.4 on AMD RV740
-+            m_galliumVersion = parseVersionString(tokens.at(1));
-+            m_chipset = (tokens.at(3) == "AMD" || tokens.at(3) == "ATI") ?
-+                        tokens.at(4) : tokens.at(3);
-+        }
-+        else {
-+            // The renderer string does not contain "Gallium" anymore.
-+            m_chipset = tokens.at(0);
-+            // We don't know the actual version anymore, but it's at least 0.4.
-+            m_galliumVersion = kVersionNumber(0, 4, 0);
-+        }
- 
-         // R300G
-         if (m_vendor == QByteArrayLiteral("X.Org R300 Project")) {
-@@ -764,55 +819,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
-         }
-     }
- 
--
--    // Properietary drivers
--    // ====================================================
--    else if (m_vendor == "ATI Technologies Inc.") {
--        m_chipClass = detectRadeonClass(m_renderer);
--        m_driver = Driver_Catalyst;
--
--        if (versionTokens.count() > 1 && versionTokens.at(2)[0] == '(')
--            m_driverVersion = parseVersionString(versionTokens.at(1));
--        else if (versionTokens.count() > 0)
--            m_driverVersion = parseVersionString(versionTokens.at(0));
--        else
--            m_driverVersion = 0;
--    }
--
--    else if (m_vendor == "NVIDIA Corporation") {
--        m_chipClass = detectNVidiaClass(m_renderer);
--        m_driver = Driver_NVidia;
--
--        int index = versionTokens.indexOf("NVIDIA");
--        if (versionTokens.count() > index)
--            m_driverVersion = parseVersionString(versionTokens.at(index + 1));
--        else
--            m_driverVersion = 0;
--    }
--
--    else if (m_vendor == "Qualcomm") {
--        m_driver = Driver_Qualcomm;
--        m_chipClass = detectQualcommClass(m_renderer);
--    }
--
--    else if (m_renderer == "Software Rasterizer") {
--        m_driver = Driver_Swrast;
--    }
--
--    // Virtual Hardware
--    // ====================================================
--    else if (m_vendor == "Humper" && m_renderer == "Chromium") {
--        // Virtual Box
--        m_driver = Driver_VirtualBox;
--
--        const int index = versionTokens.indexOf("Chromium");
--        if (versionTokens.count() > index)
--            m_driverVersion = parseVersionString(versionTokens.at(index + 1));
--        else
--            m_driverVersion = 0;
--    }
--
--
-     // Driver/GPU specific features
-     // ====================================================
-     if (isRadeon()) {
--- 
-cgit v0.11.2
-
diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD
index f90541eda..ab64e2f8a 100644
--- a/user/libkscreen/APKBUILD
+++ b/user/libkscreen/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkscreen
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="KDE Plasma screen management software"
 url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="194f6b1cb5abb38f5c4fc425546652e31f8b0b0a0ae6e3d657c98095df13f383258f0e16c74b5add0935158c1affd27b21ae76cf7b951801f4250f6dc527006e  libkscreen-5.8.7.tar.xz"
+sha512sums="867ad3ab214a1399177c9c33b94e9438b1d2262f815a71ab12303cfcb6e701406e7fa237afaf7df7f2d2fe0da1bf106c21b4039d8ea05853345a2b397fdc8785  libkscreen-5.12.2.tar.xz"
diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD
index ac86a6684..666c72ff1 100644
--- a/user/libksysguard/APKBUILD
+++ b/user/libksysguard/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libksysguard
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="KDE system monitor library"
 url="https://www.kde.org/"
@@ -16,7 +16,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 gettext-dev
 	libx11-dev zlib-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/Attic/plasma/$pkgver/libksysguard-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/$pkgver/libksysguard-$pkgver.tar.xz"
 builddir="$srcdir/libksysguard-$pkgver"
 
 build() {
@@ -45,4 +45,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a2b29e548e76d73814b4775343449ca84d48c53967830eb2c96064f385e83ec800e50bff172868d381f24c790a13aef90e5745ba0d545e50a2fd4c040b5d9749  libksysguard-5.8.7.tar.xz"
+sha512sums="3047c1c048b910e77dc40bee978636cb3e5ade7897d976139e858b9fd70362eb725430ac5e608fee2b03fe4bda3c4b681145b707177aa39f851f56f1e5fedf86  libksysguard-5.12.2.tar.xz"
diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD
index 7d9acf61d..a8f6b492d 100644
--- a/user/milou/APKBUILD
+++ b/user/milou/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=milou
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="Search and launch plasmoid"
 url="https://www.kde.org/"
@@ -13,8 +13,7 @@ makedepends="kcoreaddons-dev ki18n-dev kdeclarative-dev kservice-dev
 	cmake extra-cmake-modules python3 gettext-dev"
 install=""
 subpackages="$pkgname-lang"
-source="http://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz
-	fix-test-signedness.patch"
+source="http://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz"
 builddir="$srcdir/milou-$pkgver"
 
 build() {
@@ -43,5 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b7c6d4d6d6fc1166fa816ff7e772ed339f92c35be6b888ab9fb7974e2d6f459a37e1f8f12dd4f3e836df338bc414cf233304003c9115721f86957a8528579ff0  milou-5.8.7.tar.xz
-f67b9f4040fa946ab9ededdcdc301cba969754f7b538d7b02ca73f4d72194d0eef18ff9c5963953d225604e46223d193c9f4e20df6157795a20fa5dcdd4dd5ff  fix-test-signedness.patch"
+sha512sums="1ce53df971ad028432761bf17e6b9a3f3608a4bd548e8dcb33eb9d7217cb484a18944163a2a944bcdf0210ec3b909018e33be0926e847b8e391bc111a323f031  milou-5.12.2.tar.xz"
diff --git a/user/milou/fix-test-signedness.patch b/user/milou/fix-test-signedness.patch
deleted file mode 100644
index 373c67bc1..000000000
--- a/user/milou/fix-test-signedness.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- milou-5.8.7/lib/test/modeltest.cpp.old	2017-05-23 07:05:02.000000000 -0500
-+++ milou-5.8.7/lib/test/modeltest.cpp	2017-10-06 05:05:21.383062040 -0500
-@@ -451,7 +451,7 @@
-     // Check that the alignment is one we know about
-     QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
-     if ( textAlignmentVariant.isValid() ) {
--        int alignment = textAlignmentVariant.toInt();
-+        unsigned int alignment = textAlignmentVariant.toUInt();
-         QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
-     }
- 
diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD
index a10fde8ba..21673f969 100644
--- a/user/oxygen/APKBUILD
+++ b/user/oxygen/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=oxygen
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="'Oxygen' theme for KDE"
 url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9c7d53f2da76cc34272977d23856fa527a540aefff8308513603338aa5a48c59654d69e60da11b528ccd335d58b71159b36646e4f8cddb24937c36ef5bf9cf6d  oxygen-5.8.7.tar.xz"
+sha512sums="6c753eaf27e6507d0bbc8b5f8b5a4a30263bb5577924a30f21268657696d56908a2fc75827311285ce323ad97b65b4e4e793f8df1ff881838c50a1070b46db13  oxygen-5.12.2.tar.xz"
diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD
index a23600c83..d53e6825a 100644
--- a/user/plasma-desktop/APKBUILD
+++ b/user/plasma-desktop/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=plasma-desktop
-pkgver=5.8.7.1
-pkgrel=3
+pkgver=5.12.2
+pkgrel=0
 pkgdesc="Modern, functional, integrated libre desktop environment"
 url="https://www.kde.org/info/plasma-desktop"
 arch="all"
@@ -26,8 +26,8 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev
 makedepends="$depends_dev cmake extra-cmake-modules xkeyboard-config"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="http://download.kde.org/Attic/plasma/5.8.7/plasma-desktop-$pkgver.tar.xz"
-builddir="$srcdir/$pkgname-5.8.7"
+source="http://download.kde.org/stable/plasma/5.12.2/plasma-desktop-$pkgver.tar.xz"
+builddir="$srcdir/$pkgname-5.12.2"
 
 build() {
 	cd "$builddir"
@@ -55,4 +55,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="da5d7a5e815f4e5895e93788f1634cd624bf385303599d6db9145f185b1429b24614d5c42e55d15b1202d5233b1c52db8bcb7fa6a0317ac1ebaa6b56020f228d  plasma-desktop-5.8.7.1.tar.xz"
+sha512sums="9d0497269451e39464a0e637fafb3e7830801be0895552a2275daf81cd6d372fded790ced806c2b09f48e0b28ac0940fe8d6ca2bf2789103321dcf35f4871e5c  plasma-desktop-5.12.2.tar.xz"
diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD
index 8e5452518..3fe5c72d5 100644
--- a/user/plasma-integration/APKBUILD
+++ b/user/plasma-integration/APKBUILD
@@ -1,18 +1,18 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=plasma-integration
-pkgver=5.8.7
-pkgrel=2
+pkgver=5.12.2
+pkgrel=0
 pkgdesc="Qt platform theme plugin for Plasma"
 url="https://www.kde.org/"
 arch="all"
 license="LGPL-2.1"
 options="!check"  # Times out, requires X11 desktop.
 depends="breeze ttf-noto"
-depends_dev="qt5-qtbase-dev qt5-qtx11extras-dev kconfig-dev kconfigwidgets-dev
-	ki18n-dev kiconthemes-dev kio-dev knotifications-dev kwayland-dev
-	kwidgetsaddons-dev kwindowsystem-dev breeze-dev libxcursor-dev"
-makedepends="$depends_dev cmake extra-cmake-modules python3 gettext-dev"
+makedepends="cmake extra-cmake-modules python3 gettext-dev qt5-qtbase-dev
+	qt5-qtx11extras-dev kconfig-dev kconfigwidgets-dev ki18n-dev kio-dev
+	kiconthemes-dev knotifications-dev kwayland-dev	kwidgetsaddons-dev
+	kwindowsystem-dev breeze-dev libxcursor-dev qt5-qtquickcontrols2-dev"
 install=""
 subpackages="$pkgname-lang"
 source="http://download.kde.org/stable/plasma/$pkgver/plasma-integration-$pkgver.tar.xz"
@@ -46,4 +46,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="04e4528a59f916d9fed8d083b699711df62a504aada40b71607fa10fd51074aae63b163eca2c4893fc07bf86718a567a9047b61874da6eea282993e25bf5c919  plasma-integration-5.8.7.tar.xz"
+sha512sums="19b3ad0a47631b8c61c4b23ba6d88007d105742ed1223ef027d9e72d8549d51dc1473499300967471224bcd43bdc205a39650cdc4a551bf8e006af5c271b62d4  plasma-integration-5.12.2.tar.xz"
diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD
index c6b4dc276..8da9a35ac 100644
--- a/user/plasma-workspace/APKBUILD
+++ b/user/plasma-workspace/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=plasma-workspace
-pkgver=5.8.7
-pkgrel=8
+pkgver=5.12.2
+pkgrel=0
 pkgdesc="KDE Plasma 5 workspace"
 url="https://www.kde.org/plasma-desktop"
 arch="all"
@@ -23,15 +23,11 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtscript-dev kwallet-dev
 	kcrash-dev kglobalaccel-dev kdbusaddons-dev kitemmodels-dev kdesu-dev
 	kidletime-dev kwayland-dev kjsembed-dev kxmlrpcclient-dev kholidays-dev
 	libksysguard-dev kpackage-dev baloo-dev kwin-dev libdbusmenu-qt-dev
-	ktexteditor-dev prison-dev"
+	ktexteditor-dev prison-dev libxtst-dev"
 makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/Attic/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
-	plasma-workspace-5.8-cmake-update.patch
-	plasma-workspace-5.8.7-disable-broken-test.patch
-	plasma-workspace-5.8-honour-uint.patch
-	fix-crash-on-wallpaper-change.patch
+source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
 	"
 builddir="$srcdir/plasma-workspace-$pkgver"
 
@@ -61,8 +57,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ba35a050384e0bf410097027bfb70ca7594cd5352fd6470228d537f4e876ec72ec26bac3be9a6750f306b1d2937ff53c267c2246f191c93a13972a0cf33b4faf  plasma-workspace-5.8.7.tar.xz
-3d7cfb1c7c54bcbca47c5c01497c776d54d1e2327bc0a3777cfaf001f44ec7c1863f15ab0586c00db6d7194f759b91d0a86e47ae99e7fa23782dd7deda264e47  plasma-workspace-5.8-cmake-update.patch
-2151dab30716e0b2b6a9146fd6262f4f134884961bebe9cf9baee269f35b1b3955ed07dcee2602b5adc2fc93aa15d37cb72d6983f026a2b504feb451d944d965  plasma-workspace-5.8.7-disable-broken-test.patch
-48b4c448a4e964e61f25fa751fbc67f6cfce0e792139a124a70fa5c07f8b1b1a1c51fd5652679a3c46ac997c2dda3df476e8c8ebfdc6a08ece4f2e79282d81a3  plasma-workspace-5.8-honour-uint.patch
-52ac2f37a7e1fde97385a372a4c198b573fb51fe1334bddf340c034ba0fbd2a97174d9bab9f9c8446048deb3a2c9ea3c571b0adcdb1f710b513b311c824ab88a  fix-crash-on-wallpaper-change.patch"
+sha512sums="5e4d5386e1d4fc0fa81303c22b1570da8b6d82f8cf47a7137f7edbe1647ad5575ce36465010a7433183e29f4704cb17a40ff869d7df7d6706ba35ccc79bd190e  plasma-workspace-5.12.2.tar.xz"
diff --git a/user/plasma-workspace/fix-crash-on-wallpaper-change.patch b/user/plasma-workspace/fix-crash-on-wallpaper-change.patch
deleted file mode 100644
index 078a48e3a..000000000
--- a/user/plasma-workspace/fix-crash-on-wallpaper-change.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a44d84ef47492ca60ee608996b5ab1f2849ef16e Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Mon, 14 Aug 2017 10:04:19 +0100
-Subject: Don't change fillMode of image just before deleting it
-
-It is still set for when a source is applied for the next
-transistion.
-
-Summary:
-This saves evaluating a new paintedSize and doing a bunch of evaluations
-which are not used.
-
-More importantly it works round a Qt animation crash.
-
-fadeAnim.running is bound to otherImage.status !== loading
-
-with the intention of delaying animations until the images are really
-loaded.
-
-By setting the fill mode and then the source, we go to loading and back,
-effectively restarting the animation from within the animation.
-This leads to a crash.
-
-CCBUG: 381105
-
-Test Plan:
-End user result is the same.
-
-Reviewers: #plasma, broulik, mart
-
-Reviewed By: #plasma, broulik, mart
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D7248
----
- wallpapers/image/imagepackage/contents/ui/main.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wallpapers/image/imagepackage/contents/ui/main.qml b/wallpapers/image/imagepackage/contents/ui/main.qml
-index fc22176..0539f37 100644
---- a/wallpapers/image/imagepackage/contents/ui/main.qml
-+++ b/wallpapers/image/imagepackage/contents/ui/main.qml
-@@ -193,8 +193,8 @@ Item {
-         }
-         ScriptAction {
-             script: {
--                otherImage.fillMode = fillMode;
-                 otherImage.source = "";
-+                otherImage.fillMode = fillMode;
-             }
-         }
-     }
--- 
-cgit v0.11.2
-
diff --git a/user/plasma-workspace/plasma-workspace-5.8-cmake-update.patch b/user/plasma-workspace/plasma-workspace-5.8-cmake-update.patch
deleted file mode 100644
index e77731eb5..000000000
--- a/user/plasma-workspace/plasma-workspace-5.8-cmake-update.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 052ab380b6cb7f27da19ba0937bc2563b175a19b Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Mon, 17 Jul 2017 00:07:47 +0200
-Subject: Fix compilation with current cmake (git branch release).
-
-I don't see what the private/ in front of the moc_ filenames was for anyway.
----
- shell/containmentconfigview.cpp          | 2 +-
- shell/currentcontainmentactionsmodel.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp
-index 4d107be..8d6df0d 100644
---- a/shell/containmentconfigview.cpp
-+++ b/shell/containmentconfigview.cpp
-@@ -245,4 +245,4 @@ void ContainmentConfigView::syncWallpaperObjects()
-     m_currentWallpaperConfig = static_cast<KDeclarative::ConfigPropertyMap *>(wallpaperGraphicsObject->property("configuration").value<QObject *>());
- }
- 
--#include "private/moc_containmentconfigview.cpp"
-+#include "moc_containmentconfigview.cpp"
-diff --git a/shell/currentcontainmentactionsmodel.cpp b/shell/currentcontainmentactionsmodel.cpp
-index 08317ed..521d1c9 100644
---- a/shell/currentcontainmentactionsmodel.cpp
-+++ b/shell/currentcontainmentactionsmodel.cpp
-@@ -275,4 +275,4 @@ void CurrentContainmentActionsModel::save()
-     }
- }
- 
--#include "private/moc_currentcontainmentactionsmodel.cpp"
-+#include "moc_currentcontainmentactionsmodel.cpp"
--- 
-cgit v0.11.2
-
diff --git a/user/plasma-workspace/plasma-workspace-5.8-honour-uint.patch b/user/plasma-workspace/plasma-workspace-5.8-honour-uint.patch
deleted file mode 100644
index a5e16d7b3..000000000
--- a/user/plasma-workspace/plasma-workspace-5.8-honour-uint.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2f22f0a935b69f2f2a866050be5b905f9df4e4b6 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 20 Mar 2017 16:59:25 +0100
-Subject: fix compilation with old gcc
-
-Summary:
-gcc 4.8.5 (opensuse leap) fails building modeltest with
-CMakeFiles/testHistoryModel.dir/modeltest.cpp.o: In function `ModelTest::data()':
-modeltest.cpp:(.text+0x5a57): undefined reference to `bool QTest::qCompare<int, unsigned int>(int const&, unsigned int const&, char const*, char const*, char const*, int)'
-
-Test Plan:
-builds fine now
-same thing should be done to modeltest usage in kwin
-
-Reviewers: #plasma, davidedmundson
-
-Reviewed By: #plasma, davidedmundson
-
-Subscribers: davidedmundson, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D5083
----
- klipper/autotests/modeltest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/autotests/modeltest.cpp b/klipper/autotests/modeltest.cpp
-index d42d95f..d9b70f9 100644
---- a/klipper/autotests/modeltest.cpp
-+++ b/klipper/autotests/modeltest.cpp
-@@ -453,7 +453,7 @@ void ModelTest::data()
-     // Check that the alignment is one we know about
-     QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
-     if ( textAlignmentVariant.isValid() ) {
--        int alignment = textAlignmentVariant.toInt();
-+        unsigned int alignment = textAlignmentVariant.toUInt();
-         QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
-     }
- 
--- 
-cgit v0.11.2
-
diff --git a/user/plasma-workspace/plasma-workspace-5.8.7-disable-broken-test.patch b/user/plasma-workspace/plasma-workspace-5.8.7-disable-broken-test.patch
deleted file mode 100644
index 362002d61..000000000
--- a/user/plasma-workspace/plasma-workspace-5.8.7-disable-broken-test.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- plasma-workspace-5.8.7/drkonqi/tests/CMakeLists.txt.old	2017-05-23 07:17:40.000000000 -0500
-+++ plasma-workspace-5.8.7/drkonqi/tests/CMakeLists.txt	2017-10-05 18:04:03.428394763 -0500
-@@ -1,5 +1,5 @@
- add_subdirectory(crashtest)
--add_subdirectory(backtraceparsertest)
-+#add_subdirectory(backtraceparsertest)
- if(KF5XmlRpcClient_FOUND)
-     add_subdirectory(bugzillalibtest)
- endif()
diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD
index 518cb46dc..8bf3865dd 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@adelielinux.org>
 pkgname=sddm-kcm
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="KDE configuration applet for SDDM"
 url="https://www.kde.org/"
@@ -10,7 +10,8 @@ license="GPL-2.0"
 depends=""
 makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev
 	qt5-qtdeclarative-dev kcoreaddons-dev ki18n-dev kxmlgui-dev kauth-dev
-	kconfigwidgets-dev kio-dev libxcb-dev xcb-util-image-dev libxcursor-dev"
+	kconfigwidgets-dev kio-dev libxcb-dev xcb-util-image-dev libxcursor-dev
+	knewstuff-dev"
 install=""
 install_if="systemsettings sddm"
 subpackages="$pkgname-lang"
@@ -43,4 +44,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="782e56627071ff36e1724b0d1289fc0a5bef51cc3b54378ebccbe5d912d741e8b7649f0a8b493e8139c14ea6393d5f3dfcd85edbb4385252a59e84ef983d2834  sddm-kcm-5.8.7.tar.xz"
+sha512sums="130c86c9e56421ee3a656c6c1c7005052c9343e34c809faa77504539cadc474452c59e403a0c79f518b712ba4ef690d6ca7099d9fa34a582d258265e1fe59a92  sddm-kcm-5.12.2.tar.xz"
diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD
index 3292521f3..b09ba7736 100644
--- a/user/systemsettings/APKBUILD
+++ b/user/systemsettings/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=systemsettings
-pkgver=5.8.7
+pkgver=5.12.2
 pkgrel=0
 pkgdesc="KDE system settings configuration utility"
 url="https://www.kde.org/"
@@ -11,7 +11,8 @@ depends=""
 depends_dev="qt5-qtbase-dev kauth-dev kcmutils-dev kcompletion-dev kconfig-dev
 	kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kio-dev
 	kiconthemes-dev kitemviews-dev kservice-dev kwidgetsaddons-dev
-	kwindowsystem-dev kxmlgui-dev"
+	kwindowsystem-dev kxmlgui-dev kactivities-dev kactivities-stats-dev
+	khtml-dev kirigami2-dev"
 makedepends="$depends_dev cmake extra-cmake-modules"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
@@ -44,4 +45,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="38bc0b65e5fbe10a1c229e91b93f59a1837fdfd1f2d89d7ab7bf0d64ffecc5d1b7ac946c03a8bc91e6c75ad522ed26a6351e5cfc4044b04170281854fc8c32c7  systemsettings-5.8.7.tar.xz"
+sha512sums="1c5bcc72130208208d08880c0e53a647333622033bc825961bae835cea677b93101c7e1c285e97c769cef947331efb41c0736e83bbd715d86111ad2444fefef4  systemsettings-5.12.2.tar.xz"
author	A. Wilcox <AWilcox@Wilcox-Tech.com>	2018-03-04 15:05:51 -0600
committer	A. Wilcox <AWilcox@Wilcox-Tech.com>	2018-03-04 15:05:51 -0600
commit	aa78da47b45ff1d7016d79400253a6e45b265ebe (patch)
tree	027ff1920d0abf697389303ef04aaaa3d87ff708 /user
parent	cd8822ac3987a2f52dc313081ade2bf631954d92 (diff)
download	packages-aa78da47b45ff1d7016d79400253a6e45b265ebe.tar.gz packages-aa78da47b45ff1d7016d79400253a6e45b265ebe.tar.bz2 packages-aa78da47b45ff1d7016d79400253a6e45b265ebe.tar.xz packages-aa78da47b45ff1d7016d79400253a6e45b265ebe.zip