diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
commit | be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch) | |
tree | f82923fbca262493e83dd1382e561a2fae24cc46 /kde-apps/konqueror | |
parent | 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff) | |
parent | 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff) |
Merge branch 'edge' into next
Diffstat (limited to 'kde-apps/konqueror')
-rw-r--r-- | kde-apps/konqueror/Manifest | 3 | ||||
-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.0.ebuild | 108 |
3 files changed, 166 insertions, 0 deletions
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest index ceea6d946436..996a1bb07369 100644 --- a/kde-apps/konqueror/Manifest +++ b/kde-apps/konqueror/Manifest @@ -1,3 +1,6 @@ +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 EBUILD konqueror-19.12.3.ebuild 2942 BLAKE2B 5eb0611c43d36eb5622c7d18ed4e3a5746c477abfb33ebb31f851efff756cbcf4cde5e869e7a5ef6165e9414e04c123cdab9bffaf0a6bf2ac34163871bd3b252 SHA512 872260f513859eb9e09c6bfb226c318b5b79f5b8760d1efb1bb1421aac51e2e3e20429bceb285df5a3546b8bd1ed62de106076d69bbed70d30156e2019aa52bd +EBUILD konqueror-20.04.0.ebuild 2984 BLAKE2B 696a5bc7eaeb27b83ab963670c07ba152fae6232b29646831bccd62c74c6e8b44751c741f9cfb629486e8488ba66938077cc45d3edf2554b212707c5a67e178d SHA512 5a524f765dbe84854b1f737888d1dc04707b4f544e301d9bbef14863b837af923f9f19d6583678d173a2827edf99c4a2218c918643e27d169ffe8895de7e2411 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 new file mode 100644 index 000000000000..67eab1d6315d --- /dev/null +++ b/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch @@ -0,0 +1,55 @@ +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.0.ebuild new file mode 100644 index 000000000000..9f95cfadf19d --- /dev/null +++ b/kde-apps/konqueror/konqueror-20.04.0.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support +ECM_TEST="true" +KFMIN=5.69.0 +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit flag-o-matic ecm kde.org + +DESCRIPTION="Web browser and file manager based on KDE Frameworks" +HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64" +IUSE="activities speech X" + +# 4 of 4 tests fail. Last checked for 4.0.3 +RESTRICT+=" test" + +COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdelibs4support-${KFMIN}:5 + >=kde-frameworks/kdesu-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + sys-libs/zlib + speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) + X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) +" +DEPEND="${COMMON_DEPEND} + activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) +" +RDEPEND="${COMMON_DEPEND} + kde-apps/kfind:5 + 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 + + ecm_src_prepare +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package activities KF5Activities) + $(cmake_use_find_package speech Qt5TextToSpeech) + $(cmake_use_find_package X X11) + ) + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + if ! has_version kde-apps/keditbookmarks:${SLOT} ; then + elog "For bookmarks support, install keditbookmarks:" + elog "kde-apps/keditbookmarks:${SLOT}" + fi + + if ! has_version kde-apps/dolphin:${SLOT} ; then + elog "If you want to use konqueror as a filemanager, install the dolphin kpart:" + elog "kde-apps/dolphin:${SLOT}" + fi + + if ! has_version kde-apps/svg:${SLOT} ; then + elog "For konqueror to view SVGs, install the svg kpart:" + elog "kde-apps/svgpart:${SLOT}" + fi + + if ! has_version virtual/jre ; then + elog "To use Java on webpages install virtual/jre." + fi + fi +} |