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

2021-05-12 Thread Andreas Sturmlechner 
commit: be5ea480b3dc94ebd1bc48da1b21bcf4dd60337d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 12 07:42:48 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 12 07:49:05 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=be5ea480

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  gentoo.org>

 kde-apps/dolphin/dolphin-21.04.1.ebuild|  4 +--
 kde-apps/dolphin/dolphin-21.04.49..ebuild  |  4 +--
 kde-apps/dolphin/dolphin-.ebuild   |  6 ++--
 .../dolphin-21.04.0-fix-no-semantic-desktop.patch  | 23 
 .../dolphin-21.04.1-fix-no-semantic-desktop.patch  | 41 ++
 5 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/kde-apps/dolphin/dolphin-21.04.1.ebuild 
b/kde-apps/dolphin/dolphin-21.04.1.ebuild
index 642d4e5739..c23404 100644
--- a/kde-apps/dolphin/dolphin-21.04.1.ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.1.ebuild
@@ -62,8 +62,8 @@ RDEPEND="${DEPEND}
>=kde-apps/kio-extras-${PVCUT}:5
 "
 
-# TODO: Downstream hack, track upstream bug for better solution
-PATCHES=( "${FILESDIR}/${PN}-21.04.0-fix-no-semantic-desktop.patch" ) # 
KDE-bug 435586
+# pending https://invent.kde.org/system/dolphin/-/merge_requests/208
+PATCHES=( "${FILESDIR}/${P}-fix-no-semantic-desktop.patch" ) # KDE-bug 435586
 
 src_configure() {
local mycmakeargs=(

diff --git a/kde-apps/dolphin/dolphin-21.04.49..ebuild 
b/kde-apps/dolphin/dolphin-21.04.49..ebuild
index 10e34f4c6d..7198ee2405 100644
--- a/kde-apps/dolphin/dolphin-21.04.49..ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.49..ebuild
@@ -62,8 +62,8 @@ RDEPEND="${DEPEND}
>=kde-apps/kio-extras-${PVCUT}:5
 "
 
-# TODO: Downstream hack, track upstream bug for better solution
-PATCHES=( "${FILESDIR}/${PN}-21.04.0-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/dolphin-.ebuild 
b/kde-apps/dolphin/dolphin-.ebuild
index 530de3cad0..b043a6542c 100644
--- a/kde-apps/dolphin/dolphin-.ebuild
+++ b/kde-apps/dolphin/dolphin-.ebuild
@@ -61,10 +61,8 @@ RDEPEND="${DEPEND}
>=kde-apps/kio-extras-${PVCUT}:5
 "
 
-PATCHES=(
-   # 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
+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 4f97a53c52..00
--- 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 
-+
- #include 
- 
- #include 
-@@ -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 00..5636d0532e
--- /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 
+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 
++#include 
+ 
+ #include 
+ #include 
+@@ -245,7 +246,9 @@ void

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

2020-04-13 Thread Andreas Sturmlechner 
commit: dbcb9000f3f5121b80ac708093657d1cc4ddc84a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr  7 22:30:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 13 09:00:43 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dbcb9000

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  gentoo.org>

 kde-apps/dolphin/dolphin-20.03.90.ebuild   |  2 ++
 .../dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch| 22 ++
 2 files changed, 24 insertions(+)

diff --git a/kde-apps/dolphin/dolphin-20.03.90.ebuild 
b/kde-apps/dolphin/dolphin-20.03.90.ebuild
index 6fb1850a83..98d4125d54 100644
--- a/kde-apps/dolphin/dolphin-20.03.90.ebuild
+++ b/kde-apps/dolphin/dolphin-20.03.90.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-fix-crash-w-qt-5.14.2.patch" ) # KDE-Bug 
419585
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)

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 00..3e5245001b
--- /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 
+ #include 
+ #include 
++#include 
++
++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);
+ }

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

2020-02-16 Thread Andreas Sturmlechner 
commit: 14ad5ba5144b7e65ddc23b4937f4750f4208f8a4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 15 10:46:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 16 10:39:01 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=14ad5ba5

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  gentoo.org>

 kde-apps/dolphin/dolphin-19.12.49..ebuild  |  2 +
 .../dolphin-19.12.2-create-new-consistency.patch   | 66 ++
 2 files changed, 68 insertions(+)

diff --git a/kde-apps/dolphin/dolphin-19.12.49..ebuild 
b/kde-apps/dolphin/dolphin-19.12.49..ebuild
index 8a084b3308..b4f9610954 100644
--- a/kde-apps/dolphin/dolphin-19.12.49..ebuild
+++ b/kde-apps/dolphin/dolphin-19.12.49..ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-19.12.2-create-new-consistency.patch" ) # from 
20.04
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)

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 00..dc70220d95
--- /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 
+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() << 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

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

2019-12-09 Thread Andreas Sturmlechner 
commit: 3eeebe2e17fed72ecdbadee24591e0c73bf06406
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 10 00:08:57 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 10 00:08:57 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3eeebe2e

kde-apps/dolphin: Drop obsolete patch

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/dolphin/dolphin-19.12.0.ebuild|  2 -
 .../dolphin/files/dolphin-19.12.0-qt-5.14.patch| 81 --
 2 files changed, 83 deletions(-)

diff --git a/kde-apps/dolphin/dolphin-19.12.0.ebuild 
b/kde-apps/dolphin/dolphin-19.12.0.ebuild
index 1b4b3ad99a..fcaf127a47 100644
--- a/kde-apps/dolphin/dolphin-19.12.0.ebuild
+++ b/kde-apps/dolphin/dolphin-19.12.0.ebuild
@@ -64,8 +64,6 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch ) # not yet upstream
-
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)

diff --git a/kde-apps/dolphin/files/dolphin-19.12.0-qt-5.14.patch 
b/kde-apps/dolphin/files/dolphin-19.12.0-qt-5.14.patch
deleted file mode 100644
index 02ad279aeb..00
--- a/kde-apps/dolphin/files/dolphin-19.12.0-qt-5.14.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/src/global.h b/src/global.h
 a/src/global.h
-+++ b/src/global.h
-@@ -22,6 +22,7 @@
- 
- #include 
- #include 
-+#include 
- 
- namespace Dolphin {
- QList validateUris(const QStringList& uriList);
-diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h
 a/src/kitemviews/kstandarditem.h
-+++ b/src/kitemviews/kstandarditem.h
-@@ -25,6 +25,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- class KStandardItemModel;
-diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
 a/src/search/dolphinsearchbox.cpp
-+++ b/src/search/dolphinsearchbox.cpp
-@@ -39,9 +39,11 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-diff --git a/src/settings/dolphinsettingsdialog.cpp 
b/src/settings/dolphinsettingsdialog.cpp
 a/src/settings/dolphinsettingsdialog.cpp
-+++ b/src/settings/dolphinsettingsdialog.cpp
-@@ -34,6 +34,7 @@
- #include 
- #include 
- 
-+#include 
- #include 
- 
- DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* 
parent) :
-diff --git a/src/settings/general/previewssettingspage.cpp 
b/src/settings/general/previewssettingspage.cpp
 a/src/settings/general/previewssettingspage.cpp
-+++ b/src/settings/general/previewssettingspage.cpp
-@@ -32,6 +32,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- 
-diff --git a/src/settings/services/servicessettingspage.cpp 
b/src/settings/services/servicessettingspage.cpp
 a/src/settings/services/servicessettingspage.cpp
-+++ b/src/settings/services/servicessettingspage.cpp
-@@ -36,6 +36,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- namespace
-diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
 a/src/views/draganddrophelper.cpp
-+++ b/src/views/draganddrophelper.cpp
-@@ -25,6 +25,7 @@
- 
- #include 
- #include 
-+#include 
- #include 
- 
- QHash DragAndDropHelper::m_urlListMatchesUrlCache;

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

2018-05-24 Thread Andreas Sturmlechner 
commit: 6fb468f93e623f98f94d4c7585b8228133876187
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 24 15:30:12 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 24 15:30:12 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fb468f9

kde-apps/dolphin: Fix build with -flto

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 kde-apps/dolphin/dolphin-18.04.49..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.49..ebuild 
b/kde-apps/dolphin/dolphin-18.04.49..ebuild
index 71ed7edb10..4c25caa413 100644
--- a/kde-apps/dolphin/dolphin-18.04.49..ebuild
+++ b/kde-apps/dolphin/dolphin-18.04.49..ebuild
@@ -62,6 +62,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-18.04.1-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 00..8edef6b360
--- /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 
+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()':
+:(.text+0x2583): undefined reference to `vtable for DBusInterface'
+.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
+:(.text+0x5aa3): undefined reference to `vtable for DBusInterface'
+.../ccHEv6cl.ltrans0.ltrans.o: In function `kdemain':
+:(.text+0x7686): undefined reference to 
`DBusInterface::DBusInterface()'
+:(.text+0x7b64): undefined reference to `vtable for DBusInterface'
+collect2: error: ld returned 1 exit status
+
+See also .
+
+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 
+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] proj/kde:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/

2015-08-27 Thread Michael Palimaka 
commit: 0d1e5903c0fc404a9d7a78aa98353b716c5dfbf2
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Aug 27 10:36:48 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Aug 27 10:37:59 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d1e5903

kde-apps/dolphin: backport patch from upstream to fix bogus deps.

Package-Manager: portage-2.2.20.1

 kde-apps/dolphin/dolphin-15.08.0.ebuild   |  2 +
 kde-apps/dolphin/dolphin-15.08.49..ebuild |  2 +
 kde-apps/dolphin/files/dolphin-15.08.0-deps.patch | 48 +++
 3 files changed, 52 insertions(+)

diff --git a/kde-apps/dolphin/dolphin-15.08.0.ebuild 
b/kde-apps/dolphin/dolphin-15.08.0.ebuild
index 6dabf46..a00333c 100644
--- a/kde-apps/dolphin/dolphin-15.08.0.ebuild
+++ b/kde-apps/dolphin/dolphin-15.08.0.ebuild
@@ -64,6 +64,8 @@ RDEPEND=${DEPEND}
 
 RESTRICT=test
 
+PATCHES=( ${FILESDIR}/${PN}-15.08.0-deps.patch )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with semantic-desktop KF5Baloo)

diff --git a/kde-apps/dolphin/dolphin-15.08.49..ebuild 
b/kde-apps/dolphin/dolphin-15.08.49..ebuild
index 0e90513..0e8c7c7 100644
--- a/kde-apps/dolphin/dolphin-15.08.49..ebuild
+++ b/kde-apps/dolphin/dolphin-15.08.49..ebuild
@@ -64,6 +64,8 @@ RDEPEND=${DEPEND}
 
 RESTRICT=test
 
+PATCHES=( ${FILESDIR}/${PN}-15.08.0-deps.patch )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with semantic-desktop KF5Baloo)

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 000..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 kensing...@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] proj/kde:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/

2015-02-17 Thread Johannes Huber 
commit: cb7d6c357130507c198001d19f578cc905f8852d
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Wed Feb 18 00:45:09 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Feb 18 06:37:26 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cb7d6c35

[kde-apps/dolphin] Tests optional patch upstreamed

Block by eclass, s/KDE/Plasma/

Package-Manager: portage-2.2.17

---
 kde-apps/dolphin/dolphin-5..ebuild |  5 +
 kde-apps/dolphin/files/dolphin-5.-tests-optional.patch | 11 ---
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/kde-apps/dolphin/dolphin-5..ebuild 
b/kde-apps/dolphin/dolphin-5..ebuild
index 2953627..3700424 100644
--- a/kde-apps/dolphin/dolphin-5..ebuild
+++ b/kde-apps/dolphin/dolphin-5..ebuild
@@ -11,7 +11,7 @@ KDE_TEST=true
 VIRTUALX_REQUIRED=test
 inherit kde5
 
-DESCRIPTION=KDE filemanager focusing on usability
+DESCRIPTION=Plasma filemanager focusing on usability
 HOMEPAGE=http://dolphin.kde.org 
http://www.kde.org/applications/system/dolphin;
 KEYWORDS=
 IUSE=semantic-desktop
@@ -53,11 +53,8 @@ DEPEND=
 
 RDEPEND=${DEPEND}
$(add_plasma_dep kio-extras)
-   !kde-base/dolphin:4
 
 
-PATCHES=( ${FILESDIR}/${PN}-5.-tests-optional.patch )
-
 S=${S}/${PN}
 
 src_configure() {

diff --git a/kde-apps/dolphin/files/dolphin-5.-tests-optional.patch 
b/kde-apps/dolphin/files/dolphin-5.-tests-optional.patch
deleted file mode 100644
index 43aa648..000
--- a/kde-apps/dolphin/files/dolphin-5.-tests-optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/src/CMakeLists.txt   2015-01-19 02:45:45.207037408 +0100
-+++ b/src/CMakeLists.txt   2015-01-19 02:52:38.558025089 +0100
-@@ -334,4 +334,7 @@
- install( PROGRAMS settings/services/servicemenuinstallation DESTINATION 
${BIN_INSTALL_DIR} )
- install( PROGRAMS settings/services/servicemenudeinstallation DESTINATION 
${BIN_INSTALL_DIR} )
- 
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+add_subdirectory(tests)
-+endif()

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

2015-01-19 Thread Johannes Huber 
commit: 8440fac77cf5050fe3a85e903a52f46afa6a1d40
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Mon Jan 19 02:13:11 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Jan 19 21:56:19 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8440fac7

[kde-apps/dolphin] Make tests optional

---
 kde-apps/dolphin/dolphin-5..ebuild |  6 +-
 kde-apps/dolphin/files/dolphin-5.-tests-optional.patch | 11 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/kde-apps/dolphin/dolphin-5..ebuild 
b/kde-apps/dolphin/dolphin-5..ebuild
index ce3acdb..05564bd 100644
--- a/kde-apps/dolphin/dolphin-5..ebuild
+++ b/kde-apps/dolphin/dolphin-5..ebuild
@@ -6,7 +6,9 @@ EAPI=5
 
 EGIT_BRANCH=frameworks
 KMNAME=kde-baseapps
-KDE_HANDBOOK=true
+KDE_HANDBOOK=true
+KDE_TEST=true
+VIRTUALX_REQUIRED=test
 inherit kde5
 
 DESCRIPTION=KDE filemanager focusing on usability
@@ -53,6 +55,8 @@ RDEPEND=${DEPEND}
!kde-base/dolphin:4
 
 
+PATCHES=( ${FILESDIR}/${PN}-5.-tests-optional.patch )
+
 S=${S}/${PN}
 
 src_configure() {

diff --git a/kde-apps/dolphin/files/dolphin-5.-tests-optional.patch 
b/kde-apps/dolphin/files/dolphin-5.-tests-optional.patch
new file mode 100644
index 000..43aa648
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-5.-tests-optional.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt   2015-01-19 02:45:45.207037408 +0100
 b/src/CMakeLists.txt   2015-01-19 02:52:38.558025089 +0100
+@@ -334,4 +334,7 @@
+ install( PROGRAMS settings/services/servicemenuinstallation DESTINATION 
${BIN_INSTALL_DIR} )
+ install( PROGRAMS settings/services/servicemenudeinstallation DESTINATION 
${BIN_INSTALL_DIR} )
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++add_subdirectory(tests)
++endif()