diff --git a/recipes-kde/kf5/tier3/baloo/baloo.bb b/recipes-kde/kf5/tier3/baloo/baloo.bb index d9061cb6..93e17646 100644 --- a/recipes-kde/kf5/tier3/baloo/baloo.bb +++ b/recipes-kde/kf5/tier3/baloo/baloo.bb @@ -31,7 +31,6 @@ SRC_URI[sha256sum] = "8ddf85c6ae74dac868f37b562b80fdad753888f0c75b97ab26f01bdfc7 SRC_URI += " \ file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \ - file://org.kde.baloo.fileindexer.xml \ " CMAKE_ALIGN_SYSROOT[1] = "KF5Baloo, -S${libdir}, -s${OE_QMAKE_PATH_HOST_LIBS}" diff --git a/recipes-kde/kf5/tier3/baloo/files/0002-do-not-create-dbus-xml-for-fileindexer-our-native-qd.patch b/recipes-kde/kf5/tier3/baloo/files/0002-do-not-create-dbus-xml-for-fileindexer-our-native-qd.patch deleted file mode 100644 index 2ad3f73c..00000000 --- a/recipes-kde/kf5/tier3/baloo/files/0002-do-not-create-dbus-xml-for-fileindexer-our-native-qd.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 58e317df45cfabe199d492ee8fd648ac21c3dd37 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 6 Aug 2017 13:26:55 +0200 -Subject: [PATCH] do not create dbus xml for fileindexer - our native - qdbuscpp2xml is broken -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/dbus/CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt -index 9381bfc..1863efb 100644 ---- a/src/dbus/CMakeLists.txt -+++ b/src/dbus/CMakeLists.txt -@@ -25,11 +25,6 @@ qt5_generate_dbus_interface( - # - set(contentindexer_xml org.kde.baloo.fileindexer.xml) - --qt5_generate_dbus_interface( -- ${CMAKE_SOURCE_DIR}/src/file/filecontentindexer.h -- ${contentindexer_xml} -- OPTIONS -a --) - - set( - dbus_interface_xmls --- -2.9.4 - diff --git a/recipes-kde/kf5/tier3/baloo/files/fileindexerinterface.cpp b/recipes-kde/kf5/tier3/baloo/files/fileindexerinterface.cpp deleted file mode 100644 index d8ee38b2..00000000 --- a/recipes-kde/kf5/tier3/baloo/files/fileindexerinterface.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: - * - * qdbusxml2cpp is Copyright (C) 2016 The Qt Company Ltd. - * - * This is an auto-generated file. - * This file may have been hand-edited. Look for HAND-EDIT comments - * before re-generating it. - */ - -#include "fileindexerinterface.h" - -/* - * Implementation of interface class OrgKdeBalooFileindexerInterface - */ - -OrgKdeBalooFileindexerInterface::OrgKdeBalooFileindexerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) - : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) -{ -} - -OrgKdeBalooFileindexerInterface::~OrgKdeBalooFileindexerInterface() -{ -} - - -#include "fileindexerinterface.moc" diff --git a/recipes-kde/kf5/tier3/baloo/files/fileindexerinterface.h b/recipes-kde/kf5/tier3/baloo/files/fileindexerinterface.h deleted file mode 100644 index 56e1d4e1..00000000 --- a/recipes-kde/kf5/tier3/baloo/files/fileindexerinterface.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: - * - * qdbusxml2cpp is Copyright (C) 2016 The Qt Company Ltd. - * - * This is an auto-generated file. - * Do not edit! All changes made to it will be lost. - */ - -#ifndef FILEINDEXERINTERFACE_H -#define FILEINDEXERINTERFACE_H - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Proxy class for interface org.kde.baloo.fileindexer - */ -class OrgKdeBalooFileindexerInterface: public QDBusAbstractInterface -{ - Q_OBJECT -public: - static inline const char *staticInterfaceName() - { return "org.kde.baloo.fileindexer"; } - -public: - OrgKdeBalooFileindexerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); - - ~OrgKdeBalooFileindexerInterface(); - - Q_PROPERTY(QString currentFile READ currentFile) - inline QString currentFile() const - { return qvariant_cast< QString >(property("currentFile")); } - -public Q_SLOTS: // METHODS - inline QDBusPendingReply<> registerMonitor() - { - QList argumentList; - return asyncCallWithArgumentList(QStringLiteral("registerMonitor"), argumentList); - } - - inline QDBusPendingReply<> unregisterMonitor() - { - QList argumentList; - return asyncCallWithArgumentList(QStringLiteral("unregisterMonitor"), argumentList); - } - -Q_SIGNALS: // SIGNALS - void finishedIndexingFile(const QString &filePath); - void startedIndexingFile(const QString &filePath); -}; - -namespace org { - namespace kde { - namespace baloo { - typedef ::OrgKdeBalooFileindexerInterface fileindexer; - } - } -} -#endif diff --git a/recipes-kde/kf5/tier3/baloo/files/org.kde.baloo.fileindexer.xml b/recipes-kde/kf5/tier3/baloo/files/org.kde.baloo.fileindexer.xml deleted file mode 100644 index 179e1bda..00000000 --- a/recipes-kde/kf5/tier3/baloo/files/org.kde.baloo.fileindexer.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - -