Commit 90aff07a authored by Natanael Copa's avatar Natanael Copa
Browse files

community/kpmcore: backport build fix

parent 35dab6f5
......@@ -2,14 +2,16 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kpmcore
pkgver=4.2.0
pkgrel=0
pkgrel=1
arch="all !armhf !s390x !mips64"
url="https://kde.org/applications/system/org.kde.partitionmanager"
pkgdesc="Library for managing partitions"
license="GPL-3.0-or-later"
depends="sfdisk smartmontools device-mapper-udev"
makedepends="extra-cmake-modules qt5-qtbase-dev kauth-dev kcoreaddons-dev ki18n-dev kwidgetsaddons-dev qca-dev"
source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz"
source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz
Make-plugins-compatible-to-latest-KPluginFactory-code.patch
"
subpackages="$pkgname-dev $pkgname-lang"
options="!check" # Requires running dbus server
......@@ -34,4 +36,5 @@ package() {
DESTDIR="$pkgdir" cmake --build build --target install
}
sha512sums="71c5411f3ec24149695bbc1ec0c2bb7423b1cfd24ea9c2f33492c6310b1e911ea14a0a46a53024d7a1afebf0cbc5b56fb7cf5be22b832fb49239a270b63404f0 kpmcore-4.2.0.tar.xz"
sha512sums="71c5411f3ec24149695bbc1ec0c2bb7423b1cfd24ea9c2f33492c6310b1e911ea14a0a46a53024d7a1afebf0cbc5b56fb7cf5be22b832fb49239a270b63404f0 kpmcore-4.2.0.tar.xz
206d6efabfd02311f2c6a67c12a6719a2184f7de895012637031146b0e07e58d80c11d866aafa20b59c7541029d3fc313842cea4f8e30954b80a8b29b793047f Make-plugins-compatible-to-latest-KPluginFactory-code.patch"
From 07e5a3ac2858e6d38cc698e0f740e7a693e9f302 Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Mon, 16 Nov 2020 17:14:52 +0100
Subject: [PATCH] Make plugins compatible to latest KPluginFactory code
That one uses std::is_constructible<impl, QObject *, const QVariantList &>
which will fail for our current plugin constructors due to being private
and with only friend class KPluginFactory.
---
src/plugins/dummy/dummybackend.h | 4 +---
src/plugins/sfdisk/sfdiskbackend.h | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/plugins/dummy/dummybackend.h b/src/plugins/dummy/dummybackend.h
index 815b020..8d67158 100644
--- a/src/plugins/dummy/dummybackend.h
+++ b/src/plugins/dummy/dummybackend.h
@@ -24,11 +24,9 @@ class QString;
*/
class DummyBackend : public CoreBackend
{
- friend class KPluginFactory;
-
Q_DISABLE_COPY(DummyBackend)
-private:
+public:
DummyBackend(QObject* parent, const QList<QVariant>& args);
public:
diff --git a/src/plugins/sfdisk/sfdiskbackend.h b/src/plugins/sfdisk/sfdiskbackend.h
index e709f61..0571add 100644
--- a/src/plugins/sfdisk/sfdiskbackend.h
+++ b/src/plugins/sfdisk/sfdiskbackend.h
@@ -27,11 +27,9 @@ class QString;
*/
class SfdiskBackend : public CoreBackend
{
- friend class KPluginFactory;
-
Q_DISABLE_COPY(SfdiskBackend)
-private:
+public:
SfdiskBackend(QObject* parent, const QList<QVariant>& args);
public:
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment