From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF897138334 for ; Tue, 10 Dec 2019 01:06:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DD83E08A8; Tue, 10 Dec 2019 01:06:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9ECDE08A8 for ; Tue, 10 Dec 2019 01:06:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B61F634D7D9 for ; Tue, 10 Dec 2019 01:06:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B78F8D3 for ; Tue, 10 Dec 2019 01:06:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1575936537.3eeebe2e17fed72ecdbadee24591e0c73bf06406.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/dolphin/dolphin-19.12.0.ebuild kde-apps/dolphin/files/dolphin-19.12.0-qt-5.14.patch X-VCS-Directories: kde-apps/dolphin/ kde-apps/dolphin/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3eeebe2e17fed72ecdbadee24591e0c73bf06406 X-VCS-Branch: master Date: Tue, 10 Dec 2019 01:06:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 567a22ab-27cc-41b9-9748-620ae5d2cb0b X-Archives-Hash: 2978b66a49772acdbd6c20b9aa8ec8b2 commit: 3eeebe2e17fed72ecdbadee24591e0c73bf06406 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 10 00:08:57 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 10 00:08:57 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3eeebe2e kde-apps/dolphin: Drop obsolete patch Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner 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 deletions(-) diff --git a/kde-apps/dolphin/dolphin-19.12.0.ebuild b/kde-apps/dolphin/dolphin-19.12.0.ebuild index 1b4b3ad99a..fcaf127a47 100644 --- a/kde-apps/dolphin/dolphin-19.12.0.ebuild +++ b/kde-apps/dolphin/dolphin-19.12.0.ebuild @@ -64,8 +64,6 @@ 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 deleted file mode 100644 index 02ad279aeb..0000000000 --- a/kde-apps/dolphin/files/dolphin-19.12.0-qt-5.14.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/src/global.h b/src/global.h ---- a/src/global.h -+++ b/src/global.h -@@ -22,6 +22,7 @@ - - #include - #include -+#include - - namespace Dolphin { - QList 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 - #include - #include -+#include - #include - - 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 - #include - #include -+#include - #include - #include - #include -+#include - #include - #include - #include -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 - #include - -+#include - #include - - 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 - #include - #include -+#include - #include - #include - -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 - #include - #include -+#include - #include - - 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 - #include -+#include - #include - - QHash DragAndDropHelper::m_urlListMatchesUrlCache;