gentoo resync : 15.06.2021

4 files changed, 73 insertions, 3 deletions

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index a528a5cf66cc..49de5cf55301 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,6 @@
+AUX konqueror-20.12.3-use-new-QComboBox-signal.patch 3328 BLAKE2B 3e4ed3fab89a3a707a302a1142c96042bcd694385fe36f89cb89da8860000ff958d81ff0d25c9931c7979e90bb33a5a3a00455c2e3b877ec145000dffaf73e19 SHA512 3c6f30af0ac0a9b0a7e5d46c3c30e95f08d217e81acacd267d91ab17a09d8b2b48ab0eb774097dd3dd5a64e553b2ae7f582693fbb73599ee12f3790650da2918
 DIST konqueror-20.12.3.tar.xz 7241896 BLAKE2B 0fd3e4fffe57cbd56bd953901617fee15d264ba4d4c709d2866ee01516cb00d15a2888e8e174592245a35f58fa5c4b7c10391c450506a23a4851e72dd2a3c4fc SHA512 38008dbecd9a22ff9658cb6b72092245b408288388b4c3f8077cc958d0a1dd5be62f24e05f3802eb5aed718ea7d5f902e3c6e15a52846661e3ffdd41c0fc7370
-DIST konqueror-21.04.1.tar.xz 7256176 BLAKE2B 86a2549bf4cfde87a67f516ea0c02670961b994e5aa0507796c01f63632b23a9ec106acdba3904fdb737d7692ae94b96d1fb05e4a718fbeaff302279d57065a3 SHA512 8e0b1875e3391335c489c170928f3b428673d98a0ef6c377d81283b4351ee6958b51dfcd27a3c4618cfcc8d8267ac8014a1e5a9dd1507dfe20a311b408bc3ca7
-EBUILD konqueror-20.12.3.ebuild 2446 BLAKE2B 5095f794fe957e220bc9551cbbdc2dadc36a101ba041493a8e02a5c1c8516e77faaf44956d4cd3d417e84eae0b2ca1ee8ee2dbab53c5b4e1dbb4de939d973290 SHA512 ab5e776f45d971f536c8b0ada2c2889627c33a83063b30ac745a5feaf73b782ba5160977054e21b5cf30cfab46031ad183b8d3a1c6eb5d2a82ad57cd8537ed31
-EBUILD konqueror-21.04.1.ebuild 2449 BLAKE2B bae852f2debc23fab2a84f6f6d2ae141aa144e8a85155fe7d5962ab6c9b7f94fad84f26b37c087c5c8772f7940f4dc9c4325711664dc4d9ff786cf0586d4b95e SHA512 7a0cee39f999ae616b5293e6794fe2e88da695a8d738dc24a876c461f070daf3308485cd66fb97a46c0e22110f4620b1ed31db7c0a02ed328e0e5b69d392ba74
+DIST konqueror-21.04.2.tar.xz 7410200 BLAKE2B ec3b244a216bf3581ee9a174df0e001062a787ee8ba38fe6f90fb74ed435b3d26628ba304275a6e9f4389dd8b4822a0e24df748574199ed1ecc9b40bd9ad2b23 SHA512 4042484e0e6b5e0fc16cb1676e4fd0752f6a01a3762ba7f30ea5bb7590a68b20b40e2d4b1fc633ceef8d51c6201bc513a6d0f74b3e8b4228e493a8bc1f29e78b
+EBUILD konqueror-20.12.3-r1.ebuild 2526 BLAKE2B ec322c053681a3c83e14ca7f8537fa5f6548cff4f2240778a2ae9d3dc1aa84468dde2c06b5d3b3eb7af7f3616e53fd2652cc266c7cbe9f0117a36c896dc1c05d SHA512 dd4320a4b8d74d0473b614533d64b7f1c78dab9cddf9fc8b385e3e00d23f844dc5426af026085091ca84f1e2d407afe5253e428c9e5da65acd07d7f99189bfdd
+EBUILD konqueror-21.04.2.ebuild 2449 BLAKE2B bae852f2debc23fab2a84f6f6d2ae141aa144e8a85155fe7d5962ab6c9b7f94fad84f26b37c087c5c8772f7940f4dc9c4325711664dc4d9ff786cf0586d4b95e SHA512 7a0cee39f999ae616b5293e6794fe2e88da695a8d738dc24a876c461f070daf3308485cd66fb97a46c0e22110f4620b1ed31db7c0a02ed328e0e5b69d392ba74
 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/files/konqueror-20.12.3-use-new-QComboBox-signal.patch b/kde-apps/konqueror/files/konqueror-20.12.3-use-new-QComboBox-signal.patch
new file mode 100644
index 000000000000..65ca9be7e442
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-20.12.3-use-new-QComboBox-signal.patch
@@ -0,0 +1,67 @@
+From f4a3fec5a229fea59eba15b8644a06a9e16e91a0 Mon Sep 17 00:00:00 2001
+From: Jonathan Marten <jjm@keelhaul.me.uk>
+Date: Sun, 16 May 2021 14:07:56 +0000
+Subject: [PATCH] KonqCombo: Use new QComboBox signal and new-style connect
+
+(cherry picked from commit 1003724180b3a758f7f4f42b247261ac95234e1b)
+---
+ src/konqcombo.cpp | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/konqcombo.cpp b/src/konqcombo.cpp
+index f401aca3f..84daa8078 100644
+--- a/src/konqcombo.cpp
++++ b/src/konqcombo.cpp
+@@ -143,9 +143,7 @@ KonqCombo::KonqCombo(QWidget *parent)
+     edit->setCompletionBox(new KonqComboCompletionBox(edit));
+     setLineEdit(edit);
+     setItemDelegate(new KonqComboItemDelegate(this));
+-
+-    connect(edit, SIGNAL(textEdited(QString)),
+-            this, SLOT(slotTextEdited(QString)));
++    connect(edit, &QLineEdit::textEdited, this, &KonqCombo::slotTextEdited);
+ 
+     completionBox()->setTabHandling(true); // #167135
+     completionBox()->setItemDelegate(new KonqComboItemDelegate(this));
+@@ -156,16 +154,18 @@ KonqCombo::KonqCombo(QWidget *parent)
+     // Connect to the returnPressed signal when completionMode == CompletionNone. #314736
+     slotCompletionModeChanged(completionMode());
+ 
+-    connect(KonqHistoryManager::kself(), SIGNAL(cleared()), SLOT(slotCleared()));
+-    connect(this, &KonqCombo::cleared, this, &KonqCombo::slotCleared);
+-    connect(this, static_cast<void (KonqCombo::*)(int)>(&KonqCombo::highlighted), this, &KonqCombo::slotSetIcon);
++    connect(KonqHistoryManager::kself(), &KParts::HistoryProvider::cleared, this, &KonqCombo::slotCleared);
++    connect(this, &KHistoryComboBox::cleared, this, &KonqCombo::slotCleared);
++    // The overload resolution is still needed until QComboBox::highlight(QString)
++    // is either removed or hidden.
++    connect(this, QOverload<int>::of(&QComboBox::highlighted), this, &KonqCombo::slotSetIcon);
+ 
+-    // WARNING! has to be the old style connect below, otherwise location bar doesn't work!
+-    //connect(this, &KonqCombo::activated, this, &KonqCombo::slotActivated);
++#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
++    connect(this, &QComboBox::textActivated, this, &KonqCombo::slotActivated);
++#else
+     connect(this, SIGNAL(activated(QString)), this, SLOT(slotActivated(QString)));
+-
+-    connect(this, SIGNAL(completionModeChanged(KCompletion::CompletionMode)),
+-            this, SLOT(slotCompletionModeChanged(KCompletion::CompletionMode)));
++#endif
++    connect(this, &KComboBox::completionModeChanged, this, &KonqCombo::slotCompletionModeChanged);
+ }
+ 
+ KonqCombo::~KonqCombo()
+@@ -680,9 +680,9 @@ void KonqCombo::slotReturnPressed()
+ void KonqCombo::slotCompletionModeChanged(KCompletion::CompletionMode mode)
+ {
+     if (mode == KCompletion::CompletionNone) {
+-        connect(this, static_cast<void (KonqCombo::*)()>(&KonqCombo::returnPressed), this, &KonqCombo::slotReturnPressed);
++        connect(this, QOverload<const QString &>::of(&KComboBox::returnPressed), this, &KonqCombo::slotReturnPressed);
+     } else {
+-        disconnect(this, static_cast<void (KonqCombo::*)()>(&KonqCombo::returnPressed), this, &KonqCombo::slotReturnPressed);
++        disconnect(this, QOverload<const QString &>::of(&KComboBox::returnPressed), this, &KonqCombo::slotReturnPressed);
+     }
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/konqueror/konqueror-20.12.3.ebuild b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
index 9f79b9152f53..485920585e09 100644
--- a/kde-apps/konqueror/konqueror-20.12.3.ebuild
+++ b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
@@ -62,6 +62,8 @@ RDEPEND="${COMMON_DEPEND}
 	kde-plasma/kde-cli-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-use-new-QComboBox-signal.patch" ) # KDE-bug 437161
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
diff --git a/kde-apps/konqueror/konqueror-21.04.1.ebuild b/kde-apps/konqueror/konqueror-21.04.2.ebuild
index 01cc100cb5a4..01cc100cb5a4 100644
--- a/kde-apps/konqueror/konqueror-21.04.1.ebuild
+++ b/kde-apps/konqueror/konqueror-21.04.2.ebuild