Merge pull request #7933 from Hoshpak/update-qalculate

Update qalculate to 2.1.0

common/shlibs

@@ -2749,6 +2749,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
+libqalculate.so.12 libqalculate-2.1.0_1
 libqalculate.so.11 libqalculate-2.0.0_1
 libweston-3.so.0 weston-3.0.0_1
 libweston-desktop-3.so.0 weston-3.0.0_1

srcpkgs/kde-workspace/template

@@ -4,7 +4,7 @@ _kappversion=15.08.0
 
 pkgname=kde-workspace
 version=4.11.22
-revision=6
+revision=7
 short_desc="Provides the interface and basic tools for the KDE workspace"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2, LGPL-2.1, FDL"

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<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"

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"

srcpkgs/qalculate-gtk/template

@@ -1,6 +1,6 @@
 # Template file for 'qalculate-gtk'
 pkgname=qalculate-gtk
-version=2.0.0
+version=2.1.0
 revision=1
 build_style=gnu-configure
 maintainer="Orphaned <orphan@voidlinux.eu>"
@@ -9,5 +9,5 @@ makedepends="libqalculate-devel gdk-pixbuf-devel gtk+3-devel"
 license="GPL-2"
 homepage="https://qalculate.github.io/"
 short_desc="A multi-purpose desktop calculator - GTK+ version"
-distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}a/qalculate-gtk-${version}.tar.gz"
-checksum=1fbe6dfedeb7074c795c3c7f01a74867bae27c81325a248f2ae0de8aabd7de2f
+distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
+checksum=eb0663f9167c0d21b636973f27186158b3eca88894a586a2cdbc39265879b37b

srcpkgs/qalculate/template

@@ -1,6 +1,6 @@
 # Template file for 'qalculate'
 pkgname=qalculate
-version=2.0.0
+version=2.1.0
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="GPL-2"
 homepage="https://qalculate.github.io/"
 short_desc="A multi-purpose desktop calculator"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=86d04362f37aa5acbc78108e0044b96fbffbaa33c309c19c8c37ac4fb46c5485
+checksum=7668ed9ab32d46d3638297985a03bc995b6aedf8b8335685e1a43393ba236f12
 
 libqalculate-data_package() {
 	noarch=yes