diff options
Diffstat (limited to 'kde-apps/konqueror')
| -rw-r--r-- | kde-apps/konqueror/Manifest | 5 | ||||
| -rw-r--r-- | kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch | 46 | ||||
| -rw-r--r-- | kde-apps/konqueror/konqueror-18.12.3.ebuild | 116 | ||||
| -rw-r--r-- | kde-apps/konqueror/konqueror-19.04.3.ebuild | 2 |
4 files changed, 2 insertions, 167 deletions
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest index 8bb828268d90..cb0f4fad77e7 100644 --- a/kde-apps/konqueror/Manifest +++ b/kde-apps/konqueror/Manifest @@ -1,6 +1,3 @@ -AUX konqueror-18.08.3-tidyhtml5.patch 1645 BLAKE2B 9c9edb5f6cf7f40bcce3764c3c778752baeb27b9df55efbba96db603be61f5a1d01257538abaa8ee44e59d13d0942fdf8afd16860018c07c9c232ec7d2538b90 SHA512 98e13b59d94b65dc163827f0b8b85ee8b4d02afa794ff5e3156a6b7ab0a996df3958fe272e766b5799daf1c5cbb746f48c520f01d6a808f0ce19925d3a95e38c -DIST konqueror-18.12.3.tar.xz 7755872 BLAKE2B 87a6d0a506aa989fe43064c9c197f2b2dc8e521580f9ef63daa74fd2c2bf5e30ffee1dd70af092879147616331941086aaf8f6a12563b8403a60744db2be44c7 SHA512 a7cc231887af484c2bdd45f6f7ec3664aa15d799bb7715f27191d3cfbb11b135a28b5742a121608025cfc462367539389caee38f83d3f4dc75ab94fc29997830 DIST konqueror-19.04.3.tar.xz 7578812 BLAKE2B 370ae99b1662cb3f548027718f4bf97d58bcab61f252fccafe2dce518543e90cf37f182d5025350405e2c9d120dac391f79a10051791f6f26a4b660659db8d1a SHA512 ac04f601ddcf711e70298a7af72aba6fd2b72510d62f0337f3df7422a09cc16235b624ce32e6cfab8c1768b8cc6fce9275529705fc73c07d6e83b725a51a5372 -EBUILD konqueror-18.12.3.ebuild 3143 BLAKE2B a4396597eb255393be41a032a4ad709ee2745a28b64da07eedf4353dc0eea8229b12cf582b2f5b6b0e9e395b6fad310cb68b53cfb5d01882f38890f88adddaf5 SHA512 f25b27146228e1eb1767ae5e433bfd609f8d0054366b9e46cf55fea4ba6ae029c59da7165e1a7cdd4ed282b7c9a8c047389aa2d8f2dd05cc755dc4ad8aa3e113 -EBUILD konqueror-19.04.3.ebuild 2993 BLAKE2B 1931af494e8f39ab6e5f419c51ff2f6faf7864f5e70a46b62589090d11cd9b1b8a2ac80e271a364513194407bef0a39e676d2deea2c975fa5189b6540fc21531 SHA512 ff04c09e151e3aacffa5f3734ae411a56650bdeb8191e98956415dd6f25f0a058b98f74fa27b300ad61b7d2b56d6d86387836da22857b612c1d09a2396852afc +EBUILD konqueror-19.04.3.ebuild 2990 BLAKE2B 5bc4eb968b821345b21dc1f4af0f41a563ea8dc62098ea9607da8e507d266619c3e020db6dff8dd807b54e6a2b2dcbe52b5c5d585b54853192a8241b11e23075 SHA512 9321a9d6bfd7910e88bfef46a2f782240ceb3d2d92bf4608b616af381f651e05fce739eca787a517c426a4f14eba745d55c36939adf2c3750071fa0aa25ff222 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2 diff --git a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch deleted file mode 100644 index dae1486d5807..000000000000 --- a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 18 Nov 2018 18:07:32 +0100 -Subject: [PATCH] Switch to tidy-html5 and use tidybuffio.h instead of buffio.h - -Summary: Header was renamed a few years ago. - -Test Plan: Builds and validates fine. - -Reviewers: #konqueror - -Differential Revision: https://phabricator.kde.org/D16982 ---- - plugins/validators/CMakeLists.txt | 2 +- - plugins/validators/tidy_validator.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/validators/CMakeLists.txt b/plugins/validators/CMakeLists.txt -index cf3b70694..7f6060e9c 100644 ---- a/plugins/validators/CMakeLists.txt -+++ b/plugins/validators/CMakeLists.txt -@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) - find_package(LibTidy) - find_package(KF5 REQUIRED KHtml WidgetsAddons IconThemes) - set_package_properties(LibTidy PROPERTIES DESCRIPTION "HTML Tidy" -- URL "http://tidy.sourceforge.net" -+ URL "http://www.html-tidy.org/" - TYPE OPTIONAL - PURPOSE "Gives the Konqueror validators plugin the ability to validate HTML" - ) -diff --git a/plugins/validators/tidy_validator.cpp b/plugins/validators/tidy_validator.cpp -index 3247199f9..ac22429d0 100644 ---- a/plugins/validators/tidy_validator.cpp -+++ b/plugins/validators/tidy_validator.cpp -@@ -25,7 +25,7 @@ - - #include <kdebug.h> - --#include <buffio.h> -+#include <tidybuffio.h> - #include <tidy.h> - - #include <config-konq-validator.h> --- -2.19.1 - diff --git a/kde-apps/konqueror/konqueror-18.12.3.ebuild b/kde-apps/konqueror/konqueror-18.12.3.ebuild deleted file mode 100644 index 87116a390c10..000000000000 --- a/kde-apps/konqueror/konqueror-18.12.3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit flag-o-matic kde5 - -DESCRIPTION="Web browser and file manager based on KDE Frameworks" -HOMEPAGE=" - https://www.kde.org/applications/internet/konqueror/ - https://konqueror.org/ -" -KEYWORDS="amd64 ~arm64 x86" -IUSE="activities speech tidy +webengine X" -# 4 of 4 tests fail. Last checked for 4.0.3 -RESTRICT+=" test" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kdesu) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep khtml) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - sys-libs/zlib - speech? ( $(add_qt_dep qtspeech) ) - tidy? ( app-text/tidy-html5 ) - webengine? ( $(add_qt_dep qtwebengine 'widgets') ) - X? ( $(add_qt_dep qtx11extras) ) -" -DEPEND="${COMMON_DEPEND} - activities? ( $(add_frameworks_dep kactivities) ) -" -RDEPEND="${COMMON_DEPEND} - !kde-apps/kfmclient:4 - !kde-apps/konq-plugins - !kde-apps/konqueror:4 - !kde-apps/libkonq:5 - $(add_kdeapps_dep kfind) - $(add_plasma_dep kde-cli-tools) - !webengine? ( kde-misc/kwebkitpart:5 ) -" - -PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" ) - -src_prepare() { - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc - - if ! use webengine; then - punt_bogus_dep Qt5 WebEngineWidgets - cmake_comment_add_subdirectory webenginepart - fi - - kde5_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package activities KF5Activities) - $(cmake-utils_use_find_package speech Qt5TextToSpeech) - $(cmake-utils_use_find_package tidy LibTidy) - $(cmake-utils_use_find_package X X11) - ) - kde5_src_configure -} - -pkg_postinst() { - kde5_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 -} diff --git a/kde-apps/konqueror/konqueror-19.04.3.ebuild b/kde-apps/konqueror/konqueror-19.04.3.ebuild index 1e545b7f4b1c..09642f435a1d 100644 --- a/kde-apps/konqueror/konqueror-19.04.3.ebuild +++ b/kde-apps/konqueror/konqueror-19.04.3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE=" https://kde.org/applications/internet/konqueror/ https://konqueror.org/ " -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="activities speech tidy +webengine X" # 4 of 4 tests fail. Last checked for 4.0.3 RESTRICT+=" test" |