commit: 4db428442545ec02ad7867d7895e6db8ac8e89aa Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Dec 6 21:08:46 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 7 11:42:39 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4db42844
kde-apps/dolphin: Fix build with Qt 5.14.0 RC See also https://mail.kde.org/pipermail/release-team/2019-December/011688.html Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/dolphin/dolphin-19.12.0.ebuild | 2 + .../dolphin/files/dolphin-19.12.0-qt-5.14.patch | 81 ++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/kde-apps/dolphin/dolphin-19.12.0.ebuild b/kde-apps/dolphin/dolphin-19.12.0.ebuild index fcaf127a47..1b4b3ad99a 100644 --- a/kde-apps/dolphin/dolphin-19.12.0.ebuild +++ b/kde-apps/dolphin/dolphin-19.12.0.ebuild @@ -64,6 +64,8 @@ RDEPEND="${DEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch ) # not yet upstream + src_configure() { local mycmakeargs=( $(cmake_use_find_package activities KF5Activities) diff --git a/kde-apps/dolphin/files/dolphin-19.12.0-qt-5.14.patch b/kde-apps/dolphin/files/dolphin-19.12.0-qt-5.14.patch new file mode 100644 index 0000000000..02ad279aeb --- /dev/null +++ b/kde-apps/dolphin/files/dolphin-19.12.0-qt-5.14.patch @@ -0,0 +1,81 @@ +diff --git a/src/global.h b/src/global.h +--- a/src/global.h ++++ b/src/global.h +@@ -22,6 +22,7 @@ + + #include <QList> + #include <QUrl> ++#include <QWidget> + + namespace Dolphin { + QList<QUrl> validateUris(const QStringList& uriList); +diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h +--- a/src/kitemviews/kstandarditem.h ++++ b/src/kitemviews/kstandarditem.h +@@ -25,6 +25,7 @@ + #include <QByteArray> + #include <QHash> + #include <QObject> ++#include <QSet> + #include <QVariant> + + class KStandardItemModel; +diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp +--- a/src/search/dolphinsearchbox.cpp ++++ b/src/search/dolphinsearchbox.cpp +@@ -39,9 +39,11 @@ + #include <QFontDatabase> + #include <QHBoxLayout> + #include <QIcon> ++#include <QKeyEvent> + #include <QLabel> + #include <QLineEdit> + #include <QScrollArea> ++#include <QShowEvent> + #include <QTimer> + #include <QToolButton> + #include <QUrlQuery> +diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp +--- a/src/settings/dolphinsettingsdialog.cpp ++++ b/src/settings/dolphinsettingsdialog.cpp +@@ -34,6 +34,7 @@ + #include <KWindowConfig> + #include <KMessageBox> + ++#include <QCloseEvent> + #include <QPushButton> + + DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) : +diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp +--- a/src/settings/general/previewssettingspage.cpp ++++ b/src/settings/general/previewssettingspage.cpp +@@ -32,6 +32,7 @@ + #include <QLabel> + #include <QListView> + #include <QPainter> ++#include <QShowEvent> + #include <QSortFilterProxyModel> + #include <QSpinBox> + +diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp +--- a/src/settings/services/servicessettingspage.cpp ++++ b/src/settings/services/servicessettingspage.cpp +@@ -36,6 +36,7 @@ + #include <QGridLayout> + #include <QLabel> + #include <QListWidget> ++#include <QShowEvent> + #include <QSortFilterProxyModel> + + namespace +diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp +--- a/src/views/draganddrophelper.cpp ++++ b/src/views/draganddrophelper.cpp +@@ -25,6 +25,7 @@ + + #include <QDBusConnection> + #include <QDBusMessage> ++#include <QDropEvent> + #include <QMimeData> + + QHash<QUrl, bool> DragAndDropHelper::m_urlListMatchesUrlCache;
