public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2015-02-12 22:39 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2015-02-12 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     09ece6632aeff85eb016bb405fabed193d26c809
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 12 22:16:24 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Feb 12 22:18:10 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=09ece663

[kde-plasma/plasma-workspace] Depend on kde-frameworks/kxmlrpcclient

...and fix tests-optional patch.

Package-Manager: portage-2.2.17

---
 .../files/plasma-workspace-9999-tests-optional.patch      | 15 ---------------
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild  |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
index 79285e5..11606f7 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
@@ -9,18 +9,3 @@
  find_package(ECM 0.0.11 REQUIRED NO_MODULE)
  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
  
---- a/drkonqi/internalkxmlrpcclient/CMakeLists.txt	2015-01-20 23:55:55.857657633 +0100
-+++ b/drkonqi/internalkxmlrpcclient/CMakeLists.txt	2015-01-21 00:05:27.684341452 +0100
-@@ -33,7 +33,11 @@
- 
- ########### Targets ###########
- add_subdirectory(src)
--add_subdirectory(autotests)
-+
-+if(BUILD_TESTING)
-+  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+  add_subdirectory(autotests)
-+endif()
- 
- ########### CMake Config Files ###########
- set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5XmlRpcClientPrivate")

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 4f3bdea..8dff4dc 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -53,6 +53,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kxmlrpcclient)
 	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep solid)
 	dev-libs/wayland


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2015-05-31 21:03 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2015-05-31 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b2c85440d75bc57661830a76b9d75634fa2a4258
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 21:01:45 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 31 21:01:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b2c85440

[kde-plasma/plasma-workspace] Rename patch

Package-Manager: portage-2.2.20

 ...-9999-tests-optional.patch => plasma-workspace-tests-optional.patch} | 0
 kde-plasma/plasma-workspace/plasma-workspace-5.3.1.ebuild               | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild         | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild                | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch
similarity index 100%
rename from kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
rename to kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.1.ebuild
index 4c7130b..fc1abc8 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.1.ebuild
@@ -129,7 +129,7 @@ RESTRICT="test"
 
 src_prepare() {
 	# whole patch should be upstreamed, doesn't work in PATCHES
-	epatch "${FILESDIR}/${PN}-9999-tests-optional.patch"
+	epatch "${FILESDIR}/${PN}-tests-optional.patch"
 
 	kde5_src_prepare
 

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild
index 5997f83..c05b182 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild
@@ -129,7 +129,7 @@ RESTRICT="test"
 
 src_prepare() {
 	# whole patch should be upstreamed, doesn't work in PATCHES
-	epatch "${FILESDIR}/${PN}-9999-tests-optional.patch"
+	epatch "${FILESDIR}/${PN}-tests-optional.patch"
 
 	kde5_src_prepare
 

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 77bdc92..329e224 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -128,7 +128,7 @@ RESTRICT="test"
 
 src_prepare() {
 	# whole patch should be upstreamed, doesn't work in PATCHES
-	epatch "${FILESDIR}/${PN}-9999-tests-optional.patch"
+	epatch "${FILESDIR}/${PN}-tests-optional.patch"
 
 	kde5_src_prepare
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2015-11-26 16:06 Michael Palimaka
  0 siblings, 0 replies; 15+ messages in thread
From: Michael Palimaka @ 2015-11-26 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     2b17a8c3045a236a3931d59ac9cddd03ae72bc2b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Nov 23 19:46:42 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 16:06:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b17a8c3

kde-plasma/plasma-workspace: Block dev-libs/xembed-sni-proxy

Fixes bug 566354

Package-Manager: portage-2.2.25

 .../files/plasma-workspace-5.4-consolekit2.patch   | 189 ---------------------
 .../files/plasma-workspace-5.4.3-fix-drkonqi.patch |  32 ----
 .../plasma-workspace-5.4.95.ebuild                 |   1 +
 .../plasma-workspace-5.5.49.9999.ebuild            |   1 +
 .../plasma-workspace/plasma-workspace-9999.ebuild  |   1 +
 5 files changed, 3 insertions(+), 221 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch
deleted file mode 100644
index 6131c90..0000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Wed, 12 Aug 2015 08:33:39 +0000
-Subject: ConsoleKit2 support for screenlocker
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=72578284a1fda5f012cafcaccad6069fadbf9a25
----
-ConsoleKit2 support for screenlocker
-
-ConsoleKit2 has the same API as systemd-logind for Lock, Unlock,
-PrepareForSleep, and Inhibit. This patch adds the functionality
-for ConsoleKit2 while attempting to minimize code duplication.
-
-REVIEW: 124469
----
-
-
---- a/ksmserver/screenlocker/logind.cpp
-+++ b/ksmserver/screenlocker/logind.cpp
-@@ -25,13 +25,17 @@
- #include <QDebug>
- #include <QDBusConnection>
- #include <QDBusConnectionInterface>
--#include <QDBusPendingCallWatcher>
- #include <QDBusServiceWatcher>
- 
- const static QString s_login1Service = QStringLiteral("org.freedesktop.login1");
- const static QString s_login1Path = QStringLiteral("/org/freedesktop/login1");
- const static QString s_login1ManagerInterface = QStringLiteral("org.freedesktop.login1.Manager");
- const static QString s_login1SessionInterface = QStringLiteral("org.freedesktop.login1.Session");
-+
-+const static QString s_consolekitService = QStringLiteral("org.freedesktop.ConsoleKit");
-+const static QString s_consolekitPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
-+const static QString s_consolekitManagerInterface = QStringLiteral("org.freedesktop.ConsoleKit.Manager");
-+const static QString s_consolekitSessionInterface = QStringLiteral("org.freedesktop.ConsoleKit.Session");
- 
- LogindIntegration::LogindIntegration(const QDBusConnection &connection, QObject *parent)
-     : QObject(parent)
-@@ -42,6 +46,10 @@
-                                                      this))
-     , m_connected(false)
-     , m_inhibitFileDescriptor()
-+    , m_service(nullptr)
-+    , m_path(nullptr)
-+    , m_managerInterface(nullptr)
-+    , m_sessionInterface(nullptr)
- {
-     connect(m_logindServiceWatcher, &QDBusServiceWatcher::serviceRegistered, this, &LogindIntegration::logindServiceRegistered);
-     connect(m_logindServiceWatcher, &QDBusServiceWatcher::serviceUnregistered, this,
-@@ -67,6 +75,11 @@
-             }
-             if (reply.value().contains(s_login1Service)) {
-                 logindServiceRegistered();
-+                // Don't register ck if we have logind
-+                return;
-+            }
-+            if (reply.value().contains(s_consolekitService)) {
-+                consolekitServiceRegistered();
-             }
-         }
-     );
-@@ -89,6 +102,40 @@
-     message.setArguments(QVariantList() << (quint32) QCoreApplication::applicationPid());
-     QDBusPendingReply<QDBusObjectPath> session = m_bus.asyncCall(message);
-     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(session, this);
-+
-+    m_service = &s_login1Service;
-+    m_path = &s_login1Path;
-+    m_managerInterface = &s_login1ManagerInterface;
-+    m_sessionInterface = &s_login1SessionInterface;
-+
-+    commonServiceRegistered(watcher);
-+}
-+
-+void LogindIntegration::consolekitServiceRegistered()
-+{
-+    // Don't try to register with ck if we have logind
-+    if (m_connected) {
-+        return;
-+    }
-+
-+    // get the current session
-+    QDBusMessage message = QDBusMessage::createMethodCall(s_consolekitService,
-+                                                          s_consolekitPath,
-+                                                          s_consolekitManagerInterface,
-+                                                          QStringLiteral("GetCurrentSession"));
-+    QDBusPendingReply<QDBusObjectPath> session = m_bus.asyncCall(message);
-+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(session, this);
-+
-+    m_service = &s_consolekitService;
-+    m_path = &s_consolekitPath;
-+    m_managerInterface = &s_consolekitManagerInterface;
-+    m_sessionInterface = &s_consolekitSessionInterface;
-+
-+    commonServiceRegistered(watcher);
-+}
-+
-+void LogindIntegration::commonServiceRegistered(QDBusPendingCallWatcher *watcher)
-+{
-     connect(watcher, &QDBusPendingCallWatcher::finished, this,
-         [this](QDBusPendingCallWatcher *self) {
-             QDBusPendingReply<QDBusObjectPath> reply = *self;
-@@ -97,7 +144,7 @@
-                 return;
-             }
-             if (!reply.isValid()) {
--                qDebug() << "The session is not registered with logind" << reply.error().message();
-+                qDebug() << "The session is not registered: " << reply.error().message();
-                 return;
-             }
-             const QString sessionPath = reply.value().path();
-@@ -105,15 +152,15 @@
- 
-             // connections need to be done this way as the object exposes both method and signal
-             // with name "Lock"/"Unlock". Qt is not able to automatically handle this.
--            m_bus.connect(s_login1Service,
-+            m_bus.connect(*m_service,
-                           sessionPath,
--                          s_login1SessionInterface,
-+                          *m_sessionInterface,
-                           QStringLiteral("Lock"),
-                           this,
-                           SIGNAL(requestLock()));
--            m_bus.connect(s_login1Service,
-+            m_bus.connect(*m_service,
-                           sessionPath,
--                          s_login1SessionInterface,
-+                          *m_sessionInterface,
-                           QStringLiteral("Unlock"),
-                           this,
-                           SIGNAL(requestUnlock()));
-@@ -123,9 +170,9 @@
-     );
- 
-     // connect to manager object's signals we need
--    m_bus.connect(s_login1Service,
--                  s_login1Path,
--                  s_login1ManagerInterface,
-+    m_bus.connect(*m_service,
-+                  *m_path,
-+                  *m_managerInterface,
-                   QStringLiteral("PrepareForSleep"),
-                   this,
-                   SIGNAL(prepareForSleep(bool)));
-@@ -136,9 +183,14 @@
-     if (m_inhibitFileDescriptor.isValid()) {
-         return;
-     }
--    QDBusMessage message = QDBusMessage::createMethodCall(s_login1Service,
--                                                          s_login1Path,
--                                                          s_login1ManagerInterface,
-+
-+    if (!m_connected) {
-+        return;
-+    }
-+
-+    QDBusMessage message = QDBusMessage::createMethodCall(*m_service,
-+                                                          *m_path,
-+                                                          *m_managerInterface,
-                                                           QStringLiteral("Inhibit"));
-     message.setArguments(QVariantList({QStringLiteral("sleep"),
-                                        i18n("Screen Locker"),
-
---- a/ksmserver/screenlocker/logind.h
-+++ b/ksmserver/screenlocker/logind.h
-@@ -23,6 +23,7 @@
- #include <QDBusConnection>
- #include <QDBusUnixFileDescriptor>
- #include <QObject>
-+#include <QDBusPendingCallWatcher>
- 
- class QDBusServiceWatcher;
- 
-@@ -59,10 +60,16 @@
-      **/
-     explicit LogindIntegration(const QDBusConnection &connection, QObject *parent = nullptr);
-     void logindServiceRegistered();
-+    void consolekitServiceRegistered();
-+    void commonServiceRegistered(QDBusPendingCallWatcher *watcher);
-     QDBusConnection m_bus;
-     QDBusServiceWatcher *m_logindServiceWatcher;
-     bool m_connected;
-     QDBusUnixFileDescriptor m_inhibitFileDescriptor;
-+    const QString *m_service;
-+    const QString *m_path;
-+    const QString *m_managerInterface;
-+    const QString *m_sessionInterface;
- };
- 
- #endif
-

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch
deleted file mode 100644
index 9aa89ca..0000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 21 Oct 2015 16:42:01 +0000
-Subject: Don't connect to signals which don't exist
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=2441d350ef571329b67848f79668f3956534806e
----
-Don't connect to signals which don't exist
-
-Fix KDialog porting
----
-
-
---- a/drkonqi/bugzillaintegration/reportassistantpages_bugzilla_duplicates.cpp
-+++ b/drkonqi/bugzillaintegration/reportassistantpages_bugzilla_duplicates.cpp
-@@ -574,7 +574,7 @@
-                                   QIcon::fromTheme("view-refresh"),
-                                   i18nc("@info:tooltip", "Use this button to retry "
-                                                   "loading the bug report.")));
--    connect(ui.m_retryButton, SIGNAL(clicked()), this, SLOT(reloadReport()));
-+    connect(ui.m_retryButton, &QPushButton::clicked, this, &BugzillaReportInformationDialog::reloadReport);
- 
-     m_suggestButton = new QPushButton(this);
-     ui.buttonBox->addButton(m_suggestButton, QDialogButtonBox::ActionRole);
-@@ -583,7 +583,7 @@
-                     QIcon::fromTheme("list-add"), i18nc("@info:tooltip", "Use this button to suggest that "
-                                              "the crash you experienced is related to this bug "
-                                              "report")));
--    connect(this, SIGNAL(user1Clicked()) , this, SLOT(relatedReportClicked()));
-+    connect(m_suggestButton, &QPushButton::clicked, this, &BugzillaReportInformationDialog::relatedReportClicked);
- 
-     connect(ui.m_showOwnBacktraceCheckBox, SIGNAL(toggled(bool)), this, SLOT(toggleShowOwnBacktrace(bool)));
- 
-

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.95.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.95.ebuild
index 704b6fb..4c4ba5c 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.95.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.95.ebuild
@@ -99,6 +99,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	x11-apps/xset
 	x11-apps/xsetroot
+	!dev-libs/xembed-sni-proxy
 	!kde-base/freespacenotifier:4
 	!kde-base/libtaskmanager:4
 	!kde-base/kcminit:4

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
index b432c4c..ab72864 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
@@ -99,6 +99,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	x11-apps/xset
 	x11-apps/xsetroot
+	!dev-libs/xembed-sni-proxy
 	!kde-base/freespacenotifier:4
 	!kde-base/libtaskmanager:4
 	!kde-base/kcminit:4

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 971bf3e..b1366d9 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -99,6 +99,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	x11-apps/xset
 	x11-apps/xsetroot
+	!dev-libs/xembed-sni-proxy
 	!kde-base/freespacenotifier:4
 	!kde-base/libtaskmanager:4
 	!kde-base/kcminit:4


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2016-06-15 12:38 Michael Palimaka
  0 siblings, 0 replies; 15+ messages in thread
From: Michael Palimaka @ 2016-06-15 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     c8e05ef3a5e62d8fd3fc3c267cec47ace4cf235b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 19:12:29 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 12:38:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8e05ef3

kde-plasma/plasma-workspace: Drop KScreen dependency from PlasmaShell

Makes it depend on >=Qt-5.6.1 and fixes a lot of crashes.

Gentoo-bug: 569556

Package-Manager: portage-2.2.28

 .../plasma-workspace-5.6.5-drop-kscreen-dep.patch  | 562 +++++++++++++++++++++
 .../plasma-workspace-5.6.49.9999.ebuild            |   2 +-
 .../plasma-workspace/plasma-workspace-9999.ebuild  |   1 -
 3 files changed, 563 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch
new file mode 100644
index 0000000..80a7bc9
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch
@@ -0,0 +1,562 @@
+commit 816b8a0e17cc087b05ac0155757c5d4a1ee6673a
+Author: Aleix Pol <aleixpol@kde.org>
+Date:   Mon May 30 13:20:50 2016 +0200
+
+    Drop KScreen dependency from PlasmaShell
+    REVIEW: 125451
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,6 +26,4 @@ find_package(KF5XmlRpcClient REQUIRED)
+ find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
+ find_package(KF5 REQUIRED COMPONENTS SysGuard)
+-# Require KScreen >= 5.0.93 due to large API change
+-find_package(KF5 5.0.93 REQUIRED COMPONENTS Screen)
+ find_package(KF5 REQUIRED COMPONENTS Package)
+ # Baloo has a different version scheme than KF5 for now
+--- a/shell/CMakeLists.txt
++++ b/shell/CMakeLists.txt
+@@ -81,5 +81,4 @@ target_link_libraries(plasmashell
+  KF5::CoreAddons
+  KF5::DBusAddons
+- KF5::Screen
+  KF5::Declarative
+  KF5::QuickAddons
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -37,8 +37,6 @@
+ 
+ #include <Plasma/Containment>
+ #include <Plasma/Package>
+-#include <KScreen/Config>
+-#include <KScreen/Output>
+ 
+ #include <KWayland/Client/plasmashell.h>
+ #include <KWayland/Client/surface.h>
+@@ -87,5 +85,6 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent
+     connect(&m_unhideTimer, &QTimer::timeout,
+             this, &PanelView::restoreAutoHide);
+ 
++    m_lastScreen = targetScreen;
+     connect(screen(), SIGNAL(geometryChanged(QRect)),
+             &m_positionPaneltimer, SLOT(start()));
+@@ -102,8 +101,5 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent
+     connect(&m_strutsTimer, &QTimer::timeout,
+             this, &PanelView::updateStruts);
+ 
+-    connect(m_corona->screensConfiguration()->screen().data(), &KScreen::Screen::currentSizeChanged,
+-            this, &PanelView::updateStruts);
+-
+     qmlRegisterType<QScreen>();
+     rootContext()->setContextProperty(QStringLiteral("panel"), this);
+@@ -682,19 +678,23 @@ void PanelView::showEvent(QShowEvent *event)
+ {
+     PanelShadows::self()->addWindow(this);
+     PlasmaQuick::ContainmentView::showEvent(event);
+-    integrateScreen();
+ 
+     //When the screen is set, the screen is recreated internally, so we need to
+     //set anything that depends on the winId()
+-    connect(this, &QWindow::screenChanged, this, [this](QScreen* screen) {
+-        emit screenChangedProxy(screen);
++    connect(this, &QWindow::screenChanged, this, &PanelView::moveScreen, Qt::UniqueConnection);
++    integrateScreen();
++}
+ 
+-        if (!screen)
+-            return;
+-        integrateScreen();
+-        showTemporarily();
+-        m_positionPaneltimer.start();
+-    });
++void PanelView::moveScreen(QScreen* screen)
++{
++    emit screenChangedProxy(screen);
++    m_lastScreen = screen;
++
++    if (!screen)
++        return;
++    integrateScreen();
++    showTemporarily();
++    m_positionPaneltimer.start();
+ }
+ 
+ bool PanelView::event(QEvent *e)
+@@ -904,5 +904,5 @@ void PanelView::updateStruts()
+         const QRect thisScreen = screen()->geometry();
+         // QScreen::virtualGeometry() is very unreliable (Qt 5.5)
+-        const QRect wholeScreen = QRect(QPoint(0, 0), m_corona->screensConfiguration()->screen()->currentSize());
++        const QRect wholeScreen = QRect(QPoint(0, 0), screen()->geometry().size());
+ 
+         //Extended struts against a screen edge near to another screen are really harmful, so windows maximized under the panel is a lesser pain
+--- a/shell/panelview.h
++++ b/shell/panelview.h
+@@ -136,6 +136,8 @@ public:
+     /* Shared with script/panel.cpp */
+     static KConfigGroup panelConfig(ShellCorona *corona, Plasma::Containment *containment, QScreen *screen);
+ 
++    void updateStruts();
++
+ protected:
+     void resizeEvent(QResizeEvent *ev) override;
+     void showEvent(QShowEvent *event) override;
+@@ -162,7 +164,6 @@ protected Q_SLOTS:
+      * It will be called when the configuration is requested
+      */
+     void showConfigurationInterface(Plasma::Applet *applet) override;
+-    void updateStruts();
+ 
+ private Q_SLOTS:
+     void themeChanged();
+@@ -176,5 +177,6 @@ private Q_SLOTS:
+     void screenDestroyed(QObject* screen);
+ 
+ private:
++    void moveScreen(QScreen* screen);
+     void integrateScreen();
+     bool containmentContainsPosition(const QPointF &point) const;
+@@ -198,6 +200,7 @@ private:
+     //only for the mask, not to actually paint
+     Plasma::FrameSvg *m_background;
+     KWayland::Client::PlasmaShellSurface *m_shellSurface;
++    QWeakPointer<QScreen> m_lastScreen;
+ 
+     static const int STRUTSTIMERDELAY = 200;
+ };
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -44,11 +44,6 @@
+ #include <kdeclarative/qmlobject.h>
+ #include <KMessageBox>
+ 
+-#include <KScreen/Config>
+-#include <KScreen/ConfigMonitor>
+-#include <KScreen/GetConfigOperation>
+-#include <KScreen/Output>
+-
+ #include <KPackage/PackageLoader>
+ 
+ #include <KWayland/Client/connection_thread.h>
+@@ -90,7 +85,6 @@ ShellCorona::ShellCorona(QObject *parent)
+       m_addPanelAction(nullptr),
+       m_addPanelsMenu(nullptr),
+       m_interactiveConsole(nullptr),
+-      m_screenConfiguration(nullptr),
+       m_waylandPlasmaShell(nullptr)
+ {
+     setupWaylandIntegration();
+@@ -305,14 +299,7 @@ void ShellCorona::setShell(const QString &shell)
+ 
+     connect(m_activityConsumer, &KActivities::Consumer::serviceStatusChanged, this, &ShellCorona::load, Qt::UniqueConnection);
+ 
+-    connect(new KScreen::GetConfigOperation(KScreen::GetConfigOperation::NoEDID), &KScreen::GetConfigOperation::finished,
+-                this, [this](KScreen::ConfigOperation *op) {
+-                    if (op->hasError()) {
+-                        qWarning() << "Error found while setting up ShellCorona's KScreen: " << op->errorString();
+-                    }
+-                    m_screenConfiguration = qobject_cast<KScreen::GetConfigOperation*>(op)->config();
+-                    load();
+-                });
++    load();
+ }
+ 
+ QString ShellCorona::shell() const
+@@ -320,17 +307,19 @@ QString ShellCorona::shell() const
+     return m_shell;
+ }
+ 
+-bool outputLess(const KScreen::OutputPtr &a, const KScreen::OutputPtr &b)
++bool outputLess(QScreen* a, QScreen* b)
+ {
+-    return ((a->isEnabled() && !b->isEnabled())
+-         || (a->isEnabled() == b->isEnabled() && (a->isPrimary() && !b->isPrimary()))
+-         || (a->isPrimary() == b->isPrimary() && (a->pos().x() < b->pos().x()
+-         || (a->pos().x() == b->pos().x() && a->pos().y() < b->pos().y()))));
++    const QPoint aPos = a->geometry().topLeft();
++    const QPoint bPos = b->geometry().topLeft();
++
++    return (qGuiApp->primaryScreen() == a
++         || (qGuiApp->primaryScreen() != b && (aPos.x() < bPos.x()
++         || (aPos.x() == bPos.x() && aPos.y() < bPos.y()))));
+ }
+ 
+-static QList<KScreen::OutputPtr> sortOutputs(const KScreen::OutputList &outputs)
++static QList<QScreen*> sortOutputs(const QList<QScreen*> &outputs)
+ {
+-    QList<KScreen::OutputPtr> ret = outputs.values();
++    QList<QScreen*> ret = outputs;
+     std::sort(ret.begin(), ret.end(), outputLess);
+     return ret;
+ }
+@@ -338,8 +327,7 @@ static QList<KScreen::OutputPtr> sortOutputs(const KScreen::OutputList &outputs)
+ void ShellCorona::load()
+ {
+     if (m_shell.isEmpty() ||
+-        m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown ||
+-        !m_screenConfiguration) {
++        m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown) {
+         return;
+     }
+ 
+@@ -373,13 +361,11 @@ void ShellCorona::load()
+         }
+     }
+ 
+-    KScreen::ConfigMonitor::instance()->addConfig(m_screenConfiguration);
+-    //we're not going through the connectedOutputs because we need to connect to all outputs
+-    for (const KScreen::OutputPtr &output : sortOutputs(m_screenConfiguration->outputs())) {
+-        addOutput(output);
++    for (QScreen* screen : sortOutputs(qGuiApp->screens())) {
++        addOutput(screen);
+     }
+-    connect(m_screenConfiguration.data(), &KScreen::Config::outputAdded, this, &ShellCorona::addOutput);
+-    connect(m_screenConfiguration.data(), &KScreen::Config::primaryOutputChanged, this, &ShellCorona::primaryOutputChanged);
++    connect(qGuiApp, &QGuiApplication::screenAdded, this, &ShellCorona::addOutput);
++    connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &ShellCorona::primaryOutputChanged);
+     connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved);
+ 
+     if (!m_waitingPanels.isEmpty()) {
+@@ -401,13 +387,8 @@ void ShellCorona::primaryOutputChanged()
+         return;
+     }
+ 
+-    const KScreen::OutputPtr output = m_screenConfiguration->primaryOutput();
+-    if (!output) {
+-        return;
+-    }
+-
+     QScreen *oldPrimary = m_views[0]->screen();
+-    QScreen *newPrimary = outputToScreen(output);
++    QScreen *newPrimary = qGuiApp->primaryScreen();
+     if (!newPrimary || newPrimary == oldPrimary) {
+         return;
+     }
+@@ -433,7 +414,7 @@ void ShellCorona::primaryOutputChanged()
+             Q_ASSERT(oldPrimary != newPrimary);
+             Q_ASSERT(m_views[0]->screen() == oldPrimary);
+             Q_ASSERT(m_views[0]->screen() != newPrimary);
+-            Q_ASSERT(m_views[0]->geometry() == oldPrimary->geometry());
++//             Q_ASSERT(m_views[0]->geometry() == oldPrimary->geometry());
+             qDebug() << "adapting" << newPrimary->geometry() << oldPrimary->geometry();
+ 
+             view->setScreen(oldPrimary);
+@@ -442,6 +423,7 @@ void ShellCorona::primaryOutputChanged()
+     }
+ 
+     m_views[0]->setScreen(newPrimary);
++    Q_ASSERT(m_views[0]->screen()==newPrimary);
+ 
+     foreach (PanelView *panel, m_panelViews) {
+         if (panel->screen() == oldPrimary) {
+@@ -459,20 +441,15 @@ void ShellCorona::screenInvariants() const
+ {
+     Q_ASSERT(m_views.count() <= QGuiApplication::screens().count());
+     QScreen *s = m_views.isEmpty() ? nullptr : m_views[0]->screen();
+-    const KScreen::OutputPtr primaryOutput = m_screenConfiguration->primaryOutput();
+-    if (!s) {
+-        qWarning() << "error: couldn't find primary output" << primaryOutput;
+-        return;
+-    }
+ 
+-    QScreen* ks = outputToScreen(primaryOutput);
+-    Q_ASSERT(!ks || ks == s || !primaryOutput->isEnabled() || m_redundantOutputs.contains(primaryOutput));
++    QScreen* ks = qGuiApp->primaryScreen();
++    Q_ASSERT(ks == s);
+ 
+     QSet<QScreen*> screens;
+     int i = 0;
+     foreach (const DesktopView *view, m_views) {
+         QScreen *screen = view->screen();
+         Q_ASSERT(!screens.contains(screen));
+-        Q_ASSERT(!m_redundantOutputs.contains(screenToOutput(screen)));
++        Q_ASSERT(!m_redundantOutputs.contains(screen));
+ //         commented out because a different part of the code-base is responsible for this
+ //         and sometimes is not yet called here.
+@@ -492,7 +469,7 @@ void ShellCorona::screenInvariants() const
+         ++i;
+     }
+ 
+-    foreach (const KScreen::OutputPtr &out, m_redundantOutputs) {
++    foreach (QScreen* out, m_redundantOutputs) {
+         Q_ASSERT(isOutputRedundant(out));
+     }
+ 
+@@ -630,18 +607,14 @@ KActivities::Controller *ShellCorona::activityController()
+ 
+ int ShellCorona::numScreens() const
+ {
+-    //don't start loading screens until kscreen has finished initialising.
+-    if (!m_screenConfiguration) {
+-        return 0;
+-    }
+-    return m_screenConfiguration->connectedOutputs().count();
++    return qGuiApp->screens().count();
+ }
+ 
+ QRect ShellCorona::screenGeometry(int id) const
+ {
+     if (id >= m_views.count() || id < 0) {
+         qWarning() << "requesting unexisting screen" << id;
+-        QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput());
++        QScreen *s = qGuiApp->primaryScreen();
+         return s ? s->geometry() : QRect();
+     }
+     return m_views[id]->geometry();
+@@ -652,7 +625,7 @@ QRegion ShellCorona::availableScreenRegion(int id) const
+     if (id >= m_views.count() || id < 0) {
+         //each screen should have a view
+         qWarning() << "requesting unexisting screen" << id;
+-        QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput());
++        QScreen *s = qGuiApp->primaryScreen();
+         return s ? s->availableGeometry() : QRegion();
+     }
+     DesktopView *view = m_views[id];
+@@ -673,7 +646,7 @@ QRect ShellCorona::availableScreenRect(int id) const
+     if (id >= m_views.count() || id < 0) {
+         //each screen should have a view
+         qWarning() << "requesting unexisting screen" << id;
+-        QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput());
++        QScreen *s = qGuiApp->primaryScreen();
+         return s ? s->availableGeometry() : QRect();
+     }
+ 
+@@ -793,24 +766,20 @@ void ShellCorona::screenRemoved(QScreen* screen)
+ {
+     if (DesktopView* v = desktopForScreen(screen))
+         remove(v);
+-//     addOutput(screenToOutput(screen));
+-    m_reconsiderOutputsTimer.start();
+-}
+ 
+-void ShellCorona::outputEnabledChanged()
+-{
+-    addOutput(KScreen::OutputPtr(qobject_cast<KScreen::Output *>(sender()), [](void*){}));
++    m_reconsiderOutputsTimer.start();
++    m_redundantOutputs.remove(screen);
+ }
+ 
+-bool ShellCorona::isOutputRedundant(const KScreen::OutputPtr &screen) const
++bool ShellCorona::isOutputRedundant(QScreen* screen) const
+ {
+-    Q_ASSERT(screen->currentMode());
++    Q_ASSERT(screen);
+     const QRect geometry = screen->geometry();
+ 
+     //FIXME: QScreen doesn't have any idea of "this qscreen is clone of this other one
+     //so this ultra inefficient heuristic has to stay until we have a slightly better api
+-    foreach (const KScreen::OutputPtr &s, m_screenConfiguration->connectedOutputs()) {
+-        if (screen == s || !s->isEnabled() || !s->currentMode()) {
++    foreach (QScreen* s, qGuiApp->screens()) {
++        if (screen == s) {
+             continue;
+         }
+ 
+@@ -827,71 +796,47 @@ bool ShellCorona::isOutputRedundant(const KScreen::OutputPtr &screen) const
+ 
+ void ShellCorona::reconsiderOutputs()
+ {
+-    if (!m_screenConfiguration) {
+-        return;
+-    }
+-    foreach (const KScreen::OutputPtr &out, m_screenConfiguration->connectedOutputs()) {
+-        if (!out->isEnabled() || !out->currentMode()) {
+-//             qDebug() << "skip screen" << out << desktopForScreen(outputToScreen(out));
+-            continue;
+-        }
+-
+-        if (m_redundantOutputs.contains(out)) {
+-            if (!isOutputRedundant(out)) {
++    foreach (QScreen* screen, qGuiApp->screens()) {
++        if (m_redundantOutputs.contains(screen)) {
++            if (!isOutputRedundant(screen)) {
+ //                 qDebug() << "not redundant anymore" << out;
+-                addOutput(out);
++                addOutput(screen);
+             }
+-        } else if (isOutputRedundant(out)) {
+-//             qDebug() << "new redundant screen" << out;
++        } else if (isOutputRedundant(screen)) {
++            qDebug() << "new redundant screen" << screen;
+ 
+-            if (DesktopView* v = desktopForScreen(outputToScreen(out)))
++            if (DesktopView* v = desktopForScreen(screen))
+                 remove(v);
+ 
+-            m_redundantOutputs.insert(out);
++            m_redundantOutputs.insert(screen);
+         }
+ //         else
+ //             qDebug() << "fine screen" << out;
+     }
+ 
++    updateStruts();
++
+     CHECK_SCREEN_INVARIANTS
+ }
+ 
+-void ShellCorona::addOutput(const KScreen::OutputPtr &output)
++void ShellCorona::addOutput(QScreen* screen)
+ {
+-    if (!output) {
+-        return;
+-    }
++    Q_ASSERT(screen);
+ 
+-    connect(output.data(), &KScreen::Output::isEnabledChanged,
+-            this, &ShellCorona::outputEnabledChanged,
+-            Qt::UniqueConnection);
+-    connect(output.data(), &KScreen::Output::posChanged,
+-            &m_reconsiderOutputsTimer, static_cast<void (QTimer::*)()>(&QTimer::start),
+-            Qt::UniqueConnection);
+-    connect(output.data(), &KScreen::Output::currentModeIdChanged,
++    connect(screen, &QScreen::geometryChanged,
+             &m_reconsiderOutputsTimer, static_cast<void (QTimer::*)()>(&QTimer::start),
+             Qt::UniqueConnection);
+ 
+-    if (!output->isEnabled()) {
+-        m_redundantOutputs.remove(output);
+-        m_reconsiderOutputsTimer.start();
+-        return;
+-    }
+-
+-    QScreen *screen = outputToScreen(output);
+-    Q_ASSERT(screen);
+-
+-    if (isOutputRedundant(output)) {
+-        m_redundantOutputs.insert(output);
++    if (isOutputRedundant(screen)) {
++        m_redundantOutputs.insert(screen);
+         return;
+     } else {
+-        m_redundantOutputs.remove(output);
++        m_redundantOutputs.remove(screen);
+     }
+ 
+     int insertPosition = 0;
+     foreach (DesktopView *view, m_views) {
+-        const KScreen::OutputPtr out = screenToOutput(view->screen());
+-        if (outputLess(output, out)) {
++        if (outputLess(screen, view->screen())) {
+             break;
+         }
+ 
+@@ -930,32 +875,6 @@ void ShellCorona::addOutput(const KScreen::OutputPtr &output)
+     CHECK_SCREEN_INVARIANTS
+ }
+ 
+-QScreen *ShellCorona::outputToScreen(const KScreen::OutputPtr &output) const
+-{
+-    if (!output) {
+-        return nullptr;
+-    }
+-
+-    foreach (QScreen *screen, QGuiApplication::screens()) {
+-        if (screen->name() == output->name()) {
+-            return screen;
+-        }
+-    }
+-
+-    return nullptr;
+-}
+-
+-KScreen::OutputPtr ShellCorona::screenToOutput(QScreen *screen) const
+-{
+-    foreach (const KScreen::OutputPtr &output, m_screenConfiguration->connectedOutputs()) {
+-        if (screen->name() == output->name()) {
+-            return output;
+-        }
+-    }
+-
+-    return KScreen::OutputPtr();
+-}
+-
+ QScreen* ShellCorona::insertScreen(QScreen *screen, int idx)
+ {
+     if (idx == m_views.count()) {
+@@ -1579,5 +1498,5 @@ int ShellCorona::screenForContainment(const Plasma::Containment *containment) co
+     //won't be associated to a screen
+ //     qDebug() << "ShellCorona screenForContainment: " << containment << " Last screen is " << containment->lastScreen();
+-    for (int i = 0, count = m_screenConfiguration->outputs().count(); i<count; ++i) {
++    for (int i = 0, count = qGuiApp->screens().count(); i<count; ++i) {
+         if (containment->lastScreen() == i &&
+             (containment->activity() == m_activityConsumer->currentActivity() ||
+@@ -1703,11 +1622,6 @@ void ShellCorona::desktopContainmentDestroyed(QObject *obj)
+     }
+ }
+ 
+-KScreen::ConfigPtr ShellCorona::screensConfiguration() const
+-{
+-    return m_screenConfiguration;
+-}
+-
+ void ShellCorona::showOpenGLNotCompatibleWarning()
+ {
+     static bool s_multipleInvokations = false;
+@@ -1750,6 +1664,13 @@ KWayland::Client::PlasmaShell *ShellCorona::waylandPlasmaShellInterface() const
+     return m_waylandPlasmaShell;
+ }
+ 
++void ShellCorona::updateStruts()
++{
++    foreach(PanelView* view, m_panelViews) {
++        view->updateStruts();
++    }
++}
++
+ // Desktop corona handler
+ 
+ 
+--- a/shell/shellcorona.h
++++ b/shell/shellcorona.h
+@@ -30,8 +30,6 @@
+ 
+ #include <KPackage/Package>
+ 
+-#include <KScreen/Types>
+-
+ class Activity;
+ class DesktopView;
+ class PanelView;
+@@ -99,8 +97,6 @@ public:
+ 
+     Plasma::Containment *setContainmentTypeForScreen(int screen, const QString &plugin);
+ 
+-    KScreen::ConfigPtr screensConfiguration() const;
+-
+     QScreen *screenForId(int screenId) const;
+     void remove(DesktopView *desktopView);
+ 
+@@ -182,8 +178,7 @@ private Q_SLOTS:
+     void addPanel(QAction *action);
+     void populateAddPanelsMenu();
+ 
+-    void outputEnabledChanged();
+-    void addOutput(const KScreen::OutputPtr &output);
++    void addOutput(QScreen* screen);
+     void primaryOutputChanged();
+ 
+     void activityOpened();
+@@ -197,10 +192,9 @@ private Q_SLOTS:
+     void screenRemoved(QScreen* screen);
+ 
+ private:
+-    QScreen *outputToScreen(const KScreen::OutputPtr &output) const;
+-    KScreen::OutputPtr screenToOutput(QScreen *screen) const;
++    void updateStruts();
+     QScreen *insertScreen(QScreen *screen, int idx);
+     void removeView(int idx);
+-    bool isOutputRedundant(const KScreen::OutputPtr &output) const;
++    bool isOutputRedundant(QScreen* screen) const;
+     void reconsiderOutputs();
+     QList<PanelView *> panelsForScreen(QScreen *screen) const;
+@@ -227,9 +221,8 @@ private:
+     QMenu *m_addPanelsMenu;
+     KPackage::Package m_lookAndFeelPackage;
+-    QSet<KScreen::OutputPtr> m_redundantOutputs;
++    QSet<QScreen*> m_redundantOutputs;
+     QList<KDeclarative::QmlObject *> m_alternativesObjects;
+     KDeclarative::QmlObject *m_interactiveConsole;
+ 
+-    KScreen::ConfigPtr m_screenConfiguration;
+     QTimer m_waitingPanelsTimer;
+     QTimer m_appConfigSyncTimer;

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild
index fc5deb8..8d3ad9c 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild
@@ -57,7 +57,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep solid)
 	$(add_plasma_dep kscreenlocker)
 	$(add_plasma_dep kwin)
-	$(add_plasma_dep libkscreen)
 	$(add_plasma_dep libksysguard)
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdbus)
@@ -121,6 +120,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.6.0-rpath.patch"
+	"${FILESDIR}/${PN}-5.6.5-drop-kscreen-dep.patch"
 )
 
 RESTRICT="test"

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index c305c64..f87837c 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -57,7 +57,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep solid)
 	$(add_plasma_dep kscreenlocker)
 	$(add_plasma_dep kwin)
-	$(add_plasma_dep libkscreen)
 	$(add_plasma_dep libksysguard)
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdbus)


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2016-12-31 21:45 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2016-12-31 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a1b323a6bb6a2d1a3d8e1fc4651bf81fe1f2cb0e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 21:44:27 2016 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 21:44:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1b323a6

kde-plasma/plasma-workspace: Drop backported patch

Upstream commit: e43b89e2b9f3ff9bf6299488e82a365cbfde2b2a

Package-Manager: portage-2.3.0

 .../plasma-workspace-5.8.3-systray-cpuload.patch   | 177 ---------------------
 .../plasma-workspace-5.8.49.9999.ebuild            |   1 -
 2 files changed, 178 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch
deleted file mode 100644
index fada327..0000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From: Lindsay Roberts <m@lindsayr.com>
-Date: Mon, 10 Oct 2016 16:55:49 +0000
-Subject: Systray: Move all icon resolution to dataengine
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=749f60b89f4a166833fb64a5b593a801f63f9615
----
-Systray: Move all icon resolution to dataengine
-
-Summary:
-Changes triggered by investigation into a long-running high CPU usage bug with system tray animations. The systray itself had icon name to icon resolution code, which was being triggered (twice) for every icon, every time any icon in the systray was updated. This code was spinning up a KIconLoader on each of these instances, and throwing it directly away. Each one triggered a large quantity of memory allocations and disk scans.
-
-This patch moves the extra bit of "appName" logic from the native part of the system tray to the statusnotifieritem datasource, which already had a stored 'customIconLoader' to handle icon theme paths, and removes the special lookup from the sytemtray applet completely. It also prefers icons provided by the dataengine to doing another lookup (contentious?). This removes all the extra CPU usage outside of the QML scene graph and graphics drivers locally.
-
-This is very much a looking for feedback item - there are things about the icon loading paths I almost certainly haven't appreciated yet, and perhaps preferring loading by icon name in the applet has a another purpose.
-
-BUG: 356479
-
-Test Plan: Have tested locally with kgpg and steam, the two apps I have that trigger the old code path. In neither case, however, did the appName logic produce a different result to the code with just the icon search path in statusnotifieritem.
-
-Reviewers: #plasma, davidedmundson, mart
-
-Reviewed By: #plasma, davidedmundson, mart
-
-Subscribers: davidedmundson, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D2986
----
-
-
---- a/applets/systemtray/package/contents/ui/ConfigEntries.qml
-+++ b/applets/systemtray/package/contents/ui/ConfigEntries.qml
-@@ -75,7 +75,7 @@
-                 "index": i,
-                 "taskId": item.Id,
-                 "name": item.Title,
--                "iconName": plasmoid.nativeInterface.resolveIcon(item.IconName, item.IconThemePath),
-+                "iconName": item.IconName,
-                 "icon": item.Icon
-             });
-         }
-
---- a/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml
-+++ b/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml
-@@ -28,7 +28,7 @@
-     text: Title
-     mainText: ToolTipTitle != "" ? ToolTipTitle : Title
-     subText: ToolTipSubTitle
--    icon: ToolTipIcon != "" ? ToolTipIcon : plasmoid.nativeInterface.resolveIcon(IconName != "" ? IconName : Icon, IconThemePath)
-+    icon: ToolTipIcon != "" ? ToolTipIcon : Icon ? Icon : IconName
-     textFormat: Text.AutoText
-     category: Category
- 
-@@ -48,7 +48,7 @@
- 
-     PlasmaCore.IconItem {
-         id: iconItem
--        source: plasmoid.nativeInterface.resolveIcon(IconName != "" ? IconName : Icon, IconThemePath)
-+        source: Icon ? Icon : IconName
-         width: Math.min(parent.width, parent.height)
-         height: width
-         active: taskIcon.containsMouse
-
---- a/applets/systemtray/systemtray.cpp
-+++ b/applets/systemtray/systemtray.cpp
-@@ -37,36 +37,10 @@
- #include <Plasma/PluginLoader>
- #include <Plasma/ServiceJob>
- 
--#include <KIconLoader>
--#include <KIconEngine>
- #include <KActionCollection>
- #include <KLocalizedString>
- 
- #include <plasma_version.h>
--
--/*
-- * An app may also load icons from their own directories, so we need a new iconloader that takes this into account
-- * This is wrapped into a subclass of iconengine so the iconloader lifespan matches the icon object
-- */
--class AppIconEngine : public KIconEngine
--{
--public:
--    AppIconEngine(const QString &variant, const QString &path, const QString &appName);
--    ~AppIconEngine();
--private:
--    KIconLoader* m_loader;
--};
--
--AppIconEngine::AppIconEngine(const QString &variant, const QString &path, const QString &appName) :
--    KIconEngine(variant, m_loader = new KIconLoader(appName, QStringList()))
--{
--    m_loader->addAppDir(appName, path);
--}
--
--AppIconEngine::~AppIconEngine()
--{
--    delete m_loader;
--}
- 
- class PlasmoidModel: public QStandardItemModel
- {
-@@ -167,32 +141,6 @@
-             emit appletDeleted(applet);
-         }
-     }
--}
--
--QVariant SystemTray::resolveIcon(const QVariant &variant, const QString &iconThemePath)
--{
--    if (variant.canConvert<QString>()) {
--        if (!iconThemePath.isEmpty()) {
--            const QString path = iconThemePath;
--            if (!path.isEmpty()) {
--                // FIXME: If last part of path is not "icons", this won't work!
--                auto tokens = path.splitRef('/', QString::SkipEmptyParts);
--                if (tokens.length() >= 3 && tokens.takeLast() == QLatin1String("icons")) {
--                    const QString appName = tokens.takeLast().toString();
--
--                    return QVariant(QIcon(new AppIconEngine(variant.toString(), path, appName)));
--                } else {
--                    qCWarning(SYSTEM_TRAY) << "Wrong IconThemePath" << path << ": too short or does not end with 'icons'";
--                }
--            }
--
--            //return just the string hoping that IconItem will know how to interpret it anyways as either a normal icon or a SVG from the theme
--            return variant;
--        }
--    }
--
--    // Most importantly QIcons. Nothing to do for those.
--    return variant;
- }
- 
- void SystemTray::showPlasmoidMenu(QQuickItem *appletInterface, int x, int y)
-
---- a/applets/systemtray/systemtray.h
-+++ b/applets/systemtray/systemtray.h
-@@ -59,12 +59,6 @@
-     void cleanupTask(const QString &task);
- 
-     //Invokable utilities
--    /**
--     * returns either a simple icon name or a custom path if the app is
--     * using a custom theme
--     */
--    Q_INVOKABLE QVariant resolveIcon(const QVariant &variant, const QString &iconThemePath);
--
-     /**
-      * Given an AppletInterface pointer, shows a proper context menu for it
-      */
-
---- a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
-+++ b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
-@@ -240,14 +240,19 @@
-             if (!m_customIconLoader) {
-                 m_customIconLoader = new KIconLoader(QString(), QStringList(), this);
-             }
-+            // FIXME: If last part of path is not "icons", this won't work!
-+            QString appName;
-+            auto tokens = path.splitRef('/', QString::SkipEmptyParts);
-+            if (tokens.length() >= 3 && tokens.takeLast() == QLatin1String("icons"))
-+                appName = tokens.takeLast().toString();
- 
-             //icons may be either in the root directory of the passed path or in a appdir format
-             //i.e hicolor/32x32/iconname.png
- 
--            m_customIconLoader->reconfigure(QString(), QStringList(path));
-+            m_customIconLoader->reconfigure(appName, QStringList(path));
- 
-             //add app dir requires an app name, though this is completely unused in this context
--            m_customIconLoader->addAppDir(QStringLiteral("unused"), path);
-+            m_customIconLoader->addAppDir(appName.size() ? appName : QStringLiteral("unused"), path);
-         }
-         setData(QStringLiteral("IconThemePath"), path);
- 
-

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild
index 845e63d..0e1932d 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild
@@ -123,7 +123,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
 	# master
 	"${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
-	"${FILESDIR}/${PN}-5.8.3-systray-cpuload.patch"
 )
 
 RESTRICT+=" test"


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2017-07-27 18:19 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2017-07-27 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     42269aed00323e50a4ea09a434b1f1cfddeab0c3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 18:19:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 18:19:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=42269aed

kde-plasma/plasma-workspace: Fix DEPENDs, fix cmake warning

Upstream commits
7df184afa19f148c1cd09ae9588645bb2b4556fc
a2202472aa4d488da7562fe8b150c42dddc2d7f2

Reported-by: Michael Mair-Keimberger (iamnr3) <bu9zilla <AT> gmail.com>
Gentoo-bug: 626040

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../files/plasma-workspace-5.10.4-unused-dep.patch    | 19 +++++++++++++++++++
 .../plasma-workspace-5.10.49.9999.ebuild              | 16 +++++++++++-----
 .../plasma-workspace/plasma-workspace-9999.ebuild     | 16 +++++++++++-----
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch
new file mode 100644
index 0000000000..fa0f385096
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch
@@ -0,0 +1,19 @@
+commit 5a7d251cfbed417a2617945a94427a93cdd2e82d
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Thu Jul 27 17:50:17 2017 +0200
+
+    Drop unused dependency
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ba61d1cc..ab5536ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory)
+ include(KDEPackageAppTemplates)
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+-                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet KCMUtils
++                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet
+                     IdleTime Declarative TextWidgets KDELibs4Support Crash GlobalAccel
+                     DBusAddons Wayland)
+ find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION})

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
index 239067e983..cbd22c5842 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
@@ -12,11 +12,12 @@ DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
 IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
 
+REQUIRED_USE="gps? ( geolocation )"
+
 COMMON_DEPEND="
 	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -25,7 +26,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdesu)
 	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
@@ -56,7 +56,6 @@ COMMON_DEPEND="
 	$(add_plasma_dep kscreenlocker)
 	$(add_plasma_dep kwin)
 	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative 'widgets')
 	$(add_qt_dep qtgui 'jpeg')
@@ -75,6 +74,7 @@ COMMON_DEPEND="
 	x11-libs/libxcb
 	x11-libs/libXfixes
 	x11-libs/libXrender
+	x11-libs/libXtst
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	calendar? ( $(add_kdeapps_dep kholidays) )
@@ -86,6 +86,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdesu)
 	$(add_kdeapps_dep kio-extras)
 	$(add_plasma_dep kde-cli-tools)
 	$(add_plasma_dep ksysguard)
@@ -114,10 +115,14 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/plasma-workspace:4
 "
 DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
 	x11-proto/xproto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+)
 
 RESTRICT+=" test"
 
@@ -132,12 +137,13 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package calendar KF5Holidays)
 		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package gps libgps)
 		$(cmake-utils_use_find_package prison KF5Prison)
 		$(cmake-utils_use_find_package qalculate Qalculate)
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
 	)
 
+	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
 	kde5_src_configure
 }
 

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 239067e983..cbd22c5842 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -12,11 +12,12 @@ DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
 IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
 
+REQUIRED_USE="gps? ( geolocation )"
+
 COMMON_DEPEND="
 	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -25,7 +26,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdesu)
 	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
@@ -56,7 +56,6 @@ COMMON_DEPEND="
 	$(add_plasma_dep kscreenlocker)
 	$(add_plasma_dep kwin)
 	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative 'widgets')
 	$(add_qt_dep qtgui 'jpeg')
@@ -75,6 +74,7 @@ COMMON_DEPEND="
 	x11-libs/libxcb
 	x11-libs/libXfixes
 	x11-libs/libXrender
+	x11-libs/libXtst
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	calendar? ( $(add_kdeapps_dep kholidays) )
@@ -86,6 +86,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdesu)
 	$(add_kdeapps_dep kio-extras)
 	$(add_plasma_dep kde-cli-tools)
 	$(add_plasma_dep ksysguard)
@@ -114,10 +115,14 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/plasma-workspace:4
 "
 DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
 	x11-proto/xproto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+)
 
 RESTRICT+=" test"
 
@@ -132,12 +137,13 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package calendar KF5Holidays)
 		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package gps libgps)
 		$(cmake-utils_use_find_package prison KF5Prison)
 		$(cmake-utils_use_find_package qalculate Qalculate)
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
 	)
 
+	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
 	kde5_src_configure
 }
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2017-08-02 23:22 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2017-08-02 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     94f86d4d9e93668733123cad4cf43cea6f837e19
Author:     José Pekkarinen <koalinux <AT> gmail <DOT> com>
AuthorDate: Wed Aug  2 22:13:02 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 23:08:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=94f86d4d

kde-plasma/plasma-workspace: Gentoo FHS script support for Wayland session

Gentoo-bug: 626746

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 ...rkspace-5.10-startplasmacompositor-script.patch | 40 ++++++++++++++++++++++
 .../plasma-workspace-5.10.49.9999.ebuild           |  1 +
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  1 +
 3 files changed, 42 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
new file mode 100644
index 0000000000..de56ffe236
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
@@ -0,0 +1,40 @@
+From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <koalinux@gmail.com>
+Date: Tue, 1 Aug 2017 23:09:24 +0300
+Subject: [PATCH] Source files in /etc/plasma/{startup,shutdown}
+
+---
+ startkde/startplasmacompositor.cmake | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
+index 5bcf26a..e965f19 100644
+--- a/startkde/startplasmacompositor.cmake
++++ b/startkde/startplasmacompositor.cmake
+@@ -157,6 +157,11 @@ for prefix in `echo $scriptpath`; do
+   done
+ done
+
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ echo 'startplasmacompositor: Starting up...'  1>&2
+
+ # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
+@@ -232,6 +237,11 @@ fi
+
+ echo 'startplasmacompositor: Shutting down...'  1>&2
+
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+--
+2.13.0
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
index cbd22c5842..ae70767907 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
@@ -121,6 +121,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
 )
 

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index cbd22c5842..ae70767907 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -121,6 +121,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
 )
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2018-02-18 13:35 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2018-02-18 13:35 UTC (permalink / raw
  To: gentoo-commits

commit:     c7e30f34dd64a17b0a753ef53dc0a825a9154ac6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 13:31:48 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 13:32:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7e30f34

kde-plasma/plasma-workspace: Fix build w/o tests

Thanks-to: Duncan <1i5t5.duncan <AT> cox.net>
Bug: https://bugs.gentoo.org/646264
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/plasma-workspace-5.12.80-tests-optional.patch    | 14 ++++++++++++++
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild   |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
new file mode 100644
index 0000000000..73979f73b0
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
@@ -0,0 +1,14 @@
+--- a/dataengines/notifications/CMakeLists.txt  2018-01-31 19:54:26.608634042 -0700
++++ b/dataengines/notifications/CMakeLists.txt  2018-01-31 21:00:17.040830824 -0700
+@@ -33,6 +33,8 @@ install(FILES notifications.operations D
+ 
+ #unit test
+ 
+-add_executable(notification_test  notificationsanitizer.cpp notifications_test.cpp)
+-target_link_libraries(notification_test Qt5::Test Qt5::Core)
+-ecm_mark_as_test(notification_test)
++if(BUILD_TESTING)
++    add_executable(notification_test  notificationsanitizer.cpp notifications_test.cpp)
++    target_link_libraries(notification_test Qt5::Test Qt5::Core)
++    ecm_mark_as_test(notification_test)
++endif()

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 923f193500..21b940bcc9 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5 qmake-utils
 
@@ -125,6 +125,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
 )
 
 RESTRICT+=" test"


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2018-03-29 18:00 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2018-03-29 18:00 UTC (permalink / raw
  To: gentoo-commits

commit:     0ac1806c80c3c2ac960ccdf5bb16813493c289e2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 18:00:38 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 18:00:38 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ac1806c

kde-plasma/plasma-workspace: Make tests optional again

Package-Manager: Portage-2.3.26, Repoman-2.3.7

 .../plasma-workspace-5.12.80-tests-optional.patch  | 23 ++++++++++++----------
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
index 73979f73b0..e26b27e8c3 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
@@ -1,14 +1,17 @@
---- a/dataengines/notifications/CMakeLists.txt  2018-01-31 19:54:26.608634042 -0700
-+++ b/dataengines/notifications/CMakeLists.txt  2018-01-31 21:00:17.040830824 -0700
-@@ -33,6 +33,8 @@ install(FILES notifications.operations D
- 
- #unit test
- 
--add_executable(notification_test  notificationsanitizer.cpp notifications_test.cpp)
+diff --git a/dataengines/notifications/CMakeLists.txt b/dataengines/notifications/CMakeLists.txt
+index 8a90cb59..597b3f7e 100644
+--- a/dataengines/notifications/CMakeLists.txt
++++ b/dataengines/notifications/CMakeLists.txt
+@@ -46,7 +46,8 @@ ecm_qt_declare_logging_category(notifications_test_SRCS HEADER debug.h
+                                                IDENTIFIER NOTIFICATIONS
+                                                CATEGORY_NAME kde.dataengine.notifications`
+                                                DEFAULT_SEVERITY Info)
+-
+-add_executable(notification_test  ${notifications_test_SRCS})
 -target_link_libraries(notification_test Qt5::Test Qt5::Core)
 -ecm_mark_as_test(notification_test)
 +if(BUILD_TESTING)
-+    add_executable(notification_test  notificationsanitizer.cpp notifications_test.cpp)
-+    target_link_libraries(notification_test Qt5::Test Qt5::Core)
-+    ecm_mark_as_test(notification_test)
++	add_executable(notification_test  ${notifications_test_SRCS})
++	target_link_libraries(notification_test Qt5::Test Qt5::Core)
++	ecm_mark_as_test(notification_test)
 +endif()

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index a33002f4fe..21b940bcc9 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -125,6 +125,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
 )
 
 RESTRICT+=" test"


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2018-11-10 18:50 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2018-11-10 18:50 UTC (permalink / raw
  To: gentoo-commits

commit:     0626526494dfa356290323670f1a63e436d83f7f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 18:24:58 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 18:46:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=06265264

kde-plasma/plasma-workspace: Rebase startkde-script.patch, drop RDEPENDs

Upstream commit 5374513266ee707dee23ef43db7eba18c7b6cb3b

Thanks-to: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/670810
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../plasma-workspace-5.14.80-startkde-script.patch | 39 ++++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  4 +--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
new file mode 100644
index 0000000000..44e86a0169
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
@@ -0,0 +1,39 @@
+From bf569560bf195ac4e79d65d4103a7161a6a2f2ac Mon Sep 17 00:00:00 2001
+From: Elias Probst <mail@eliasprobst.eu>
+Date: Sat, 4 Jul 2015 11:33:01 +0200
+Subject: [PATCH] [startkde] Gentoo FHS script support
+
+---
+ startkde/startkde.cmake | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 2585600..9350158 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -210,6 +210,11 @@ for prefix in `echo $scriptpath`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+ # from some users that they're confused and don't know what to do. This is
+ # especially necessary on slow machines, where starting KDE takes one or two
+@@ -417,6 +422,11 @@ for prefix in `echo "$scriptpath"`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-- 
+2.3.6

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 7b96ecd714..d3df49e518 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -100,11 +100,9 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtpaths)
 	$(add_qt_dep qtquickcontrols 'widgets')
 	app-text/iso-codes
-	x11-apps/mkfontdir
 	x11-apps/xmessage
 	x11-apps/xprop
 	x11-apps/xrdb
-	x11-apps/xset
 	x11-apps/xsetroot
 	systemd? ( sys-apps/dbus[user-session] )
 	!systemd? ( sys-apps/dbus )
@@ -123,7 +121,7 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.14.80-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
 	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2019-07-20 20:08 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2019-07-20 20:08 UTC (permalink / raw
  To: gentoo-commits

commit:     8b27072530e08ae2ca94d87ba268662bce3e7f8d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 20:07:13 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 20:07:13 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8b270725

kde-plasma/plasma-workspace: Rename Xorg session

To make it distinguishable from Wayland session regardless of DM hacks.
SDDM hack can be dropped any time, both changes are still pending upstreams.

Bug: https://bugs.gentoo.org/689120
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../plasma-workspace-5.16.3-x11sessionrename.patch | 91 ++++++++++++++++++++++
 .../plasma-workspace-5.16.49.9999.ebuild           |  1 +
 2 files changed, 92 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
new file mode 100644
index 0000000000..a851f5f54b
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
@@ -0,0 +1,91 @@
+From bcabb38b1f07a52847752fb54eb61696a1312a61 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 2 Jul 2019 10:13:54 +0200
+Subject: [PATCH] Fix Name conflict between plasma.desktop and
+ plasmawayland.desktop
+
+Summary:
+SDDM as of 0.18.1 appends " (Wayland)" to the Name of any session file it
+finds in wayland-sessions dir, and Plasma is relying on that behaviour to
+distinguish between its X11 and Wayland sessions. This leads to duplicate
+"Plasma" entries on any other DM not applying the same hack, e.g. lightdm,
+and users are lost without downstream patching.
+
+Instead of waiting for which of (SDDM, Plasma) is doing something about
+it first, renaming X11 session to "Plasma on Xorg" appears to be the most
+elegant solution out of the deadlock. SDDM can be fixed any time later.
+
+CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
+See also: https://github.com/sddm/sddm/pull/997
+
+Reviewers: #plasma
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D22210
+---
+ plasma.desktop.cmake | 46 +----------------------------
+ 1 file changed, 1 insertion(+), 45 deletions(-)
+
+diff --git a/plasma.desktop.cmake b/plasma.desktop.cmake
+index 4d361606d..099de2908 100644
+--- a/plasma.desktop.cmake
++++ b/plasma.desktop.cmake
+@@ -3,51 +3,7 @@ Type=XSession
+ Exec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
+ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
+ DesktopNames=KDE
+-Name=Plasma
+-Name[ar]=بلازما
+-Name[bs]=Plazma
+-Name[ca]=Plasma
+-Name[ca@valencia]=Plasma
+-Name[cs]=Plasma
+-Name[da]=Plasma
+-Name[de]=Plasma
+-Name[el]=Plasma
+-Name[en_GB]=Plasma
+-Name[es]=Plasma
+-Name[et]=Plasma
+-Name[eu]=Plasma
+-Name[fi]=Plasma
+-Name[fr]=Plasma
+-Name[gl]=Plasma
+-Name[he]=פלזמה
+-Name[hu]=Plasma
+-Name[id]=Plasma
+-Name[is]=Plasma
+-Name[it]=Plasma
+-Name[ja]=プラズマ
+-Name[ko]=Plasma
+-Name[lt]=Plasma
+-Name[nb]=Plasma
+-Name[nds]=Plasma
+-Name[nl]=Plasma
+-Name[nn]=Plasma
+-Name[pa]=ਪਲਾਜ਼ਮਾ
+-Name[pl]=Plazma
+-Name[pt]=Plasma
+-Name[pt_BR]=Plasma
+-Name[ru]=Plasma
+-Name[sk]=Plasma
+-Name[sl]=Plasma
+-Name[sr]=Плазма
+-Name[sr@ijekavian]=Плазма
+-Name[sr@ijekavianlatin]=Plasma
+-Name[sr@latin]=Plasma
+-Name[sv]=Plasma
+-Name[tr]=Plama
+-Name[uk]=Плазма
+-Name[x-test]=xxPlasmaxx
+-Name[zh_CN]=Plasma
+-Name[zh_TW]=Plasma
++Name=Plasma on Xorg
+ Comment=Plasma by KDE
+ Comment[ar]=بلازما كدي
+ Comment[bs]=Plazma od strane KDe
+-- 
+2.22.0
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.16.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.16.49.9999.ebuild
index 4922a7a24d..d3cdb07eb2 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.16.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.16.49.9999.ebuild
@@ -118,6 +118,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.14.80-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+	"${FILESDIR}/${PN}-5.16.3-x11sessionrename.patch"
 )
 
 RESTRICT+=" test"


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2019-07-24 11:10 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2019-07-24 11:10 UTC (permalink / raw
  To: gentoo-commits

commit:     e98ea25b78edc3a378480b8e8e34e4136d1de96c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 10:35:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 11:09:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e98ea25b

kde-plasma/plasma-workspace: Drop share dataengine ahead of upstream

This will be merged in git master shortly, why not get a head start and
drop an unnecessary dependency.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...asma-workspace-5.16.4-no-share-dataengine.patch | 25 ++++++++++++++++++++++
 .../plasma-workspace-5.16.49.9999.ebuild           |  1 +
 2 files changed, 26 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
new file mode 100644
index 0000000000..dc5214b303
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
@@ -0,0 +1,25 @@
+See also: https://phabricator.kde.org/D22691
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,7 @@
+ include(KDEPackageAppTemplates)
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+-                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet
++                    Plasma DocTools Runner NotifyConfig Su NewStuff Wallet
+                     IdleTime Declarative I18n KCMUtils TextWidgets KDELibs4Support Crash GlobalAccel
+                     DBusAddons Wayland CoreAddons)
+ find_package(KDED CONFIG REQUIRED)
+diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
+--- a/dataengines/CMakeLists.txt
++++ b/dataengines/CMakeLists.txt
+@@ -24,7 +24,6 @@
+ add_subdirectory(time)
+ add_subdirectory(weather)
+ add_subdirectory(statusnotifieritem)
+-add_subdirectory(share)
+ 
+ if(NOT WIN32)
+   add_subdirectory(mouse)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.16.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.16.49.9999.ebuild
index de7bf3b24c..81b82f617e 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.16.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.16.49.9999.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
 	"${FILESDIR}/${PN}-5.16.3-x11sessionrename.patch"
+	"${FILESDIR}/${PN}-5.16.4-no-share-dataengine.patch"
 )
 
 RESTRICT+=" test"


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2019-10-29 22:01 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2019-10-29 22:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b388c33932ad258b3c1d086bca252493bc824da3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 21:35:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 21:48:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b388c339

kde-plasma/plasma-workspace: Drop translations of Plasma session name

We need to remove all translations in order to not reproduce the initial issue.
Drop obsolete comment, the old paths won't come back.

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ma-workspace-5.17.2-waylandsessionrename.patch} | 61 ++++++++++++++++++----
 .../plasma-workspace-5.17.49.9999.ebuild           |  3 +-
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  5 +-
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
similarity index 54%
rename from kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch
rename to kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
index 2493b8a159..71d1ce4abb 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
@@ -1,7 +1,7 @@
-From f8e716524435c0fc2bfec2aa36183e5c99e12d42 Mon Sep 17 00:00:00 2001
+From 36bc9bfd9661f88039a8945688e07b0626b48610 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Tue, 15 Oct 2019 18:33:45 +0200
-Subject: [PATCH] Fix Name conflict between plasma.desktop and
+Subject: [PATCH 1/2] Fix Name conflict between plasma.desktop and
  plasmawayland.desktop
 
 Summary:
@@ -19,7 +19,7 @@ See also: https://github.com/sddm/sddm/pull/997
 
 Reviewers: #plasma, davidedmundson, fvogt, ngraham
 
-Reviewed By: #plasma, davidedmundson, ngraham
+Reviewed By: #plasma, davidedmundson, fvogt, ngraham
 
 Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel
 
@@ -31,18 +31,61 @@ Differential Revision: https://phabricator.kde.org/D22210
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/login-sessions/plasmawayland.desktop.cmake b/login-sessions/plasmawayland.desktop.cmake
-index 1207621e0..c114959a2 100644
+index 64f997ea4..3e9b46bc9 100644
 --- a/login-sessions/plasmawayland.desktop.cmake
 +++ b/login-sessions/plasmawayland.desktop.cmake
-@@ -2,7 +2,7 @@
+@@ -2,51 +2,7 @@
  Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
  TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
  DesktopNames=KDE
 -Name=Plasma
+-Name[ar]=بلازما
+-Name[bs]=Plazma
+-Name[ca]=Plasma
+-Name[ca@valencia]=Plasma
+-Name[cs]=Plasma
+-Name[da]=Plasma
+-Name[de]=Plasma
+-Name[el]=Plasma
+-Name[en_GB]=Plasma
+-Name[es]=Plasma
+-Name[et]=Plasma
+-Name[eu]=Plasma
+-Name[fi]=Plasma
+-Name[fr]=Plasma
+-Name[gl]=Plasma
+-Name[he]=פלזמה
+-Name[hu]=Plasma
+-Name[id]=Plasma
+-Name[is]=Plasma
+-Name[it]=Plasma
+-Name[ja]=プラズマ
+-Name[ko]=Plasma
+-Name[lt]=Plasma
+-Name[nb]=Plasma
+-Name[nds]=Plasma
+-Name[nl]=Plasma
+-Name[nn]=Plasma
+-Name[pa]=ਪਲਾਜ਼ਮਾ
+-Name[pl]=Plazma
+-Name[pt]=Plasma
+-Name[pt_BR]=Plasma
+-Name[ru]=Plasma
+-Name[sk]=Plasma
+-Name[sl]=Plasma
+-Name[sr]=Плазма
+-Name[sr@ijekavian]=Плазма
+-Name[sr@ijekavianlatin]=Plasma
+-Name[sr@latin]=Plasma
+-Name[sv]=Plasma
+-Name[tr]=Plama
+-Name[uk]=Плазма
+-Name[x-test]=xxPlasmaxx
+-Name[zh_CN]=Plasma
+-Name[zh_TW]=Plasma
 +Name=Plasma (Wayland)
- Name[ar]=بلازما
- Name[bs]=Plazma
- Name[ca]=Plasma
+ Comment=Plasma by KDE
+ Comment[ar]=بلازما كدي
+ Comment[bs]=Plazma od strane KDe
 -- 
 2.23.0
-

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
index 4712dbfc55..96f1c1b918 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
@@ -117,9 +117,8 @@ PDEPEND="
 "
 
 PATCHES=(
-	# TODO: Restore Gentoo part for FHS installs, bug 688366
 	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-	"${FILESDIR}/${PN}-5.17.0-waylandsessionrename.patch"
+	"${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch"
 )
 
 RESTRICT+=" test"

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index e60dcf067b..6e287a1520 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -117,10 +117,7 @@ PDEPEND="
 	$(add_plasma_dep kde-cli-tools)
 "
 
-PATCHES=(
-	# TODO: Restore Gentoo part for FHS installs, bug 688366
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
 
 RESTRICT+=" test"
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2020-06-21 21:59 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-06-21 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     ec025c06d2a9a37a8cdce7fd4e80f48ac26764c9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 21:09:08 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 21:41:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec025c06

kde-plasma/plasma-workspace: systray [2/4]: Fix unreadable text w/ Breeze Dark

See also: https://mail.kde.org/pipermail/distributions/2020-June/000368.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=422684

Upstream commit faef126255222f727219bf69ac2b89857dc61ab2
"Port applets to use PlasmaExtras.PlaceholderMessage"

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ....19.2-use-PlasmaExtras.PlaceholderMessage.patch | 44 ++++++++++++++++++++++
 .../plasma-workspace-5.19.49.9999.ebuild           |  5 ++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
new file mode 100644
index 0000000000..527e199cc6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
@@ -0,0 +1,44 @@
+From faef126255222f727219bf69ac2b89857dc61ab2 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 14 Jun 2020 09:08:21 -0600
+Subject: [PATCH] Port applets to use PlasmaExtras.PlaceholderMessage
+
+The Kirigami version uses QQC2 elements which don't respect the plasma
+theme and color scheme, leading to thing slooking out of place
+especially when using a dark color theme or scheme.
+
+Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
+---
+ applets/clipboard/contents/ui/Menu.qml                          | 2 +-
+ .../notifications/package/contents/ui/FullRepresentation.qml    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml
+index 0bd6064a5..cac8380db 100644
+--- a/applets/clipboard/contents/ui/Menu.qml
++++ b/applets/clipboard/contents/ui/Menu.qml
+@@ -55,7 +55,7 @@ PlasmaExtras.ScrollArea {
+             onAction: menu.action(uuid)
+         }
+ 
+-        Kirigami.PlaceholderMessage {
++        PlasmaExtras.PlaceholderMessage {
+             id: emptyHint
+ 
+             anchors.centerIn: parent
+diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml
+index b34dee7af..989cb4341 100644
+--- a/applets/notifications/package/contents/ui/FullRepresentation.qml
++++ b/applets/notifications/package/contents/ui/FullRepresentation.qml
+@@ -585,7 +585,7 @@ PlasmaComponents3.Page {
+                     }
+                 }
+ 
+-                Kirigami.PlaceholderMessage {
++                PlasmaExtras.PlaceholderMessage {
+                     anchors.centerIn: parent
+                     width: parent.width - (units.largeSpacing * 4)
+ 
+-- 
+2.27.0
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.49.9999.ebuild
index 0b3a93c49d..2ec5040768 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.49.9999.ebuild
@@ -123,7 +123,10 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+)
 
 RESTRICT+=" test"
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-05-29 21:13 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2021-05-29 21:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2e45a010d69af7cd6d7d686f60db7c1cedc1bb41
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 20:49:11 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 29 20:49:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e45a010

kde-plasma/plasma-workspace: Rebase split-libkworkspace.patch

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...h => plasma-workspace-5.21.5-split-libkworkspace.patch} | 14 ++++++--------
 .../plasma-workspace/plasma-workspace-5.21.90.ebuild       |  2 +-
 .../plasma-workspace/plasma-workspace-5.22.49.9999.ebuild  |  2 +-
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild   |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
similarity index 71%
rename from kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch
rename to kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
index f12d9f4daf..c96c0ba623 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
@@ -8,19 +8,19 @@ Subject: [PATCH] libkworkspace: Allow standalone build
  1 file changed, 5 insertions(+), 1 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e587a386..d1a63527 100644
+index 67f82cfb7..88a8c09b4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -46,6 +46,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
+@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
  
  find_package(KF5TextEditor)
  find_package(KWinDBusInterface CONFIG REQUIRED)
-+find_package(LibKWorkspace 5.14.1)
++find_package(LibKWorkspace 5.21.5)
  
+ find_package(KF5Screen CONFIG REQUIRED)
  find_package(KScreenLocker 5.13.80 REQUIRED)
- find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
-@@ -135,7 +136,10 @@ endif()
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS)
+ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE)
  
  add_subdirectory(doc)
 -add_subdirectory(libkworkspace)
@@ -31,5 +31,3 @@ index e587a386..d1a63527 100644
  add_subdirectory(libdbusmenuqt)
  add_subdirectory(appmenu)
  
--- 
-2.19.1

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild
index 56a8a45e5f..f3b2afd529 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild
@@ -148,7 +148,7 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild
index 8f18aa1c0b..470072dbc5 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild
@@ -148,7 +148,7 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 7114aa97f8..d7e27260c8 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -148,7 +148,7 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
 
 src_prepare() {
 	ecm_src_prepare


^ permalink raw reply related	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-05-29 21:14 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-10 18:50 [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2021-05-29 21:13 Andreas Sturmlechner
2020-06-21 21:59 Andreas Sturmlechner
2019-10-29 22:01 Andreas Sturmlechner
2019-07-24 11:10 Andreas Sturmlechner
2019-07-20 20:08 Andreas Sturmlechner
2018-03-29 18:00 Johannes Huber
2018-02-18 13:35 Andreas Sturmlechner
2017-08-02 23:22 Andreas Sturmlechner
2017-07-27 18:19 Andreas Sturmlechner
2016-12-31 21:45 Andreas Sturmlechner
2016-06-15 12:38 Michael Palimaka
2015-11-26 16:06 Michael Palimaka
2015-05-31 21:03 Johannes Huber
2015-02-12 22:39 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox