plasma-workspace: rebuild against qalculate-2.1.0

also adds fix from upstream master revision 9ec8ab022ee7041f2dbf2667a9bad344a00e2503
to compile with current cmake versions.
This commit is contained in:
Helmut Pozimski 2017-10-04 14:30:02 +02:00
parent 52559d6fbe
commit 3884c37a83
2 changed files with 21 additions and 1 deletions

View file

@ -0,0 +1,20 @@
diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp
index 4d107bec..8d6df0d4 100644
--- shell/containmentconfigview.cpp
+++ 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 08317ed9..521d1c98 100644
--- shell/currentcontainmentactionsmodel.cpp
+++ shell/currentcontainmentactionsmodel.cpp
@@ -275,4 +275,4 @@ void CurrentContainmentActionsModel::save()
}
}
-#include "private/moc_currentcontainmentactionsmodel.cpp"
+#include "moc_currentcontainmentactionsmodel.cpp"

View file

@ -1,7 +1,7 @@
# Template file for 'plasma-workspace'
pkgname=plasma-workspace
version=5.8.7
revision=1
revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules iso-codes"