From 52559d6fbeee1180fd7fe7a859579af0ae0a8947 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 4 Oct 2017 14:29:17 +0200 Subject: [PATCH 1/4] qalculate: update to 2.1.0 (soname bump) --- common/shlibs | 2 +- srcpkgs/qalculate/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index dfb7430003e..a5ebf1e4f26 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2749,7 +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.11 libqalculate-2.0.0_1 +libqalculate.so.12 libqalculate-2.1.0_1 libweston-2.so.0 weston-2.0.0_1 libmutter-0.so.0 mutter-3.24.0_1 libmutter-clutter-0.so mutter-3.24.0_1 diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template index ef4d8fc6d1a..3025d50a2ce 100644 --- a/srcpkgs/qalculate/template +++ b/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 From 3884c37a83f416524acf4d3da5e369c08c37e741 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 4 Oct 2017 14:30:02 +0200 Subject: [PATCH 2/4] 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" From b5224de4c10531a819c1c74ca1707d0cb85f8d86 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 4 Oct 2017 14:30:02 +0200 Subject: [PATCH 3/4] kde-workspace: rebuild against qalculate-2.1.0 --- srcpkgs/kde-workspace/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template index 3caca083acf..816b2ab02da 100644 --- a/srcpkgs/kde-workspace/template +++ b/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 " license="GPL-2, LGPL-2.1, FDL" From 0e3ecc969d5fcaa585e79a2e0fccc43e64f3734c Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 4 Oct 2017 14:32:51 +0200 Subject: [PATCH 4/4] qalculate-gtk: update to 2.1.0 --- srcpkgs/qalculate-gtk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template index e446a8f1de9..8d5301406f9 100644 --- a/srcpkgs/qalculate-gtk/template +++ b/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 " @@ -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