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.04.0-kf5bookmarks-5.69.patch | 55 | ||||
| -rw-r--r-- | kde-apps/konqueror/konqueror-20.04.1.ebuild (renamed from kde-apps/konqueror/konqueror-20.04.0.ebuild) | 6 |
3 files changed, 3 insertions, 63 deletions
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest index cc664bba25f4..9705048d976b 100644 --- a/kde-apps/konqueror/Manifest +++ b/kde-apps/konqueror/Manifest @@ -1,6 +1,5 @@ -AUX konqueror-20.04.0-kf5bookmarks-5.69.patch 1806 BLAKE2B e58ce126ef744d5a431fddf89923eba44912c8c74a51a5fb4b75d0ccdf5567e91870391689920ba266c6dce0f72fbfe9ca33e6069f5a6f329170ddda320514c5 SHA512 94df2f508e9c4d35ed58c55c6399d19676712587cfd89e63daa32733ee2719d9a8af7525b189d9916ba501fa73d6ce092c35994507a85f982f9dd1cc0229c4d5 DIST konqueror-19.12.3.tar.xz 7369676 BLAKE2B 0f36f016b3b1d556faf247574f8d9a94ca2e72e6c4d2010739179eeab0aa2c71f9970487db349dc063295b94dbd83ded57e1dae30a62c2f269350155ef1801d7 SHA512 50550af334f7b9e848f7568092b89f927053a2c421da08a40357ae3732a8663b969a3babdab764146195c83b08bccf6834ea07c67e6064262e27dc8288cef420 -DIST konqueror-20.04.0.tar.xz 7376852 BLAKE2B fe2f3b0707bb2be2fd726375852e4a265978d04534b1c7b93d17aa34e304ddc9299ce065830e74724e3de22d7133f64a8c72e9409f63c2db9841f05c1da1c900 SHA512 412ffb2c69ae4e4bb6e14604536fe07998247c3ec50fb2171a471cbbcf8173a416d55f155794800a80370e5e3da88dcd6c6c18c7c5df603a1f6364d1b908c5f0 +DIST konqueror-20.04.1.tar.xz 7375952 BLAKE2B c0a9476b77c3f96c40e468d1ad169c3971f3122fcf2872a1c6e1061c698e5d0bb9f744338e68beff1b6a380bcd7f8a1625249dd9adb56fcd060b61e3d7c05679 SHA512 e97224405ae81238bb8642d6a9db25c326300edb339ed47fd21acc516600013ae3fec8c3e311f9e32fbc3fd973a03f9955391e83d075a53db3719b41ab676ca2 EBUILD konqueror-19.12.3.ebuild 2942 BLAKE2B 5eb0611c43d36eb5622c7d18ed4e3a5746c477abfb33ebb31f851efff756cbcf4cde5e869e7a5ef6165e9414e04c123cdab9bffaf0a6bf2ac34163871bd3b252 SHA512 872260f513859eb9e09c6bfb226c318b5b79f5b8760d1efb1bb1421aac51e2e3e20429bceb285df5a3546b8bd1ed62de106076d69bbed70d30156e2019aa52bd -EBUILD konqueror-20.04.0.ebuild 2996 BLAKE2B 2821dd3433d719295411e72d314d0817971fd13de081b68719c873bbc3a152db2ca8ed27be5079702086022233bf366ff5c4080086701e04dccc3f3fdb8c3e2f SHA512 23cf14ee659674396fb15d08aa127dd980f28a8d4ef5b4248d1abd1548dd676d6da2956bd389403a669d10585d9ee1ac3adc1cfe6417deb3f9251fe997f4ba33 +EBUILD konqueror-20.04.1.ebuild 2910 BLAKE2B 829ba46ef0de85aeffbc3d0ecc9c12d92b5a445eca603de861e69130e1f78335557322b35cbde586824bfbd1e30c98815b9f24e1abddeab94952e200a44eb2da SHA512 e6bb8e854c95568ff88b1324fa8c72d64da58bb697dc505323cfaba90974d92ed898d05ec30a3d15f62294292e9cfb0cbf1651002fc679d13e414cfa9ce056b1 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955 diff --git a/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch b/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch deleted file mode 100644 index 67eab1d6315d..000000000000 --- a/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b61086cfece0d0f11ecfe9c3309697997cada201 Mon Sep 17 00:00:00 2001 -From: Stefano Crocco <stefano.crocco@alice.it> -Date: Tue, 14 Apr 2020 10:21:48 +0200 -Subject: [PATCH] Fix crash due to changes in KBookmarkMenu - -Summary: -Since version 5.69, KBookmarkMenu doesn't automatically create an action -collection. This causes Konqueror to crash when going on a submenu in -the Bookmarks menu. To avoid it, manually create the action collection. - -Also, avoid calling the version of KBookmarkMenu construction which -takes a KActionCollection, as it's deprecated. - -Test Plan: -Open the bookmarks menu and hover with the mouse on a submenu. Check -that it crashes. Do the same after this change and check it doesn't crash -anymore. - -Reviewers: dfaure, nicolasfella - -Reviewed By: dfaure, nicolasfella - -Subscribers: arojas, poboiko - -Differential Revision: https://phabricator.kde.org/D28789 ---- - src/konqbookmarkmenu.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h -index 9ff4c0f55..d47960f7b 100644 ---- a/src/konqbookmarkmenu.h -+++ b/src/konqbookmarkmenu.h -@@ -26,6 +26,7 @@ - #include "kbookmarkcontextmenu.h" - - #include <KActionCollection> -+#include <kbookmarks_version.h> - - namespace Konqueror { // to avoid clashing with KF5::Bookmarks which had a KonqBookmarkMenu class. Remove once using KF6. - -@@ -61,7 +62,10 @@ public: - KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress) - : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress) - { -+//KBookmarkMenu doesn't create an action collection only in version 5.69.0 -+#if KBOOKMARKS_VERSION == QT_VERSION_CHECK(5, 69, 0) - m_actionCollection = new KActionCollection(this); -+#endif - } - - protected: --- -2.26.2 - diff --git a/kde-apps/konqueror/konqueror-20.04.0.ebuild b/kde-apps/konqueror/konqueror-20.04.1.ebuild index 92826aa5be88..1b962865633a 100644 --- a/kde-apps/konqueror/konqueror-20.04.0.ebuild +++ b/kde-apps/konqueror/konqueror-20.04.1.ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support ECM_TEST="true" -KFMIN=5.69.0 +KFMIN=5.70.0 QTMIN=5.12.3 VIRTUALX_REQUIRED="test" inherit flag-o-matic ecm kde.org @@ -63,10 +63,6 @@ RDEPEND="${COMMON_DEPEND} kde-plasma/kde-cli-tools:5 " -PATCHES=( - "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # bug 717316, KDE-Bug 420010 -) - src_prepare() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |