From 3884c37a83f416524acf4d3da5e369c08c37e741 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 4 Oct 2017 14:30:02 +0200 Subject: [PATCH] plasma-workspace: rebuild against qalculate-2.1.0 also adds fix from upstream master revision 9ec8ab022ee7041f2dbf2667a9bad344a00e2503 to compile with current cmake versions. --- .../currentcontainmentactionsmodel_path.patch | 20 +++++++++++++++++++ srcpkgs/plasma-workspace/template | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/plasma-workspace/patches/currentcontainmentactionsmodel_path.patch diff --git a/srcpkgs/plasma-workspace/patches/currentcontainmentactionsmodel_path.patch b/srcpkgs/plasma-workspace/patches/currentcontainmentactionsmodel_path.patch new file mode 100644 index 00000000000..726c95215de --- /dev/null +++ b/srcpkgs/plasma-workspace/patches/currentcontainmentactionsmodel_path.patch @@ -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(wallpaperGraphicsObject->property("configuration").value()); + } + +-#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" diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index 8bce07ca7b8..888600e4647 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -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"