[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/
commit: d4bedf3b05b25d89a0bf4b6293ac87eeb296ce38
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 27 13:39:13 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 6 07:44:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bedf3b
kde-apps/konqueror: Fix build with USE -X
Upstream commit ff0e19961f8345faea54e4f85057312b7ad7007d
Bug: https://bugs.gentoo.org/813450
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/konqueror-22.04.3-with_x11.patch | 83 ++
kde-apps/konqueror/konqueror-22.04.3.ebuild| 4 +-
2 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
b/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
new file mode 100644
index ..90273b072f0e
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
@@ -0,0 +1,83 @@
+From 69c2186c1a6c4fc0bf7f13b571b581e5f6157063 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sat, 27 Nov 2021 14:36:20 +0100
+Subject: [PATCH] Add CMake option to build without X11
+
+Signed-off-by: Andreas Sturmlechner
+---
+ CMakeLists.txt| 16 ++--
+ client/CMakeLists.txt | 4 ++--
+ src/CMakeLists.txt| 6 +++---
+ 3 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77f5ea645..488ee7dc4 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -46,12 +46,16 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0")
+ add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH)
+ endif()
+
+-find_package(X11)
+-set(KONQ_HAVE_X11 ${X11_FOUND})
+-
+-if (X11_FOUND)
+- find_package(Qt5 REQUIRED X11Extras)
+-endif(X11_FOUND)
++if (NOT WIN32)
++option(WITH_X11 "Build with X11 integration" ON)
++if (WITH_X11)
++find_package(X11 REQUIRED)
++find_package(Qt5X11Extras NO_MODULE REQUIRED)
++set(KONQ_HAVE_X11 TRUE)
++endif()
++else()
++set(WITH_X11 OFF)
++endif()
+
+ add_definitions(
+ -DQT_USE_QSTRINGBUILDER
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 24aedb14c..51d2b44d0 100644
+--- a/client/CMakeLists.txt
b/client/CMakeLists.txt
+@@ -30,9 +30,9 @@ if (WIN32)
+ else (WIN32)
+ kf5_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
+ target_link_libraries(kdeinit_kfmclient ${kfmclient_LIBS})
+-if(X11_FOUND)
++if(WITH_X11)
+ target_link_libraries(kdeinit_kfmclient Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+ install(TARGETS kdeinit_kfmclient ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+ endif (WIN32)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2113e1c2f..07e64d90f 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -33,9 +33,9 @@ target_link_libraries(konquerorprivate
+KF5::KIOGui
+ )
+
+-if(X11_FOUND)
++if(WITH_X11)
+ target_link_libraries(konquerorprivate Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+
+
+ set_target_properties(konquerorprivate PROPERTIES VERSION
${KONQUEROR_LIB_VERSION} SOVERSION "5" )
+@@ -113,7 +113,7 @@ target_link_libraries(kdeinit_konqueror
+KF5::SonnetUi
+ )
+
+-if (X11_FOUND)
++if (WITH_X11)
+ target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
+ endif ()
+
+--
+2.34.1
+
diff --git a/kde-apps/konqueror/konqueror-22.04.3.ebuild
b/kde-apps/konqueror/konqueror-22.04.3.ebuild
index 6d69ff80806c..05c5705662e8 100644
--- a/kde-apps/konqueror/konqueror-22.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-22.04.3.ebuild
@@ -63,6 +63,8 @@ RDEPEND="${COMMON_DEPEND}
kde-plasma/kde-cli-tools:5
"
+PATCHES=( "${FILESDIR}/${P}-with_x11.patch" )
+
src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
@@ -74,7 +76,7 @@ src_configure() {
-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)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/
commit: c322214967d93dd6ad80fa992366f5a1177fa7f0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Oct 3 11:18:46 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 3 11:45:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3222149
kde-apps/konqueror: Fix compatibility with KDE Frameworks 5.86
Closes: https://bugs.gentoo.org/815022
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/konqueror-21.04.3-kf-5.86-compat.patch | 250 +
kde-apps/konqueror/konqueror-21.04.3-r2.ebuild | 91
kde-apps/konqueror/konqueror-21.08.1-r2.ebuild | 92
3 files changed, 433 insertions(+)
diff --git a/kde-apps/konqueror/files/konqueror-21.04.3-kf-5.86-compat.patch
b/kde-apps/konqueror/files/konqueror-21.04.3-kf-5.86-compat.patch
new file mode 100644
index 000..0814c335a73
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-21.04.3-kf-5.86-compat.patch
@@ -0,0 +1,250 @@
+From 6a46c0c8701fbde143a33e4be61f198e98f53c10 Mon Sep 17 00:00:00 2001
+From: David Faure
+Date: Sun, 19 Sep 2021 12:03:46 +0200
+Subject: [PATCH 1/5] Don't open HTTP URLs in another browser than Konqueror,
+ from Konqueror
+
+From 8506c585594d9d0cfc0ebe8b869ca05ff7610fa7 Mon Sep 17 00:00:00 2001
+From: Stefano Crocco
+Date: Sun, 19 Sep 2021 20:56:38 +0200
+Subject: [PATCH 2/5] Make Konqueror compatible with KIO 5.86.0
+
+Due to a change in KIO::DesktopExecParser::hasSchemeHandler (commit
+5fa55a2395cbfb6504e56bf71c869c8e49902e13Q) URLs entered in the
+navigation bar either were always opened in a new tab or they were
+opened in another program altogether (for example, man and info URLs).
+
+To fix this issue, it has been necessary to copy the implementation of
+KRun::init and KParts::BrowserRun::init in KonqRun::init, making the
+necessary changes to restore the old behaviour.
+
+(cherry picked from commit ba1ea2b74f77832d2a26bb74fed18970eeadf301)
+
+From ec995b8091e97750c12e8e543d298a7a56045d41 Mon Sep 17 00:00:00 2001
+From: Stefano Crocco
+Date: Sun, 19 Sep 2021 22:01:30 +0200
+Subject: [PATCH 3/5] Fix signature and avoid calling url() repeatedly
+
+(cherry picked from commit 0326d9b8553a7c33d0c1498ca4c0199cc2344e15)
+
+From d368615b28a97993ce53691731f5152f044f98a2 Mon Sep 17 00:00:00 2001
+From: Stefano Crocco
+Date: Sun, 19 Sep 2021 22:47:03 +0200
+Subject: [PATCH 4/5] Add a comment explaining the interaction with
+ WebEnginePart
+
+(cherry picked from commit 5c4b0456af2a534c65c60b16add4012566309fb9)
+
+From 036fdfe1666294e5388803eb8877971362347428 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Thu, 30 Sep 2021 13:58:28 +0200
+Subject: [PATCH 5/5] Replace handleInitError with KParts::BrowserRun::init
+
+Avoids breaking string freeze.
+
+Thanks-to: Stefano Crocco
+Signed-off-by: Andreas Sturmlechner
+
+BUG: 442636
+---
+
+diff --git a/src/konqrun.cpp b/src/konqrun.cpp
+index 8bfc22285..4415c67c4 100644
+--- a/src/konqrun.cpp
b/src/konqrun.cpp
+@@ -27,8 +27,17 @@
+ #include
+ #include
+ #include
++#include
++#include
++
+ #include
+ #include
++#include
++#include
++#include
++#include
++#include
++#include
+
+ #include
+ #include
+@@ -48,8 +57,9 @@ KonqRun::KonqRun(KonqMainWindow *mainWindow, KonqView
*_childView,
+ // Don't use inline errors on reloading due to
auto-refresh sites, but use them in all other cases
+ // (no reload or user-requested reload)
+ !req.args.reload() || req.userRequestedReload),
+- m_pMainWindow(mainWindow), m_pView(_childView),
m_bFoundMimeType(false), m_req(req)
++ m_pMainWindow(mainWindow), m_pView(_childView),
m_bFoundMimeType(false), m_req(req), m_inlineErrors(!req.args.reload() ||
req.userRequestedReload)
+ {
++setEnableExternalBrowser(false);
+ //qCDebug(KONQUEROR_LOG) << "KonqRun::KonqRun() " << this;
+ Q_ASSERT(!m_pMainWindow.isNull());
+ if (m_pView) {
+@@ -188,15 +198,124 @@ void KonqRun::handleError(KJob *job)
+ KParts::BrowserRun::handleError(job);
+ }
+
++//Code copied from browserrun.cpp
++void KonqRun::switchToErrorUrl(KIO::Error error, const QString )
++{
++KRun::setUrl(makeErrorUrl(error, stringUrl, url()));
++setJob(nullptr);
++mimeTypeDetermined(QStringLiteral("text/html"));
++}
++
++//Most of the code in this function has been copied from krun.cpp and
browserrun.cpp
+ void KonqRun::init()
+ {
+-KParts::BrowserRun::init();
+-// Maybe init went to the "let's try stat'ing" part. Then connect to info
messages.
+-// (in case it goes to scanFile, this will be done below)
+-KIO::StatJob *job = dynamic_cast(KRun::job());
++QUrl url = KRun::url();
++if (!url.isValid() || url.scheme().isEmpty()) {
++if (m_inlineErrors && !url.isValid()) {
++switchToErrorUrl(KIO::ERR_MALFORMED_URL, url.toString());
++return;
++
[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/
commit: d3b754271c5044865980daa94fcc0046c21d7ce8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 3 11:10:22 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 3 11:14:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3b75427
kde-apps/konqueror: Fix broken address bar w/ >=KF-5.82
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=437161
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
...onqueror-21.04.1-use-new-QComboBox-signal.patch | 67
kde-apps/konqueror/konqueror-21.04.1-r1.ebuild | 90 ++
2 files changed, 157 insertions(+)
diff --git
a/kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch
b/kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch
new file mode 100644
index 000..65ca9be7e44
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch
@@ -0,0 +1,67 @@
+From f4a3fec5a229fea59eba15b8644a06a9e16e91a0 Mon Sep 17 00:00:00 2001
+From: Jonathan Marten
+Date: Sun, 16 May 2021 14:07:56 +
+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, ::textEdited, this, ::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, ::cleared, this, ::slotCleared);
+-connect(this, static_cast(::highlighted), this, ::slotSetIcon);
++connect(KonqHistoryManager::kself(), ::HistoryProvider::cleared,
this, ::slotCleared);
++connect(this, ::cleared, this, ::slotCleared);
++// The overload resolution is still needed until
QComboBox::highlight(QString)
++// is either removed or hidden.
++connect(this, QOverload::of(::highlighted), this,
::slotSetIcon);
+
+-// WARNING! has to be the old style connect below, otherwise location bar
doesn't work!
+-//connect(this, ::activated, this, ::slotActivated);
++#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
++connect(this, ::textActivated, this, ::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, ::completionModeChanged, this,
::slotCompletionModeChanged);
+ }
+
+ KonqCombo::~KonqCombo()
+@@ -680,9 +680,9 @@ void KonqCombo::slotReturnPressed()
+ void KonqCombo::slotCompletionModeChanged(KCompletion::CompletionMode mode)
+ {
+ if (mode == KCompletion::CompletionNone) {
+-connect(this, static_cast(::returnPressed), this,
::slotReturnPressed);
++connect(this, QOverload::of(::returnPressed), this, ::slotReturnPressed);
+ } else {
+-disconnect(this, static_cast(::returnPressed), this,
::slotReturnPressed);
++disconnect(this, QOverload::of(::returnPressed), this, ::slotReturnPressed);
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
b/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
new file mode 100644
index 000..8cbc1bfb931
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic ecm kde.org optfeature
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/konqueror/;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+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]
+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/
commit: 93d86ef95882e8cc6d1e02b0ce8f5de92eb8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 23 13:56:07 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 23 22:06:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d86ef9
kde-apps/konqueror: Adapt to >=kde-frameworks/kbookmarks-5.69
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../konqueror-20.04.0-kf5bookmarks-5.69.patch | 55 ++
kde-apps/konqueror/konqueror-20.04.0.ebuild| 4 ++
2 files changed, 59 insertions(+)
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 000..67eab1d6315
--- /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
+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
++#include
+
+ 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
index 4d7a5e44fde..9f95cfadf19 100644
--- a/kde-apps/konqueror/konqueror-20.04.0.ebuild
+++ b/kde-apps/konqueror/konqueror-20.04.0.ebuild
@@ -63,6 +63,10 @@ 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
[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/
commit: be2e1a24cd6c969690ca7a2bc40d98203fbee551
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 18 18:04:26 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 18 19:04:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2e1a24
kde-apps/konqueror: Switch USE tidy to app-text/tidy-html5
Bug: https://bugs.gentoo.org/671450
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/konqueror-18.08.3-tidyhtml5.patch| 46 +
kde-apps/konqueror/konqueror-18.08.3-r1.ebuild | 113 +
2 files changed, 159 insertions(+)
diff --git a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
new file mode 100644
index 000..dae1486d580
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
@@ -0,0 +1,46 @@
+From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+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
+
+-#include
++#include
+ #include
+
+ #include
+--
+2.19.1
+
diff --git a/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
new file mode 100644
index 000..c84260236ac
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~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/libkonq:5
+ $(add_kdeapps_dep kfind)
+ $(add_plasma_dep kde-cli-tools)
+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/
commit: 169244b9dc13a148c768aeccea04f8f84c1219cc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat May 6 19:10:15 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 6 20:02:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169244b9
kde-apps/konqueror: Drop slot 4
Package-Manager: Portage-2.3.5, Repoman-2.3.1
kde-apps/konqueror/Manifest| 1 -
.../files/konqueror-16.08.0-kactivities.patch | 15 ---
kde-apps/konqueror/konqueror-16.08.3-r1.ebuild | 102 -
kde-apps/konqueror/metadata.xml| 2 -
4 files changed, 120 deletions(-)
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 180c5605554..79194971d69 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-16.08.3.tar.xz 2051000 SHA256
47e9bb15c64495392625d69af9ac7e00644caa52c98c7187489a7c569ec842a1 SHA512
6606430c2ec5ab934d253a009bbc2c1df4e9d1f8b54dcf16dd9f1894449d7c734641f17360b906a3a7667ac7083ab712b8498b44a20c137d836dd1dab8963649
WHIRLPOOL
b65a32a9c03424ed6718db4b5fea85c28690074f450f49df1c581d77e03cc172004dda5aadd39de087e6ff0d101ac1f7587a960e20f7d4faa56f2b45a6ee7643
DIST konqueror-16.12.3.tar.xz 1172012 SHA256
e52654a1bb2c0be317f8ed80dba3147bc4d2126abce209ab57c6e69e64159bdf SHA512
cef6fe2fbade73a89d8f8b7932ae0dba42d98fbf1160dcc888339a071d72084aeb847fc74a22ae4a39b21fd0cef24a60832e343885c0e673b418482faebad93a
WHIRLPOOL
1afb257eb10cff77e71d1479972d25029727dd1a6202173422203f9e309767a80150b713a104dd7848c66ad86c342e1c6a1d7bf28c705051a52e9a120ed1d4c3
DIST konqueror-17.04.0.tar.xz 7783204 SHA256
95a6358da4cfd9589b66b78116adce29c0f69a5964e81fcde3862e32b1653833 SHA512
8d6c00a4df41a7feec82b63647a64fabf810dad8ed40647178d98529bfcfbfc228a05649f5b1e267644cd21db1efbc8fe43362a2dfef25bdec5b4cfee336336a
WHIRLPOOL
ae83fb5f379d2c68e0ec0fad1a96d22da0747268500963532fd2caadb04142cd731ff30939c1538fd4165ca31cb8a34c6bbfe7097831dcafe6f85f99bd870efb
diff --git a/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch
b/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch
deleted file mode 100644
index 9207fd6b973..000
--- a/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make sure KActivities headers aren't used either if disabled.
-
a/dolphin/src/CMakeLists.txt 2016-08-24 22:25:42.603345565 +0200
-+++ b/dolphin/src/CMakeLists.txt 2016-08-24 22:27:39.921317927 +0200
-@@ -27,7 +27,9 @@
- macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
- configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
-
--include_directories( ${KACTIVITIES_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} )
-+if (KActivities_FOUND)
-+ include_directories( ${KACTIVITIES_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} )
-+endif (KActivities_FOUND)
-
- if(HAVE_BALOO)
- include_directories(${BALOO_INCLUDE_DIR} ${BALOO_WIDGETS_INCLUDE_DIR}
${KFILEMETADATA_INCLUDE_DIR})
diff --git a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
deleted file mode 100644
index b2a1a5b7595..000
--- a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="Web browser and file manager"
-HOMEPAGE="
- https://www.kde.org/applications/internet/konqueror/
- https://konqueror.org/
-"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+bookmarks debug +filemanager svg"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-DEPEND="
- $(add_kdeapps_dep libkonq)
- filemanager? (
- media-libs/phonon[qt4]
- x11-libs/libXrender
- )
-"
-
-# bug #544630: evince[nsplugin] crashes konqueror
-RDEPEND="${DEPEND}
- kde-apps/kfind:*
- $(add_kdeapps_dep kfmclient)
- $(add_kdeapps_dep kurifilter-plugins)
- bookmarks? ( kde-apps/keditbookmarks:* )
- filemanager? (
- $(add_kdeapps_dep kdebase-kioslaves)
- $(add_kdeapps_dep konsolepart)
- !kde-apps/dolphin:4
- )
- svg? ( $(add_kdeapps_dep svgpart) )
- !app-text/evince[nsplugin]
-"
-
-KMEXTRA="
- dolphin/
-"
-
-KMEXTRACTONLY="
- konqueror/client/
- lib/konq/
-"
-
-PATCHES=( "${FILESDIR}/${PN}-16.08.0-kactivities.patch" )
-
-src_prepare() {
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
- # required for dolphin
- sed -e "/konq_copytomenu.h/ s/# //" \
- -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
- -i lib/konq/CMakeLists.txt \
- || die "Failed to fix libkonq CMakeLists.txt"
-
- kde4-meta_src_prepare
-
- # Avoid doc file collisions
