Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2022-08-19 17:53:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Fri Aug 19 17:53:46 2022 rev:72 rq:997749 version:22.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2022-07-09 17:02:13.644723736 +0200 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.2083/akonadiconsole.changes 2022-08-19 17:54:59.971914385 +0200 @@ -1,0 +2,20 @@ +Sun Aug 14 09:41:24 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/22.08.0/ + +------------------------------------------------------------------- +Fri Aug 5 12:10:11 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.07.90 + * New feature release + +------------------------------------------------------------------- +Sat Jul 16 08:27:27 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.07.80 + * New feature release + +------------------------------------------------------------------- Old: ---- akonadiconsole-22.04.3.tar.xz akonadiconsole-22.04.3.tar.xz.sig New: ---- akonadiconsole-22.08.0.tar.xz akonadiconsole-22.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.rVSpsx/_old 2022-08-19 17:55:00.419915324 +0200 +++ /var/tmp/diff_new_pack.rVSpsx/_new 2022-08-19 17:55:00.423915331 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: akonadiconsole -Version: 22.04.3 +Version: 22.08.0 Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ akonadiconsole-22.04.3.tar.xz -> akonadiconsole-22.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/.codespellrc new/akonadiconsole-22.08.0/.codespellrc --- old/akonadiconsole-22.04.3/.codespellrc 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadiconsole-22.08.0/.codespellrc 2022-08-08 07:02:34.000000000 +0200 @@ -0,0 +1,4 @@ +[codespell] +skip = ./build*,.git,*.notifyrc,*.desktop,*.json,*.xml +interactive = 3 +ignore-words-list = accessort diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/CMakeLists.txt new/akonadiconsole-22.08.0/CMakeLists.txt --- old/akonadiconsole-22.04.3/CMakeLists.txt 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/CMakeLists.txt 2022-08-08 07:02:34.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.20.3") +set(PIM_VERSION "5.21.0") project(akonadiconsole VERSION ${PIM_VERSION}) # Needs C++17 because Akonadi uses it and we link # against its private API -set(KF5_MIN_VERSION "5.91.0") +set(KF5_MIN_VERSION "5.95.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -34,29 +34,29 @@ # Do NOT add quote -set(KDEPIM_DEV_VERSION) +set(KDEPIM_DEV_VERSION ) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() -set(RELEASE_SERVICE_VERSION "22.04.3") +set(RELEASE_SERVICE_VERSION "22.08.0") set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})") set(KDEPIM_LIB_VERSION "${PIM_VERSION}") set(KDEPIM_LIB_SOVERSION "5") -set(AKONADI_CONTACT_VERSION "5.20.3") -set(CALENDARSUPPORT_LIB_VERSION "5.20.3") -set(AKONADI_VERSION "5.20.3") -set(AKONADI_SEARCH_VERSION "5.20.3") +set(AKONADI_CONTACT_VERSION "5.21.0") +set(CALENDARSUPPORT_LIB_VERSION "5.21.0") +set(AKONADI_VERSION "5.21.0") +set(AKONADI_SEARCH_VERSION "5.21.0") set(QT_REQUIRED_VERSION "5.15.2") find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION "5.20.3") -set(LIBKDEPIM_LIB_VERSION "5.20.3") -set(KMIME_LIB_VERSION "5.20.3") +set(MESSAGELIB_LIB_VERSION "5.21.0") +set(LIBKDEPIM_LIB_VERSION "5.21.0") +set(KMIME_LIB_VERSION "5.21.0") # Find KF5 package @@ -110,7 +110,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus") endif() -ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.92.0) +ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.96.0) include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR} ${XAPIAN_INCLUDE_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/CMakePresets.json new/akonadiconsole-22.08.0/CMakePresets.json --- old/akonadiconsole-22.04.3/CMakePresets.json 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/CMakePresets.json 2022-08-08 07:02:34.000000000 +0200 @@ -2,81 +2,89 @@ "version": 3, "configurePresets": [ { + "name": "base", + "displayName": "base preset", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF5}", + "hidden": true + }, + { "name": "dev", "displayName": "Build as debug", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] + }, { "name": "coverage", "displayName": "Build as debug", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "BUILD_COVERAGE": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "dev-qt6", "displayName": "Build against qt6", - "generator": "Ninja", "binaryDir": "${sourceDir}/build-qt6", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "BUILD_WITH_QT6": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF6}" + "inherits": [ + "base" + ] }, { "name": "dev-disable-deprecated", "displayName": "Build as without deprecated methods", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-disable-deprecated", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", "CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "asan", "displayName": "Build with Asan support.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-asan", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "ECM_ENABLE_SANITIZERS" : "'address;undefined'", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "pch", "displayName": "Build with PCH support.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-pch", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "dev-clang", "displayName": "dev-clang", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-clang", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" @@ -85,46 +93,46 @@ "CXX": "clang++", "CCACHE_DISABLE": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "unity", "displayName": "Build with CMake unity support.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-unity", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "USE_UNITY_CMAKE_SUPPORT": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "release", "displayName": "Build as release mode.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-release", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "profile", "displayName": "profile", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-profile", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "clazy", "displayName": "clazy", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-clazy", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" }, @@ -132,7 +140,9 @@ "CXX": "clazy", "CCACHE_DISABLE": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] } ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/config-akonadiconsole.h.cmake new/akonadiconsole-22.08.0/config-akonadiconsole.h.cmake --- old/akonadiconsole-22.04.3/config-akonadiconsole.h.cmake 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/config-akonadiconsole.h.cmake 2022-08-08 07:02:34.000000000 +0200 @@ -1,2 +1,2 @@ -#cmakedefine ENABLE_SEARCH 1 -#cmakedefine ENABLE_CONTENTVIEWS 1 +#cmakedefine01 ENABLE_SEARCH +#cmakedefine01 ENABLE_CONTENTVIEWS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/CMakeLists.txt new/akonadiconsole-22.08.0/src/CMakeLists.txt --- old/akonadiconsole-22.04.3/src/CMakeLists.txt 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/CMakeLists.txt 2022-08-08 07:02:34.000000000 +0200 @@ -21,7 +21,6 @@ collectioninternalspage.cpp collectionaclpage.cpp connectionpage.cpp - dbaccess.cpp dbbrowser.cpp dbconsole.cpp debugfiltermodel.cpp @@ -74,7 +73,6 @@ jobtrackerfilterproxymodel.h loggingmodel.h agentwidget.h - dbaccess.h debugmodel.h instanceselector.h ${libakonadiconsole_tracker_SRCS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/browserwidget.cpp new/akonadiconsole-22.08.0/src/browserwidget.cpp --- old/akonadiconsole-22.04.3/src/browserwidget.cpp 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/browserwidget.cpp 2022-08-08 07:02:34.000000000 +0200 @@ -11,8 +11,9 @@ #include "collectionattributespage.h" #include "collectioninternalspage.h" #include "config-akonadiconsole.h" -#include "dbaccess.h" #include "tagpropertiesdialog.h" +#include <Akonadi/ClearCacheJob> +#include <Akonadi/DbAccess> #include <Akonadi/AttributeFactory> #include <Akonadi/ChangeRecorder> @@ -64,7 +65,7 @@ #include <QTimer> #include <QVBoxLayout> -#ifdef ENABLE_CONTENTVIEWS +#if ENABLE_CONTENTVIEWS #include <Akonadi/ContactGroupViewer> #include <Akonadi/ContactViewer> #include <CalendarSupport/IncidenceViewer> @@ -195,7 +196,7 @@ connect(contentUi.saveButton, &QPushButton::clicked, this, &BrowserWidget::save); splitter3->addWidget(contentViewParent); -#ifdef ENABLE_CONTENTVIEWS +#if ENABLE_CONTENTVIEWS auto w = new QWidget; w->setLayout(new QVBoxLayout); w->layout()->addWidget(mContactView = new Akonadi::ContactViewer); @@ -308,7 +309,7 @@ void BrowserWidget::setItem(const Akonadi::Item &item) { mCurrentItem = item; -#ifdef ENABLE_CONTENTVIEWS +#if ENABLE_CONTENTVIEWS if (item.hasPayload<KContacts::Addressee>()) { mContactView->setItem(item); contentUi.stack->setCurrentWidget(mContactView->parentWidget()); @@ -526,52 +527,10 @@ void BrowserWidget::clearCache() { - const Collection coll = currentCollection(); - if (!coll.isValid()) { - return; - } - - const auto ridCount = QStringLiteral("SELECT COUNT(*) FROM PimItemTable WHERE collectionId=%1 AND remoteId=''").arg(coll.id()); - QSqlQuery query(DbAccess::database()); - if (!query.exec(ridCount)) { - qCWarning(AKONADICONSOLE_LOG) << "Failed to execute query" << ridCount << ":" << query.lastError().text(); - KMessageBox::error(this, query.lastError().text()); - return; - } - - query.next(); - const int emptyRidCount = query.value(0).toInt(); - if (emptyRidCount > 0) { - if (KMessageBox::warningContinueCancel(this, - QStringLiteral("The collection '%1' contains %2 items without Remote ID. " - "Those items were likely never uploaded to the destination server, " - "so clearing this collection means that those <b>data will be lost</b>. " - "Are you sure you want to proceed?") - .arg(coll.id()) - .arg(emptyRidCount), - QStringLiteral("POSSIBLE DATA LOSS!")) - == KMessageBox::Cancel) { - return; - } - } - - QString str = QStringLiteral("DELETE FROM PimItemTable WHERE collectionId=%1").arg(coll.id()); - qCDebug(AKONADICONSOLE_LOG) << str; - query = QSqlQuery(str, DbAccess::database()); - if (query.exec()) { - if (query.lastError().isValid()) { - qCDebug(AKONADICONSOLE_LOG) << query.lastError(); - KMessageBox::error(this, query.lastError().text()); - } - } - - // TODO: Clear external parts - // TODO: Reset Akonadi's internal collection statistics cache - // TODO: Notify all clients EXCEPT FOR THE RESOURCE about the deletion? - // TODO: Clear search index - // TODO: ??? - - KMessageBox::information(this, QStringLiteral("Collection cache cleared. You should restart Akonadi now.")); + Akonadi::ClearCacheJob *job = new Akonadi::ClearCacheJob(this); + job->setCollection(currentCollection()); + job->setParentWidget(this); + job->start(); } Akonadi::Collection BrowserWidget::currentCollection() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/dbaccess.cpp new/akonadiconsole-22.08.0/src/dbaccess.cpp --- old/akonadiconsole-22.04.3/src/dbaccess.cpp 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/dbaccess.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -/* - SPDX-FileCopyrightText: 2009 Volker Krause <vkra...@kde.org> - - SPDX-License-Identifier: LGPL-2.0-or-later -*/ - -#include "dbaccess.h" - -#include <Akonadi/ServerManager> - -#include <QSettings> -#include <QSqlDatabase> -#include <QSqlError> -#include <QSqlQuery> - -#include <KMessageBox> - -using namespace Akonadi; - -class DbAccessPrivate -{ -public: - DbAccessPrivate() - { - init(); - } - - void init() - { - const QString serverConfigFile = ServerManager::serverConfigFilePath(ServerManager::ReadWrite); - QSettings settings(serverConfigFile, QSettings::IniFormat); - - const QString driver = settings.value(QStringLiteral("General/Driver"), QStringLiteral("QMYSQL")).toString(); - database = QSqlDatabase::addDatabase(driver); - settings.beginGroup(driver); - database.setHostName(settings.value(QStringLiteral("Host"), QString()).toString()); - database.setDatabaseName(settings.value(QStringLiteral("Name"), QStringLiteral("akonadi")).toString()); - database.setUserName(settings.value(QStringLiteral("User"), QString()).toString()); - database.setPassword(settings.value(QStringLiteral("Password"), QString()).toString()); - database.setConnectOptions(settings.value(QStringLiteral("Options"), QString()).toString()); - if (!database.open()) { - KMessageBox::error(nullptr, QStringLiteral("Failed to connect to database: %1").arg(database.lastError().text())); - } - } - - QSqlDatabase database; -}; - -Q_GLOBAL_STATIC(DbAccessPrivate, sInstance) -QSqlDatabase DbAccess::database() -{ - // hack to detect database gone away error - QSqlQuery query(sInstance->database); - // prepare or exec of "SELECT 1" will only fail when we are not connected to database - if (!query.prepare(QStringLiteral("SELECT 1")) || !query.exec()) { - sInstance->database.close(); - QSqlDatabase::removeDatabase(sInstance->database.connectionName()); - sInstance->init(); - } - return sInstance->database; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/dbaccess.h new/akonadiconsole-22.08.0/src/dbaccess.h --- old/akonadiconsole-22.04.3/src/dbaccess.h 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/dbaccess.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -/* - SPDX-FileCopyrightText: 2009 Volker Krause <vkra...@kde.org> - - SPDX-License-Identifier: LGPL-2.0-or-later -*/ - -#pragma once - -class QSqlDatabase; - -namespace DbAccess -{ -QSqlDatabase database(); -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/dbbrowser.cpp new/akonadiconsole-22.08.0/src/dbbrowser.cpp --- old/akonadiconsole-22.04.3/src/dbbrowser.cpp 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/dbbrowser.cpp 2022-08-08 07:02:34.000000000 +0200 @@ -5,7 +5,7 @@ */ #include "dbbrowser.h" -#include "dbaccess.h" +#include <Akonadi/DbAccess> #include <QSqlTableModel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/dbconsole.cpp new/akonadiconsole-22.08.0/src/dbconsole.cpp --- old/akonadiconsole-22.04.3/src/dbconsole.cpp 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/dbconsole.cpp 2022-08-08 07:02:34.000000000 +0200 @@ -5,7 +5,7 @@ */ #include "dbconsole.h" -#include "dbaccess.h" +#include <Akonadi/DbAccess> #include <QAction> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/jobtrackerfilterproxymodel.cpp new/akonadiconsole-22.08.0/src/jobtrackerfilterproxymodel.cpp --- old/akonadiconsole-22.04.3/src/jobtrackerfilterproxymodel.cpp 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/jobtrackerfilterproxymodel.cpp 2022-08-08 07:02:34.000000000 +0200 @@ -8,6 +8,7 @@ #include "akonadiconsole_debug.h" #include "jobtrackermodel.h" #include <QDebug> +#include <QRegularExpression> JobTrackerFilterProxyModel::JobTrackerFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) @@ -30,11 +31,11 @@ } } } - QRegExp reg = filterRegExp(); - if (reg.isEmpty()) { + QRegularExpression reg = filterRegularExpression(); + if (reg.pattern().isEmpty()) { return true; } - reg.setCaseSensitivity(Qt::CaseInsensitive); + reg.setPatternOptions(QRegularExpression::CaseInsensitiveOption); if (mSearchColumn == -1) { // search in all columns const int colCount = sourceModel()->columnCount(); for (int i = 0; i < colCount; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/mainwidget.cpp new/akonadiconsole-22.08.0/src/mainwidget.cpp --- old/akonadiconsole-22.04.3/src/mainwidget.cpp 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/mainwidget.cpp 2022-08-08 07:02:34.000000000 +0200 @@ -13,7 +13,7 @@ #include "dbbrowser.h" #include "dbconsole.h" #include "debugwidget.h" -#ifdef ENABLE_SEARCH +#if ENABLE_SEARCH #include "searchwidget.h" #endif #include "jobtrackerwidget.h" @@ -56,7 +56,7 @@ tabWidget->addTab(new JobTrackerWidget("resourcesJobtracker", tabWidget, QStringLiteral("Enable tracking of Resource Schedulers")), QStringLiteral("Resources Schedulers")); tabWidget->addTab(new NotificationMonitor(tabWidget), QStringLiteral("Notification Monitor")); -#ifdef ENABLE_SEARCH +#if ENABLE_SEARCH tabWidget->addTab(new SearchWidget(tabWidget), QStringLiteral("Item Search")); #endif tabWidget->addTab(new MonitorsWidget(tabWidget), QStringLiteral("Monitors")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/org.kde.akonadiconsole.desktop new/akonadiconsole-22.08.0/src/org.kde.akonadiconsole.desktop --- old/akonadiconsole-22.04.3/src/org.kde.akonadiconsole.desktop 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/org.kde.akonadiconsole.desktop 2022-08-08 07:02:34.000000000 +0200 @@ -20,6 +20,7 @@ Name[hu]=Akonadi konzol Name[ia]=Consol de Akonadi Name[it]=Console Akonadi +Name[ka]=Akonadi-?????? ????????????????????? Name[ko]=Akonadi ?????? Name[lt]=Akonadi pultas Name[nl]=Akonadi-console @@ -66,6 +67,7 @@ Comment[hu]=Akonadi fel??gyeleti ??s hibakeres??si konzol Comment[ia]=Consol de Akonadi pro gestion e cribrar Comment[it]=Console di gestione e debugging di Akonadi +Comment[ka]=Akonadi-?????? ???????????????????????? ?????? ??????????????????????????? ????????????????????? Comment[ko]=Akonadi ?????? ??? ????????? ?????? Comment[lt]=Akonadi tvarkymo ir derinimo pultas Comment[nl]=Akonadi-beheer en debugging-console diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/searchwidget.cpp new/akonadiconsole-22.08.0/src/searchwidget.cpp --- old/akonadiconsole-22.04.3/src/searchwidget.cpp 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/searchwidget.cpp 2022-08-08 07:02:34.000000000 +0200 @@ -95,6 +95,7 @@ layout->addWidget(mVSplitter); const auto stores = Akonadi::Search::SearchStore::searchStores(); + qDebug() << " stores " << stores.count(); for (const auto &store : stores) { mStoreCombo->addItem(store->types().last(), QVariant::fromValue(store)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.04.3/src/tagpropertiesdialog.cpp new/akonadiconsole-22.08.0/src/tagpropertiesdialog.cpp --- old/akonadiconsole-22.04.3/src/tagpropertiesdialog.cpp 2022-07-01 05:04:07.000000000 +0200 +++ new/akonadiconsole-22.08.0/src/tagpropertiesdialog.cpp 2022-08-08 07:02:34.000000000 +0200 @@ -6,7 +6,7 @@ */ #include "tagpropertiesdialog.h" -#include "dbaccess.h" +#include <Akonadi/DbAccess> #include <Akonadi/AttributeFactory> #include <QDialogButtonBox>
