* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2020-02-15 13:43 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-02-15 13:43 UTC (permalink / raw
To: gentoo-commits
commit: c1ef5f33ff460fd4e6ce3f0ab59c8555f7971436
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 15 10:46:33 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 13:39:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ef5f33
kde-apps/dolphin: Return to old placement of 'Create New' context menu
See also: https://phabricator.kde.org/D27267
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin/dolphin-19.12.2-r1.ebuild | 99 ++++++++++++++++++++++
.../dolphin-19.12.2-create-new-consistency.patch | 66 +++++++++++++++
2 files changed, 165 insertions(+)
diff --git a/kde-apps/dolphin/dolphin-19.12.2-r1.ebuild b/kde-apps/dolphin/dolphin-19.12.2-r1.ebuild
new file mode 100644
index 00000000000..5d2d4067386
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-19.12.2-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.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin
+https://userbase.kde.org/Dolphin"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="activities semantic-desktop"
+
+DEPEND="
+ >=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
+ >=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
+ media-libs/phonon[qt5(+)]
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+ semantic-desktop? (
+ >=kde-frameworks/baloo-${KFMIN}:5
+ >=kde-frameworks/kfilemetadata-${KFMIN}:5
+ >=kde-apps/baloo-widgets-${PVCUT}:5
+ )
+"
+RDEPEND="${DEPEND}
+ >=kde-apps/kio-extras-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-create-new-consistency.patch" ) # from 20.04
+
+src_configure() {
+ local mycmakeargs=(
+ $(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)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ has_version "kde-apps/ark:${SLOT}" || \
+ elog "For compress/extract and other actions install kde-apps/ark:${SLOT}"
+
+ has_version "kde-apps/kleopatra:${SLOT}" || \
+ elog "For crypto actions install kde-apps/kleopatra:${SLOT}"
+
+ has_version "kde-apps/ffmpegthumbs:${SLOT}" || \
+ elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}"
+
+ has_version "kde-apps/thumbnailers:${SLOT}" || \
+ elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}"
+
+ has_version "kde-frameworks/purpose:${SLOT}" || \
+ elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}"
+ fi
+}
diff --git a/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch b/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch
new file mode 100644
index 00000000000..dc70220d956
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch
@@ -0,0 +1,66 @@
+From 4c923a531f77bc4c44b5c8687fe18dd6438eb9c5 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 9 Feb 2020 08:58:10 -0700
+Subject: Restore former position of "Create New" menu item in viewport context
+ menu
+
+Summary:
+I've seem various complaints from users about the fact that the {nav Create New...} menu
+item in the viewport context menu is now below {nav Open With} item. All the other
+changes to menus seem to have been well-received but this one has garnered criticism.
+Looking through D23757 and D11884, I can't actually see that this was intentional, so
+it might even be a bug.
+
+Either way, this patch restores the old position of the {nav Create New} menu items at
+the top of the Viewport context menu.
+
+BUG: 417640
+FIXED-IN: 20.04.0
+
+Test Plan: {F8093605}
+
+Reviewers: #vdg, #dolphin, elvisangelaccio, ndavis
+
+Reviewed By: #vdg, ndavis
+
+Subscribers: asturmlechner, markuss, kfm-devel
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D27267
+---
+ src/dolphincontextmenu.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
+index 79143d4..9f39671 100644
+--- a/src/dolphincontextmenu.cpp
++++ b/src/dolphincontextmenu.cpp
+@@ -342,12 +342,6 @@ void DolphinContextMenu::openViewportContextMenu()
+ fileItemActions.setParentWidget(m_mainWindow);
+ fileItemActions.setItemListProperties(baseUrlProperties);
+
+- // Don't show "Open With" menu items if the current dir is empty, because there's
+- // generally no app that can do anything interesting with an empty directory
+- if (view->itemsCount() != 0) {
+- addOpenWithActions(fileItemActions);
+- }
+-
+ // Set up and insert 'Create New' menu
+ KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
+ newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
+@@ -355,6 +349,12 @@ void DolphinContextMenu::openViewportContextMenu()
+ newFileMenu->setPopupFiles(QList<QUrl>() << m_baseUrl);
+ addMenu(newFileMenu->menu());
+
++ // Don't show "Open With" menu items if the current dir is empty, because there's
++ // generally no app that can do anything interesting with an empty directory
++ if (view->itemsCount() != 0) {
++ addOpenWithActions(fileItemActions);
++ }
++
+ QAction* pasteAction = createPasteAction();
+ addAction(pasteAction);
+
+--
+cgit v1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2024-02-22 10:09 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2024-02-22 10:09 UTC (permalink / raw
To: gentoo-commits
commit: cdda2b4470aa4bba18bf1650b4566a8eef3d16c5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 21:51:24 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 10:04:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdda2b44
kde-apps/dolphin: Fix musl build
Closes: https://bugs.gentoo.org/925195
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin/dolphin-23.08.5.ebuild | 2 +
kde-apps/dolphin/files/dolphin-23.08.5-musl.patch | 64 +++++++++++++++++++++++
2 files changed, 66 insertions(+)
diff --git a/kde-apps/dolphin/dolphin-23.08.5.ebuild b/kde-apps/dolphin/dolphin-23.08.5.ebuild
index f253b8e0a372..3116f5e5d438 100644
--- a/kde-apps/dolphin/dolphin-23.08.5.ebuild
+++ b/kde-apps/dolphin/dolphin-23.08.5.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
)
"
+PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+
src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch b/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch
new file mode 100644
index 000000000000..044a0caef830
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch
@@ -0,0 +1,64 @@
+From 32a5f1c041d00cdd0246cf7e764a447588f30f3a Mon Sep 17 00:00:00 2001
+From: Bart Ribbers <bribbers@disroot.org>
+Date: Wed, 9 Aug 2023 14:07:46 +0200
+Subject: [PATCH] Fix musl build by using fts_* from external library
+
+musl does not support fts. There is however a standalone package that
+can be used, but it must be linked against. This commit adds a check
+that makes sure to link to the external library if it is required.
+---
+ CMakeLists.txt | 17 +++++++++++++++++
+ src/CMakeLists.txt | 2 ++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a0b97c635..0a655babb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,6 +27,8 @@ include(GenerateExportHeader)
+ include(FeatureSummary)
+ include(ECMQtDeclareLoggingCategory)
+ include(ECMDeprecationSettings)
++include(CheckIncludeFiles)
++include(CheckLibraryExists)
+
+ ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHIN
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
+@@ -150,6 +152,21 @@ else()
+ set(HAVE_TERMINAL TRUE)
+ endif()
+
++# Compatibility with platforms without native fts (e.g. musl)
++check_include_files("sys/types.h;sys/stat.h;fts.h" HAVE_FTS_H)
++if(HAVE_FTS_H)
++ check_function_exists(fts_open HAVE_FTS_OPEN)
++ if(NOT HAVE_FTS_OPEN)
++ check_library_exists(fts fts_open "" HAVE_LIB_FTS)
++ endif()
++endif()
++
++if(HAVE_LIB_FTS)
++ set(FTS_LIB fts)
++else()
++ set(FTS_LIB "")
++endif()
++
+ add_subdirectory(src)
+ add_subdirectory(doc)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5a481e39ff..fa7de5cc23 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -213,6 +213,8 @@ target_link_libraries(
+ KF5::WindowSystem
+ KF5::WidgetsAddons
+ KF5::Codecs
++
++ ${FTS_LIB}
+ )
+
+ if(HAVE_BALOO)
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2022-12-14 20:01 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-12-14 20:01 UTC (permalink / raw
To: gentoo-commits
commit: 559300b55404683b346eeb2b60b1c7cb5c73acf9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 19:51:11 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 20:00:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=559300b5
kde-apps/dolphin: Revert "portalize drag urls"
KDE-bug: https://bugs.kde.org/457529
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=462928
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin/dolphin-22.12.0-r1.ebuild | 97 ++++++++++++++++++++++
...olphin-22.12.0-revert-portalize-drag-urls.patch | 94 +++++++++++++++++++++
2 files changed, 191 insertions(+)
diff --git a/kde-apps/dolphin/dolphin-22.12.0-r1.ebuild b/kde-apps/dolphin/dolphin-22.12.0-r1.ebuild
new file mode 100644
index 000000000000..c125eb9bb985
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-22.12.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.99.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~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/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}-revert-portalize-drag-urls.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
+ 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-22.12.0-revert-portalize-drag-urls.patch b/kde-apps/dolphin/files/dolphin-22.12.0-revert-portalize-drag-urls.patch
new file mode 100644
index 000000000000..417c3f340c6a
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-22.12.0-revert-portalize-drag-urls.patch
@@ -0,0 +1,94 @@
+From c8aed8ac81d9f7f3dc93a7570037041228a98bf4 Mon Sep 17 00:00:00 2001
+From: Felix Ernst <felixernst@kde.org>
+Date: Wed, 14 Dec 2022 12:33:51 +0000
+Subject: [PATCH] Revert "portalize drag urls"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 8d7e600f63a1961294dfe2c278a710b4ce0716e9.
+
+While this revert unfortunately removes Dolphin's ability to copy to
+sandboxed applications, the bugs being temporarily fixed by this seem
+more important. See the bugs mentioned below for details.
+
+Especially copy-pasting needs to work flawlessly for an application
+like Dolphin. After the revert this will either work correctly or – in
+the case of sandboxed applications – not at all.
+
+CCBUG: 457529
+CCBUG: 462928
+---
+ src/kitemviews/kitemlistcontroller.cpp | 4 +---
+ src/panels/folders/treeviewcontextmenu.cpp | 1 -
+ src/views/dolphinview.cpp | 5 +----
+ 3 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
+index 955e418e8..29dd13aac 100644
+--- a/src/kitemviews/kitemlistcontroller.cpp
++++ b/src/kitemviews/kitemlistcontroller.cpp
+@@ -17,7 +17,6 @@
+
+ #include <KTwoFingerSwipe>
+ #include <KTwoFingerTap>
+-#include <KUrlMimeData>
+
+ #include <QAccessible>
+ #include <QApplication>
+@@ -1334,11 +1333,10 @@ void KItemListController::startDragging()
+ return;
+ }
+
+- QMimeData *data = m_model->createMimeData(selectedItems);
++ QMimeData* data = m_model->createMimeData(selectedItems);
+ if (!data) {
+ return;
+ }
+- KUrlMimeData::exportUrlsToPortal(data);
+
+ // The created drag object will be owned and deleted
+ // by QApplication::activeWindow().
+diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
+index 893a494fb..e0da9e976 100644
+--- a/src/panels/folders/treeviewcontextmenu.cpp
++++ b/src/panels/folders/treeviewcontextmenu.cpp
+@@ -168,7 +168,6 @@ void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
+ bool dummy;
+ mostLocalUrls.append(m_fileItem.mostLocalUrl(&dummy));
+ KIO::setClipboardDataCut(mimeData, cut);
+- KUrlMimeData::exportUrlsToPortal(mimeData);
+ KUrlMimeData::setUrls(kdeUrls, mostLocalUrls, mimeData);
+ }
+
+diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
+index e8603858f..88f275557 100644
+--- a/src/views/dolphinview.cpp
++++ b/src/views/dolphinview.cpp
+@@ -45,7 +45,6 @@
+ #include <KLocalizedString>
+ #include <KMessageBox>
+ #include <KProtocolManager>
+-#include <KUrlMimeData>
+
+ #include <kwidgetsaddons_version.h>
+
+@@ -802,14 +801,12 @@ void DolphinView::cutSelectedItemsToClipboard()
+ {
+ QMimeData* mimeData = selectionMimeData();
+ KIO::setClipboardDataCut(mimeData, true);
+- KUrlMimeData::exportUrlsToPortal(mimeData);
+ QApplication::clipboard()->setMimeData(mimeData);
+ }
+
+ void DolphinView::copySelectedItemsToClipboard()
+ {
+- QMimeData *mimeData = selectionMimeData();
+- KUrlMimeData::exportUrlsToPortal(mimeData);
++ QMimeData* mimeData = selectionMimeData();
+ QApplication::clipboard()->setMimeData(mimeData);
+ }
+
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2022-02-06 21:17 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-02-06 21:17 UTC (permalink / raw
To: gentoo-commits
commit: ad38b38964f572f4f13aa5542ed2c49e4600ac77
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 6 18:31:41 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 6 21:16:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad38b389
kde-apps/dolphin: Fix KNewStuff3 ProvidersUrl
See also:
https://mail.kde.org/pipermail/distributions/2022-February/001124.html
https://mail.kde.org/pipermail/distributions/2022-February/001128.html
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...in-21.08.3.ebuild => dolphin-21.08.3-r1.ebuild} | 4 +++-
.../files/dolphin-21.08.3-fix-ProvidersUrl.patch | 27 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/kde-apps/dolphin/dolphin-21.08.3.ebuild b/kde-apps/dolphin/dolphin-21.08.3-r1.ebuild
similarity index 95%
rename from kde-apps/dolphin/dolphin-21.08.3.ebuild
rename to kde-apps/dolphin/dolphin-21.08.3-r1.ebuild
index 9160d9e3ad2d..d4a96ad6d8a2 100644
--- a/kde-apps/dolphin/dolphin-21.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-21.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -63,6 +63,8 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-21.08.1-port-to-KTerminalLauncherJob.patch" # KDE-bug 441072
+ # https://mail.kde.org/pipermail/distributions/2022-February/001128.html
+ "${FILESDIR}/${PN}-21.08.3-fix-ProvidersUrl.patch"
)
src_configure() {
diff --git a/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch b/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch
new file mode 100644
index 000000000000..74472fd0943d
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch
@@ -0,0 +1,27 @@
+From d0898592a17d14fc8d48fc5cba71f3d57f0a1856 Mon Sep 17 00:00:00 2001
+From: Ben Cooksley <bcooksley@kde.org>
+Date: Thu, 30 Dec 2021 07:31:41 +1300
+Subject: [PATCH] Use the CDN based endpoint rather than the legacy endpoint
+ which hits our download redirector.
+
+CCMAIL: distributions@kde.org
+
+(cherry picked from commit 694e4e24526c5f55e162ad9288782e7c82cac38f)
+---
+ src/settings/contextmenu/servicemenu.knsrc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/settings/contextmenu/servicemenu.knsrc b/src/settings/contextmenu/servicemenu.knsrc
+index 59d459895..4374082c7 100644
+--- a/src/settings/contextmenu/servicemenu.knsrc
++++ b/src/settings/contextmenu/servicemenu.knsrc
+@@ -1,5 +1,5 @@
+ [KNewStuff3]
+-ProvidersUrl=https://download.kde.org/ocs/providers.xml
++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
+ Categories=Dolphin Service Menus
+ TargetDir=servicemenu-download
+ Uncompress=never
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2021-05-12 8:12 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2021-05-12 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 8ad7c2e0f13807f5037ffa4c7fa18a5ee5127dfd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 07:42:48 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 12 08:12:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad7c2e0
kde-apps/dolphin: Update fix-no-semantic-desktop.patch w/ upstream MR
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin/dolphin-20.12.3-r1.ebuild | 4 +--
kde-apps/dolphin/dolphin-21.04.0.ebuild | 4 +--
.../dolphin-21.04.0-fix-no-semantic-desktop.patch | 23 ------------
.../dolphin-21.04.1-fix-no-semantic-desktop.patch | 41 ++++++++++++++++++++++
4 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
index 84ed6041e31..76be41e62f6 100644
--- a/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
@@ -64,8 +64,8 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${P}-fix-session-restore-w-o-tabs.patch" # KDE-bug 434911
- # TODO: Downstream hack, track upstream bug for better solution
- "${FILESDIR}/${PN}-21.04.0-fix-no-semantic-desktop.patch" # KDE-bug 435586
+ # pending https://invent.kde.org/system/dolphin/-/merge_requests/208
+ "${FILESDIR}/${PN}-21.04.1-fix-no-semantic-desktop.patch" # KDE-bug 435586
)
src_configure() {
diff --git a/kde-apps/dolphin/dolphin-21.04.0.ebuild b/kde-apps/dolphin/dolphin-21.04.0.ebuild
index c9439d4dddc..6c4eb30ae3d 100644
--- a/kde-apps/dolphin/dolphin-21.04.0.ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.0.ebuild
@@ -62,8 +62,8 @@ RDEPEND="${DEPEND}
>=kde-apps/kio-extras-${PVCUT}:5
"
-# TODO: Downstream hack, track upstream bug for better solution
-PATCHES=( "${FILESDIR}/${P}-fix-no-semantic-desktop.patch" ) # KDE-bug 435586
+# pending https://invent.kde.org/system/dolphin/-/merge_requests/208
+PATCHES=( "${FILESDIR}/${PN}-21.04.1-fix-no-semantic-desktop.patch" ) # KDE-bug 435586
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch b/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch
deleted file mode 100644
index 4f97a53c523..00000000000
--- a/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
-index d52d146a8..9f0078631 100644
---- a/src/search/dolphinfacetswidget.cpp
-+++ b/src/search/dolphinfacetswidget.cpp
-@@ -7,6 +7,8 @@
-
- #include "dolphinfacetswidget.h"
-
-+#include <config-baloo.h>
-+
- #include <KLocalizedString>
-
- #include <QComboBox>
-@@ -257,7 +259,9 @@ void DolphinFacetsWidget::updateTagsSelector()
- void DolphinFacetsWidget::updateTagsMenu()
- {
- updateTagsMenuItems({}, {});
-+#ifdef HAVE_BALOO
- m_tagsLister.openUrl(QUrl(QStringLiteral("tags:/")), KCoreDirLister::OpenUrlFlag::Reload);
-+#endif
- }
-
- void DolphinFacetsWidget::updateTagsMenuItems(const QUrl&, const KFileItemList& items)
diff --git a/kde-apps/dolphin/files/dolphin-21.04.1-fix-no-semantic-desktop.patch b/kde-apps/dolphin/files/dolphin-21.04.1-fix-no-semantic-desktop.patch
new file mode 100644
index 00000000000..5636d0532ed
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-21.04.1-fix-no-semantic-desktop.patch
@@ -0,0 +1,41 @@
+From 29636baff0f0cf8d769aa75b1c458b96cf83b828 Mon Sep 17 00:00:00 2001
+From: Ismael Asensio <isma.af@gmail.com>
+Date: Sun, 9 May 2021 21:10:44 +0200
+Subject: [PATCH] search/facetswidget: Check for protocol before trying to
+ fetch tags
+
+This was causing an error when trying to list items from the
+non-existent `tags:` protocol.
+
+BUG: 435586
+FIXED-IN: 21.04.1
+---
+ src/search/dolphinfacetswidget.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
+index d4079f1eb..e8a43101f 100644
+--- a/src/search/dolphinfacetswidget.cpp
++++ b/src/search/dolphinfacetswidget.cpp
+@@ -8,6 +8,7 @@
+ #include "dolphinfacetswidget.h"
+
+ #include <KLocalizedString>
++#include <KProtocolInfo>
+
+ #include <QComboBox>
+ #include <QDate>
+@@ -245,7 +246,9 @@ void DolphinFacetsWidget::updateTagsSelector()
+ void DolphinFacetsWidget::updateTagsMenu()
+ {
+ updateTagsMenuItems({}, {});
+- m_tagsLister.openUrl(QUrl(QStringLiteral("tags:/")), KCoreDirLister::OpenUrlFlag::Reload);
++ if (KProtocolInfo::isKnownProtocol(QStringLiteral("tags"))) {
++ m_tagsLister.openUrl(QUrl(QStringLiteral("tags:/")), KCoreDirLister::OpenUrlFlag::Reload);
++ }
+ }
+
+ void DolphinFacetsWidget::updateTagsMenuItems(const QUrl&, const KFileItemList& items)
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2021-04-04 13:23 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 13:23 UTC (permalink / raw
To: gentoo-commits
commit: cb14d193518487ecc9867eb4735538f63ba88dad
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 12:14:40 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 13:19:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb14d193
kde-apps/dolphin: Don't re-open already-open URLs w/ session-restore
Upstream commit 175538020824355115cd98637ce83ecc53badd44
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=434911
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin/dolphin-20.12.3-r1.ebuild | 101 +++++++++++++++++++++
...phin-20.12.3-fix-session-restore-w-o-tabs.patch | 70 ++++++++++++++
2 files changed, 171 insertions(+)
diff --git a/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
new file mode 100644
index 00000000000..367584e27d2
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 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.2
+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}-fix-session-restore-w-o-tabs.patch" # KDE-bug 434911
+)
+
+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.3-fix-session-restore-w-o-tabs.patch b/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch
new file mode 100644
index 00000000000..9605bead03c
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch
@@ -0,0 +1,70 @@
+From 175538020824355115cd98637ce83ecc53badd44 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 18 Mar 2021 13:42:59 -0600
+Subject: [PATCH] Don't re-open already-open URLs when using session-restore
+ feature
+
+If Dolphin would be asked to open a location that is already open, don't
+open it again in a new tab; instead switch to that view. Supports tabs
+and split view.
+
+BUG: 434911
+FIXED-IN: 21.04
+---
+ src/dolphintabwidget.cpp | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
+index d61a9f74f..17fa0ff4e 100644
+--- a/src/dolphintabwidget.cpp
++++ b/src/dolphintabwidget.cpp
+@@ -186,14 +186,20 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
+ {
+ Q_ASSERT(dirs.size() > 0);
+
++ bool somethingWasAlreadyOpen = false;
++
+ QList<QUrl>::const_iterator it = dirs.constBegin();
+ while (it != dirs.constEnd()) {
+ const QUrl& primaryUrl = *(it++);
+ const QPair<int, bool> indexInfo = indexByUrl(primaryUrl);
+ const int index = indexInfo.first;
+ const bool isInPrimaryView = indexInfo.second;
++
++ // When the user asks for a URL that's already open, activate it instead
++ // of opening a second copy
+ if (index >= 0) {
+- setCurrentIndex(index);
++ somethingWasAlreadyOpen = true;
++ activateTab(index);
+ const auto tabPage = tabPageAt(index);
+ if (isInPrimaryView) {
+ tabPage->primaryViewContainer()->setActive(true);
+@@ -204,13 +210,19 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
+ // Required for updateViewState() call in openFiles() to work as expected
+ // If there is a selection, updateViewState() calls are effectively a no-op
+ tabPage->activeViewContainer()->view()->clearSelection();
+- continue;
+- }
+- if (splitView && (it != dirs.constEnd())) {
++ } else if (splitView) {
+ const QUrl& secondaryUrl = *(it++);
+- openNewActivatedTab(primaryUrl, secondaryUrl);
++ if (somethingWasAlreadyOpen) {
++ openNewTab(primaryUrl, secondaryUrl);
++ } else {
++ openNewActivatedTab(primaryUrl, secondaryUrl);
++ }
+ } else {
+- openNewActivatedTab(primaryUrl);
++ if (somethingWasAlreadyOpen) {
++ openNewTab(primaryUrl);
++ } else {
++ openNewActivatedTab(primaryUrl);
++ }
+ }
+ }
+ }
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2021-01-23 0:25 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2021-01-23 0:25 UTC (permalink / raw
To: gentoo-commits
commit: fdb8d397da0d650b8fa255906f6b237020d982b4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 18:59:44 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 00:25:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb8d397
kde-apps/dolphin: Show button to open knetattach inline
See also: https://mail.kde.org/pipermail/distributions/2021-January/000916.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=431626
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin/dolphin-20.12.1-r1.ebuild | 99 +++++++++++
.../files/dolphin-20.12.1-knetattach-button.patch | 193 +++++++++++++++++++++
2 files changed, 292 insertions(+)
diff --git a/kde-apps/dolphin/dolphin-20.12.1-r1.ebuild b/kde-apps/dolphin/dolphin-20.12.1-r1.ebuild
new file mode 100644
index 00000000000..0fbdb6a7523
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-20.12.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 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}-knetattach-button.patch" ) # KDE-Bug 431626
+
+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.1-knetattach-button.patch b/kde-apps/dolphin/files/dolphin-20.12.1-knetattach-button.patch
new file mode 100644
index 00000000000..b66b6c7e034
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-20.12.1-knetattach-button.patch
@@ -0,0 +1,193 @@
+From 33270dd4423eea329b8f20db17f8d70ab7b108da Mon Sep 17 00:00:00 2001
+From: Norbert Preining <norbert@preining.info>
+Date: Tue, 19 Jan 2021 06:43:14 +0900
+Subject: [PATCH] Show button to open knetattach inline with URL nav on
+ remove:// view
+
+This is a backport of b1cadeba939155282a9fadf7d7b025d6529c489e
+
+ From b1cadeba939155282a9fadf7d7b025d6529c489e Mon Sep 17 00:00:00 2001
+ From: Nate Graham <nate@kde.org>
+ Date: Tue, 15 Dec 2020 23:03:00 -0700
+ Subject: [PATCH] Show button to open knetattach inline with URL nav on
+ Remote:// view
+
+ In conjunction with
+ https://invent.kde.org/frameworks/kio/-/merge_requests/260,
+ the net result is to hide the knetattach launcher in the view, and show
+ it inline with Dolphin's URL navigator toolbar when viewing the
+ remote:// view, just like how we add an "Empty Trash" button when
+ viewing trash://.
+
+The backport ensures that even with frameworks << 5.78 only one network
+button is shown.
+
+BUG: 431626
+---
+ src/dolphinnavigatorswidgetaction.cpp | 61 +++++++++++++++++++++++++++
+ src/dolphinnavigatorswidgetaction.h | 20 ++++++++-
+ 2 files changed, 80 insertions(+), 1 deletion(-)
+
+diff --git a/src/dolphinnavigatorswidgetaction.cpp b/src/dolphinnavigatorswidgetaction.cpp
+index b8c77c69b..b25c60d0c 100644
+--- a/src/dolphinnavigatorswidgetaction.cpp
++++ b/src/dolphinnavigatorswidgetaction.cpp
+@@ -10,9 +10,13 @@
+ #include "trash/dolphintrash.h"
+
+ #include <KLocalizedString>
++#include <KNotificationJobUiDelegate>
++#include <KService>
+ #include <KXMLGUIFactory>
+ #include <KXmlGuiWindow>
+
++#include <KIO/ApplicationLauncherJob>
++
+ #include <QApplication>
+ #include <QDomDocument>
+ #include <QHBoxLayout>
+@@ -154,7 +158,13 @@ void DolphinNavigatorsWidgetAction::adjustSpacing()
+ }
+ int trailingSpacing = (m_globalXOfSplitter + m_splitter->width())
+ - (m_globalXOfPrimary + m_widthOfPrimary);
++#if KIO_VERSION < QT_VERSION_CHECK(5, 78, 0)
+ if (trailingSpacing < 0 || emptyTrashButton(Primary)->isVisible()) {
++#else
++ if (trailingSpacing < 0 || emptyTrashButton(Primary)->isVisible()
++ || networkFolderButton(Primary)->isVisible()
++ ) {
++#endif
+ trailingSpacing = 0;
+ }
+ const int widthLeftForUrlNavigator = m_splitter->widget(0)->width() - leadingSpacing - trailingSpacing;
+@@ -181,7 +191,13 @@ void DolphinNavigatorsWidgetAction::adjustSpacing()
+
+ trailingSpacing = (m_globalXOfSplitter + m_splitter->width())
+ - (m_globalXOfSecondary + m_widthOfSecondary);
++#if KIO_VERSION < QT_VERSION_CHECK(5, 78, 0)
+ if (trailingSpacing < 0 || emptyTrashButton(Secondary)->isVisible()) {
++#else
++ if (trailingSpacing < 0 || emptyTrashButton(Secondary)->isVisible()
++ || networkFolderButton(Secondary)->isVisible()
++ ) {
++#endif
+ trailingSpacing = 0;
+ } else {
+ const int widthLeftForUrlNavigator2 = m_splitter->widget(1)->width() - trailingSpacing;
+@@ -212,6 +228,11 @@ QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const
+ auto emptyTrashButton = newEmptyTrashButton(urlNavigator, navigatorWidget);
+ layout->addWidget(emptyTrashButton);
+
++#if !(KIO_VERSION < QT_VERSION_CHECK(5, 78, 0))
++ auto networkFolderButton = newNetworkFolderButton(urlNavigator, navigatorWidget);
++ layout->addWidget(networkFolderButton);
++#endif
++
+ connect(urlNavigator, &KUrlNavigator::urlChanged, this, [this]() {
+ // We have to wait for DolphinUrlNavigator::sizeHint() to update which
+ // happens a little bit later than when urlChanged is emitted.
+@@ -249,6 +270,38 @@ QPushButton *DolphinNavigatorsWidgetAction::newEmptyTrashButton(const DolphinUrl
+ return emptyTrashButton;
+ }
+
++#if !(KIO_VERSION < QT_VERSION_CHECK(5, 78, 0))
++QPushButton *DolphinNavigatorsWidgetAction::networkFolderButton(DolphinNavigatorsWidgetAction::Side side)
++{
++ int sideIndex = (side == Primary ? 0 : 1);
++ if (side == Primary) {
++ return static_cast<QPushButton *>(m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget());
++ }
++ return static_cast<QPushButton *>(m_splitter->widget(sideIndex)->layout()->itemAt(2)->widget());
++}
++
++QPushButton *DolphinNavigatorsWidgetAction::newNetworkFolderButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const
++{
++ auto networkFolderButton = new QPushButton(QIcon::fromTheme(QStringLiteral("folder-add")),
++ i18nc("@action:button", "Add Network Folder"), parent);
++ networkFolderButton->setFlat(true);
++ connect(networkFolderButton, &QPushButton::clicked,
++ this, [networkFolderButton]() {
++ KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("org.kde.knetattach"));
++ auto *job = new KIO::ApplicationLauncherJob(service, networkFolderButton);
++ auto *delegate = new KNotificationJobUiDelegate;
++ delegate->setAutoErrorHandlingEnabled(true);
++ job->setUiDelegate(delegate);
++ job->start();
++ });
++ networkFolderButton->hide();
++ connect(urlNavigator, &KUrlNavigator::urlChanged, this, [networkFolderButton, urlNavigator]() {
++ networkFolderButton->setVisible(urlNavigator->locationUrl().scheme() == QLatin1String("remote"));
++ });
++ return networkFolderButton;
++}
++#endif
++
+ QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) const
+ {
+ int sideIndex = (side == Primary ? 0 : 1);
+@@ -257,9 +310,17 @@ QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) co
+ return m_splitter->widget(sideIndex)->layout()->itemAt(0)->widget();
+ }
+ if (side == Primary) {
++#if KIO_VERSION < QT_VERSION_CHECK(5, 78, 0)
+ return m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget();
++#else
++ return m_splitter->widget(sideIndex)->layout()->itemAt(4)->widget();
++#endif
+ }
++#if KIO_VERSION < QT_VERSION_CHECK(5, 78, 0)
+ return m_splitter->widget(sideIndex)->layout()->itemAt(2)->widget();
++#else
++ return m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget();
++#endif
+ }
+
+ void DolphinNavigatorsWidgetAction::updateText()
+diff --git a/src/dolphinnavigatorswidgetaction.h b/src/dolphinnavigatorswidgetaction.h
+index bbd8cf127..ce199b3f0 100644
+--- a/src/dolphinnavigatorswidgetaction.h
++++ b/src/dolphinnavigatorswidgetaction.h
+@@ -10,6 +10,7 @@
+
+ #include "dolphinurlnavigator.h"
+
++#include <kio_version.h>
+ #include <QSplitter>
+ #include <QTimer>
+ #include <QWidgetAction>
+@@ -30,7 +31,8 @@ class QPushButton;
+ * The secondary side only exists for split view and is created by
+ * createSecondaryUrlNavigator() when necessary.
+ * - Each side is a QWidget which I call NavigatorWidget with a QHBoxLayout.
+- * - Each NavigatorWidget consists an UrlNavigator, an emptyTrashButton and spacing.
++ * - Each NavigatorWidget consists an UrlNavigator, an emptyTrashButton, a
++ * networkFolderButton (for frameworks >= 5.78), and spacing.
+ * - Only the primary navigatorWidget has leading spacing. Both have trailing spacing.
+ * The spacing is there to align the UrlNavigator with its DolphinViewContainer.
+ */
+@@ -131,6 +133,22 @@ private:
+ */
+ QPushButton *newEmptyTrashButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const;
+
++#if !(KIO_VERSION < QT_VERSION_CHECK(5, 78, 0))
++ /**
++ * Used to retrieve the networkFolderButtons for the navigatorWidgets on
++ * both sides.
++ */
++ QPushButton *networkFolderButton(Side side);
++
++ /**
++ * Creates a new add "network folder" button.
++ * @param urlNavigator Only when this UrlNavigator shows the remote directory
++ * will the button be visible.
++ * @param parent The object that should be the button's parent.
++ */
++ QPushButton *newNetworkFolderButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const;
++#endif
++
+ enum Position {
+ Leading,
+ Trailing
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2020-04-09 21:37 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 99ec5f37f59f0c3d5077988b765d2b93896c6c73
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 7 22:30:22 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 21:36:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ec5f37
kde-apps/dolphin: Fix crashes with Qt 5.14.2
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin/dolphin-19.12.3-r1.ebuild | 102 +++++++++++++++++++++
.../dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch | 22 +++++
2 files changed, 124 insertions(+)
diff --git a/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild b/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild
new file mode 100644
index 00000000000..4f5ca6b530c
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild
@@ -0,0 +1,102 @@
+# 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.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin
+https://userbase.kde.org/Dolphin"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="activities semantic-desktop"
+
+DEPEND="
+ >=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
+ >=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
+ media-libs/phonon[qt5(+)]
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+ semantic-desktop? (
+ >=kde-frameworks/baloo-${KFMIN}:5
+ >=kde-frameworks/kfilemetadata-${KFMIN}:5
+ >=kde-apps/baloo-widgets-${PVCUT}:5
+ )
+"
+RDEPEND="${DEPEND}
+ >=kde-apps/kio-extras-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-19.12.2-create-new-consistency.patch" # from 20.04
+ "${FILESDIR}/${P}-fix-crash-w-qt-5.14.2.patch" # KDE-Bug 419585
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(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)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ has_version "kde-apps/ark:${SLOT}" || \
+ elog "For compress/extract and other actions install kde-apps/ark:${SLOT}"
+
+ has_version "kde-apps/kleopatra:${SLOT}" || \
+ elog "For crypto actions install kde-apps/kleopatra:${SLOT}"
+
+ has_version "kde-apps/ffmpegthumbs:${SLOT}" || \
+ elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}"
+
+ has_version "kde-apps/thumbnailers:${SLOT}" || \
+ elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}"
+
+ has_version "kde-frameworks/purpose:${SLOT}" || \
+ elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}"
+ fi
+}
diff --git a/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch b/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch
new file mode 100644
index 00000000000..3e5245001bb
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch
@@ -0,0 +1,22 @@
+diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
+--- a/src/kitemviews/kfileitemmodel.cpp
++++ b/src/kitemviews/kfileitemmodel.cpp
+@@ -33,6 +33,9 @@
+ #include <QMimeData>
+ #include <QTimer>
+ #include <QWidget>
++#include <QMutex>
++
++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_collatorMutex, (QMutex::Recursive))
+
+ // #define KFILEITEMMODEL_DEBUG
+
+@@ -1878,6 +1881,8 @@
+
+ int KFileItemModel::stringCompare(const QString& a, const QString& b, const QCollator& collator) const
+ {
++ QMutexLocker collatorLock(s_collatorMutex());
++
+ if (m_naturalSorting) {
+ return collator.compare(a, b);
+ }
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2018-11-18 0:17 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2018-11-18 0:17 UTC (permalink / raw
To: gentoo-commits
commit: c49e785e16c43104a9b2e8c2f7df3eaf35c6c57a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 23:47:36 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 00:16:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49e785e
kde-apps/dolphin: Move kcrash link to dolphin app
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin/dolphin-18.08.3.ebuild | 2 +
.../files/dolphin-18.08.3-kcrash-init.patch | 56 ++++++++++++++++++++++
2 files changed, 58 insertions(+)
diff --git a/kde-apps/dolphin/dolphin-18.08.3.ebuild b/kde-apps/dolphin/dolphin-18.08.3.ebuild
index 47da3a35d62..e38021b2487 100644
--- a/kde-apps/dolphin/dolphin-18.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-18.08.3.ebuild
@@ -62,6 +62,8 @@ RDEPEND="${DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-kcrash-init.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
diff --git a/kde-apps/dolphin/files/dolphin-18.08.3-kcrash-init.patch b/kde-apps/dolphin/files/dolphin-18.08.3-kcrash-init.patch
new file mode 100644
index 00000000000..cb7923534c3
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-18.08.3-kcrash-init.patch
@@ -0,0 +1,56 @@
+From a4cddf7517dab5f666f1c1ede2a58900f3bc5e53 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Thu, 15 Nov 2018 14:43:57 +0100
+Subject: move kcrash link to dolphin app (which is the effective user)
+
+Summary:
+to successfully use kcrash when linking with as-needed (which is a default
+flag on many linux distros) one also needs to call KCrash::initialize.
+this call happens in the app's main.cpp. as such the kcrash link target
+on the dolphinprivate library doesn't do anything for dolphinprivate but
+only kicks into action for dolphin itself.
+to avoid confusion and make it clear that kcrash is only initialized in the
+application scope the KF5::Crash link target is now on the application
+target, not the library target.
+
+(this makes no difference in the output, kcrash was still correctly linked
+ via dolphinprivate; but only for kdeinit_dolphin, dolphinprivate did
+ not get linked to it with as-needed)
+
+Test Plan: builds; links as expected
+
+Reviewers: elvisangelaccio, #dolphin
+
+Reviewed By: elvisangelaccio, #dolphin
+
+Subscribers: kfm-devel
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D16896
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4a1f173..d5206be 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -136,7 +136,6 @@ target_link_libraries(
+ dolphinvcs
+ Qt5::Concurrent
+ Qt5::Gui
+- KF5::Crash
+ KF5::I18n
+ KF5::IconThemes
+ KF5::KIOCore
+@@ -301,6 +300,7 @@ kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
+ target_link_libraries(kdeinit_dolphin PRIVATE
+ dolphinstatic
+ dolphinprivate
++ KF5::Crash
+ )
+
+ include(DbusInterfaceMacros)
+--
+cgit v0.11.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
@ 2015-09-26 15:56 Michael Palimaka
0 siblings, 0 replies; 10+ messages in thread
From: Michael Palimaka @ 2015-09-26 15:56 UTC (permalink / raw
To: gentoo-commits
commit: a5fa7a7db833f23eddd20837a381147446156a50
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 15:55:42 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 15:56:27 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5fa7a7d
kde-apps/dolphin: version bump
Package-Manager: portage-2.2.20.1
kde-apps/dolphin/Manifest | 1 +
kde-apps/dolphin/dolphin-15.08.1.ebuild | 90 ++++++++++++++++++++++
.../files/dolphin-15.08.1-kactivities.patch | 29 +++++++
3 files changed, 120 insertions(+)
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 08f6847..b8a05dc 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,2 +1,3 @@
DIST dolphin-15.08.0.tar.xz 656524 SHA256 7ac16d7150b7c5e1d6350cf679981d675c995303a7f68eab1290763d3fd35ad9 SHA512 485f5a888ef5f68014c9c33b8a0f63a0d9b20a65098b026714b1b7cf831751bf382430296ef43861d4259bb73f84251353855c60ca096acdb384d1947e8fed57 WHIRLPOOL 3a207189700c11287b2286b5dc017beea4040279849079b5d86a9ce7464023d19d6ba55818ce0a11f609242f01f19a2936ec626a211352944f848dd8646a224c
+DIST dolphin-15.08.1.tar.xz 656544 SHA256 5a5e895a1ccd6e423af2a349572658c34469102305c4d6469b047bbf3e29b926 SHA512 7b97028ff06a0117b93b5ea2035bda164cad2af85c9bc53cbf704cf6551d5191f4da08531fab180558d98dfdc37b46d99cb402becbf82d7263e87bc78287c54e WHIRLPOOL 6b6a7183ace01bc31a846e9dfcb2d75184ea8d158534ec31ce9ac96e494954c84d65a303a5c60fab5b3473086aeed1bb734ee5c04ba0e32be77b2ca53f067297
DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/dolphin/dolphin-15.08.1.ebuild b/kde-apps/dolphin/dolphin-15.08.1.ebuild
new file mode 100644
index 0000000..5db5984
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-15.08.1.ebuild
@@ -0,0 +1,90 @@
+# 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"
+ "${FILESDIR}/${PN}-15.08.1-kactivities.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.1-kactivities.patch b/kde-apps/dolphin/files/dolphin-15.08.1-kactivities.patch
new file mode 100644
index 0000000..08cce3e
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-15.08.1-kactivities.patch
@@ -0,0 +1,29 @@
+From 6e218c4c146c08626c6bf4c87e9849a9de7462c4 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sat, 26 Sep 2015 05:34:26 +1000
+Subject: [PATCH] Fix KF5Activities being optional.
+
+If found via find_package(KF5 COMPONENTS Activities) instead, it will
+inherit REQUIRED from the previous call.
+
+REVIEW: 125360
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d98f261..d926e9f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,7 +66,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ WindowSystem
+ Notifications
+ )
+-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS
++find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
+ Activities
+ )
+
+--
+2.4.9
+
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-02-22 10:09 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-15 13:43 [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-02-22 10:09 Andreas Sturmlechner
2022-12-14 20:01 Andreas Sturmlechner
2022-02-06 21:17 Andreas Sturmlechner
2021-05-12 8:12 Andreas Sturmlechner
2021-04-04 13:23 Andreas Sturmlechner
2021-01-23 0:25 Andreas Sturmlechner
2020-04-09 21:37 Andreas Sturmlechner
2018-11-18 0:17 Andreas Sturmlechner
2015-09-26 15:56 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox