diff --git a/recipes-kde/apps/ark/ark.bb b/recipes-kde/apps/ark/ark.bb index 55ae0fe3..8e6fb543 100644 --- a/recipes-kde/apps/ark/ark.bb +++ b/recipes-kde/apps/ark/ark.bb @@ -30,7 +30,10 @@ DEPENDS += "\ PV = "${KDE_APP_VERSION}" SRC_URI[md5sum] = "bfecb779782abd51b7a5e8a8a4e25beb" SRC_URI[sha256sum] = "b0c4e4150aa6595e1a2c6fdd2a38046fa03cf594875fb1e8af284e84c5923211" -SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" +SRC_URI += " \ + file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch \ + file://0002-Do-not-use-Q_DECLARE_METATYPE-KPluginMetaData-with-K.patch \ +" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/ark/files/0002-Do-not-use-Q_DECLARE_METATYPE-KPluginMetaData-with-K.patch b/recipes-kde/apps/ark/files/0002-Do-not-use-Q_DECLARE_METATYPE-KPluginMetaData-with-K.patch new file mode 100644 index 00000000..295e0d9d --- /dev/null +++ b/recipes-kde/apps/ark/files/0002-Do-not-use-Q_DECLARE_METATYPE-KPluginMetaData-with-K.patch @@ -0,0 +1,43 @@ +From 3aacbbaab50ac6e0557c5d69c430459eb3d71ad7 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Fri, 5 Jul 2019 07:01:09 +0200 +Subject: [PATCH] Do not use Q_DECLARE_METATYPE(KPluginMetaData) with KF 5.60+ + +It is already defined in kcoreaddons since 318b0e75242931ea420caf3e7123d54eb8351c51 +and will break compilation. + +Use a version macro instead, so that it is correctly used only with KF +5.59 or lower. + +I put this in stable branch in case people will use 19.04 with 5.60 +(likely), but feel free to revert in case it is not appropriate. + +Upstream-Status: Applied +--- + kerfuffle/archive_kerfuffle.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/kerfuffle/archive_kerfuffle.h b/kerfuffle/archive_kerfuffle.h +index 578b5ce2..78e628cf 100644 +--- a/kerfuffle/archive_kerfuffle.h ++++ b/kerfuffle/archive_kerfuffle.h +@@ -33,6 +33,7 @@ + + #include + #include ++#include + + #include + #include +@@ -244,6 +245,8 @@ private: + + } // namespace Kerfuffle + ++#if KCOREADDONS_VERSION < QT_VERSION_CHECK(5,60,0) + Q_DECLARE_METATYPE(KPluginMetaData) ++#endif + + #endif // ARCHIVE_H +-- +2.21.0 +