7 files changed, 6 insertions, 194 deletions
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 57f898bb0e61..5f4c10b1108d 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,11 +1,7 @@
 AUX dolphin-18.04.1-flto.patch 3061 BLAKE2B d24d99f9cebd2979d6e0b6c8edb30b552601ba502937313395dae35e9c21c2ec6b1978eaf949cb87c5846ea6a12fe535b4fc849b3d7547c6c95c5b75c0cfc2d9 SHA512 7af21ea15381a460b08c02d5dee0bc1702a2a30c0b86b2b8f1b937783a199fb3b3cc1f76ee827ac15ca934d0e975ad2e702053369477afa35990423abe7e9d63
-AUX dolphin-18.04.3-memleak-1.patch 1651 BLAKE2B dff558ec7e3ba2dafe676c43da09409bfbdaaa12bf508aaf825121a72df129b3c1c6ef17066520b8c5900682806bf7a2cf65d914c9e69cafd64fd5f65f25e468 SHA512 1acfdb7b200464be878e503053faa08680595422c62619f94ed66a6f8bf84087328bd6959f69c0351b926bf63ebbe63a2c70f34e4ebe6e873958893d6caf0455
-AUX dolphin-18.04.3-memleak-2.patch 1180 BLAKE2B 4b546aefe5b1c5342522fae2a0bcf7e74f023f45f0e39950a104188b40e51a480e638d864b953033ec3f3630c89095315fb73a1ab45782c34adffa11b6a0f77c SHA512 533a449113f3c196cac02634f5c4baf25225fbca6747f3d47c6a69986329bfc2f52d95bc20c7a7c603e80e18dfb65a47e0608835fe4eeeea906035136fe541b1
-AUX dolphin-18.04.3-root-user.patch 2198 BLAKE2B e92b053b53f7f1c2c6ce25eb7a81e8c26f5dc9497f9bff6e2d02d125c9b57b7722352d18ee4d0ea001b73a71904d729485544596904229700d4a29a240e1c28f SHA512 c9f419f67ffae57ccf057fb5aa7352e3fb652cec3a9a21459ae5d3e9fba0b1dede993058afe83ced5c3fc036c11649476bc25435a29bc5d910257443e21cb43a
-AUX dolphin-18.04.3-root-warn.patch 1488 BLAKE2B 8e9536926b0b9e9f37c0e2be7e23fafc60f34ca1e25ef83423097d49e5f575cb762008b6c4cbf2c8d664cdbd010db5ed52a15226e812c5988c2e3431770334a6 SHA512 ae763f8fcef45108f812bccdb485d8da31fd27997583195e612c2ded82f041441849ae680f20d7259b3621b9609d55ff12dc6b3044b993e8f3063a1abc85aebd
 AUX dolphin-18.08.3-kcrash-init.patch 1741 BLAKE2B f569dfc4fc07790b1c69697b2259b6cf13e4bd7ff0d98be5e3b09a8bf0d404f86fdfee001349c8631b8c74c5ba1a73bf6573b130a5d8bf30241560d2dc6a6eef SHA512 34393a2285647ee8e33eebccc2bb563e5ea5298252c88ece505389bceae58ecc953e5daec3ca5f05cf7838f39375474ef97e4b54ec120d0396cd7e3cc5ac0d7b
-DIST dolphin-18.04.3.tar.xz 4850916 BLAKE2B 1d2a5c4f5e94e2f30055804d96c205eb2c03864ad2b6c245d917549986fbac26686e654818dacf93fcb711f59bfe6e7f3a011e578988f5bf9e6b6cb82fc33876 SHA512 167a35225dd4e75b7ff863771287a471273e0594c247ef058adc718682eb07f014ca84bc373e1c3a846e99711aad3d9a16b12aab8543aa3603e17f944b206b21
 DIST dolphin-18.08.3.tar.xz 4859384 BLAKE2B 60361ce997e0e4734fe953f988774dbe28aef9dcb7c2837c3860cfad5f56345d4d635f1478ce42a1649a6d5bd0d3838f722c95a747e1c77f17828d0d38b0ab29 SHA512 f3017ecb67009292972876f27ade398699622cd4253e608d78b9c8dd7693bce2a1d742af5f51885b28c1765496b31f83ac25fda40ba330821b460622adc7ad7c
-EBUILD dolphin-18.04.3-r1.ebuild 2395 BLAKE2B b19b63b7c8c21be681ebdbffb31f6393d52deb82e84ec57ac0309eb40940e457f24f327c697433127d7e9987b14f01b76ee719d9781e1210a2d0520aba4d4bb1 SHA512 9b2cb58ed674f4a18580a36b18ba1f7ccde9fe440d759304dec97b66c278e3a69ffe1e63772899add41cbc611742f3539c0caf10a47eb7a801ca60db5decdf7a
-EBUILD dolphin-18.08.3.ebuild 2279 BLAKE2B 3751ba86049a6b3a0b7ae4c8ae6c255281110ecfdd939c8b0a566ae54f62a59bb8f77f1d78de6be7e740d70c54d82f7f37b1c1848d49e69e840eebaa09024716 SHA512 9316c267dddba8e21b7cd7ebc216b00a1fae6966caa48480cd9079f7374362475b74e6ecf0bb06ca1056ba25f48748c34e5eab3e40a12e9eeca85200ffbe9e77
+DIST dolphin-18.12.0.tar.xz 4865672 BLAKE2B 9459f58ab2a04e61a10d1ea7b8b90544246ea179c795e7b119486b60e5446c9f151298a3ed7d5a22dd2a110c9a292e2fe6481b36906981d2e5a329a61eea7583 SHA512 3adf07f4e58cabb91083080f0942d2d8018ec76d391869481de716c1afb6a0fa63e2bb13f94c31f70a7c1cb0d375444fb1ddc44af2522092108795db1b017b15
+EBUILD dolphin-18.08.3.ebuild 2277 BLAKE2B 447bd4a6809cf09a627eb3ae837df58088e6c396cc62e49c0daccf621e96b20210fb91d440ad222861fa17fccecac302769c7a7fcb0969dab208905ca9e841e7 SHA512 0bc9f70ab9a9be684b7b78d9d43d6996a3dd56242768d4acdcdb287e30cd92830ba31e5a01329040312ef213b0a8a42359a9d43bffe9830626e76021444f38bd
+EBUILD dolphin-18.12.0.ebuild 2164 BLAKE2B 0d32ee7e0eb96a2269798176c5c44fa73c6b30de95f3aacf7b894139ea12f14fd72de99402f78568233d2c45b88d01eddd64ad2af42b2eec2b5f3558f5b451f9 SHA512 23153f2ff12d087e161b5997f338a7a40e25ac7fe32af7705de6464f8628a73de9648270c9983a73a46b2862df2482f670804a595030f363684398309685444f
 MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169
diff --git a/kde-apps/dolphin/dolphin-18.08.3.ebuild b/kde-apps/dolphin/dolphin-18.08.3.ebuild
index e38021b24876..660fdd8036ed 100644
--- a/kde-apps/dolphin/dolphin-18.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Plasma filemanager focusing on usability"
 HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="semantic-desktop thumbnail"
 
 DEPEND="
diff --git a/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild b/kde-apps/dolphin/dolphin-18.12.0.ebuild
index 0b73811fb28b..9ec0f8f669a8 100644
--- a/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Plasma filemanager focusing on usability"
 HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="semantic-desktop thumbnail"
 
 DEPEND="
@@ -48,9 +48,6 @@ DEPEND="
 		$(add_frameworks_dep kfilemetadata)
 		$(add_kdeapps_dep baloo-widgets)
 	)
-	!semantic-desktop? (
-		$(add_frameworks_dep kdelibs4support)
-	)
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kio-extras)
@@ -62,13 +59,6 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-18.04.1-flto.patch
-	"${FILESDIR}"/${P}-root-user.patch
-	"${FILESDIR}"/${P}-root-warn.patch
-	"${FILESDIR}"/${P}-memleak-{1,2}.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch
deleted file mode 100644
index 5bbeaa7e617c..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4536e25ac929d8d37ffbbba0642de662bcc9f891 Mon Sep 17 00:00:00 2001
-From: David Hallas <david@davidhallas.dk>
-Date: Wed, 18 Jul 2018 23:20:18 +0200
-Subject: Fixes memory leak in KItemListViewAccessible
-
-Summary: The KItemListViewAccessible class has a list of QAccessibleInterface pointers in a member variable m_cells. The problem is that when new entries are created, the newly allocated pointer is not stored in the list, only a nullptr is store, this renders the cleanup code in the destructor useless. This patch simply stores the pointer in the list, causing the destructor to correctly free the memory.
-
-Test Plan: I found this issue using address sanitizer. Simply building Dolphin with -fsanitize=address and opening a window caused the memory leak.
-
-Reviewers: #dolphin, jtamate, elvisangelaccio
-
-Reviewed By: #dolphin, jtamate, elvisangelaccio
-
-Subscribers: elvisangelaccio, kfm-devel
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D14168
----
- src/kitemviews/kitemlistviewaccessible.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
-index 69c126f..4d1b28b 100644
---- a/src/kitemviews/kitemlistviewaccessible.cpp
-+++ b/src/kitemviews/kitemlistviewaccessible.cpp
-@@ -78,6 +78,7 @@ QAccessibleInterface* KItemListViewAccessible::cell(int index) const
-     QAccessibleInterface* child = m_cells.at(index);
-     if (!child) {
-         child = new KItemListAccessibleCell(view(), index);
-+        m_cells.insert(index, child);
-         QAccessible::registerAccessibleInterface(child);
-     }
-     return child;
--- 
-cgit v0.11.2
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch
deleted file mode 100644
index f39885bdca36..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2cbf3cb11ea668577121fa755c1ddacc6f0acdd8 Mon Sep 17 00:00:00 2001
-From: David Hallas <david@davidhallas.dk>
-Date: Wed, 18 Jul 2018 16:43:25 -0600
-Subject: Fixes small memory leak in DolphinContextMenu
-
-Summary: When DolphinContextMenu::baseFileItem is called a KFileItem is allocated and stored in DolphinContextMenu::m_baseFileItem, which is of type KFileItem*, but the destructor failed to delete this.
-
-Test Plan: This leak was found using Address Sanitizer
-
-Reviewers: broulik, elvisangelaccio
-
-Reviewed By: broulik, elvisangelaccio
-
-Subscribers: ngraham, kfm-devel
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D14178
----
- src/dolphincontextmenu.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
-index 7d7d7a4..8fdaab1 100644
---- a/src/dolphincontextmenu.cpp
-+++ b/src/dolphincontextmenu.cpp
-@@ -81,6 +81,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
- 
- DolphinContextMenu::~DolphinContextMenu()
- {
-+    delete m_baseFileItem;
-+    m_baseFileItem = nullptr;
-     delete m_selectedItemsProperties;
-     m_selectedItemsProperties = nullptr;
- }
--- 
-cgit v0.11.2
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch b/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch
deleted file mode 100644
index 04baafa1d8e8..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 40453cb627a39f1ff92373f865426f0bcdc83419 Mon Sep 17 00:00:00 2001
-From: Nathaniel Graham <nate@kde.org>
-Date: Wed, 9 May 2018 17:18:08 -0600
-Subject: Re-allow running Dolphin as the root user (but still not using sudo)
-
-Summary:
-Prohibiting the use of Dolphin as the actual root user (not using `sudo` or `kdesu`) breaks legitimate use cases for using the root user. An example is Kali, a distro that logs in as the root user by default as a deliberate design choice.
-
-In such an environment, there is no additional security vulnerability beyond what you're already potentially exposing yourself to. So, let's re-enable it.
-
-BUG: 387974
-FIXED-IN: 18.08.0
-
-Test Plan:
-- Log in as normal user and run `sudo dolphin`: you get an error message.
-- Log in as normal user and run `kdesu dolphin`: you get an error message.
-- Log in as the root user and run dolphin normally: it works.
-
-Reviewers: markg, elvisangelaccio, #dolphin
-
-Reviewed By: markg
-
-Subscribers: chinmoyr, cfeck, elvisangelaccio, mmustac, Fuchs, markg, graesslin, nicolasfella, zzag, kfm-devel, emmanuelp
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D12795
----
- src/main.cpp | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index db52e11..75bab67 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -43,10 +43,15 @@
- extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
- {
- #ifndef Q_OS_WIN
--    // Check whether we are running as root
-+    // Prohibit using sudo or kdesu (but allow using the root user directly)
-     if (getuid() == 0) {
--        std::cout << "Executing Dolphin as root is not possible." << std::endl;
--        return EXIT_FAILURE;
-+        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-+            std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-+            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        }
-     }
- #endif
- 
--- 
-cgit v0.11.2
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch b/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch
deleted file mode 100644
index bd6e2ab0d815..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 621cd24acfec8cbed19e9aa6ff8650cd6f38f809 Mon Sep 17 00:00:00 2001
-From: Nathaniel Graham <nate@kde.org>
-Date: Sun, 6 May 2018 17:48:54 -0600
-Subject: Show a warning when running as the root user
-
-Summary: Now that Dolphin can be run as the root user again, let's show a warning.
-
-Test Plan:
-When run with the root user account:
-{F5882057}
-
-Reviewers: #dolphin, markg, elvisangelaccio
-
-Reviewed By: markg, elvisangelaccio
-
-Subscribers: acooligan, anthonyfieroni, chinmoyr, kfm-devel, rikmills, emmanuelp, zzag, nicolasfella, elvisangelaccio, Fuchs, mmustac, markg
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D12732
----
- src/dolphinviewcontainer.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
-index bf8ac88..7b99595 100644
---- a/src/dolphinviewcontainer.cpp
-+++ b/src/dolphinviewcontainer.cpp
-@@ -108,6 +108,14 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
-     m_messageWidget->setCloseButtonVisible(true);
-     m_messageWidget->hide();
- 
-+#ifndef Q_OS_WIN
-+    if (getuid() == 0) {
-+
-+        // We must be logged in as the root user; show a big scary warning
-+        showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), Warning);
-+    }
-+#endif
-+
-     m_view = new DolphinView(url, this);
-     connect(m_view, &DolphinView::urlChanged,
-             m_urlNavigator, &KUrlNavigator::setLocationUrl);
--- 
-cgit v0.11.2