user/[KDE Plasma]: Update to 5.18.5

4 files changed, 12 insertions, 42 deletions

diff --git a/user/libkworkspace/APKBUILD b/user/libkworkspace/APKBUILD
index 84b7e5e7a..4cad8faab 100644
--- a/user/libkworkspace/APKBUILD
+++ b/user/libkworkspace/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=libkworkspace
-pkgver=5.18.4.1
+pkgver=5.18.5
 pkgrel=0
 pkgdesc="KDE Plasma 5 workspace library"
 url="https://www.kde.org/plasma-desktop"
@@ -14,8 +14,7 @@ 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/stable/plasma/${pkgver%.*}/plasma-workspace-$pkgver.tar.xz
-	header-generation.patch
+source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
 	session.patch
 	standalone.patch
 	"
@@ -33,19 +32,19 @@ build() {
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DBUILD_TESTING=OFF \
-		${CMAKE_CROSSOPTS} .
-	make
+		${CMAKE_CROSSOPTS} . \
+		-Bbuild
+	make -C build
 }
 
 check() {
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+	CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
-sha512sums="683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7  plasma-workspace-5.18.4.1.tar.xz
-3f72f33219999bc39c52c143c047df37eb34b4149bf479ec9aee64ce14c78946635cf20cf120858f10a676a2b7c00cef0b95aa696e8e71b7412d936fbdd7e755  header-generation.patch
-1c7a23a4bb13030b992b8bde125548f104dbc6db489b60a6c40d91e2b793b208f35f88cca9ad90a9cc116d92b902d5c536b0e643805799b07286fbc82a0dafe8  session.patch
-520a29666deed549b9d6bafe9ae6576aae39004616a46383e40d874fc0622710497de85da508cf6299f55e27c2d2681fc140678efef592abb14253b02d0fce59  standalone.patch"
+sha512sums="870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2  plasma-workspace-5.18.5.tar.xz
+27d801b0d05c5fbcd172f4ff60d537f8ebc8d2658202ed290203effc7c9b81599d0bd1c644afada265200d2d48669a3762a66310780dcc23d0ea19fa7865f62b  session.patch
+4e0559902e3c718260a1f8bfdc8110b6c4dcc0647f2060a991ca27ce2c1c1b070f3d58512c5ef37db1216924a014b0ae84e2d28b2e546b113551e3d75dd2652b  standalone.patch"
diff --git a/user/libkworkspace/header-generation.patch b/user/libkworkspace/header-generation.patch
deleted file mode 100644
index c78fad092..000000000
--- a/user/libkworkspace/header-generation.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-[ 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
index ec29807c1..dd61f53c5 100644
--- a/user/libkworkspace/session.patch
+++ b/user/libkworkspace/session.patch
@@ -1,23 +1,11 @@
 --- 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"));
++    return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"));
  }
  
  ConsoleKitSessionBackend::ConsoleKitSessionBackend()
diff --git a/user/libkworkspace/standalone.patch b/user/libkworkspace/standalone.patch
index 27ad62eab..e91ec552b 100644
--- a/user/libkworkspace/standalone.patch
+++ b/user/libkworkspace/standalone.patch
@@ -15,7 +15,7 @@ index 3c4c47870..53bc780b5 100644
 +project(libkworkspace)
 +
 +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+    set(PROJECT_VERSION "5.18.4.1")
++    set(PROJECT_VERSION "5.18.5")
 +    set(PROJECT_VERSION_MAJOR 5)
 +
 +    cmake_minimum_required(VERSION 3.0)