Hello community, here is the log from the commit of package kdepim-addons for openSUSE:Factory checked in at 2017-08-02 11:30:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-addons (Old) and /work/SRC/openSUSE:Factory/.kdepim-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-addons" Wed Aug 2 11:30:41 2017 rev:17 rq:513149 version:17.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-addons/kdepim-addons.changes 2017-07-25 11:28:34.836458208 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim-addons.new/kdepim-addons.changes 2017-08-02 11:30:43.108544812 +0200 @@ -1,0 +2,7 @@ +Sun Jul 30 09:11:58 UTC 2017 - [email protected] + +- Fix saving the AdBlock plugin's settings if + ~/.local/share/adblock/ does not exist (boo#1013566) + Add fix-saving-adblock-settings.patch + +------------------------------------------------------------------- New: ---- fix-saving-adblock-settings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-addons.spec ++++++ --- /var/tmp/diff_new_pack.4vaRAs/_old 2017-08-02 11:30:44.020415898 +0200 +++ /var/tmp/diff_new_pack.4vaRAs/_new 2017-08-02 11:30:44.024415332 +0200 @@ -29,6 +29,8 @@ Group: Productivity/Graphics/Other Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: fix-saving-adblock-settings.patch # It can only build on the same platforms as Qt Webengine ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64 BuildRequires: akonadi-calendar-devel @@ -85,6 +87,7 @@ %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build ++++++ fix-saving-adblock-settings.patch ++++++ >From 45191cfc8875ba4433ea6f35cbe85db89e703a67 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Sun, 30 Jul 2017 10:57:50 +0200 Subject: Create ~/.local/share/adblock/ if it doesn't exist Otherwise saving manual filters will fail, which will also result in the general settings (Enable Ad Block, Hide filtered elements, Update interval) not getting written at all. Differential Revision: https://phabricator.kde.org/D6980 --- .../adblock/lib/widgets/adblocksettingwidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblocksettingwidget.cpp b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblocksettingwidget.cpp index 3e9abf2..8e90aae 100644 --- a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblocksettingwidget.cpp +++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblocksettingwidget.cpp @@ -57,6 +57,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils; #include <QTextStream> #include <QStandardPaths> #include <QRegularExpression> +#include <QDir> #include <KRun> using namespace AdBlock; @@ -289,6 +290,9 @@ void AdBlockSettingWidget::save() config.deleteGroup(group); } + // make sure the directory exists, otherwise saving the filters will fail + QDir().mkpath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/adblock")); + const int numberItem(mUi->automaticFiltersListWidget->count()); for (int i = 0; i < numberItem; ++i) { QListWidgetItem *subItem = mUi->automaticFiltersListWidget->item(i); -- cgit v0.11.2
