Hello community, here is the log from the commit of package plasma-pass for openSUSE:Factory checked in at 2020-06-05 20:19:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-pass (Old) and /work/SRC/openSUSE:Factory/.plasma-pass.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-pass" Fri Jun 5 20:19:33 2020 rev:3 rq:811544 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-pass/plasma-pass.changes 2019-12-06 15:06:51.336361860 +0100 +++ /work/SRC/openSUSE:Factory/.plasma-pass.new.3606/plasma-pass.changes 2020-06-05 20:24:56.900738994 +0200 @@ -1,0 +2,6 @@ +Thu Jun 4 15:11:08 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch: + * 0001-Fix-build-against-Qt-5.15.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-against-Qt-5.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-pass.spec ++++++ --- /var/tmp/diff_new_pack.1bdV8P/_old 2020-06-05 20:24:58.636742093 +0200 +++ /var/tmp/diff_new_pack.1bdV8P/_new 2020-06-05 20:24:58.640742100 +0200 @@ -1,7 +1,7 @@ # # spec file for package plasma-pass # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,7 @@ Source1: https://download.kde.org/stable/plasma-pass/%{name}-%{version}.tar.xz.sig Source2: plasma-pass.keyring %endif +Patch0: 0001-Fix-build-against-Qt-5.15.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: cmake(KF5I18n) >= 5.42.0 @@ -49,32 +50,33 @@ %lang_package %prep -%autosetup +%autosetup -p1 %build %cmake_kf5 -d build -%make_jobs +%cmake_build %install %kf5_makeinstall -C build %if %{with lang} %find_lang %{lang_name} %{name}.lang %endif + %fdupes %{buildroot} %files %license COPYING %doc README.md -%{_kf5_appstreamdir}/org.kde.plasma.pass.appdata.xml %dir %{_kf5_plasmadir}/plasmoids -%{_kf5_plasmadir}/plasmoids/org.kde.plasma.pass/ %dir %{_kf5_qmldir}/org/kde/plasma/ %dir %{_kf5_qmldir}/org/kde/plasma/private/ %dir %{_kf5_qmldir}/org/kde/plasma/private/plasmapass +%{_kf5_appstreamdir}/org.kde.plasma.pass.appdata.xml +%{_kf5_debugdir}/plasma-pass.categories +%{_kf5_plasmadir}/plasmoids/org.kde.plasma.pass/ %{_kf5_qmldir}/org/kde/plasma/private/plasmapass/libplasmapassplugin.so %{_kf5_qmldir}/org/kde/plasma/private/plasmapass/qmldir %{_kf5_servicesdir}/plasma-applet-org.kde.plasma.pass.desktop -%{_kf5_debugdir}/plasma-pass.categories %if %{with lang} %files lang -f %{name}.lang ++++++ 0001-Fix-build-against-Qt-5.15.patch ++++++ >From cbc0374d0671b14fe84c12ff2e9f0c3dbc56c4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <[email protected]> Date: Thu, 9 Apr 2020 12:48:53 +0200 Subject: [PATCH] Fix build against Qt 5.15 --- plugin/passwordfiltermodel.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugin/passwordfiltermodel.cpp b/plugin/passwordfiltermodel.cpp index 3115a6c..79173fa 100644 --- a/plugin/passwordfiltermodel.cpp +++ b/plugin/passwordfiltermodel.cpp @@ -79,7 +79,11 @@ void PasswordFilterModel::delayedUpdateFilter() Q_ASSERT(sender() == &mUpdateTimer); mFilter = mUpdateTimer.property(newFilterProperty).toString(); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) mParts = mFilter.splitRef(QLatin1Char('/'), QString::SkipEmptyParts); +#else + mParts = mFilter.splitRef(QLatin1Char('/'), Qt::SkipEmptyParts); +#endif Q_EMIT passwordFilterChanged(); mSortingLookup.clear(); invalidate(); -- 2.26.2
