From c7414e963f4152b32606c00d5b2f885afc1779e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 10 Dec 2014 09:26:26 +0100 Subject: [PATCH] add baloo 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../tier3/baloo/baloo_5.1.1.bb | 29 ++++++++++++ ...1-fix-build-for-QT_NO_SESSIONMANAGER.patch | 47 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 recipes-kde-framework/tier3/baloo/baloo_5.1.1.bb create mode 100644 recipes-kde-framework/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch diff --git a/recipes-kde-framework/tier3/baloo/baloo_5.1.1.bb b/recipes-kde-framework/tier3/baloo/baloo_5.1.1.bb new file mode 100644 index 00000000..bbb35cd8 --- /dev/null +++ b/recipes-kde-framework/tier3/baloo/baloo_5.1.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Baloo provides searching and indexing infrastucture with an emphasis on files" +LICENSE = "GPLv2 LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit kde cmake-lib + +DEPENDS += "ki18n kconfig kidletime kauth kcrash solid kio kdelibs4support kfilemetadata ktexteditor xapian-core" + +SRCREV = "adfd9da80f65b3342833391c30f69d8036132601" +KDE_BRANCH = "Plasma/5.1" +SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch" + +# cross libs / headers +CMAKE_HIDE_ERROR[1] = "KF5Baloo, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" +CMAKE_HIDE_ERROR[2] = "KF5Baloo, -S${includedir}, -S${STAGING_INCDIR}" + +FILES_${PN} += "${datadir} \ + ${libdir}/qml/org/kde/baloo \ + ${libdir}/plugins ${libdir}/kauth \ +" +FILES_${PN}-dbg += " \ + ${libdir}/qml/org/kde/baloo/.debug \ + ${libdir}/*/.debug \ + ${libdir}/plugins/kf5/*/.debug \ +" + diff --git a/recipes-kde-framework/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde-framework/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch new file mode 100644 index 00000000..0e897ada --- /dev/null +++ b/recipes-kde-framework/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch @@ -0,0 +1,47 @@ +From 432cefd14f0056c5c81587079fe93c9244f59b5e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 9 Dec 2014 14:48:36 +0100 +Subject: [PATCH] fix build for QT_NO_SESSIONMANAGER +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/file/main.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/file/main.cpp b/src/file/main.cpp +index e46ce47..c8b0c8b 100644 +--- a/src/file/main.cpp ++++ b/src/file/main.cpp +@@ -38,7 +38,10 @@ + + #include + #include ++ ++#ifndef QT_NO_SESSIONMANAGER + #include ++#endif + + int main(int argc, char** argv) + { +@@ -57,11 +60,13 @@ int main(int argc, char** argv) + QApplication app(argc, argv); + app.setQuitOnLastWindowClosed(false); + ++#ifndef QT_NO_SESSIONMANAGER + auto disableSessionManagement = [](QSessionManager &sm) { + sm.setRestartHint(QSessionManager::RestartNever); + }; + QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); + QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); ++#endif + + KConfig config(QLatin1String("baloofilerc")); + KConfigGroup group = config.group("Basic Settings"); +-- +1.8.3.1 +