mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
kpmcore: bump version
This commit is contained in:
@@ -17,7 +17,7 @@ systems, although the only functional backend is the one for Linux systems:
|
||||
* sfdisk backend (Linux)
|
||||
* null backend"
|
||||
HOMEPAGE="https://github.com/KDE/kpmcore/"
|
||||
COPYRIGHT="2010-2018 KDE Organisation"
|
||||
COPYRIGHT="2010-2021 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
srcGitRev="9e6cf4063a29dd13fafed939e2ee4ae3061a37d6"
|
||||
@@ -30,7 +30,6 @@ ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
settings/dbus-1/system.d/org.kde.kpmcore.externalcommand.conf keep-old
|
||||
settings/dbus-1/system.d/org.kde.kpmcore.helperinterface.conf keep-old
|
||||
"
|
||||
|
||||
@@ -70,6 +69,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:qdbuscpp2xml$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
@@ -78,6 +78,7 @@ BUILD()
|
||||
cd build
|
||||
|
||||
cmake .. $cmakeDirArgs \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
||||
-DINCLUDE_INSTALL_DIR=$includeDir \
|
||||
@@ -110,3 +110,55 @@ index 098738c..1df787c 100644
|
||||
--
|
||||
2.16.2
|
||||
|
||||
|
||||
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:
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
Reference in New Issue
Block a user