diff options
Diffstat (limited to 'kde-apps/konqueror')
| -rw-r--r-- | kde-apps/konqueror/Manifest | 5 | ||||
| -rw-r--r-- | kde-apps/konqueror/files/konqueror-20.12.3-use-new-QComboBox-signal.patch | 67 | ||||
| -rw-r--r-- | kde-apps/konqueror/konqueror-21.08.0.ebuild (renamed from kde-apps/konqueror/konqueror-20.12.3-r1.ebuild) | 7 |
3 files changed, 5 insertions, 74 deletions
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest index 0b3592f9a7d6..6f4edb834123 100644 --- a/kde-apps/konqueror/Manifest +++ b/kde-apps/konqueror/Manifest @@ -1,6 +1,5 @@ -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.3.tar.xz 7410612 BLAKE2B 0640bd4d7c8cc877e511652e4ab35885fee88a1558d1c9d4f7692b64c4f6929876f437a7dab5da457ff76aca11774c9d60952243548e90f43307ef19353da03b SHA512 60a396633ba87605225e2e791d8b8a429ddd8081fc0db45227d31a550b00fb2197735f110eb0d9ea48199dcbb19525890d04470beb20c1a49bfc3fb545125104 -EBUILD konqueror-20.12.3-r1.ebuild 2526 BLAKE2B ec322c053681a3c83e14ca7f8537fa5f6548cff4f2240778a2ae9d3dc1aa84468dde2c06b5d3b3eb7af7f3616e53fd2652cc266c7cbe9f0117a36c896dc1c05d SHA512 dd4320a4b8d74d0473b614533d64b7f1c78dab9cddf9fc8b385e3e00d23f844dc5426af026085091ca84f1e2d407afe5253e428c9e5da65acd07d7f99189bfdd +DIST konqueror-21.08.0.tar.xz 7415776 BLAKE2B b02bd5455ef8522432d0438f70ea29574b60f089e6eccb1b3f51b4e62c04d2c2af36fd2882d53dc09d7f4b7a5b97d27dd1a7d343165dd89f8546f58959b3ecbc SHA512 4ce8fad0c670904c962849d7f16865560f2edbec63c45e13cb33d702f7e19495f8775a327c2fa6cac9e987720b1993d2090db4f31c8bd9de595df6315414b201 EBUILD konqueror-21.04.3.ebuild 2446 BLAKE2B affd5c9c5b39b3f02671fae563726d9ab1b94817f5ce3fadbc39923d18795312f21882748eca5aa74d2b440f7d3f5445dc6524920a04656d1342b44a8813a29c SHA512 79d68b181fbd55acbfec990ff93536cd952f3e34548b6128974e690053e71837b4722fc377034fba29de744d7beadf5cb3532d22c56954dc140993f0e33fe460 +EBUILD konqueror-21.08.0.ebuild 2521 BLAKE2B 4f05553f11dba934db856014d655514cd07bc844cbd9301d276e2f683c468f43b28c2897f25a481e851b00aa9b823ba485ae58389b7f89ee4ca7c90fc8fb09eb SHA512 c07de6bb6306c27c43bb14658dd671c34e1013432f6b8f53c36b909b63faec1b12b7664a9fa380af72ac44169b62e087fe9ca6ec4bb41359b3497ea09b18d606 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 deleted file mode 100644 index 65ca9be7e442..000000000000 --- a/kde-apps/konqueror/files/konqueror-20.12.3-use-new-QComboBox-signal.patch +++ /dev/null @@ -1,67 +0,0 @@ -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-r1.ebuild b/kde-apps/konqueror/konqueror-21.08.0.ebuild index 485920585e09..ace99d4c95e8 100644 --- a/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild +++ b/kde-apps/konqueror/konqueror-21.08.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_HANDBOOK="optional" ECM_TEST="true" -KFMIN=5.75.0 +KFMIN=5.84.0 QTMIN=5.15.2 VIRTUALX_REQUIRED="test" inherit flag-o-matic ecm kde.org optfeature @@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 arm64 x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="activities speech X" # 4 of 4 tests fail. Last checked for 4.0.3 @@ -62,8 +62,6 @@ 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 @@ -72,6 +70,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 634122 $(cmake_use_find_package activities KF5Activities) $(cmake_use_find_package speech Qt5TextToSpeech) $(cmake_use_find_package X X11) |