[gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/files/, kde-apps/dolphin/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/files/, kde-apps/dolphin/

[Michael Palimaka]

commit:     e1543c0d8a58ebfae1f2f98439cb51acf10b335e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 11:09:28 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 11:09:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1543c0d

kde-apps/dolphin: Version bump 15.08.0

Package-Manager: portage-2.2.20.1

 kde-apps/dolphin/Manifest                         |  1 +
 kde-apps/dolphin/dolphin-15.08.0.ebuild           | 87 +++++++++++++++++++++++
 kde-apps/dolphin/files/dolphin-15.08.0-deps.patch | 48 +++++++++++++
 3 files changed, 136 insertions(+)

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index f17829a..08f6847 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1 +1,2 @@
+DIST dolphin-15.08.0.tar.xz 656524 SHA256 7ac16d7150b7c5e1d6350cf679981d675c995303a7f68eab1290763d3fd35ad9 SHA512 485f5a888ef5f68014c9c33b8a0f63a0d9b20a65098b026714b1b7cf831751bf382430296ef43861d4259bb73f84251353855c60ca096acdb384d1947e8fed57 WHIRLPOOL 3a207189700c11287b2286b5dc017beea4040279849079b5d86a9ce7464023d19d6ba55818ce0a11f609242f01f19a2936ec626a211352944f848dd8646a224c
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a

diff --git a/kde-apps/dolphin/dolphin-15.08.0.ebuild b/kde-apps/dolphin/dolphin-15.08.0.ebuild
new file mode 100644
index 0000000..2c5f46b
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-15.08.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://dolphin.kde.org https://www.kde.org/applications/system/dolphin"
+KEYWORDS="~amd64 ~x86"
+IUSE="semantic-desktop thumbnail"
+
+DEPEND="
+	$(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 kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+		$(add_kdeapps_dep baloo-widgets)
+	)
+	!semantic-desktop? (
+		$(add_frameworks_dep kdelibs4support)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kio-extras)
+	thumbnail? (
+		$(add_kdeapps_dep ffmpegthumbs '' 5.9999)
+		$(add_kdeapps_dep thumbnailers '' 5.9999)
+	)
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-15.08.0-deps.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop KF5Baloo)
+		$(cmake-utils_use_with semantic-desktop KF5BalooWidgets)
+		$(cmake-utils_use_with semantic-desktop KF5FileMetaData)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ( ! has_version kde-apps/ark:${SLOT} || ! has_version kde-apps/libkonq:${SLOT} ); then
+		echo
+		elog "For compress/extract actions, please install kde-apps/ark:${SLOT} and kde-apps/libkonq:${SLOT}"
+		echo
+	fi
+}

diff --git a/kde-apps/dolphin/files/dolphin-15.08.0-deps.patch b/kde-apps/dolphin/files/dolphin-15.08.0-deps.patch
new file mode 100644
index 0000000..43ae391
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-15.08.0-deps.patch
@@ -0,0 +1,48 @@
+From 4c0d110b2d36153a564602223b4dd3e04b1f4158 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Wed, 26 Aug 2015 22:53:44 +1000
+Subject: [PATCH] Update dependencies.
+
+It appears that KF5TextEditor was added for KTextEdit, but that is actually
+provided by KF5TextWidgets. It's then necessary to explicitly link to KF5Parts
+(it was previously brought in implicitly by KF5TextEditor).
+
+REVIEW: 124932
+---
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b56fd7a..a5580e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,7 +62,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     Solid
+     IconThemes
+     Completion
+-    TextEditor
++    TextWidgets
+     WindowSystem
+     Notifications
+ )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2a5e5a6..9689923 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -143,10 +143,11 @@ target_link_libraries(
+     KF5::KIOWidgets
+     KF5::KIOFileWidgets
+     KF5::Completion
+-    KF5::TextEditor
++    KF5::TextWidgets
+     KF5::WindowSystem
+     KF5::ConfigCore
+     KF5::NewStuff
++    KF5::Parts
+ )
+ 
+ if(HAVE_BALOO)
+-- 
+2.4.6
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/files/, kde-apps/dolphin/

[Andreas Sturmlechner]

commit:     041cd55b5dc192e9e6b1133a08e4279ea3674476
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 15:29:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 24 15:31:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=041cd55b

kde-apps/dolphin: Fix build with -flto

Thanks-to: Alexander Miller <alex.miller <AT> gmx.de>
Closes: https://bugs.gentoo.org/655710
Package-Manager: Portage-2.3.38, Repoman-2.3.9

 kde-apps/dolphin/dolphin-18.04.1.ebuild           |  2 +
 kde-apps/dolphin/files/dolphin-18.04.1-flto.patch | 96 +++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/kde-apps/dolphin/dolphin-18.04.1.ebuild b/kde-apps/dolphin/dolphin-18.04.1.ebuild
index 256cdd94762..6814ee4e99c 100644
--- a/kde-apps/dolphin/dolphin-18.04.1.ebuild
+++ b/kde-apps/dolphin/dolphin-18.04.1.ebuild
@@ -62,6 +62,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-flto.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)

diff --git a/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch b/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
new file mode 100644
index 00000000000..8edef6b3601
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
@@ -0,0 +1,96 @@
+From b607091c3982f6b84732fcf0c23c1c3f0054f203 Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Fri, 18 May 2018 22:43:25 +0200
+Subject: [PATCH 1/2] Remove main.cpp from dolphinstatic_SRCS
+
+Summary:
+The file main.cpp is already in dolphin_SRCS and doesn't
+belong in dolphinstatic_SRCS.
+
+Normally the duplicate object is simply ignored, but with
+link time optimization (LTO), linking dolphin can fail.
+Apparently, the compiler tries to inline inline kdemain()
+in this case. That is undesirable anyway and it ultimately
+fails because the DBusInterface definition is not available:
+
+.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
+<artificial>:(.text+0x2583): undefined reference to `vtable for DBusInterface'
+.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
+<artificial>:(.text+0x5aa3): undefined reference to `vtable for DBusInterface'
+.../ccHEv6cl.ltrans0.ltrans.o: In function `kdemain':
+<artificial>:(.text+0x7686): undefined reference to `DBusInterface::DBusInterface()'
+<artificial>:(.text+0x7b64): undefined reference to `vtable for DBusInterface'
+collect2: error: ld returned 1 exit status
+
+See also <https://bugs.gentoo.org/655710>.
+
+Reviewers: #dolphin, elvisangelaccio
+
+Reviewed By: elvisangelaccio
+
+Subscribers: elvisangelaccio, asturmlechner, kfm-devel
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D12929
+---
+ src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 263b3ff0c..e8fe719a4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -207,7 +207,6 @@ set(dolphinstatic_SRCS
+     dolphintabwidget.cpp
+     trash/dolphintrash.cpp
+     filterbar/filterbar.cpp
+-    main.cpp
+     panels/information/filemetadataconfigurationdialog.cpp
+     panels/information/informationpanel.cpp
+     panels/information/informationpanelcontent.cpp
+-- 
+2.17.0
+
+
+From 8e6f4eecd318041d2e4e6386d1660742dd4ddd89 Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Fri, 18 May 2018 22:44:52 +0200
+Subject: [PATCH 2/2] Make target_link_libraries for kdeinit_dolphin PRIVATE
+
+Summary:
+There is no need to add all of kdeinit_dolphin's
+dependencies (including the static archive) when
+linking dolphin; kdemain is the only needed symbol.
+Mark the link libraries PRIVATE to simplify the
+link command for dolphin.
+
+Reviewers: #dolphin, elvisangelaccio
+
+Reviewed By: elvisangelaccio
+
+Subscribers: asturmlechner, kfm-devel
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D12931
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e8fe719a4..beaa0ec50 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -299,7 +299,7 @@ ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
+ kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
+ 
+ 
+-target_link_libraries(kdeinit_dolphin
++target_link_libraries(kdeinit_dolphin PRIVATE
+     dolphinstatic
+     dolphinprivate
+ )
+-- 
+2.17.0
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/files/, kde-apps/dolphin/

[Andreas Sturmlechner]

commit:     569d001e979ee0976ee16f5efb53f8b748579727
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 16:28:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 16:35:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=569d001e

kde-apps/dolphin: Fix memleaks

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 kde-apps/dolphin/dolphin-18.04.3-r1.ebuild         | 92 ++++++++++++++++++++++
 .../dolphin/files/dolphin-18.04.3-memleak-1.patch  | 36 +++++++++
 .../dolphin/files/dolphin-18.04.3-memleak-2.patch  | 37 +++++++++
 3 files changed, 165 insertions(+)

diff --git a/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild b/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild
new file mode 100644
index 00000000000..030c7e78bf3
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
+KEYWORDS="~amd64 ~x86"
+IUSE="semantic-desktop thumbnail"
+
+DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+		$(add_kdeapps_dep baloo-widgets)
+	)
+	!semantic-desktop? (
+		$(add_frameworks_dep kdelibs4support)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kio-extras)
+	thumbnail? (
+		$(add_kdeapps_dep ffmpegthumbs)
+		$(add_kdeapps_dep thumbnailers)
+	)
+"
+
+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)
+		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/ark:${SLOT}" ; then
+		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
+	fi
+}

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
new file mode 100644
index 00000000000..5bbeaa7e617
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 00000000000..f39885bdca3
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch
@@ -0,0 +1,37 @@
+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

[gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/files/, kde-apps/dolphin/

[Andreas Sturmlechner]

commit:     ee0c9b5bb373695466c06a621be10a7a13eed2d5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 21:11:28 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 21:32:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0c9b5b

kde-apps/dolphin: Crash fix

Upstream commit c95d7fae79a309ed7f2df393fa20257cb20d54a8

See also: https://mail.kde.org/pipermail/distributions/2020-December/000913.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=429628
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430434
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/dolphin/dolphin-20.12.0-r1.ebuild         | 99 ++++++++++++++++++++++
 .../dolphin/files/dolphin-20.12.0-crashfix.patch   | 27 ++++++
 2 files changed, 126 insertions(+)

diff --git a/kde-apps/dolphin/dolphin-20.12.0-r1.ebuild b/kde-apps/dolphin/dolphin-20.12.0-r1.ebuild
new file mode 100644
index 00000000000..ffeb5b378fe
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-20.12.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.75.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://apps.kde.org/en/dolphin https://userbase.kde.org/Dolphin"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="activities semantic-desktop telemetry"
+
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-libs/phonon-4.11.0
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	semantic-desktop? (
+		>=kde-apps/baloo-widgets-${PVCUT}:5
+		>=kde-frameworks/baloo-${KFMIN}:5
+		>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kio-extras-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# servicemenuinstaller requires ruby, no thanks
+		# dolphinmainwindowtest, kitemlistcontrollertest, kfileitemlistviewtest, kfileitemmodeltest hang forever
+		# placesitemmodeltest requires DBus
+		-E "(servicemenuinstaller|dolphinmainwindowtest|kfileitemlistviewtest|kfileitemmodeltest|kitemlistcontrollertest|placesitemmodeltest)"
+	)
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "compress/extract and other actions" kde-apps/ark:${SLOT}
+		optfeature "crypto actions" kde-apps/kleopatra:${SLOT}
+		optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
+		optfeature "graphics file thumbnails" kde-apps/thumbnailers:${SLOT}
+		optfeature "'Share' context menu actions" kde-frameworks/purpose:${SLOT}
+	fi
+	ecm_pkg_postinst
+}

diff --git a/kde-apps/dolphin/files/dolphin-20.12.0-crashfix.patch b/kde-apps/dolphin/files/dolphin-20.12.0-crashfix.patch
new file mode 100644
index 00000000000..65350b7ba3e
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-20.12.0-crashfix.patch
@@ -0,0 +1,27 @@
+From c95d7fae79a309ed7f2df393fa20257cb20d54a8 Mon Sep 17 00:00:00 2001
+From: Anthony Fieroni <bvbfan@abv.bg>
+Date: Sat, 12 Dec 2020 12:36:23 +0200
+Subject: [PATCH] Fix access url navigator while creating new tab in filename
+ search view BUG: 429628 BUG: 430434
+
+Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
+---
+ src/dolphinviewcontainer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
+index 7260d2c4c..8dd309314 100644
+--- a/src/dolphinviewcontainer.cpp
++++ b/src/dolphinviewcontainer.cpp
+@@ -390,7 +390,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
+     m_searchBox->setVisible(enabled);
+ 
+     if (enabled) {
+-        const QUrl& locationUrl = m_urlNavigatorConnected->locationUrl();
++        const QUrl& locationUrl = m_urlNavigator->locationUrl();
+         m_searchBox->fromSearchUrl(locationUrl);
+     }
+ 
+-- 
+GitLab
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/files/, kde-apps/dolphin/

[Maciej Mrozowski]

commit:     0f40b12d3f5d6182cf7b74cebdfaacb0051d11e8
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 21:27:48 2023 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat May 13 21:29:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f40b12d

kde-apps/dolphin: revert upstream commit in 23.04.1 that introduces startup delay with USE=-activities

Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
Bug: https://bugs.gentoo.org/906170

 kde-apps/dolphin/dolphin-23.04.1.ebuild            |   4 +
 .../files/dolphin-23.04.1-fix-startup-delay.patch  | 121 +++++++++++++++++++++
 2 files changed, 125 insertions(+)

diff --git a/kde-apps/dolphin/dolphin-23.04.1.ebuild b/kde-apps/dolphin/dolphin-23.04.1.ebuild
index 6972df06322e..c323a3f3ea19 100644
--- a/kde-apps/dolphin/dolphin-23.04.1.ebuild
+++ b/kde-apps/dolphin/dolphin-23.04.1.ebuild
@@ -62,6 +62,10 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
+PATCHES=(
+	"${FILESDIR}/dolphin-23.04.1-fix-startup-delay.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON

diff --git a/kde-apps/dolphin/files/dolphin-23.04.1-fix-startup-delay.patch b/kde-apps/dolphin/files/dolphin-23.04.1-fix-startup-delay.patch
new file mode 100644
index 000000000000..6a34ff66efb3
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-23.04.1-fix-startup-delay.patch
@@ -0,0 +1,121 @@
+Revert patch https://invent.kde.org/system/dolphin/-/commit/d19800c69198b904ae47cb1e53dfe28f74618eb2
+See https://bugs.gentoo.org/906170
+---
+diff -ruN dolphin-23.04.1/src/dolphinmainwindow.cpp new/src/dolphinmainwindow.cpp
+--- dolphin-23.04.1/src/dolphinmainwindow.cpp	2023-05-09 10:52:07.000000000 +0200
++++ new/src/dolphinmainwindow.cpp	2023-05-13 22:37:50.984895964 +0200
+@@ -270,31 +270,6 @@
+     openFiles(QUrl::fromStringList(files), splitView);
+ }
+ 
+-bool DolphinMainWindow::isOnCurrentDesktop() const
+-{
+-#if HAVE_X11
+-    if (KWindowSystem::isPlatformX11()) {
+-        const NET::Properties properties = NET::WMDesktop;
+-        KWindowInfo info(this->winId(), properties);
+-        return info.isOnCurrentDesktop();
+-    }
+-#endif
+-    return true;
+-}
+-
+-bool DolphinMainWindow::isOnActivity(const QString &activityId) const
+-{
+-#if HAVE_X11 && HAVE_KACTIVITIES
+-    if (KWindowSystem::isPlatformX11()) {
+-        const NET::Properties properties = NET::Supported;
+-        const NET::Properties2 properties2 = NET::WM2Activities;
+-        KWindowInfo info(this->winId(), properties, properties2);
+-        return info.activities().contains(activityId);
+-    }
+-#endif
+-    return true;
+-}
+-
+ void DolphinMainWindow::activateWindow(const QString &activationToken)
+ {
+     window()->setAttribute(Qt::WA_NativeWindow, true);
+diff -ruN dolphin-23.04.1/src/dolphinmainwindow.h new/src/dolphinmainwindow.h
+--- dolphin-23.04.1/src/dolphinmainwindow.h	2023-05-09 10:52:07.000000000 +0200
++++ new/src/dolphinmainwindow.h	2023-05-13 22:37:50.984895964 +0200
+@@ -203,9 +203,6 @@
+     /** @see GeneralSettings::splitViewChanged() */
+     void slotSplitViewChanged();
+ 
+-    bool isOnActivity(const QString &activityId) const;
+-    bool isOnCurrentDesktop() const;
+-
+ Q_SIGNALS:
+     /**
+      * Is sent if the selection of the currently active view has
+diff -ruN dolphin-23.04.1/src/global.cpp new/src/global.cpp
+--- dolphin-23.04.1/src/global.cpp	2023-05-09 10:52:07.000000000 +0200
++++ new/src/global.cpp	2023-05-13 22:50:40.449973915 +0200
+@@ -16,9 +16,6 @@
+ #include <KIO/ApplicationLauncherJob>
+ #include <KService>
+ #include <KWindowSystem>
+-#if HAVE_KACTIVITIES
+-#include <KActivities/Consumer>
+-#endif
+ 
+ #include <QApplication>
+ 
+@@ -143,37 +140,13 @@
+ 
+ QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Dolphin::dolphinGuiInstances(const QString &preferredService)
+ {
+-#if HAVE_KACTIVITIES
+-    static std::once_flag one_consumer;
+-    static KActivities::Consumer *consumer;
+-    std::call_once(one_consumer, []() {
+-        consumer = new KActivities::Consumer();
+-        // ensures the consumer is ready for query
+-        QEventLoop loop;
+-        QObject::connect(consumer, &KActivities::Consumer::serviceStatusChanged, &loop, &QEventLoop::quit);
+-        loop.exec();
+-    });
+-#endif
+-
+     QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> dolphinInterfaces;
+-    const auto tryAppendInterface = [&dolphinInterfaces](const QString &service) {
+-        // Check if instance can handle our URLs
+-        QSharedPointer<OrgKdeDolphinMainWindowInterface> interface(
+-            new OrgKdeDolphinMainWindowInterface(service, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
+-        if (interface->isValid() && !interface->lastError().isValid()) {
+-#if HAVE_KACTIVITIES
+-            const auto currentActivity = consumer->currentActivity();
+-            if (currentActivity.isEmpty() || currentActivity == QStringLiteral("00000000-0000-0000-0000-000000000000")
+-                || interface->isOnActivity(consumer->currentActivity()))
+-#endif
+-                if (interface->isOnCurrentDesktop()) {
+-                    dolphinInterfaces.append(qMakePair(interface, QStringList()));
+-                }
+-        }
+-    };
+-
+     if (!preferredService.isEmpty()) {
+-        tryAppendInterface(preferredService);
++        QSharedPointer<OrgKdeDolphinMainWindowInterface> preferredInterface(
++            new OrgKdeDolphinMainWindowInterface(preferredService, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
++        if (preferredInterface->isValid() && !preferredInterface->lastError().isValid()) {
++            dolphinInterfaces.append(qMakePair(preferredInterface, QStringList()));
++        }
+     }
+ 
+     // Look for dolphin instances among all available dbus services.
+@@ -185,7 +158,12 @@
+     const QString myPid = QLatin1Char('-') + QString::number(QCoreApplication::applicationPid());
+     for (const QString &service : dbusServices) {
+         if (service.startsWith(pattern) && !service.endsWith(myPid)) {
+-            tryAppendInterface(service);
++            // Check if instance can handle our URLs
++            QSharedPointer<OrgKdeDolphinMainWindowInterface> interface(
++                new OrgKdeDolphinMainWindowInterface(service, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
++            if (interface->isValid() && !interface->lastError().isValid()) {
++                dolphinInterfaces.append(qMakePair(interface, QStringList()));
++            }
+         }
+     }
+