diff -Nru akregator-19.08.3+p20.04+git20200312.2145/CMakeLists.txt akregator-19.08.3+p20.04+git20200328.1505/CMakeLists.txt --- akregator-19.08.3+p20.04+git20200312.2145/CMakeLists.txt 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/CMakeLists.txt 2020-03-28 15:05:00.000000000 +0000 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.5) -set(KDEPIM_VERSION_NUMBER "5.13.80") +set(KDEPIM_VERSION_NUMBER "5.14.40") project(akregator VERSION ${KDEPIM_VERSION_NUMBER}) set(KF5_MIN_VERSION "5.68.0") -set(RELEASE_SERVICE_VERSION "20.03.80") +set(RELEASE_SERVICE_VERSION "20.07.40") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -28,7 +28,7 @@ # Do NOT add quote -set(KDEPIM_DEV_VERSION alpha) +set(KDEPIM_DEV_VERSION rc) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) @@ -41,13 +41,13 @@ set(QT_REQUIRED_VERSION "5.12.0") -set(KONTACTINTERFACE_LIB_VERSION "5.13.40") -set(KPIMTEXTEDIT_LIB_VERSION "5.13.40") -set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.13.40") -set(LIBKDEPIM_LIB_VERSION_LIB "5.13.40") -set(LIBKLEO_LIB_VERSION_LIB "5.13.40") -set(MESSAGELIB_LIB_VERSION_LIB "5.13.55") -set(PIMCOMMON_LIB_VERSION_LIB "5.13.40") +set(KONTACTINTERFACE_LIB_VERSION "5.14.40") +set(KPIMTEXTEDIT_LIB_VERSION "5.14.40") +set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.14.40") +set(LIBKDEPIM_LIB_VERSION_LIB "5.14.40") +set(LIBKLEO_LIB_VERSION_LIB "5.14.40") +set(MESSAGELIB_LIB_VERSION_LIB "5.14.40") +set(PIMCOMMON_LIB_VERSION_LIB "5.14.40") option(KDEPIM_KUSERFEEDBACK "Enable user feedback support (experimental)" FALSE) @@ -79,7 +79,7 @@ find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED) find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KUserFeedback) +find_package(KUserFeedback 0.9.90 CONFIG) # Needs Provider::describeDataSources() set_package_properties(KUserFeedback PROPERTIES DESCRIPTION "User Feedback lib" TYPE OPTIONAL PURPOSE "Allow to send Telemetry Information (optional). It can be disable in apps.") @@ -89,7 +89,7 @@ add_definitions(-DQT_NO_FOREACH) if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x058000) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) endif() if (TARGET KUserFeedbackWidgets) add_definitions(-DWITH_KUSERFEEDBACK) diff -Nru akregator-19.08.3+p20.04+git20200312.2145/configuration/akregator_config_userfeedback.cpp akregator-19.08.3+p20.04+git20200328.1505/configuration/akregator_config_userfeedback.cpp --- akregator-19.08.3+p20.04+git20200312.2145/configuration/akregator_config_userfeedback.cpp 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/configuration/akregator_config_userfeedback.cpp 2020-03-28 15:05:00.000000000 +0000 @@ -27,7 +27,7 @@ #include "userfeedback/userfeedbackmanager.h" #endif -using namespace KAddressBook; +using namespace Akregator; K_PLUGIN_FACTORY(KCMAkregatorUserFeedBackConfigFactory, registerPlugin(); ) @@ -50,21 +50,24 @@ connect(mUserFeedbackWidget, &KUserFeedback::FeedbackConfigWidget::configurationChanged, this, &KCMAkregatorUserFeedBackConfig::markAsChanged); lay->addWidget(mUserFeedbackWidget); - mUserFeedbackWidget->setFeedbackProvider(UserFeedBackManager::self()->userFeedbackProvider()); + mUserFeedbackWidget->setFeedbackProvider(Akregator::UserFeedBackManager::self()->userFeedbackProvider()); } void KCMAkregatorUserFeedBackConfig::save() { - UserFeedBackManager::self()->userFeedbackProvider()->setTelemetryMode(mUserFeedbackWidget->telemetryMode()); - UserFeedBackManager::self()->userFeedbackProvider()->setSurveyInterval(mUserFeedbackWidget->surveyInterval()); + Akregator::UserFeedBackManager::self()->userFeedbackProvider()->setTelemetryMode(mUserFeedbackWidget->telemetryMode()); + Akregator::UserFeedBackManager::self()->userFeedbackProvider()->setSurveyInterval(mUserFeedbackWidget->surveyInterval()); } void KCMAkregatorUserFeedBackConfig::load() { + mUserFeedbackWidget->setFeedbackProvider(Akregator::UserFeedBackManager::self()->userFeedbackProvider()); } void KCMAkregatorUserFeedBackConfig::defaults() { + //TODO fixme default values + mUserFeedbackWidget->setFeedbackProvider(Akregator::UserFeedBackManager::self()->userFeedbackProvider()); } #include "akregator_config_userfeedback.moc" diff -Nru akregator-19.08.3+p20.04+git20200312.2145/configuration/akregator_config_userfeedback.desktop akregator-19.08.3+p20.04+git20200328.1505/configuration/akregator_config_userfeedback.desktop --- akregator-19.08.3+p20.04+git20200312.2145/configuration/akregator_config_userfeedback.desktop 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/configuration/akregator_config_userfeedback.desktop 2020-03-28 15:05:00.000000000 +0000 @@ -12,8 +12,11 @@ Name=User Feedback Name[ca]=Comentaris de l'usuari Name[ca@valencia]=Comentaris de l'usuari +Name[cs]=Zpětná vazba uživatele Name[es]=Comentarios del usuario Name[et]=Kasutaja tagasiside +Name[fr]=Retours des utilisateurs +Name[ko]=사용자 피드백 Name[nl]=Terugkoppeling van gebruiker Name[pt]=Reacções do Utilizador Name[pt_BR]=Comentários do usuário @@ -26,6 +29,7 @@ X-KDE-Keywords[es]=akregator, configurar, preferencias, comentarios del usuario X-KDE-Keywords[et]=akregator, seadistamine, seadistused, kasutaja tagasiside X-KDE-Keywords[fr]=Akregator, configurer, paramétrage, retours des utilisateurs +X-KDE-Keywords[ko]=akregator, configure, settings, userfeedback, 설정, 일반, 사용자 피드백 X-KDE-Keywords[nl]=akregator, configureren, instellingen, terugkoppeling van gebruiker X-KDE-Keywords[pt]=akregator, configurar, configuração, reacções dos utilizadores X-KDE-Keywords[pt_BR]=akregator, configurar, configurações, geral, comentários do usuário diff -Nru akregator-19.08.3+p20.04+git20200312.2145/configuration/akregator_config_userfeedback.h akregator-19.08.3+p20.04+git20200328.1505/configuration/akregator_config_userfeedback.h --- akregator-19.08.3+p20.04+git20200312.2145/configuration/akregator_config_userfeedback.h 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/configuration/akregator_config_userfeedback.h 2020-03-28 15:05:00.000000000 +0000 @@ -27,7 +27,7 @@ class FeedbackConfigWidget; } -namespace KAddressBook { +namespace Akregator { class KCMAkregatorUserFeedBackConfig : public KCModule { Q_OBJECT diff -Nru akregator-19.08.3+p20.04+git20200312.2145/debian/changelog akregator-19.08.3+p20.04+git20200328.1505/debian/changelog --- akregator-19.08.3+p20.04+git20200312.2145/debian/changelog 2020-03-12 21:45:52.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/debian/changelog 2020-03-28 15:05:02.000000000 +0000 @@ -1,4 +1,4 @@ -akregator (4:19.08.3+p20.04+git20200312.2145-0) focal; urgency=high +akregator (4:19.08.3+p20.04+git20200328.1505-0) focal; urgency=high [ Rik Mills ] * New upstream release (19.08.0) @@ -9,7 +9,13 @@ [ Kubuntu CI ] * Automatic Ubuntu CI Build - -- Kubuntu CI Thu, 12 Mar 2020 21:45:52 +0000 + -- Kubuntu CI Sat, 28 Mar 2020 15:05:02 +0000 + +akregator (4:19.04.3-0ubuntu2) focal; urgency=medium + + * No-change rebuild for libgcc-s1 package name change. + + -- Matthias Klose Mon, 23 Mar 2020 19:15:22 +0100 akregator (4:19.04.3-0ubuntu1) eoan; urgency=medium diff -Nru akregator-19.08.3+p20.04+git20200312.2145/interfaces/CMakeLists.txt akregator-19.08.3+p20.04+git20200328.1505/interfaces/CMakeLists.txt --- akregator-19.08.3+p20.04+git20200312.2145/interfaces/CMakeLists.txt 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/interfaces/CMakeLists.txt 2020-03-28 15:05:00.000000000 +0000 @@ -11,6 +11,7 @@ if (TARGET KUserFeedbackWidgets) set(akregatorinterfaces_userfeedback_LIB_SRCS ${akregatorinterfaces_userfeedback_LIB_SRCS} userfeedback/userfeedbackmanager.cpp + userfeedback/akregatoruserfeedbackprovider.cpp ) endif() diff -Nru akregator-19.08.3+p20.04+git20200312.2145/interfaces/userfeedback/akregatoruserfeedbackprovider.cpp akregator-19.08.3+p20.04+git20200328.1505/interfaces/userfeedback/akregatoruserfeedbackprovider.cpp --- akregator-19.08.3+p20.04+git20200312.2145/interfaces/userfeedback/akregatoruserfeedbackprovider.cpp 1970-01-01 00:00:00.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/interfaces/userfeedback/akregatoruserfeedbackprovider.cpp 2020-03-28 15:05:00.000000000 +0000 @@ -0,0 +1,54 @@ +/* + Copyright (C) 2020 Laurent Montel + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + + +#include "akregatoruserfeedbackprovider.h" +#include +#include +#include +#include +#include +#include +#include +#include +using namespace Akregator; +AkregatorUserFeedbackProvider::AkregatorUserFeedbackProvider(QObject *parent) + : KUserFeedback::Provider(parent) +{ + setProductIdentifier(QStringLiteral("org.kde.akregator")); + setFeedbackServer(QUrl(QStringLiteral("https://telemetry.kde.org/"))); + setSubmissionInterval(7); + setApplicationStartsUntilEncouragement(5); + setEncouragementDelay(30); + + addDataSource(new KUserFeedback::ApplicationVersionSource); + addDataSource(new KUserFeedback::PlatformInfoSource); + addDataSource(new KUserFeedback::ScreenInfoSource); + addDataSource(new KUserFeedback::QtVersionSource); + + addDataSource(new KUserFeedback::StartCountSource); + addDataSource(new KUserFeedback::UsageTimeSource); + + addDataSource(new KUserFeedback::LocaleInfoSource); +} + +AkregatorUserFeedbackProvider::~AkregatorUserFeedbackProvider() +{ + +} diff -Nru akregator-19.08.3+p20.04+git20200312.2145/interfaces/userfeedback/akregatoruserfeedbackprovider.h akregator-19.08.3+p20.04+git20200328.1505/interfaces/userfeedback/akregatoruserfeedbackprovider.h --- akregator-19.08.3+p20.04+git20200312.2145/interfaces/userfeedback/akregatoruserfeedbackprovider.h 1970-01-01 00:00:00.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/interfaces/userfeedback/akregatoruserfeedbackprovider.h 2020-03-28 15:05:00.000000000 +0000 @@ -0,0 +1,35 @@ +/* + Copyright (C) 2020 Laurent Montel + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + + +#ifndef AKREGATORUSERFEEDBACKPROVIDER_H +#define AKREGATORUSERFEEDBACKPROVIDER_H + +#include +#include "akregatorinterfaces_export.h" +namespace Akregator { +class AKREGATORINTERFACES_EXPORT AkregatorUserFeedbackProvider : public KUserFeedback::Provider +{ + Q_OBJECT +public: + explicit AkregatorUserFeedbackProvider(QObject *parent = nullptr); + ~AkregatorUserFeedbackProvider(); +}; +} +#endif // AKREGATORUSERFEEDBACKPROVIDER_H diff -Nru akregator-19.08.3+p20.04+git20200312.2145/interfaces/userfeedback/userfeedbackmanager.cpp akregator-19.08.3+p20.04+git20200328.1505/interfaces/userfeedback/userfeedbackmanager.cpp --- akregator-19.08.3+p20.04+git20200312.2145/interfaces/userfeedback/userfeedbackmanager.cpp 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/interfaces/userfeedback/userfeedbackmanager.cpp 2020-03-28 15:05:00.000000000 +0000 @@ -17,35 +17,13 @@ Boston, MA 02110-1301, USA. */ +#include "akregatoruserfeedbackprovider.h" #include "userfeedbackmanager.h" -#include -#include -#include -#include -#include -#include -#include -#include - +using namespace Akregator; UserFeedBackManager::UserFeedBackManager(QObject *parent) : QObject(parent) { - mUserFeedbackProvider = new KUserFeedback::Provider(this); - mUserFeedbackProvider->setProductIdentifier(QStringLiteral("org.kde.akregator")); - mUserFeedbackProvider->setFeedbackServer(QUrl(QStringLiteral("https://telemetry.kde.org/"))); - mUserFeedbackProvider->setSubmissionInterval(7); - mUserFeedbackProvider->setApplicationStartsUntilEncouragement(5); - mUserFeedbackProvider->setEncouragementDelay(30); - - mUserFeedbackProvider->addDataSource(new KUserFeedback::ApplicationVersionSource); - mUserFeedbackProvider->addDataSource(new KUserFeedback::PlatformInfoSource); - mUserFeedbackProvider->addDataSource(new KUserFeedback::ScreenInfoSource); - mUserFeedbackProvider->addDataSource(new KUserFeedback::QtVersionSource); - - mUserFeedbackProvider->addDataSource(new KUserFeedback::StartCountSource); - mUserFeedbackProvider->addDataSource(new KUserFeedback::UsageTimeSource); - - mUserFeedbackProvider->addDataSource(new KUserFeedback::LocaleInfoSource); + mUserFeedbackProvider = new AkregatorUserFeedbackProvider(this); } UserFeedBackManager *UserFeedBackManager::self() diff -Nru akregator-19.08.3+p20.04+git20200312.2145/interfaces/userfeedback/userfeedbackmanager.h akregator-19.08.3+p20.04+git20200328.1505/interfaces/userfeedback/userfeedbackmanager.h --- akregator-19.08.3+p20.04+git20200312.2145/interfaces/userfeedback/userfeedbackmanager.h 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/interfaces/userfeedback/userfeedbackmanager.h 2020-03-28 15:05:00.000000000 +0000 @@ -26,6 +26,7 @@ namespace KUserFeedback { class Provider; } +namespace Akregator { class AKREGATORINTERFACES_EXPORT UserFeedBackManager : public QObject { Q_OBJECT @@ -38,5 +39,5 @@ private: KUserFeedback::Provider *mUserFeedbackProvider = nullptr; }; - +} #endif // USERFEEDBACKMANAGER_H diff -Nru akregator-19.08.3+p20.04+git20200312.2145/src/akregator_options.h akregator-19.08.3+p20.04+git20200328.1505/src/akregator_options.h --- akregator-19.08.3+p20.04+git20200312.2145/src/akregator_options.h 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/src/akregator_options.h 2020-03-28 15:05:00.000000000 +0000 @@ -49,6 +49,9 @@ QStringLiteral("url"), i18n("Add a feed with the given URL"), QStringLiteral("[url...]")); +#ifdef WITH_KUSERFEEDBACK + parser->addOption(QCommandLineOption(QStringLiteral("feedback"), i18n("Lists the available options for user feedback"))); +#endif } } diff -Nru akregator-19.08.3+p20.04+git20200312.2145/src/command/importfeedlistcommand.cpp akregator-19.08.3+p20.04+git20200328.1505/src/command/importfeedlistcommand.cpp --- akregator-19.08.3+p20.04+git20200312.2145/src/command/importfeedlistcommand.cpp 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/src/command/importfeedlistcommand.cpp 2020-03-28 15:05:00.000000000 +0000 @@ -69,9 +69,7 @@ const QSharedPointer target = targetList.lock(); if (!target) { - if (!target) { - qCWarning(AKREGATOR_LOG) << "Target list was deleted, could not import feed list"; - } + qCWarning(AKREGATOR_LOG) << "Target list was deleted, could not import feed list"; q->done(); return; } diff -Nru akregator-19.08.3+p20.04+git20200312.2145/src/command/loadfeedlistcommand.cpp akregator-19.08.3+p20.04+git20200328.1505/src/command/loadfeedlistcommand.cpp --- akregator-19.08.3+p20.04+git20200312.2145/src/command/loadfeedlistcommand.cpp 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/src/command/loadfeedlistcommand.cpp 2020-03-28 15:05:00.000000000 +0000 @@ -146,10 +146,6 @@ Q_ASSERT(!fileName.isNull()); Q_EMIT q->progress(0, i18n("Opening Feed List...")); - QString str; - - const QString listBackup = storage->restoreFeedList(); - QDomDocument doc; if (!QFileInfo::exists(fileName)) { diff -Nru akregator-19.08.3+p20.04+git20200312.2145/src/data/org.kde.akregator.appdata.xml akregator-19.08.3+p20.04+git20200328.1505/src/data/org.kde.akregator.appdata.xml --- akregator-19.08.3+p20.04+git20200312.2145/src/data/org.kde.akregator.appdata.xml 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/src/data/org.kde.akregator.appdata.xml 2020-03-28 15:05:00.000000000 +0000 @@ -63,6 +63,7 @@ A Comunidade do KDE A comunidade KDE KDE Komunita + Skupnost KDE KDE-gemenskapen Спільнота KDE xxThe KDE Communityxx @@ -92,6 +93,7 @@

O Akregator é um leitor de fontes de notícias. Permite-lhe seguir as páginas de notícias, 'blogs' e outras páginas com suporte para RSS/Atom sem a necessidade de pesquisar manualmente por actualizações com um navegador Web. O Akregator está desenhado para ser o mais simples de usar e poderoso o suficiente para ler centenas de fontes de notícias de forma conveniente. Vem com a integração com o Konqueror para adicionar fontes de notícias e com um navegador interno para a leitura simples de notícias.

Akregator é um leitor de fontes de notícias. Permite-lhe acompanhar as páginas de notícias, blogs e outras páginas com suporte a RSS/Atom, sem a necessidade usar um navegador Web para verificar se existem atualizações. O Akregator foi projetado para ser simples de usar e, ao mesmo tempo, poderoso o suficiente para ler centenas de fontes de notícias de forma conveniente. Ele possui uma pesquisa rápida, funcionalidade de arquivamento avançada e um navegador interno para leitura de notícias.

Akregator je program na čítanie správ. Umožňuje vám sledovať spravodajské weby, blogy a iné webové stránky s podporou RSS/Atom bez potreby ručnej kontroly aktualizácií pomocou webového prehliadača. Akregator je navrhnutý tak, aby sa dal ľahko používať a aby bol dostatočne výkonný na pohodlné čítanie stoviek spravodajských zdrojov. Je dodávaný s rýchlym vyhľadávaním, pokročilými funkciami archivácie a interným prehliadačom pre ľahké čítanie správ.

+

Akregator je bralnik novic. Omogoča vam spremljanje novic, spletnih mest, blogovin drugih spletnih mest, ki podpirajo RSS/Atom, ne da bi bilo treba ročno preverjatiposodobitve s pomočjo spletnega brskalnika. Akregator je zasnovan tako, da je enostaven za uporaboin da bo dovolj močan, da lahko priročno bere na stotine virov novic. Omogoča s hitro iskanje, napredne funkcije arhiviranja in internibrskalnik za enostavno branje novic.

Akregator är en nyhetskanalläsare. Den gör det möjligt att följa nyhetsplatser, bloggar och andra webbplatser som hanterar RSS/Atom utan att manuellt behöva leta efter uppdateringar med en webbläsare. Akregator är konstruerad för att både vara lätt att använda och kraftfull nog för att bekvämt läsa hundratals nyhetskällor. Den levereras med snabb sökning, avancerad arkiveringsfunktionalitet och en intern webbläsare för att enkelt kunna läsa nyheter.

Akregator — програма для отримання подач новин. За її допомогою ви можете стежити за сайтами новин, блогами та іншими сайтами з даними RSS/Atom без потреби у перевірці вручну оновлень за допомогою програми для перегляду інтернету. Akregator розроблено простим у користуванні та достатньо потужним для зручного читання сотень джерел новин. У програмі передбачено швидкий пошук, розширені можливості із архівування та вбудований переглядач для полегшення читання новин.

xxAkregator is a news feed reader. It enables you to follow news sites, blogs and other RSS/Atom-enabled websites without the need to manually check for updates using a web browser. Akregator is designed to be both easy to use and to be powerful enough to read hundreds of news sources conveniently. It comes with a fast search, advanced archiving functionality and an internal browser for easy news reading.xx

@@ -152,6 +154,7 @@ Leitura de fontes no Kontact com o Akregator Leitura de fontes de notícias no Kontact com o Akregator Čítanie informačných kanálov v Kontact s Akregator + Branje virov v Kontaktu z Akregatorjem Läsa kanaler i Kontact med Akregator Читання подач у Kontact за допомогою Akregator xxReading feeds in Kontact with Akregatorxx diff -Nru akregator-19.08.3+p20.04+git20200312.2145/src/feed/feed.cpp akregator-19.08.3+p20.04+git20200328.1505/src/feed/feed.cpp --- akregator-19.08.3+p20.04+git20200312.2145/src/feed/feed.cpp 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/src/feed/feed.cpp 2020-03-28 15:05:00.000000000 +0000 @@ -375,7 +375,7 @@ Akregator::DownloadFeedIconJob *job = new Akregator::DownloadFeedIconJob(this); job->setFeedIconUrl(url); job->setDownloadFavicon(downloadFavicon); - connect(job, &DownloadFeedIconJob::result, this, [job, this](const QString &result) { + connect(job, &DownloadFeedIconJob::result, this, [this](const QString &result) { setFaviconUrl(result); }); if (!job->start()) { diff -Nru akregator-19.08.3+p20.04+git20200312.2145/src/formatter/grantleeviewformatter.cpp akregator-19.08.3+p20.04+git20200328.1505/src/formatter/grantleeviewformatter.cpp --- akregator-19.08.3+p20.04+git20200312.2145/src/formatter/grantleeviewformatter.cpp 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/src/formatter/grantleeviewformatter.cpp 2020-03-28 15:05:00.000000000 +0000 @@ -37,10 +37,10 @@ GrantleeViewFormatter::GrantleeViewFormatter(const QString &htmlFileName, const QString &themePath, int deviceDpiY) : GrantleeTheme::GenericFormatter(htmlFileName, themePath) , mHtmlArticleFileName(htmlFileName) + , mDirectionString(QApplication::isRightToLeft() ? QStringLiteral("rtl") : QStringLiteral("ltr")) , mGrantleeThemePath(QStringLiteral("file://") + themePath + QLatin1Char('/')) , mDeviceDpiY(deviceDpiY) { - mDirectionString = QApplication::isRightToLeft() ? QStringLiteral("rtl") : QStringLiteral("ltr"); setApplicationDomain("akregator"); } diff -Nru akregator-19.08.3+p20.04+git20200312.2145/src/main.cpp akregator-19.08.3+p20.04+git20200328.1505/src/main.cpp --- akregator-19.08.3+p20.04+git20200312.2145/src/main.cpp 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/src/main.cpp 2020-03-28 15:05:00.000000000 +0000 @@ -27,7 +27,9 @@ #include "akregator_options.h" #include "akregator_debug.h" #include "akregratormigrateapplication.h" - +#ifdef WITH_KUSERFEEDBACK +#include "userfeedback/akregatoruserfeedbackprovider.h" +#endif #include #include @@ -100,6 +102,14 @@ cmdArgs->process(args); about.processCommandLine(cmdArgs); +#ifdef WITH_KUSERFEEDBACK + if(cmdArgs->isSet(QStringLiteral("feedback"))) { + Akregator::AkregatorUserFeedbackProvider *userFeedBack = new Akregator::AkregatorUserFeedbackProvider(nullptr); + QTextStream(stdout) << userFeedBack->describeDataSources() << '\n'; + delete userFeedBack; + return 0; + } +#endif if (!Akregator::Application::start(args)) { qCWarning(AKREGATOR_LOG) << "akregator is already running, exiting."; exit(0); diff -Nru akregator-19.08.3+p20.04+git20200312.2145/src/openurlrequest.cpp akregator-19.08.3+p20.04+git20200328.1505/src/openurlrequest.cpp --- akregator-19.08.3+p20.04+git20200312.2145/src/openurlrequest.cpp 2020-03-12 21:45:51.000000000 +0000 +++ akregator-19.08.3+p20.04+git20200328.1505/src/openurlrequest.cpp 2020-03-28 15:05:00.000000000 +0000 @@ -105,11 +105,7 @@ QString OpenUrlRequest::debugInfo() const { return QStringLiteral("url=%1 mimeType=%2 newTab=%3 forcesNewWindow=%4 options=%5") - .arg(m_url.url()) - .arg(m_args.mimeType()) - .arg(m_browserArgs.newTab()) - .arg(m_browserArgs.forcesNewWindow()) - .arg(m_options); + .arg(m_url.url(), m_args.mimeType()).arg(m_browserArgs.newTab()).arg(m_browserArgs.forcesNewWindow()).arg(m_options); } bool OpenUrlRequest::wasHandled() const