Hello community, here is the log from the commit of package baloo for openSUSE:Factory checked in at 2014-04-22 07:37:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baloo (Old) and /work/SRC/openSUSE:Factory/.baloo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "baloo" Changes: -------- --- /work/SRC/openSUSE:Factory/baloo/baloo.changes 2014-04-18 12:37:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.baloo.new/baloo.changes 2014-04-22 07:37:58.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Apr 20 16:56:53 UTC 2014 - hrvoje.sen...@gmail.com + +- Added 0001-Bug-333566-Quick-filter-in-KMail-4.13-stops-working-.patch: + fixes KMail searches with non-Latin characters, kde#333566; + triggers re-indexing of collections + +------------------------------------------------------------------- New: ---- 0001-Bug-333566-Quick-filter-in-KMail-4.13-stops-working-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo.spec ++++++ --- /var/tmp/diff_new_pack.emvatJ/_old 2014-04-22 07:37:59.000000000 +0200 +++ /var/tmp/diff_new_pack.emvatJ/_new 2014-04-22 07:37:59.000000000 +0200 @@ -25,6 +25,8 @@ Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE tittiatc...@gmail.com Don't build the filewatch_raiselimit to prevent security issues Patch1: kauth.patch +# PATCH-FIX-UPSTREAM 0001-Bug-333566-Quick-filter-in-KMail-4.13-stops-working-.patch -- fixes KMail searches with non-Latin characters +Patch2: 0001-Bug-333566-Quick-filter-in-KMail-4.13-stops-working-.patch BuildRequires: kfilemetadata-devel >= %{version} BuildRequires: libakonadiprotocolinternals-devel BuildRequires: libattr-devel @@ -113,6 +115,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %cmake_kde4 -d build @@ -166,6 +169,13 @@ %{_kde4_servicesdir}/baloo_filesearchstore.desktop %{_kde4_modulesdir}/baloo_filesearchstore.so %{_kde4_iconsdir}/hicolor/*/apps/baloo.png +%if 0 +# These files can only be activated once the security team did a full review +%{_kde4_modulesdir}/libexec/kde_baloo_filewatch_raiselimit +%{_kde4_datadir}/dbus-1/system-services/org.kde.baloo.filewatch.service +%{_kde4_datadir}/polkit-1/actions/org.kde.baloo.filewatch.policy +%{_kde4_sysconfdir}/dbus-1/system.d/org.kde.baloo.filewatch.conf +%endif %files kioslaves %defattr(-,root,root) ++++++ 0001-Bug-333566-Quick-filter-in-KMail-4.13-stops-working-.patch ++++++ >From f99d93f4df844d4a9ed271bd9e505fdeaa5a20ee Mon Sep 17 00:00:00 2001 From: Montel Laurent <mon...@kde.org> Date: Sun, 20 Apr 2014 17:17:53 +0200 Subject: [PATCH 1/1] Bug 333566 - Quick filter in KMail 4.13 stops working with non-Latin characters (Cyrillic Russian Unicode) - search empty result FIXED-IN: 4.13.1 BUG: 333566 We need to update database --- src/pim/agent/agent.cpp | 4 ++-- src/pim/agent/akonotesindexer.cpp | 2 +- src/pim/agent/emailindexer.cpp | 4 ++-- src/pim/lib/contactquery.cpp | 27 ++++++++++++++++----------- src/pim/lib/emailquery.cpp | 27 ++++++++++++++++----------- src/pim/lib/notequery.cpp | 6 ++++-- 6 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/pim/agent/agent.cpp b/src/pim/agent/agent.cpp index 3cb0a0c..7de454e 100644 --- a/src/pim/agent/agent.cpp +++ b/src/pim/agent/agent.cpp @@ -63,7 +63,7 @@ namespace { } } -#define INDEXING_AGENT_VERSION 3 +#define INDEXING_AGENT_VERSION 4 BalooIndexingAgent::BalooIndexingAgent(const QString& id) : AgentBase(id), @@ -144,7 +144,7 @@ qlonglong BalooIndexingAgent::indexedItemsInDatabase(const std::string& term, co { Xapian::Database db; try { - db = Xapian::Database(dbPath.toStdString()); + db = Xapian::Database(dbPath.toUtf8().constData()); } catch (const Xapian::DatabaseError& e) { kError() << "Failed to open database" << dbPath << ":" << QString::fromStdString(e.get_msg()); return 0; diff --git a/src/pim/agent/akonotesindexer.cpp b/src/pim/agent/akonotesindexer.cpp index b12d607..93d8de9 100644 --- a/src/pim/agent/akonotesindexer.cpp +++ b/src/pim/agent/akonotesindexer.cpp @@ -28,7 +28,7 @@ AkonotesIndexer::AkonotesIndexer(const QString& path) : AbstractIndexer(), m_termGen( 0 ) { - m_db = new Xapian::WritableDatabase(path.toStdString(), Xapian::DB_CREATE_OR_OPEN); + m_db = new Xapian::WritableDatabase(path.toUtf8().constData(), Xapian::DB_CREATE_OR_OPEN); } AkonotesIndexer::~AkonotesIndexer() diff --git a/src/pim/agent/emailindexer.cpp b/src/pim/agent/emailindexer.cpp index 0176c27..14acea6 100644 --- a/src/pim/agent/emailindexer.cpp +++ b/src/pim/agent/emailindexer.cpp @@ -32,8 +32,8 @@ EmailIndexer::EmailIndexer(const QString& path, const QString& contactDbPath): AbstractIndexer(), m_doc( 0 ), m_termGen( 0 ) { - m_db = new Xapian::WritableDatabase(path.toStdString(), Xapian::DB_CREATE_OR_OPEN); - m_contactDb = new Xapian::WritableDatabase(contactDbPath.toStdString(), Xapian::DB_CREATE_OR_OPEN); + m_db = new Xapian::WritableDatabase(path.toUtf8().constData(), Xapian::DB_CREATE_OR_OPEN); + m_contactDb = new Xapian::WritableDatabase(contactDbPath.toUtf8().constData(), Xapian::DB_CREATE_OR_OPEN); } EmailIndexer::~EmailIndexer() diff --git a/src/pim/lib/contactquery.cpp b/src/pim/lib/contactquery.cpp index dff26c8..a30fb59 100644 --- a/src/pim/lib/contactquery.cpp +++ b/src/pim/lib/contactquery.cpp @@ -108,19 +108,23 @@ ResultIterator ContactQuery::exec() if (d->criteria == ExactMatch) { if (!d->any.isEmpty()) { - m_queries << Xapian::Query(d->any.toStdString()); + const QByteArray ba = d->any.toUtf8(); + m_queries << Xapian::Query(ba.constData()); } if (!d->name.isEmpty()) { - m_queries << Xapian::Query("NA" + d->name.toStdString()); + const QByteArray ba = "NA" + d->name.toUtf8(); + m_queries << Xapian::Query(ba.constData()); } if (!d->nick.isEmpty()) { - m_queries << Xapian::Query("NI" + d->nick.toStdString()); + const QByteArray ba = "NI" + d->nick.toUtf8(); + m_queries << Xapian::Query(ba.constData()); } if (!d->email.isEmpty()) { - m_queries << Xapian::Query(d->email.toStdString()); + const QByteArray ba = d->email.toUtf8(); + m_queries << Xapian::Query(ba.constData()); } if (!d->uid.isEmpty()) { @@ -131,31 +135,32 @@ ResultIterator ContactQuery::exec() if (!d->any.isEmpty()) { Xapian::QueryParser parser; parser.set_database(db); - m_queries << parser.parse_query(d->any.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = d->any.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } if (!d->name.isEmpty()) { Xapian::QueryParser parser; parser.set_database(db); parser.add_prefix("", "NA"); - - m_queries << parser.parse_query(d->name.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = d->name.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } if (!d->nick.isEmpty()) { Xapian::QueryParser parser; parser.set_database(db); parser.add_prefix("", "NI"); - - m_queries << parser.parse_query(d->nick.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = d->nick.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } // FIXME: Check for exact match? if (!d->email.isEmpty()) { Xapian::QueryParser parser; parser.set_database(db); - - m_queries << parser.parse_query(d->email.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = d->email.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } if (!d->uid.isEmpty()) { diff --git a/src/pim/lib/emailquery.cpp b/src/pim/lib/emailquery.cpp index 2964846..e23f8b9 100644 --- a/src/pim/lib/emailquery.cpp +++ b/src/pim/lib/emailquery.cpp @@ -202,7 +202,8 @@ ResultIterator EmailQuery::exec() // vHanda: Do we really need the query parser over here? Q_FOREACH (const QString& str, d->involves) { - m_queries << parser.parse_query(str.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = str.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } } @@ -210,8 +211,8 @@ ResultIterator EmailQuery::exec() Xapian::QueryParser parser; parser.set_database(db); parser.add_prefix("", "F"); - - m_queries << parser.parse_query(d->from.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = d->from.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } if (!d->to.isEmpty()) { @@ -220,7 +221,8 @@ ResultIterator EmailQuery::exec() parser.add_prefix("", "T"); Q_FOREACH (const QString& str, d->to) { - m_queries << parser.parse_query(str.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = str.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } } @@ -230,7 +232,8 @@ ResultIterator EmailQuery::exec() parser.add_prefix("", "CC"); Q_FOREACH (const QString& str, d->cc) { - m_queries << parser.parse_query(str.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = str.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } } @@ -240,7 +243,8 @@ ResultIterator EmailQuery::exec() parser.add_prefix("", "BC"); Q_FOREACH (const QString& str, d->bcc) { - m_queries << parser.parse_query(str.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = str.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } } @@ -249,8 +253,8 @@ ResultIterator EmailQuery::exec() parser.set_database(db); parser.add_prefix("", "SU"); parser.set_default_op(Xapian::Query::OP_AND); - - m_queries << parser.parse_query(d->subjectMatchString.toStdString(), + const QByteArray ba = d->subjectMatchString.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } @@ -271,8 +275,8 @@ ResultIterator EmailQuery::exec() parser.set_database(db); parser.add_prefix("", "BO"); parser.set_default_op(Xapian::Query::OP_AND); - - m_queries << parser.parse_query(d->bodyMatchString.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray ba = d->bodyMatchString.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } if (d->important == 'T') @@ -297,7 +301,8 @@ ResultIterator EmailQuery::exec() QStringList list = d->matchString.split(QRegExp("\\s"), QString::SkipEmptyParts); Q_FOREACH (const QString& s, list) { - m_queries << parser.parse_query(s.toStdString(), + const QByteArray ba = s.toUtf8(); + m_queries << parser.parse_query(ba.constData(), Xapian::QueryParser::FLAG_PARTIAL); } } diff --git a/src/pim/lib/notequery.cpp b/src/pim/lib/notequery.cpp index 24a3907..2257cc6 100644 --- a/src/pim/lib/notequery.cpp +++ b/src/pim/lib/notequery.cpp @@ -86,7 +86,8 @@ ResultIterator NoteQuery::exec() parser.set_database(db); parser.add_prefix("", "BO"); - m_queries << parser.parse_query(d->note.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray baNote = d->note.toUtf8(); + m_queries << parser.parse_query(baNote.constData(), Xapian::QueryParser::FLAG_PARTIAL); } if (!d->title.isEmpty()) { @@ -95,7 +96,8 @@ ResultIterator NoteQuery::exec() parser.add_prefix("", "SU"); parser.set_default_op(Xapian::Query::OP_AND); - m_queries << parser.parse_query(d->title.toStdString(), Xapian::QueryParser::FLAG_PARTIAL); + const QByteArray baTitle = d->title.toUtf8(); + m_queries << parser.parse_query(baTitle.constData(), Xapian::QueryParser::FLAG_PARTIAL); } Xapian::Query query(Xapian::Query::OP_OR, m_queries.begin(), m_queries.end()); -- 1.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org