Last active
August 29, 2015 14:01
-
-
Save arcan1s/b698bb586faef627b3bb to your computer and use it in GitHub Desktop.
Patch for kdepim-4.14.2 which disables dependence on baloo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ruN kdepim-4.14.2.orig/CMakeLists.txt kdepim-4.14.2/CMakeLists.txt | |
--- kdepim-4.14.2.orig/CMakeLists.txt 2014-08-13 22:38:21.000000000 +0400 | |
+++ kdepim-4.14.2/CMakeLists.txt 2014-08-20 19:44:03.153729005 +0400 | |
@@ -178,9 +178,6 @@ | |
find_package(Grantlee 0.3.0 QUIET CONFIG) | |
set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." ) | |
- find_package(Baloo 4.14.0 QUIET CONFIG) | |
- set_package_properties(Baloo PROPERTIES DESCRIPTION "The Baloo libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Baloo provides search capabilities in KMail and Akonadi") | |
- | |
# Xsltproc | |
find_package(Xsltproc) | |
set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces.") | |
diff -ruN kdepim-4.14.2.orig/knotes/CMakeLists.txt kdepim-4.14.2/knotes/CMakeLists.txt | |
--- kdepim-4.14.2.orig/knotes/CMakeLists.txt 2014-08-13 22:38:21.000000000 +0400 | |
+++ kdepim-4.14.2/knotes/CMakeLists.txt 2014-08-20 19:45:47.113732162 +0400 | |
@@ -10,7 +10,6 @@ | |
${Grantlee_INCLUDE_DIRS} | |
${CMAKE_SOURCE_DIR}/noteshared | |
${CMAKE_BINARY_DIR}/noteshared | |
- ${BALOO_INCLUDE_DIR} | |
) | |
########### next target ############### | |
@@ -48,7 +47,7 @@ | |
kde4_add_library(knotesprivate ${LIBRARY_TYPE} ${libknotesprivate_lib_SRCS} ${libknotesprivate_kcfg_lib_SRCS} ) | |
-target_link_libraries(knotesprivate kdepim ${KDE4_KIO_LIBS} pimcommon ${KDE4_KPRINTUTILS_LIBS} ${KDE4_KCMUTILS_LIBS} ${Grantlee_CORE_LIBRARIES} ${KDE4_KDNSSD_LIBS} ${KDE4_KNEWSTUFF3_LIBS} noteshared akonadi_next ${BALOO_LIBRARIES}) | |
+target_link_libraries(knotesprivate kdepim ${KDE4_KIO_LIBS} pimcommon ${KDE4_KPRINTUTILS_LIBS} ${KDE4_KCMUTILS_LIBS} ${Grantlee_CORE_LIBRARIES} ${KDE4_KDNSSD_LIBS} ${KDE4_KNEWSTUFF3_LIBS} noteshared akonadi_next) | |
set_target_properties(knotesprivate | |
PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} | |
diff -ruN kdepim-4.14.2.orig/knotes/finddialog/knotefinddialog.cpp kdepim-4.14.2/knotes/finddialog/knotefinddialog.cpp | |
--- kdepim-4.14.2.orig/knotes/finddialog/knotefinddialog.cpp 2014-08-13 22:38:21.000000000 +0400 | |
+++ kdepim-4.14.2/knotes/finddialog/knotefinddialog.cpp 2014-08-20 19:46:51.523734117 +0400 | |
@@ -18,9 +18,6 @@ | |
#include "knotefinddialog.h" | |
#include "noteshared/widget/notelistwidget.h" | |
-#include "baloo/pim/notequery.h" | |
-#include <baloo/pim/resultiterator.h> | |
- | |
#include <KLocalizedString> | |
#include <KLineEdit> | |
#include <KPushButton> | |
@@ -122,19 +119,8 @@ | |
const QString searchStr = mSearchLineEdit->text().trimmed(); | |
if (searchStr.trimmed().isEmpty()) | |
return; | |
- Baloo::PIM::NoteQuery query; | |
- query.matchNote(searchStr); | |
- query.matchTitle(searchStr); | |
- | |
- Baloo::PIM::ResultIterator it = query.exec(); | |
Akonadi::Item::List lst; | |
- while (it.next()) { | |
- const Akonadi::Item::Id id = it.id(); | |
- if (mNotes.contains(id)) { | |
- lst << mNotes.value(id); | |
- } | |
- } | |
mNoteList->setNotes(lst); | |
if (lst.isEmpty()) { | |
mResultSearch->setText(i18n("No Result found.")); | |
diff -ruN kdepim-4.14.2.orig/libkdepim/CMakeLists.txt kdepim-4.14.2/libkdepim/CMakeLists.txt | |
--- kdepim-4.14.2.orig/libkdepim/CMakeLists.txt 2014-08-13 22:38:21.000000000 +0400 | |
+++ kdepim-4.14.2/libkdepim/CMakeLists.txt 2014-08-20 19:47:28.057068560 +0400 | |
@@ -13,7 +13,6 @@ | |
add_definitions(${QT_QTDBUS_DEFINITIONS}) | |
include_directories( ${Boost_INCLUDE_DIR} ) | |
-include_directories( ${BALOO_INCLUDE_DIR} ) | |
option(KDEPIM_INPROCESS_LDAP "Use in-process rather than KIO slave LDAP" FALSE) | |
if (KDEPIM_INPROCESS_LDAP) | |
@@ -108,7 +107,6 @@ | |
${KDEPIMLIBS_KMIME_LIBS} | |
${KDEPIMLIBS_AKONADI_LIBS} | |
${KDEPIMLIBS_AKONADI_CONTACT_LIBS} | |
- ${BALOO_LIBRARIES} | |
) | |
diff -ruN kdepim-4.14.2.orig/libkdepim/addressline/addresseelineedit.cpp kdepim-4.14.2/libkdepim/addressline/addresseelineedit.cpp | |
--- kdepim-4.14.2.orig/libkdepim/addressline/addresseelineedit.cpp 2014-08-13 22:38:21.000000000 +0400 | |
+++ kdepim-4.14.2/libkdepim/addressline/addresseelineedit.cpp 2014-08-20 19:48:54.980404532 +0400 | |
@@ -39,8 +39,6 @@ | |
#include <Akonadi/Session> | |
#include <Akonadi/Job> | |
-#include <baloo/pim/contactcompleter.h> | |
- | |
#include <KPIMUtils/Email> | |
#include <KColorScheme> | |
@@ -381,8 +379,7 @@ | |
void AddresseeLineEdit::Private::searchInBaloo() | |
{ | |
const QString trimmedString = m_searchString.trimmed(); | |
- Baloo::PIM::ContactCompleter com(trimmedString, 20); | |
- const QStringList listEmail = cleanupBalooContact(com.complete()); | |
+ const QStringList listEmail; | |
Q_FOREACH (const QString& email, listEmail) { | |
addCompletionItem(email, 1, s_static->balooCompletionSource); | |
} | |
diff -ruN kdepim-4.14.2.orig/messagelist/CMakeLists.txt kdepim-4.14.2/messagelist/CMakeLists.txt | |
--- kdepim-4.14.2.orig/messagelist/CMakeLists.txt 2014-08-13 22:38:21.000000000 +0400 | |
+++ kdepim-4.14.2/messagelist/CMakeLists.txt 2014-08-20 19:49:30.257072270 +0400 | |
@@ -9,7 +9,6 @@ | |
include_directories( | |
${Boost_INCLUDE_DIRS} | |
- ${BALOO_INCLUDE_DIR} | |
${CMAKE_CURRENT_BINARY_DIR} | |
${CMAKE_SOURCE_DIR}/messagecore | |
) | |
@@ -95,7 +94,6 @@ | |
${KDEPIMLIBS_AKONADI_LIBS} | |
${KDEPIMLIBS_AKONADI_KMIME_LIBS} | |
${KDEPIMLIBS_KMIME_LIBS} | |
- ${BALOO_LIBRARIES} | |
messagecore | |
) | |
diff -ruN kdepim-4.14.2.orig/messagelist/core/filter.cpp kdepim-4.14.2/messagelist/core/filter.cpp | |
--- kdepim-4.14.2.orig/messagelist/core/filter.cpp 2014-08-13 22:38:21.000000000 +0400 | |
+++ kdepim-4.14.2/messagelist/core/filter.cpp 2014-08-20 19:50:35.677074256 +0400 | |
@@ -21,9 +21,6 @@ | |
#include "core/filter.h" | |
#include "core/messageitem.h" | |
-#include <baloo/pim/emailquery.h> | |
-#include <baloo/pim/resultiterator.h> | |
- | |
using namespace MessageList::Core; | |
Filter::Filter() | |
@@ -130,32 +127,6 @@ | |
needToSplitString = true; | |
} | |
- Baloo::PIM::EmailQuery query; | |
- if (options & QuickSearchLine::SearchEveryWhere) { | |
- query.matches(newStr); | |
- query.setSplitSearchMatchString(needToSplitString); | |
- } else if (options & QuickSearchLine::SearchAgainstSubject) { | |
- query.subjectMatches(newStr); | |
- } else if (options & QuickSearchLine::SearchAgainstBody) { | |
- query.bodyMatches(newStr); | |
- } else if (options & QuickSearchLine::SearchAgainstFrom) { | |
- query.setFrom(newStr); | |
- } else if (options & QuickSearchLine::SearchAgainstBcc) { | |
- query.setBcc(QStringList() << newStr); | |
- } else if (options & QuickSearchLine::SearchAgainstTo) { | |
- query.setTo(QStringList() << newStr); | |
- } | |
- | |
- | |
- //If the collection is virtual we're probably trying to filter the search collection, so we just search globally | |
- if (mCurrentFolder.isValid() && !mCurrentFolder.isVirtual()) { | |
- query.addCollection(mCurrentFolder.id()); | |
- } | |
- | |
- Baloo::PIM::ResultIterator it = query.exec(); | |
- while (it.next()) { | |
- mMatchingItemIds << it.id(); | |
- } | |
emit finished(); | |
} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment