From 26fe534666f8c8ac0e8f2c2a432e5b877f756f4c Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 6 Aug 2019 22:47:32 +0000 Subject: user/[KDE Plasma]: Bump to 5.12.8 --- user/plasma-workspace/APKBUILD | 14 +++--- user/plasma-workspace/cmake-fixes.patch | 89 +++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 user/plasma-workspace/cmake-fixes.patch (limited to 'user/plasma-workspace') diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index 3d60e96e2..036b2b456 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox -# Maintainer: A. Wilcox +# Maintainer: A. Wilcox pkgname=plasma-workspace -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" @@ -29,10 +29,11 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev kwallet-dev kwayland-dev kwin-dev kxmlrpcclient-dev libksysguard-dev plasma-framework-dev prison-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz + cmake-fixes.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -49,13 +50,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e9d4a85b11264eebbce0845eefa5d01818e944c2179d5cbc3e23b720118894d88fbfe96467c68849a3fa89728cecff248cd7f9dfc0ab133e50dad28ecc957623 plasma-workspace-5.12.7.tar.xz" +sha512sums="c19d338117c5d9b05581fc1be7d99fc60f4453a009a04ddf3609add1fef7ad08bdd0d0c19c0f4151484253036cc444d8301c3fb8ee0d29d8ecc19d9929a9ff8b plasma-workspace-5.12.8.tar.xz +39ea169f50b98fd2dd246396133a3e8d9c844409338c9c3ecd79474945377886c5d1050205ad73c3d8c789315e8a4353311bafa9f1ddd22f25403b3ed7f30fde cmake-fixes.patch" diff --git a/user/plasma-workspace/cmake-fixes.patch b/user/plasma-workspace/cmake-fixes.patch new file mode 100644 index 000000000..16307ce31 --- /dev/null +++ b/user/plasma-workspace/cmake-fixes.patch @@ -0,0 +1,89 @@ +From c534fdf1ba34d0ea8a08b9b5266384a3243271e0 Mon Sep 17 00:00:00 2001 +From: David Faure +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 + #endif + +-#ifdef HAVE_X11 ++#if HAVE_X11 + #include + #include + #endif +diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp +index 3ec09c0..d06a1e6 100644 +--- a/soliduiserver/soliduiserver.cpp ++++ b/soliduiserver/soliduiserver.cpp +@@ -219,7 +219,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 + -- cgit v1.2.3-60-g2f50