|
[-]
[+]
|
Changed |
baloo.spec
|
|
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/CMakeLists.txt
^
|
| @@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.12)
project(Baloo)
-set(PROJECT_VERSION "5.6.0")
+set(PROJECT_VERSION "5.9.90")
# ECM setup
find_package(ECM 1.2.0 REQUIRED NO_MODULE)
@@ -29,7 +29,7 @@
# Build dependencies
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Widgets Quick DBus Test Sql)
-find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Config IdleTime Auth Crash Solid KIO KDELibs4Support)
+find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Config IdleTime Auth Crash Solid KIO KDELibs4Support DBusAddons)
find_package(KF5 ${PROJECT_VERSION} REQUIRED COMPONENTS FileMetaData)
find_package(Xapian CONFIG)
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/icons/128-apps-baloo.png
^
|
| (renamed from icons/hi128-apps-baloo.png)
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/icons/CMakeLists.txt
^
|
| @@ -1 +1 @@
-ecm_install_icons(ICONS hi128-apps-baloo.png DESTINATION ${ICON_INSTALL_DIR})
+ecm_install_icons(ICONS 128-apps-baloo.png DESTINATION ${ICON_INSTALL_DIR} THEME hicolor)
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/autotests/basicindexingjobtest.cpp
^
|
| @@ -24,7 +24,6 @@
#include <QMimeDatabase>
#include <QTest>
-#include <QDebug>
#include <QFileInfo>
#include <QDateTime>
#include <QTemporaryDir>
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/autotests/basicindexingqueuetest.cpp
^
|
| @@ -28,7 +28,6 @@
#include <QTest>
#include <QSignalSpy>
#include <QEventLoop>
-#include <QDebug>
using namespace Baloo;
@@ -62,7 +61,6 @@
QStringList includeFolders;
includeFolders << dir->path() + QLatin1String("/home");
- qDebug() << includeFolders;
QStringList excludeFolders;
excludeFolders << dir->path() + QLatin1String("/home/kde");
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/autotests/filtereddiriteratortest.cpp
^
|
| @@ -25,7 +25,6 @@
#include <QTemporaryDir>
#include <QTest>
-#include <QDebug>
class FilteredDirIteratorTest : public QObject
{
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/autotests/pendingfilequeuetest.cpp
^
|
| @@ -25,7 +25,6 @@
#include <qtest.h>
#include <qsignalspy.h>
#include <qtimer.h>
-#include <QDebug>
using namespace Baloo;
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/autotests/regularexpcachebenchmark.cpp
^
|
| @@ -24,7 +24,6 @@
#include <QTest>
#include <QDir>
#include <QDirIterator>
-#include <QDebug>
class RegularExpCacheBenchmark : public QObject
{
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/baloo_file.desktop
^
|
| @@ -9,7 +9,7 @@
NoDisplay=true
Name=Baloo File Daemon
-Name[ar]=مراقب ملفات بالو
+Name[ar]=عفريت بالو للملفّات
Name[bs]=Baloo datotečni demon
Name[ca]=Dimoni de fitxers Baloo
Name[ca@valencia]=Dimoni de fitxers Baloo
@@ -34,6 +34,7 @@
Name[pl]=Usługa plików Baloo
Name[pt]=Serviço de Ficheiros do Baloo
Name[pt_BR]=Serviço de arquivos do Baloo
+Name[ro]=Demon de fișiere Baloo
Name[ru]=Служба мониторинга файлов для Baloo
Name[sk]=Súborový démon Baloo
Name[sl]=Ozadnji program za datoteke Baloo
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/basicindexingjob.cpp
^
|
| @@ -30,7 +30,6 @@
#include <KFileMetaData/TypeInfo>
#include <KFileMetaData/UserMetaData>
-#include <QDebug>
using namespace Baloo;
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/basicindexingqueue.cpp
^
|
| @@ -29,7 +29,6 @@
#include "xapiandocument.h"
#include <QDebug>
-
#include <QDateTime>
#include <QTimer>
#include <QUrl>
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/cleaner/main.cpp
^
|
| @@ -30,8 +30,8 @@
#include <QCoreApplication>
#include <QCommandLineParser>
#include <QDBusConnection>
-#include <QDebug>
#include <QDir>
+#include <QDebug>
int main(int argc, char* argv[])
{
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/fileexcludefilters.cpp
^
|
| @@ -95,6 +95,7 @@
".obj",
".pch",
".uic",
+ "__pycache__",
//misc
"core-dumps",
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/inotify/org.kde.baloo.filewatch.actions
^
|
| @@ -1,6 +1,6 @@
[org.kde.baloo.filewatch.raiselimit]
Name=Folder Watch Limit
-Name[ar]=حدّ مراقبة المجلدات
+Name[ar]=حدّ مراقبة المجلّدات
Name[bs]=Ograničenje praćenja direktorija
Name[ca]=Límit de vigilància de carpetes
Name[ca@valencia]=Límit de vigilància de carpetes
@@ -24,6 +24,7 @@
Name[pl]=Ograniczenie obserwowania katalogu
Name[pt]=Limite de Monitorização de Pastas
Name[pt_BR]=Limite de monitoramento de pastas
+Name[ro]=Limita de urmărire a dosarelor
Name[ru]=Ограничение на число наблюдаемых папок
Name[sk]=Limit sledovania priečinka
Name[sl]=Omejitev opazovanih map
@@ -38,7 +39,7 @@
Name[zh_CN]=文件夹监视限制
Name[zh_TW]=資料夾監看限制
Description=To avoid missing file changes, raise the inotify folder watch limit
-Description[ar]=لتجنب تفويت تغييرات الملفات، ارفع حدّ مراقبة المجلد في inotify
+Description[ar]=لتجنّب تغييرات الملفّات النّاقصة، ارفع حدّ مراقبة مجلّد inotify
Description[bs]=Da izbjegnete nedostajuće izmjene datoteka, povećajte limit za inofity direktorij.
Description[ca]=Per evitar la pèrdua de canvis als fitxers, eleveu el límit de vigilància de les carpetes de l'«inotify»
Description[ca@valencia]=Per evitar la pèrdua de canvis de fitxers, eleveu el límit de vigilància de carpetes de l'«inotify»
@@ -61,6 +62,7 @@
Description[pl]=Aby uniknąć zmiany brakujących plików, podwyższ ograniczenie obserwacji katalogu inotify
Description[pt]=Para evitar as alterações de ficheiros perdidas, aumente o limite de monitorização de pastas do 'inotify'
Description[pt_BR]=Para evitar a perda de alterações dos arquivos, aumente o limite de monitoramento das pastas do inotify
+Description[ro]=Pentru a nu rata schimbări în fișiere, măriți limita inotify de urmărire a dosarelor
Description[ru]=Чтобы изменения файлов не оставались незамеченными, увеличьте ограничение на число наблюдаемых с помощью inotify папок
Description[sk]=Na zabránenie chýbajúcich zmien v súboroch, zvýšte obmedzenie sledovania priečinka inotify
Description[sl]=Da se izognete spregledu sprememb datotek, povečajte omejitev opazovanih map inotify
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/kinotify.cpp
^
|
| @@ -54,7 +54,7 @@
QByteArray concatPath(const QByteArray& p1, const QByteArray& p2)
{
QByteArray p(p1);
- if (p.isEmpty() || p[p.length() - 1] != '/')
+ if (p.isEmpty() || (!p2.isEmpty() && p[p.length() - 1] != '/'))
p.append('/');
p.append(p2);
return p;
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/file/pendingfile.cpp
^
|
| @@ -41,6 +41,9 @@
void PendingFile::setPath(const QString& path)
{
m_path = path;
+ if (m_path.endsWith('/')) {
+ m_path = m_path.mid(0, m_path.length() - 1);
+ }
}
bool PendingFile::shouldIndexContents() const
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/kioslaves/kded/baloosearchfolderupdater.desktop
^
|
| @@ -9,6 +9,7 @@
X-KDE-Kded-phase=1
Name=Search Folder Updater
+Name[ar]=محدّث مجلّدات البحث
Name[ca]=Actualitzador de les carpetes de cerca
Name[cs]=Nástroj pro aktualizaci složek pro vyhledávání
Name[da]=Opdatering af søgemappe
@@ -17,14 +18,18 @@
Name[en_GB]=Search Folder Updater
Name[es]=Actualizador de la carpeta de búsquedas
Name[fi]=Hakukansion päivitin
+Name[gl]=Actualizador do cartafol de busca
Name[hu]=Keresésfrissítő
Name[it]=Aggiornamento delle cartelle di ricerca
+Name[ko]=검색 폴더 업데이트 도구
Name[nb]=Søkemappe-oppdatering
Name[nds]=Söökorner-Opfrischen
Name[nl]=Bijwerker van zoekmap
Name[pl]=Uaktualnianie katalogu wyszukiwania
Name[pt]=Actualização das Pastas de Pesquisa
Name[pt_BR]=Atualização das pastas de pesquisa
+Name[ro]=Actualizator pentru dosare de căutare
+Name[ru]=Обновление папок поиска
Name[sk]=Aktualizátor priečinkov hľadania
Name[sl]=Posodobilnik iskalnih map
Name[sr]=Освеживач фасцикла претраге
@@ -38,6 +43,7 @@
Name[zh_CN]=搜索文件夹更新器
Name[zh_TW]=搜尋資料夾更新器
Comment=Allows automatic updates of Search Folders
+Comment[ar]=يسمح بالتّحديثات الآليّة لمجلّدات البحث
Comment[ca]=Permet l'actualització automàtica de les carpetes de cerca
Comment[cs]=Umožňuje automatickou aktualizaci prohledávaných složek
Comment[da]=Tillad automatisk opdatering af søgemapper
@@ -46,14 +52,18 @@
Comment[en_GB]=Allows automatic updates of Search Folders
Comment[es]=Permite actualizaciones automáticas de las carpetas de búsqueda
Comment[fi]=Mahdollistaa hakukansioiden automaattisen päivittämisen
+Comment[gl]=Permite actualizar automaticamente os cartafoles de busca.
Comment[hu]=Lehetővé teszi a keresési mappák automatikus frissítését
Comment[it]=Permette l'aggiornamento automatico delle cartelle di ricerca
+Comment[ko]=검색 폴더 자동 업데이트 허용
Comment[nb]=Tillater automatisk oppdatering av søkemapper
Comment[nds]=Frischt Söökornern automaatsch op
Comment[nl]=Staat automatisch bijwerken van zoekmappen toe
Comment[pl]=Umożliwia samoczynne uaktualnienia katalogów wyszukiwania
Comment[pt]=Permite as actualizações automáticas das Pastas de Pesquisa
Comment[pt_BR]=Permite as atualizações automáticas das pastas de pesquisa
+Comment[ro]=Permite actualizarea automată a dosarelor de căutare
+Comment[ru]=Автоматическое обновление результатов поиска файлов
Comment[sk]=Umožní automatické aktualizácie priečinkov hľadania
Comment[sl]=Omogoča samodejno posodabljanje iskalnih map
Comment[sr]=Омогућава аутоматско ажурирање фасцикла претраге
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/kioslaves/tags/kio_tags.cpp
^
|
| @@ -63,7 +63,7 @@
uds.insert(KIO::UDSEntry::UDS_DISPLAY_TYPE, i18n("Tag"));
uds.insert(KIO::UDSEntry::UDS_ACCESS, 0700);
uds.insert(KIO::UDSEntry::UDS_USER, KUser().loginName());
- uds.insert(KIO::UDSEntry::UDS_ICON_NAME, QLatin1String("feed-subscribe"));
+ uds.insert(KIO::UDSEntry::UDS_ICON_NAME, QLatin1String("tag"));
return uds;
}
@@ -158,7 +158,7 @@
uds.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
uds.insert(KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1("inode/directory"));
- uds.insert(KIO::UDSEntry::UDS_ICON_OVERLAY_NAMES, QLatin1String("feed-subscribe"));
+ uds.insert(KIO::UDSEntry::UDS_ICON_OVERLAY_NAMES, QLatin1String("tag"));
uds.insert(KIO::UDSEntry::UDS_DISPLAY_TYPE, i18n("Tag"));
uds.insert(KIO::UDSEntry::UDS_NAME, QLatin1String("."));
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/kioslaves/tags/tags.protocol
^
|
| @@ -14,6 +14,6 @@
deleteRecursive=true
listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
source=false
-Icon=feed-subscribe
+Icon=tag
Class=:local
maxInstances=100
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/autotests/filefetchjobtest.cpp
^
|
| @@ -24,7 +24,6 @@
#include "file.h"
#include <QSqlQuery>
-#include <QDebug>
#include <QTest>
#include <QTemporaryFile>
#include <QTemporaryDir>
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/autotests/filesearchstoretest.cpp
^
|
| @@ -27,7 +27,6 @@
#include "query.h"
#include "term.h"
-#include <QDebug>
#include <QtTest>
#include <xapian.h>
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/autotests/queryserializationtest.cpp
^
|
| @@ -25,8 +25,6 @@
#include <QtTest>
-#include <QDebug>
-
using namespace Baloo;
// Test a simple query with no terms
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/filemapping.cpp
^
|
| @@ -21,10 +21,11 @@
*/
#include "filemapping.h"
-#include <QDebug>
#include <QSqlQuery>
#include <QSqlError>
+#include <QVariant>
+#include <QDebug>
using namespace Baloo;
@@ -62,6 +63,9 @@
void FileMapping::setUrl(const QString& url)
{
m_url = url;
+ if (m_url.endsWith('/')) {
+ m_url = m_url.mid(0, m_url.length() - 1);
+ }
}
bool FileMapping::fetched()
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/filemonitor.cpp
^
|
| @@ -25,8 +25,6 @@
#include <QStringList>
#include <QDBusConnection>
-#include <QDebug>
-
using namespace Baloo;
class FileMonitor::Private {
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/query.cpp
^
|
| @@ -31,8 +31,6 @@
#include <QList>
#include <QUrlQuery>
-#include <QDebug>
-
#include <QJsonDocument>
#include <QJsonObject>
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/resultiterator.cpp
^
|
| @@ -23,7 +23,6 @@
#include "resultiterator.h"
#include "searchstore.h"
#include "result.h"
-#include <QDebug>
using namespace Baloo;
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/searchstore.cpp
^
|
| @@ -21,14 +21,6 @@
*/
#include "searchstore.h"
-#include "filesearchstore.h"
-
-#include <QDebug>
-#include <QThreadStorage>
-#include <QMutex>
-#include <QSharedPointer>
-#include <QCoreApplication>
-#include <QDir>
using namespace Baloo;
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/taglistjob.cpp
^
|
| @@ -20,7 +20,6 @@
#include "taglistjob.h"
#include "db.h"
-#include <QDebug>
#include <xapian.h>
#include <QStringList>
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/lib/wildcardpostingsource.cpp
^
|
| @@ -20,8 +20,6 @@
#include "wildcardpostingsource.h"
-#include <QDebug>
-
using namespace Baloo;
WildcardPostingSource::WildcardPostingSource(const QString& word, const QString& prefix)
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/tools/balooctl/main.cpp
^
|
| @@ -22,7 +22,6 @@
#include <QCommandLineOption>
#include <QCommandLineParser>
#include <QFile>
-#include <QDebug>
#include <KAboutData>
#include <KConfig>
@@ -30,6 +29,7 @@
#include <KLocalizedString>
#include <QStandardPaths>
#include <QProcess>
+#include <QTextStream>
#include <QDBusMessage>
#include <QDBusConnection>
@@ -73,6 +73,16 @@
QDBusConnection::sessionBus().call(message);
}
+void updateAllFolders()
+{
+ QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.kde.baloo"),
+ QLatin1String("/indexer"),
+ QLatin1String("org.kde.baloo"),
+ QLatin1String("updateAllFolders"));
+ message.setArguments(QList<QVariant>() << false /*forced*/);
+ QDBusConnection::sessionBus().call(message);
+}
+
int main(int argc, char* argv[])
{
KAboutData aboutData(QLatin1String("balooctl"), i18n("balooctl"), PROJECT_VERSION);
@@ -92,6 +102,7 @@
parser.addPositionalArgument(QLatin1String("restart"), i18n("Restart the file indexer"));
parser.addPositionalArgument(QLatin1String("suspend"), i18n("Suspend the file indexer"));
parser.addPositionalArgument(QLatin1String("resume"), i18n("Resume the file indexer"));
+ parser.addPositionalArgument(QLatin1String("check"), i18n("Check for any unindexed files and index them"));
parser.process(app);
if (parser.positionalArguments().isEmpty()) {
@@ -213,6 +224,12 @@
return 0;
}
+ if (command == QStringLiteral("check")) {
+ updateAllFolders();
+ out << "Started search for unindexed files\n";
+ return 0;
+ }
+
if (command == QStringLiteral("fileStatistics")) {
const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/baloo/file/");
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/tools/baloosearch/main.cpp
^
|
| @@ -24,7 +24,7 @@
#include <QCommandLineParser>
#include <QCommandLineOption>
#include <QFileInfo>
-#include <QDebug>
+#include <QTextStream>
#include <KAboutData>
#include <KLocalizedString>
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/xapian/autotests/queryparsertest.cpp
^
|
| @@ -23,7 +23,6 @@
#include "../xapiandatabase.h"
#include <QTest>
-#include <QDebug>
#include <QTemporaryDir>
using namespace Baloo;
@@ -61,7 +60,6 @@
XapianQueryParser parser;
Xapian::Query query = parser.parseQuery("The \"song of Ice\" Fire");
- //qDebug() << query.get_description().c_str();
QList<Xapian::Query> phraseQueries;
phraseQueries << Xapian::Query("song", 1, 2);
@@ -74,7 +72,6 @@
queries << Xapian::Query("fire", 1, 5);
Xapian::Query q(Xapian::Query::OP_AND, queries.begin(), queries.end());
- //qDebug() << q.get_description().c_str();
QCOMPARE(query.serialise(), q.serialise());
}
@@ -83,14 +80,12 @@
XapianQueryParser parser;
Xapian::Query query = parser.parseQuery("/opt/pro");
- //qDebug() << query.get_description().c_str();
QList<Xapian::Query> queries;
queries << Xapian::Query("opt", 1, 1);
queries << Xapian::Query("pro", 1, 2);
Xapian::Query q(Xapian::Query::OP_PHRASE, queries.begin(), queries.end());
- //qDebug() << q.get_description().c_str();
QCOMPARE(query.serialise(), q.serialise());
}
@@ -99,7 +94,6 @@
XapianQueryParser parser;
Xapian::Query query = parser.parseQuery("The \"song of Ice' and Fire");
- //qDebug() << query.get_description().c_str();
QList<Xapian::Query> queries;
queries << Xapian::Query("the", 1, 1);
@@ -110,7 +104,6 @@
queries << Xapian::Query("fire", 1, 6);
Xapian::Query q(Xapian::Query::OP_AND, queries.begin(), queries.end());
- //qDebug() << q.get_description().c_str();
QCOMPARE(query.serialise(), q.serialise());
}
@@ -180,7 +173,6 @@
parser.setDatabase(xap);
Xapian::Query query = parser.parseQuery("hell");
- //qDebug() << query.get_description().c_str();
QList<Xapian::Query> synQueries;
synQueries << Xapian::Query("hell", 1, 1);
@@ -188,7 +180,6 @@
synQueries << Xapian::Query("hellog", 1, 1);
Xapian::Query q(Xapian::Query::OP_SYNONYM, synQueries.begin(), synQueries.end());
- //qDebug() << q.get_description().c_str();
QCOMPARE(query.serialise(), q.serialise());
@@ -196,7 +187,6 @@
// Try expanding everything
//
query = parser.parseQuery("hel hi");
- // qDebug() << query.get_description().c_str();
{
QList<Xapian::Query> synQueries;
@@ -217,7 +207,6 @@
queries << q2;
Xapian::Query q(Xapian::Query::OP_AND, queries.begin(), queries.end());
- // qDebug() << q.get_description().c_str();
QCOMPARE(query.serialise(), q.serialise());
}
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/xapian/autotests/termgeneratortest.cpp
^
|
| @@ -23,7 +23,6 @@
#include "../xapiandatabase.h"
#include <QTest>
-#include <QDebug>
#include <QTemporaryDir>
using namespace Baloo;
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/xapian/xapiandatabase.cpp
^
|
| @@ -123,20 +123,20 @@
Xapian::WritableDatabase wdb = createWritableDb();
- qDebug() << "Adding:" << m_docsToAdd.size() << "docs";
- Q_FOREACH (const DocIdPair& doc, m_docsToAdd) {
+ qDebug() << "Removing:" << m_docsToRemove.size() << "docs";
+ Q_FOREACH (Xapian::docid id, m_docsToRemove) {
try {
- wdb.replace_document(doc.first, doc.second);
+ wdb.delete_document(id);
}
catch (const Xapian::Error& err) {
qDebug() << "ERROR" << err.get_description().c_str();
}
}
- qDebug() << "Removing:" << m_docsToRemove.size() << "docs";
- Q_FOREACH (Xapian::docid id, m_docsToRemove) {
+ qDebug() << "Adding:" << m_docsToAdd.size() << "docs";
+ Q_FOREACH (const DocIdPair& doc, m_docsToAdd) {
try {
- wdb.delete_document(id);
+ wdb.replace_document(doc.first, doc.second);
}
catch (const Xapian::Error& err) {
qDebug() << "ERROR" << err.get_description().c_str();
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/xapian/xapiandocument.cpp
^
|
| @@ -136,6 +136,9 @@
catch (const Xapian::Error& err) {
qDebug() << err.get_description().c_str();
}
+ catch (...) {
+ // bug 343602
+ }
return QByteArray();
}
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/xapian/xapianqueryparser.cpp
^
|
| @@ -22,7 +22,7 @@
#include <QTextBoundaryFinder>
#include <QStringList>
-#include <QDebug>
+#include <QVector>
using namespace Baloo;
|
|
[-]
[+]
|
Changed |
baloo-5.9.90.tar.xz/src/xapian/xapiantermgenerator.cpp
^
|
| @@ -21,7 +21,7 @@
#include "xapiantermgenerator.h"
#include <QTextBoundaryFinder>
-#include <QDebug>
+#include <QStringList>
using namespace Baloo;
|
|
[-]
[+]
|
Changed |
baloo.yaml
^
|
| @@ -1,5 +1,5 @@
Name : baloo
-Version : 5.6.0
+Version : 5.9.90
Release : 2
Group : System/Base
License : GPLv2+
|
