Hello community, here is the log from the commit of package baloo5-widgets for openSUSE:Factory checked in at 2019-05-03 22:37:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baloo5-widgets (Old) and /work/SRC/openSUSE:Factory/.baloo5-widgets.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "baloo5-widgets" Fri May 3 22:37:48 2019 rev:45 rq:698746 version:19.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/baloo5-widgets/baloo5-widgets.changes 2019-04-26 22:46:14.865588342 +0200 +++ /work/SRC/openSUSE:Factory/.baloo5-widgets.new.5148/baloo5-widgets.changes 2019-05-03 22:37:48.254661530 +0200 @@ -1,0 +2,9 @@ +Fri Apr 26 22:20:46 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix truncation of first tag character (kde#405777) + * 0001-TagsFileItemAction-Fix-bad-truncation-of-tag-name.patch +- Correct required versions for KF5 (5.57) and Qt5 (5.8.0) +- Use 'cmake(Qt5*)' BuildRequires instead of pkgconfig +- Remove kdelibs4support BuildRequires + +------------------------------------------------------------------- New: ---- 0001-TagsFileItemAction-Fix-bad-truncation-of-tag-name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo5-widgets.spec ++++++ --- /var/tmp/diff_new_pack.GcN6ms/_old 2019-05-03 22:37:48.702662461 +0200 +++ /var/tmp/diff_new_pack.GcN6ms/_new 2019-05-03 22:37:48.702662461 +0200 @@ -16,7 +16,7 @@ # -%define kf5_version 5.26.0 +%define kf5_version 5.57.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang @@ -29,18 +29,18 @@ URL: http://www.kde.org Source: baloo-widgets-%{version}.tar.xz Source99: baloo5-widgets-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch0: 0001-TagsFileItemAction-Fix-bad-truncation-of-tag-name.patch BuildRequires: baloo5-devel BuildRequires: extra-cmake-modules >= %{kf5_version} -BuildRequires: kdelibs4support-devel BuildRequires: kf5-filesystem BuildRequires: kfilemetadata5-devel BuildRequires: ki18n-devel BuildRequires: kio-devel BuildRequires: kservice-devel -BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +BuildRequires: cmake(Qt5Core) >= 5.8.0 +BuildRequires: cmake(Qt5Test) >= 5.8.0 +BuildRequires: cmake(Qt5Widgets) >= 5.8.0 Recommends: %{name}-lang Obsoletes: libKF5BalooWidgets5 Provides: libKF5BalooNaturalQueryParser1 = %{version} @@ -54,8 +54,7 @@ Group: Development/Libraries/KDE Requires: %{name} = %{version} Requires: kio-devel -Requires: pkgconfig -Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: cmake(Qt5Widgets) >= 5.8.0 Provides: baloo-widgets5-devel Obsoletes: baloo-widgets5-devel @@ -66,6 +65,7 @@ %prep %setup -q -n baloo-widgets-%{version} +%patch0 -p1 %build %cmake_kf5 -d build ++++++ 0001-TagsFileItemAction-Fix-bad-truncation-of-tag-name.patch ++++++ >From 03b915cb5801e458816ca48647644f29e44c4e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Fri, 26 Apr 2019 23:49:39 +0200 Subject: [PATCH 1/2] [TagsFileItemAction] Fix bad truncation of tag name Summary: Instead of reconstructing the tag name from the QAction text, just capture the tag name. The action is not required in the capture, as the `checked` state is emitted as a signal parameter. BUG: 405777 Test Plan: Add tag via context menu Reviewers: #baloo, #dolphin, nicolasfella, ngraham, elvisangelaccio Tags: #baloo Differential Revision: https://phabricator.kde.org/D20855 --- .../tagsfileitemaction.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/tagsfileitemactionplugin/tagsfileitemaction.cpp b/src/tagsfileitemactionplugin/tagsfileitemaction.cpp index f5ce499..44fb2cb 100644 --- a/src/tagsfileitemactionplugin/tagsfileitemaction.cpp +++ b/src/tagsfileitemactionplugin/tagsfileitemaction.cpp @@ -52,18 +52,14 @@ TagsFileItemAction::TagsFileItemAction(QObject* parent, const QVariantList&) action->setCheckable(true); action->setChecked(m_metaData->tags().contains(name)); - connect(action, &QAction::triggered, this, [this, action] { - if (action->isChecked()) { - QStringList newTags = m_metaData->tags(); - // HACK the first character of QAction::text is '&' - newTags.append(action->text().remove(0,1)); - m_metaData->setTags(newTags); + connect(action, &QAction::triggered, this, [this, name](bool isChecked) { + QStringList newTags = m_metaData->tags(); + if (isChecked) { + newTags.append(name); } else { - QStringList newTags = m_metaData->tags(); - // HACK the first character of QAction::text is '&' - newTags.removeAll(action->text().remove(0,1)); - m_metaData->setTags(newTags); + newTags.removeAll(name); } + m_metaData->setTags(newTags); }); } }); -- 2.21.0
