From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1177764-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 239FB1382C5
for <garchives@archives.gentoo.org>; Sun, 7 Jun 2020 09:30:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6196BE0932;
Sun, 7 Jun 2020 09:30:33 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4E933E0932
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jun 2020 09:30:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0095F34F03F
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jun 2020 09:30:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B4D2928F
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jun 2020 09:30:28 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1591522215.3cfdd312f28d0dd9d2a22aae19fa1a8d1dbaf7be.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/plasma-pass/, kde-misc/plasma-pass/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
X-VCS-Directories: kde-misc/plasma-pass/files/ kde-misc/plasma-pass/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 3cfdd312f28d0dd9d2a22aae19fa1a8d1dbaf7be
X-VCS-Branch: master
Date: Sun, 7 Jun 2020 09:30:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2d69436f-a5c5-4233-9e1e-4246adae8677
X-Archives-Hash: 8fc016ff946d412749a437e9cebeb32c
commit: 3cfdd312f28d0dd9d2a22aae19fa1a8d1dbaf7be
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 7 09:29:12 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 7 09:30:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cfdd312
kde-misc/plasma-pass: Fix build with Qt 5.15
Closes: https://bugs.gentoo.org/727398
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-pass-1.1.0-qt-5.15.patch | 29 ++++++++++++++++++++++
kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild | 2 ++
2 files changed, 31 insertions(+)
diff --git a/kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch b/kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch
new file mode 100644
index 00000000000..ea67cf18dd2
--- /dev/null
+++ b/kde-misc/plasma-pass/files/plasma-pass-1.1.0-qt-5.15.patch
@@ -0,0 +1,29 @@
+From 3fb633159ca4a1db166d5c54bbc025f71aba1652 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Thu, 9 Apr 2020 12:48:53 +0200
+Subject: Fix build against Qt 5.15
+
+* asturm 2020-06-07: Rebased for 1.1.0
+
+---
+ plugin/passwordfiltermodel.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugin/passwordfiltermodel.cpp b/plugin/passwordfiltermodel.cpp
+index e815797..2d323ad 100644
+--- a/plugin/passwordfiltermodel.cpp 2019-12-06 07:59:15.000000000 +0100
++++ b/plugin/passwordfiltermodel.cpp 2020-06-07 11:22:23.310950571 +0200
+@@ -79,7 +79,11 @@
+ 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();
+--
+cgit v1.1
diff --git a/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
index 39281fe41e4..8bc8f79a2ca 100644
--- a/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
+++ b/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
@@ -32,3 +32,5 @@ DEPEND="
RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )