* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-01-21 20:48 Johannes Huber
0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2015-01-21 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 5bca4f847ba82eed4ff02cb5c8ffa794e2ebd325
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Jan 20 23:15:57 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 21 20:47:43 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5bca4f84
[kde-plasma/plasma-workspace] Make tests optional
drkonqi/internalkxmlrpcclient/autotests subdir was added unconditionally.
---
.../plasma-workspace-9999-tests-optional.patch | 25 ++++++++++++++++++++++
.../plasma-workspace/plasma-workspace-9999.ebuild | 4 ++++
2 files changed, 29 insertions(+)
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
new file mode 100644
index 0000000..1c9c6bf
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt 2015-01-21 00:23:54.096323752 +0100
++++ b/CMakeLists.txt 2015-01-21 00:24:36.304654204 +0100
+@@ -7,7 +7,7 @@
+ set(QT_MIN_VERSION "5.3.0")
+ set(KF5_MIN_VERSION "5.7.0")
+ set(INSTALL_SDDM_THEME TRUE)
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Script Network)
+ 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,10 @@
+
+ ########### Targets ###########
+ add_subdirectory(src)
+-add_subdirectory(autotests)
++
++if(BUILD_TESTING)
++ 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 6d1bbe6..47fdee6 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -4,6 +4,7 @@
EAPI=5
+KDE_TEST="true"
VIRTUALX_REQUIRED="test"
inherit kde5 multilib
@@ -108,6 +109,9 @@ PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
RESTRICT="test"
src_prepare() {
+ # whole patch should be upstreamed, doesn't work in PATCHES
+ epatch "${FILESDIR}/${PN}-9999-tests-optional.patch"
+
kde5_src_prepare
sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-01-27 20:07 Johannes Huber
0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2015-01-27 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 18a9e9790c13bea5f6c4e27cbbb0c73288be9c3f
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 27 20:06:45 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 27 20:06:45 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=18a9e979
[kde-plasma/plasma-workspace] Revision bump
Backports freeze patch.
Package-Manager: portage-2.2.15
---
.../files/plasma-workspace-5.2.0-freeze.patch | 35 ++++++++++++++++++++++
...2.0.ebuild => plasma-workspace-5.2.0-r1.ebuild} | 5 +++-
.../plasma-workspace-5.2.9999.ebuild | 5 +++-
3 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.2.0-freeze.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.2.0-freeze.patch
new file mode 100644
index 0000000..992ea2c
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.2.0-freeze.patch
@@ -0,0 +1,35 @@
+From ba81da53e540ce9ca08ce794a92329ed15f726bc Mon Sep 17 00:00:00 2001
+From: Nick Shaforostoff <shafff@ukr.net>
+Date: Tue, 27 Jan 2015 01:53:17 +0000
+Subject: [PATCH] =?UTF-8?q?fix=20total=20system=20freeze=20on=20some=20sys?=
+ =?UTF-8?q?tems=20like=20my=2010=20inch=20netbook=20thanks=20Thomas=20L?=
+ =?UTF-8?q?=C3=BCbking=20for=20providing=20the=20patch=20BUG:=20340294?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ lookandfeel/contents/windowswitcher/WindowSwitcher.qml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lookandfeel/contents/windowswitcher/WindowSwitcher.qml b/lookandfeel/contents/windowswitcher/WindowSwitcher.qml
+index acb212f..e4a4636 100644
+--- a/lookandfeel/contents/windowswitcher/WindowSwitcher.qml
++++ b/lookandfeel/contents/windowswitcher/WindowSwitcher.qml
+@@ -52,7 +52,7 @@ KWin.Switcher {
+
+ property bool canStretchX: false
+ property bool canStretchY: false
+- width: tabBox.screenGeometry.width * 0.15
++ width: tabBox.screenGeometry.width * 0.15 + (__verticalScrollBar.visible ? __verticalScrollBar.width : 0)
+ height: tabBox.screenGeometry.height
+ clip: true
+ focus: true
+@@ -155,3 +155,4 @@ KWin.Switcher {
+ }
+ }
+ }
++
+--
+2.2.2
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r1.ebuild
similarity index 97%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.2.0.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r1.ebuild
index e7a27b1..caff838 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.0.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r1.ebuild
@@ -103,7 +103,10 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
"
-PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-startkde-script.patch"
+ "${FILESDIR}/${P}-freeze.patch"
+)
RESTRICT="test"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
index 6d1bbe6..46738bc 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
@@ -103,7 +103,10 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
"
-PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.2.0-freeze.patch"
+)
RESTRICT="test"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-04-29 15:03 Michael Palimaka
0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2015-04-29 15:03 UTC (permalink / raw
To: gentoo-commits
commit: 05925f03204aa85f9e8a6c26f34b61150b6c5375
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 15:02:19 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 15:02:19 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=05925f03
[kde-plasma/plasma-workspace] Backport patch from upstream to fix upstream bug #346870.
Package-Manager: portage-2.2.18
.../files/plasma-workspace-5.3.0-segfault.patch | 30 ++++++++++++++++++++++
...3.0.ebuild => plasma-workspace-5.3.0-r1.ebuild} | 5 +++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.3.0-segfault.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.3.0-segfault.patch
new file mode 100644
index 0000000..2a669cd
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.3.0-segfault.patch
@@ -0,0 +1,30 @@
+From a234c0923767649cc6545866a563ffc4dba58de2 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Wed, 29 Apr 2015 09:28:11 +0200
+Subject: [PATCH] check for model existence
+
+BUG:346870
+---
+ wallpapers/image/image.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/wallpapers/image/image.cpp b/wallpapers/image/image.cpp
+index a3b9c10..f5920bf 100644
+--- a/wallpapers/image/image.cpp
++++ b/wallpapers/image/image.cpp
+@@ -799,6 +799,12 @@ void Image::removeWallpaper(QString name)
+
+ void Image::commitDeletion()
+ {
++ //This is invokable from qml, so at any moment
++ //we can't be sure the model exists
++ if (!m_model) {
++ return;
++ }
++
+ for (const QString wallpaperCandidate : m_model->wallpapersAwaitingDeletion()) {
+ removeWallpaper(wallpaperCandidate);
+ }
+--
+2.0.5
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.0-r1.ebuild
similarity index 97%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.3.0.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.3.0-r1.ebuild
index 1445a90..7fb571f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.0.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.0-r1.ebuild
@@ -123,7 +123,10 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
"
-PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-startkde-script.patch"
+ "${FILESDIR}/${P}-segfault.patch"
+)
RESTRICT="test"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-06-01 18:18 Michael Palimaka
0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2015-06-01 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 14b79a7d4e149c0ed23a4480fa4e4ededafbe126
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 1 18:18:09 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun 1 18:18:09 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=14b79a7d
[kde-plasma/plasma-workspace] Import PAM files from kde-base/kdebase-pam.
These files are currently only used by kcheckpass for unlocking the screen.
Package-Manager: portage-2.2.20
kde-plasma/plasma-workspace/files/kde-np.pam | 10 ++++++++++
kde-plasma/plasma-workspace/files/kde.pam | 11 +++++++++++
.../plasma-workspace/plasma-workspace-5.3.49.9999.ebuild | 6 ++++--
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 6 ++++--
4 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/kde-np.pam b/kde-plasma/plasma-workspace/files/kde-np.pam
new file mode 100644
index 0000000..f5499e6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/kde-np.pam
@@ -0,0 +1,10 @@
+#%PAM-1.0
+
+auth required pam_nologin.so
+auth required pam_permit.so
+
+account include system-local-login
+
+password include system-local-login
+
+session include system-local-login
diff --git a/kde-plasma/plasma-workspace/files/kde.pam b/kde-plasma/plasma-workspace/files/kde.pam
new file mode 100644
index 0000000..24d19de
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/kde.pam
@@ -0,0 +1,11 @@
+#%PAM-1.0
+
+auth required pam_nologin.so
+
+auth include system-local-login
+
+account include system-local-login
+
+password include system-local-login
+
+session include system-local-login
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 c05b182..a7d7177 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
@@ -8,7 +8,7 @@ KDE_HANDBOOK="true"
KDE_PUNT_BOGUS_DEPS="true"
KDE_TEST="true"
VIRTUALX_REQUIRED="test"
-inherit kde5 multilib
+inherit kde5 multilib pam
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
@@ -102,7 +102,6 @@ RDEPEND="${COMMON_DEPEND}
dev-qt/qdbus:5
dev-qt/qtpaths:5
dev-qt/qtquickcontrols:5[widgets]
- kde-base/kdebase-pam
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
@@ -158,6 +157,9 @@ src_configure() {
src_install() {
kde5_src_install
+ newpamd "${FILESDIR}/kde.pam" kde
+ newpamd "${FILESDIR}/kde-np.pam" kde-np
+
# startup and shutdown scripts
insinto /etc/plasma/startup
doins "${FILESDIR}/agent-startup.sh"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 329e224..6c2b55a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="true"
KDE_PUNT_BOGUS_DEPS="true"
KDE_TEST="true"
VIRTUALX_REQUIRED="test"
-inherit kde5 multilib
+inherit kde5 multilib pam
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
@@ -101,7 +101,6 @@ RDEPEND="${COMMON_DEPEND}
dev-qt/qdbus:5
dev-qt/qtpaths:5
dev-qt/qtquickcontrols:5[widgets]
- kde-base/kdebase-pam
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
@@ -157,6 +156,9 @@ src_configure() {
src_install() {
kde5_src_install
+ newpamd "${FILESDIR}/kde.pam" kde
+ newpamd "${FILESDIR}/kde-np.pam" kde-np
+
# startup and shutdown scripts
insinto /etc/plasma/startup
doins "${FILESDIR}/agent-startup.sh"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-07-04 14:48 Johannes Huber
0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2015-07-04 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 2e88b36c1e59478154b4ee8899c38917c3bb8e5f
Author: Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Sat Jul 4 09:35:23 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 13:09:11 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e88b36c
[kde-plasma/plasma-workspace] Update startkde Gentoo FHS patch for 5.4
Package-Manager: portage-2.2.20
.../plasma-workspace-5.4-startkde-script.patch | 40 ++++++++++++++++++++++
.../plasma-workspace/plasma-workspace-9999.ebuild | 2 +-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch
new file mode 100644
index 0000000..1630080
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch
@@ -0,0 +1,40 @@
+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
++
+ # Activate the kde font directories.
+ #
+ # There are 4 directories that may be used for supplying fonts for KDE.
+@@ -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 6c2b55a..5a4bbde 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -121,7 +121,7 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
"
-PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
RESTRICT="test"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-08-16 20:36 Johannes Huber
0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2015-08-16 20:36 UTC (permalink / raw
To: gentoo-commits
commit: 2e42a4bcc03207b3226d5bf229d297b353b8a511
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 16 20:08:52 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 20:14:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e42a4bc
kde-plasma/plasma-workspace: Backport consolekit2 support
Package-Manager: portage-2.2.20.1
.../files/plasma-workspace-5.4-consolekit2.patch | 189 +++++++++++++++++++++
.../plasma-workspace-5.4.49.9999.ebuild | 5 +-
2 files changed, 193 insertions(+), 1 deletion(-)
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
new file mode 100644
index 0000000..6131c90
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch
@@ -0,0 +1,189 @@
+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/plasma-workspace-5.4.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
index 7145c33..9af5106 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
@@ -122,7 +122,10 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
"
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.4-consolekit2.patch"
+)
RESTRICT="test"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-11-10 12:41 Michael Palimaka
0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2015-11-10 12:41 UTC (permalink / raw
To: gentoo-commits
commit: c2dd7a70701431555e8b1204bc5a332d0e0bb6de
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Nov 9 07:27:43 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 22:22:34 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2dd7a70
kde-plasma/plasma-workspace: Fix dead button in drkonqi
Not nice: Getting a crash, then going through drkonqi and encountering a usability bug.
Package-Manager: portage-2.2.20.1
.../files/plasma-workspace-5.4.3-fix-drkonqi.patch | 32 ++++++++++++++++++++++
.../plasma-workspace/plasma-workspace-5.4.3.ebuild | 1 +
.../plasma-workspace-5.4.49.9999.ebuild | 1 +
3 files changed, 34 insertions(+)
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
new file mode 100644
index 0000000..9aa89ca
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch
@@ -0,0 +1,32 @@
+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.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
index f274660..52f30c5 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
@@ -126,6 +126,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.4-consolekit2.patch"
+ "${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch" #Upstream bug 354110
)
RESTRICT="test"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
index f1aa325..7b58192 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
@@ -126,6 +126,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.4-consolekit2.patch"
+ "${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch" #Upstream bug 354110
)
RESTRICT="test"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-11-14 16:01 Michael Palimaka
0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2015-11-14 16:01 UTC (permalink / raw
To: gentoo-commits
commit: 7bf4c3b3b8cedd4960c163eccac57eb55883ab96
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Nov 12 23:54:29 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 15:22:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7bf4c3b3
kde-plasma/plasma-workspace: USE=pam, fix setuid, block kdebase-pam:4
SUID optional per kcheckpass/README, only required for shadow based login
setuid code in upstream cmake does not work, do it manually instead if USE=-pam
Block kdebase-pam which sneakily sabotaged plasma-workspace in /etc/pam.d,
leading to broken screenlocker bugs like #564618
Package-Manager: portage-2.2.24
.../plasma-workspace-5.4.3-no-SUID-no-GUID.patch | 16 ++++++++++++++++
....4.3.ebuild => plasma-workspace-5.4.3-r1.ebuild} | 21 +++++++++++++++------
.../plasma-workspace-5.4.49.9999.ebuild | 21 +++++++++++++++------
3 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-no-SUID-no-GUID.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-no-SUID-no-GUID.patch
new file mode 100644
index 0000000..a099b23
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-no-SUID-no-GUID.patch
@@ -0,0 +1,16 @@
+diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt
+index a63fa1403e897e70989dc2e1ba7eed4bc69cbb51..12d1bfb3c690eca1acf344045a92eb942669da83 100644
+--- a/ksmserver/screenlocker/kcheckpass/CMakeLists.txt
++++ b/ksmserver/screenlocker/kcheckpass/CMakeLists.txt
+@@ -22,10 +22,6 @@ endif ()
+
+ set_property(TARGET kcheckpass APPEND_STRING PROPERTY COMPILE_FLAGS " -U_REENTRANT")
+ target_link_libraries(kcheckpass ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES})
+-install(TARGETS kcheckpass DESTINATION ${KDE_INSTALL_LIBEXECDIR})
+-install(CODE "
+- set(KCP_PATH \"\$ENV{DESTDIR}${KDE_INSTALL_LIBEXECDIR}/kcheckpass\")
+- execute_process(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\")
+-")
++install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR})
+
+ #EXTRA_DIST = README
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
similarity index 92%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
index 52f30c5..a0c34fd 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
@@ -12,13 +12,9 @@ inherit kde5 multilib pam qmake-utils
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=" ~amd64 ~x86"
-IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor"
+IUSE="dbus +drkonqi +geolocation gps pam prison qalculate +systemmonitor"
COMMON_DEPEND="
- $(add_plasma_dep kwayland)
- $(add_plasma_dep kwin)
- $(add_plasma_dep libkscreen)
- $(add_plasma_dep libksysguard)
$(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
@@ -58,6 +54,10 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlrpcclient)
$(add_frameworks_dep plasma)
$(add_frameworks_dep solid)
+ $(add_plasma_dep kwayland)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libkscreen)
+ $(add_plasma_dep libksysguard)
dev-libs/wayland
dev-qt/qtconcurrent:5
dev-qt/qtdbus:5
@@ -70,7 +70,6 @@ COMMON_DEPEND="
dev-qt/qtx11extras:5
dev-qt/qtxml:5
media-libs/phonon[qt5]
- sys-libs/pam
sys-libs/zlib
x11-libs/libICE
x11-libs/libSM
@@ -88,6 +87,7 @@ COMMON_DEPEND="
)
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
+ pam? ( virtual/pam )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
systemmonitor? (
@@ -111,7 +111,9 @@ RDEPEND="${COMMON_DEPEND}
systemmonitor? ( $(add_plasma_dep ksysguard) )
!kde-base/freespacenotifier:4
!kde-base/libtaskmanager:4
+ !<kde-base/kcheckpass-4.11.22-r1:4
!kde-base/kcminit:4
+ !kde-base/kdebase-pam:4
!kde-base/kdebase-startkde:4
!kde-base/klipper:4
!kde-base/krunner:4
@@ -127,6 +129,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.4-consolekit2.patch"
"${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch" #Upstream bug 354110
+ "${FILESDIR}/${PN}-5.4.3-no-SUID-no-GUID.patch"
)
RESTRICT="test"
@@ -164,6 +167,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ $(cmake-utils_use_find_package pam)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
$(cmake-utils_use_find_package gps libgps)
$(cmake-utils_use_find_package prison)
@@ -185,6 +189,11 @@ src_install() {
insinto /etc/plasma/shutdown
doins "${FILESDIR}/agent-shutdown.sh"
+
+ if ! use pam; then
+ chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+ chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+ fi
}
pkg_postinst () {
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
index 7b58192..1cd19ef 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
@@ -12,13 +12,9 @@ inherit kde5 multilib pam qmake-utils
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
-IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor"
+IUSE="dbus +drkonqi +geolocation gps pam prison qalculate +systemmonitor"
COMMON_DEPEND="
- $(add_plasma_dep kwayland)
- $(add_plasma_dep kwin)
- $(add_plasma_dep libkscreen)
- $(add_plasma_dep libksysguard)
$(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
@@ -58,6 +54,10 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlrpcclient)
$(add_frameworks_dep plasma)
$(add_frameworks_dep solid)
+ $(add_plasma_dep kwayland)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libkscreen)
+ $(add_plasma_dep libksysguard)
dev-libs/wayland
dev-qt/qtconcurrent:5
dev-qt/qtdbus:5
@@ -70,7 +70,6 @@ COMMON_DEPEND="
dev-qt/qtx11extras:5
dev-qt/qtxml:5
media-libs/phonon[qt5]
- sys-libs/pam
sys-libs/zlib
x11-libs/libICE
x11-libs/libSM
@@ -88,6 +87,7 @@ COMMON_DEPEND="
)
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
+ pam? ( virtual/pam )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
systemmonitor? (
@@ -111,7 +111,9 @@ RDEPEND="${COMMON_DEPEND}
systemmonitor? ( $(add_plasma_dep ksysguard) )
!kde-base/freespacenotifier:4
!kde-base/libtaskmanager:4
+ !<kde-base/kcheckpass-4.11.22-r1:4
!kde-base/kcminit:4
+ !kde-base/kdebase-pam:4
!kde-base/kdebase-startkde:4
!kde-base/klipper:4
!kde-base/krunner:4
@@ -127,6 +129,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.4-consolekit2.patch"
"${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch" #Upstream bug 354110
+ "${FILESDIR}/${PN}-5.4.3-no-SUID-no-GUID.patch"
)
RESTRICT="test"
@@ -164,6 +167,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ $(cmake-utils_use_find_package pam)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
$(cmake-utils_use_find_package gps libgps)
$(cmake-utils_use_find_package prison)
@@ -185,6 +189,11 @@ src_install() {
insinto /etc/plasma/shutdown
doins "${FILESDIR}/agent-shutdown.sh"
+
+ if ! use pam; then
+ chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+ chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+ fi
}
pkg_postinst () {
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-12-28 0:33 Marc Schiffbauer
0 siblings, 0 replies; 19+ messages in thread
From: Marc Schiffbauer @ 2015-12-28 0:33 UTC (permalink / raw
To: gentoo-commits
commit: d37c9b73cb83e8a1bef578f1fa408402798cb89b
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 00:31:47 2015 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 00:31:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d37c9b73
kde-plasma/plasma-workspace: add prefix to agent script
.../files/{agent-shutdown.sh => 10-agent-shutdown.sh} | 0
.../files/{agent-startup.sh => 10-agent-startup.sh} | 0
...ma-workspace-5.5.2.ebuild => plasma-workspace-5.5.2-r1.ebuild} | 8 ++++----
kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild | 8 ++++----
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 8 ++++----
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/agent-shutdown.sh b/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
similarity index 100%
rename from kde-plasma/plasma-workspace/files/agent-shutdown.sh
rename to kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
diff --git a/kde-plasma/plasma-workspace/files/agent-startup.sh b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
similarity index 100%
rename from kde-plasma/plasma-workspace/files/agent-startup.sh
rename to kde-plasma/plasma-workspace/files/10-agent-startup.sh
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.5.2-r1.ebuild
similarity index 95%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.5.2.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.5.2-r1.ebuild
index 172a9df..7d904f1 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.2-r1.ebuild
@@ -154,10 +154,10 @@ src_install() {
# startup and shutdown scripts
insinto /etc/plasma/startup
- doins "${FILESDIR}/agent-startup.sh"
+ doins "${FILESDIR}/10-agent-startup.sh"
insinto /etc/plasma/shutdown
- doins "${FILESDIR}/agent-shutdown.sh"
+ doins "${FILESDIR}/10-agent-shutdown.sh"
}
pkg_postinst () {
@@ -165,7 +165,7 @@ pkg_postinst () {
echo
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
- elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
echo
}
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 f8f4e9b..002a83c 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
@@ -154,10 +154,10 @@ src_install() {
# startup and shutdown scripts
insinto /etc/plasma/startup
- doins "${FILESDIR}/agent-startup.sh"
+ doins "${FILESDIR}/10-agent-startup.sh"
insinto /etc/plasma/shutdown
- doins "${FILESDIR}/agent-shutdown.sh"
+ doins "${FILESDIR}/10-agent-shutdown.sh"
}
pkg_postinst () {
@@ -165,7 +165,7 @@ pkg_postinst () {
echo
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
- elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
echo
}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 17de2d7..4e68d3a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -148,10 +148,10 @@ src_install() {
# startup and shutdown scripts
insinto /etc/plasma/startup
- doins "${FILESDIR}/agent-startup.sh"
+ doins "${FILESDIR}/10-agent-startup.sh"
insinto /etc/plasma/shutdown
- doins "${FILESDIR}/agent-shutdown.sh"
+ doins "${FILESDIR}/10-agent-shutdown.sh"
}
pkg_postinst () {
@@ -159,7 +159,7 @@ pkg_postinst () {
echo
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
- elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
echo
}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2016-03-20 14:47 Michael Palimaka
0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2016-03-20 14:47 UTC (permalink / raw
To: gentoo-commits
commit: bd76d0815d200f350c016aa7ff52e58052dcaa18
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Mar 18 23:27:23 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 14:47:26 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bd76d081
kde-plasma/plasma-workspace: Add rpath-, drop tests patch; missing DEPEND
- Fixes bug 565810: https://bugs.gentoo.org/show_bug.cgi?id=565810
- Don't wait for the next time patch breaks and use forceoptional
- iso-codes used for country names in digital-clock applet
upstream commit fea67bd2ae7549e88952ac6dbcf90392d0ee1458
Package-Manager: portage-2.2.27
.../files/plasma-workspace-5.6.0-rpath.patch | 28 ++++++++++++++++++++++
.../files/plasma-workspace-tests-optional.patch | 11 ---------
.../plasma-workspace-5.5.95.ebuild | 10 +++-----
.../plasma-workspace-5.6.49.9999.ebuild | 8 +++----
.../plasma-workspace/plasma-workspace-9999.ebuild | 11 ++++-----
5 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch
new file mode 100644
index 0000000..464f278
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch
@@ -0,0 +1,28 @@
+commit 829fb30934c455de5fc8d92512561d237c58fb35
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon Nov 23 21:34:24 2015 +0100
+
+ [phonon] Do not set RPATH
+
+ REVIEW: 126210
+
+diff --git a/phonon/platform_kde/CMakeLists.txt b/phonon/platform_kde/CMakeLists.txt
+index 281425f..20ec8f9 100644
+--- a/phonon/platform_kde/CMakeLists.txt
++++ b/phonon/platform_kde/CMakeLists.txt
+@@ -9,15 +9,6 @@ target_link_libraries(kde ${PHONON_LIBRARY} KF5::I18n KF5::KIOWidgets KF5::Notif
+
+ kcoreaddons_desktop_to_json(kde phononbackend.desktop)
+
+-if(NOT WIN32)
+- set_target_properties(kde PROPERTIES
+- INSTALL_RPATH_USE_LINK_PATH TRUE
+- SKIP_BUILD_RPATH TRUE
+- BUILD_WITH_INSTALL_RPATH TRUE
+- INSTALL_RPATH ${KDE_INSTALL_LIBDIR}
+- )
+-endif()
+-
+ install(TARGETS kde DESTINATION ${KDE_INSTALL_PLUGINDIR}/phonon_platform)
+ install(FILES phonon.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR})
+ install(FILES phononbackend.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch
deleted file mode 100644
index 9ff1e38..0000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt 2015-01-21 00:23:54.096323752 +0100
-+++ b/CMakeLists.txt 2015-01-21 00:24:36.304654204 +0100
-@@ -7,7 +7,7 @@
- set(QT_MIN_VERSION "5.4.0")
- set(KF5_MIN_VERSION "5.8.0")
- set(INSTALL_SDDM_THEME TRUE)
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Script Network)
- find_package(ECM 1.8.0 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild
index c7e8983..5e8930c 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild
@@ -4,9 +4,8 @@
EAPI=6
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5 multilib qmake-utils
@@ -117,10 +116,7 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
"
-PATCHES=(
- "${FILESDIR}/${PN}-5.4-startkde-script.patch"
- "${FILESDIR}/${PN}-tests-optional.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
RESTRICT="test"
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 85a065b..648d32f 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
@@ -4,9 +4,8 @@
EAPI=6
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5 multilib qmake-utils
@@ -96,6 +95,7 @@ RDEPEND="${COMMON_DEPEND}
$(add_qt_dep qtgraphicaleffects)
$(add_qt_dep qtpaths)
$(add_qt_dep qtquickcontrols 'widgets')
+ app-text/iso-codes
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
@@ -119,7 +119,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
- "${FILESDIR}/${PN}-tests-optional.patch"
+ "${FILESDIR}/${PN}-5.6.0-rpath.patch"
)
RESTRICT="test"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 85a065b..1a57acf 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -4,9 +4,8 @@
EAPI=6
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5 multilib qmake-utils
@@ -96,6 +95,7 @@ RDEPEND="${COMMON_DEPEND}
$(add_qt_dep qtgraphicaleffects)
$(add_qt_dep qtpaths)
$(add_qt_dep qtquickcontrols 'widgets')
+ app-text/iso-codes
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
@@ -117,10 +117,7 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
"
-PATCHES=(
- "${FILESDIR}/${PN}-5.4-startkde-script.patch"
- "${FILESDIR}/${PN}-tests-optional.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
RESTRICT="test"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2016-10-08 15:51 Michael Palimaka
0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2016-10-08 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 7c8a67d234b1226a90c295d1ef5c7b0cc31c1684
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Sep 14 22:34:21 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 8 15:51:49 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c8a67d2
kde-plasma/plasma-workspace: Make kde-frameworks/baloo optional
'baloo is the most dysfunctional part of whole kde frameworks'
Package-Manager: portage-2.3.0
.../plasma-workspace-5.7.90-baloo-optional.patch | 41 ++++++++++++++++++++++
.../plasma-workspace-5.8.49.9999.ebuild | 10 ++++--
.../plasma-workspace/plasma-workspace-9999.ebuild | 10 ++++--
3 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
new file mode 100644
index 0000000..34f7142
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
@@ -0,0 +1,41 @@
+commit 7ea5034dda3d7a497be8c8d1adea08897c165916
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu Sep 15 00:22:38 2016 +0200
+
+ Make KF5Baloo optional
+
+ https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e57cb73..49584d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,8 +26,13 @@ find_package(KF5XmlRpcClient REQUIRED)
+ find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
+ find_package(KF5 REQUIRED COMPONENTS SysGuard)
+ find_package(KF5 REQUIRED COMPONENTS Package)
+-# Baloo has a different version scheme than KF5 for now
+-find_package(KF5 5.1 REQUIRED COMPONENTS Baloo)
++
++find_package(KF5Baloo)
++set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
++ TYPE OPTIONAL
++ PURPOSE "Needed for the File Search runner."
++ )
++
+ find_package(KF5TextEditor)
+ find_package(KWinDBusInterface CONFIG REQUIRED)
+
+diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt
+index 48cc379..d7656c8 100644
+--- a/runners/CMakeLists.txt
++++ b/runners/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ add_subdirectory(activities)
+-add_subdirectory(baloo)
++if(KF5Baloo_FOUND)
++ add_subdirectory(baloo)
++endif()
+ add_subdirectory(bookmarks)
+ add_subdirectory(calculator)
+ add_subdirectory(locations)
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 7f856fa..b7ad9ce 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
@@ -11,11 +11,10 @@ inherit kde5 multilib qmake-utils
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
-IUSE="+calendar geolocation gps prison qalculate"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
# drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0
COMMON_DEPEND="
- $(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
@@ -86,6 +85,7 @@ COMMON_DEPEND="
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
@@ -120,7 +120,10 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
"
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
+)
RESTRICT+=" test"
@@ -138,6 +141,7 @@ src_configure() {
$(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)
)
kde5_src_configure
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 7f856fa..b7ad9ce 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -11,11 +11,10 @@ inherit kde5 multilib qmake-utils
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
-IUSE="+calendar geolocation gps prison qalculate"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
# drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0
COMMON_DEPEND="
- $(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
@@ -86,6 +85,7 @@ COMMON_DEPEND="
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
@@ -120,7 +120,10 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
"
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
+)
RESTRICT+=" test"
@@ -138,6 +141,7 @@ src_configure() {
$(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)
)
kde5_src_configure
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2016-11-12 8:34 Michael Palimaka
0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2016-11-12 8:34 UTC (permalink / raw
To: gentoo-commits
commit: 3783c67d83ac1267dc35cf6163dc20e7aa13664c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 08:34:09 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 08:34:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3783c67d
kde-plasma/plasma-workspace: backport patch from master
Package-Manager: portage-2.3.2
.../plasma-workspace-5.8.3-systray-cpuload.patch | 177 +++++++++++++++++++++
.../plasma-workspace-5.8.49.9999.ebuild | 2 +
2 files changed, 179 insertions(+)
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
new file mode 100644
index 0000000..fada327
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch
@@ -0,0 +1,177 @@
+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 fa55905..b57fff0 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
@@ -121,7 +121,9 @@ DEPEND="${COMMON_DEPEND}
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] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2018-10-22 18:14 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2018-10-22 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 0d96ded4d0064c4562b3a118c97e0fdca07fdf3c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 09:15:58 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 18:06:12 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d96ded4
kde-plasma/plasma-workspace: DEPEND on standalone libkworkspace
Disabling build of libkworkspace subdirectory.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
...asma-workspace-5.14.2-split-libkworkspace.patch | 35 ++++++++++++++++++++++
.../plasma-workspace-5.14.49.9999.ebuild | 8 +++++
.../plasma-workspace/plasma-workspace-9999.ebuild | 10 ++++++-
3 files changed, 52 insertions(+), 1 deletion(-)
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.14.2-split-libkworkspace.patch
new file mode 100644
index 0000000000..f12d9f4daf
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch
@@ -0,0 +1,35 @@
+From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 22 Oct 2018 10:35:10 +0200
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ CMakeLists.txt | 6 +++-
+ 1 file changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e587a386..d1a63527 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,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(KScreenLocker 5.13.80 REQUIRED)
+ find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
+@@ -135,7 +136,10 @@ endif()
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+
+ add_subdirectory(doc)
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++ message(STATUS "System LibKWorkspace not found, using bundled.")
++ add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+
+--
+2.19.1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild
index ed436f5d27..4c1e1c34c3 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild
@@ -55,6 +55,7 @@ COMMON_DEPEND="
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwin)
$(add_plasma_dep libksysguard)
+ $(add_plasma_dep libkworkspace)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui 'jpeg')
@@ -126,6 +127,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-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"
)
RESTRICT+=" test"
@@ -135,6 +137,12 @@ src_prepare() {
sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+ cmake_comment_add_subdirectory libkworkspace
+ # delete colliding libkworkspace translations
+ if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+ fi
}
src_configure() {
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index a7560f18b4..4c1e1c34c3 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -55,6 +55,7 @@ COMMON_DEPEND="
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwin)
$(add_plasma_dep libksysguard)
+ $(add_plasma_dep libkworkspace)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui 'jpeg')
@@ -126,6 +127,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-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"
)
RESTRICT+=" test"
@@ -135,6 +137,12 @@ src_prepare() {
sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+ cmake_comment_add_subdirectory libkworkspace
+ # delete colliding libkworkspace translations
+ if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+ fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2019-05-14 6:28 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2019-05-14 6:28 UTC (permalink / raw
To: gentoo-commits
commit: d72efe5d389b784090338592b8f4b553565d727c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 18:25:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 13 18:25:54 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d72efe5d
kde-plasma/plasma-workspace: Drop obsolete patch
Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/685766
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-workspace-5.12.80-tests-optional.patch | 17 -----------------
.../plasma-workspace/plasma-workspace-9999.ebuild | 1 -
2 files changed, 18 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
deleted file mode 100644
index e26b27e8c3..0000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 ${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 93343e9d50..b7ca9fcc47 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -117,7 +117,6 @@ PDEPEND="
PATCHES=(
"${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] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2019-10-15 17:10 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2019-10-15 17:10 UTC (permalink / raw
To: gentoo-commits
commit: ddf13e45190a39e8f4603729eaa75fd52f2c6d06
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 17:08:44 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 17:08:44 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ddf13e45
kde-plasma/plasma-workspace: Backport Plasma Wayland session renaming
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...sma-workspace-5.17.0-waylandsessionrename.patch | 48 ++++++++++++++++++++++
.../plasma-workspace-5.17.0.ebuild | 1 +
.../plasma-workspace-5.17.49.9999.ebuild | 1 +
3 files changed, 50 insertions(+)
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.0-waylandsessionrename.patch
new file mode 100644
index 0000000000..2493b8a159
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch
@@ -0,0 +1,48 @@
+From f8e716524435c0fc2bfec2aa36183e5c99e12d42 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
+ plasmawayland.desktop
+
+Summary:
+SDDM until 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.
+
+SDDM in 0.19 only appends " (Wayland)" in case the session name does
+not already end with this, to avoid duplicating it.
+
+CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
+See also: https://github.com/sddm/sddm/pull/997
+
+Reviewers: #plasma, davidedmundson, fvogt, ngraham
+
+Reviewed By: #plasma, davidedmundson, ngraham
+
+Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D22210
+---
+ login-sessions/plasmawayland.desktop.cmake | 2 +-
+ 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
+--- a/login-sessions/plasmawayland.desktop.cmake
++++ b/login-sessions/plasmawayland.desktop.cmake
+@@ -2,7 +2,7 @@
+ Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
+ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
+ DesktopNames=KDE
+-Name=Plasma
++Name=Plasma (Wayland)
+ Name[ar]=بلازما
+ Name[bs]=Plazma
+ Name[ca]=Plasma
+--
+2.23.0
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild
index f0efd16189..bef894f43f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild
@@ -118,6 +118,7 @@ PDEPEND="
PATCHES=(
# TODO: Restore Gentoo part for FHS installs, bug 688366
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${P}-waylandsessionrename.patch"
)
RESTRICT+=" test"
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 d6b7b9c862..be2b0fd5b6 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
@@ -118,6 +118,7 @@ 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"
)
RESTRICT+=" test"
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2021-05-04 21:12 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2021-05-04 21:12 UTC (permalink / raw
To: gentoo-commits
commit: 421fd89da5df5796db415c3eb4a294b18fca1277
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 20:00:23 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 20:17:49 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=421fd89d
kde-plasma/plasma-workspace: Backport 5.22 adaptive opacity feature
This raises the minimum required KDE Frameworks version to 5.82.0
which is carrying the necessary backport in kde-frameworks/plasma.
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=434202
KDe-bug: https://bugs.kde.org/show_bug.cgi?id=434285
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...workspace-5.21.5-transparency-panelConfig.patch | 27 ++
.../plasma-workspace-5.21.5-transparency.patch | 376 +++++++++++++++++++++
.../plasma-workspace-5.21.5.ebuild | 6 +-
3 files changed, 408 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch
new file mode 100644
index 0000000000..fb7993e6db
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch
@@ -0,0 +1,27 @@
+From 1cf02aad96bfe650a1f4d1465ae15234205fb061 Mon Sep 17 00:00:00 2001
+From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
+Date: Mon, 26 Apr 2021 18:47:51 +0000
+Subject: [PATCH] Load panelOpacity from config parent, not from config
+
+BUG: 434285
+FIXED-IN: 5.22
+---
+ shell/panelview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index 5ed743024..4533e856f 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -633,7 +633,7 @@ void PanelView::restore()
+ // the place for this config key is changed in Plasma 5.9
+ // Do NOT use readConfigValueWithFallBack
+ setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel)));
+- setOpacityMode((OpacityMode)readConfigValueWithFallBack("panelOpacity", PanelView::OpacityMode::Adaptive));
++ setOpacityMode((OpacityMode)config().parent().readEntry<int>("panelOpacity", configDefaults().parent().readEntry<int>("panelOpacity", PanelView::OpacityMode::Adaptive)));
+ m_initCompleted = true;
+ resizePanel();
+ positionPanel();
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch
new file mode 100644
index 0000000000..1a925a137c
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch
@@ -0,0 +1,376 @@
+From 7db8d5ee551f30576588d31470fe287b6ad2adcd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@venerandi.com>
+Date: Mon, 1 Mar 2021 22:14:43 +0000
+Subject: [PATCH] Add support for adaptive opacity panels
+
+Co-authored-by: Jan Blackquill <uhhadd@gmail.com>
+---
+ libtaskmanager/taskfilterproxymodel.cpp | 26 ++++++++++++++++++
+ libtaskmanager/taskfilterproxymodel.h | 19 ++++++++++++++
+ libtaskmanager/tasksmodel.cpp | 11 ++++++++
+ libtaskmanager/tasksmodel.h | 19 ++++++++++++++
+ shell/panelconfigview.cpp | 11 ++++++++
+ shell/panelconfigview.h | 5 ++++
+ shell/panelview.cpp | 35 +++++++++++++++++++++++++
+ shell/panelview.h | 28 ++++++++++++++++++++
+ 8 files changed, 154 insertions(+)
+
+diff --git a/libtaskmanager/taskfilterproxymodel.cpp b/libtaskmanager/taskfilterproxymodel.cpp
+index 37a3076fd..6bb27537a 100644
+--- a/libtaskmanager/taskfilterproxymodel.cpp
++++ b/libtaskmanager/taskfilterproxymodel.cpp
+@@ -40,6 +40,7 @@ public:
+ bool filterByScreen = false;
+ bool filterByActivity = false;
+ bool filterNotMinimized = false;
++ bool filterNotMaximized = false;
+ bool filterSkipTaskbar = true;
+ bool filterSkipPager = false;
+
+@@ -185,6 +186,22 @@ void TaskFilterProxyModel::setFilterNotMinimized(bool filter)
+ }
+ }
+
++bool TaskFilterProxyModel::filterNotMaximized() const
++{
++ return d->filterNotMaximized;
++}
++
++void TaskFilterProxyModel::setFilterNotMaximized(bool filter)
++{
++ if (d->filterNotMaximized != filter) {
++ d->filterNotMaximized = filter;
++
++ invalidateFilter();
++
++ emit filterNotMaximizedChanged();
++ }
++}
++
+ bool TaskFilterProxyModel::filterSkipTaskbar() const
+ {
+ return d->filterSkipTaskbar;
+@@ -301,6 +318,15 @@ bool TaskFilterProxyModel::acceptsRow(int sourceRow) const
+ }
+ }
+
++ // Filter not maximized.
++ if (d->filterNotMaximized) {
++ bool isMaximized = sourceIdx.data(AbstractTasksModel::IsMaximized).toBool();
++
++ if (!isMaximized) {
++ return false;
++ }
++ }
++
+ return true;
+ }
+
+diff --git a/libtaskmanager/taskfilterproxymodel.h b/libtaskmanager/taskfilterproxymodel.h
+index 7ad2cb9ce..88ba3adab 100644
+--- a/libtaskmanager/taskfilterproxymodel.h
++++ b/libtaskmanager/taskfilterproxymodel.h
+@@ -52,6 +52,7 @@ class TASKMANAGER_EXPORT TaskFilterProxyModel : public QSortFilterProxyModel, pu
+ Q_PROPERTY(bool filterByScreen READ filterByScreen WRITE setFilterByScreen NOTIFY filterByScreenChanged)
+ Q_PROPERTY(bool filterByActivity READ filterByActivity WRITE setFilterByActivity NOTIFY filterByActivityChanged)
+ Q_PROPERTY(bool filterNotMinimized READ filterNotMinimized WRITE setFilterNotMinimized NOTIFY filterNotMinimizedChanged)
++ Q_PROPERTY(bool filterNotMaximized READ filterNotMaximized WRITE setFilterNotMaximized NOTIFY filterNotMaximizedChanged)
+ Q_PROPERTY(bool filterSkipTaskbar READ filterSkipTaskbar WRITE setFilterSkipTaskbar NOTIFY filterSkipTaskbarChanged)
+ Q_PROPERTY(bool filterSkipPager READ filterSkipPager WRITE setFilterSkipPager NOTIFY filterSkipPagerChanged)
+
+@@ -212,6 +213,23 @@ public:
+ **/
+ void setFilterNotMinimized(bool filter);
+
++ /**
++ * Whether non-maximized tasks should be filtered. Defaults to
++ * @c false.
++ *
++ * @see setFilterNotMaximized
++ * @returns @c true if non-maximized tasks should be filtered.
++ **/
++ bool filterNotMaximized() const;
++
++ /**
++ * Set whether non-maximized tasks should be filtered.
++ *
++ * @see filterNotMaximized
++ * @param filter Whether non-maximized tasks should be filtered.
++ **/
++ void setFilterNotMaximized(bool filter);
++
+ /**
+ * Whether tasks which should be omitted from 'task bars' should be
+ * filtered. Defaults to @c true.
+@@ -285,6 +303,7 @@ Q_SIGNALS:
+ void filterByScreenChanged() const;
+ void filterByActivityChanged() const;
+ void filterNotMinimizedChanged() const;
++ void filterNotMaximizedChanged() const;
+ void filterSkipTaskbarChanged() const;
+ void filterSkipPagerChanged() const;
+ void demandingAttentionSkipsFiltersChanged() const;
+diff --git a/libtaskmanager/tasksmodel.cpp b/libtaskmanager/tasksmodel.cpp
+index c6e66926b..11eb53fdf 100644
+--- a/libtaskmanager/tasksmodel.cpp
++++ b/libtaskmanager/tasksmodel.cpp
+@@ -302,6 +302,7 @@ void TasksModel::Private::initModels()
+ QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterByScreenChanged, q, &TasksModel::filterByScreenChanged);
+ QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterByActivityChanged, q, &TasksModel::filterByActivityChanged);
+ QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterNotMinimizedChanged, q, &TasksModel::filterNotMinimizedChanged);
++ QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterNotMaximizedChanged, q, &TasksModel::filterNotMaximizedChanged);
+
+ groupingProxyModel = new TaskGroupingProxyModel(q);
+ groupingProxyModel->setSourceModel(filterProxyModel);
+@@ -1152,6 +1153,16 @@ void TasksModel::setFilterNotMinimized(bool filter)
+ d->filterProxyModel->setFilterNotMinimized(filter);
+ }
+
++bool TasksModel::filterNotMaximized() const
++{
++ return d->filterProxyModel->filterNotMaximized();
++}
++
++void TasksModel::setFilterNotMaximized(bool filter)
++{
++ d->filterProxyModel->setFilterNotMaximized(filter);
++}
++
+ TasksModel::SortMode TasksModel::sortMode() const
+ {
+ return d->sortMode;
+diff --git a/libtaskmanager/tasksmodel.h b/libtaskmanager/tasksmodel.h
+index 18e3d9bb4..8c84012d0 100644
+--- a/libtaskmanager/tasksmodel.h
++++ b/libtaskmanager/tasksmodel.h
+@@ -73,6 +73,7 @@ class TASKMANAGER_EXPORT TasksModel : public QSortFilterProxyModel, public Abstr
+ Q_PROPERTY(bool filterByScreen READ filterByScreen WRITE setFilterByScreen NOTIFY filterByScreenChanged)
+ Q_PROPERTY(bool filterByActivity READ filterByActivity WRITE setFilterByActivity NOTIFY filterByActivityChanged)
+ Q_PROPERTY(bool filterNotMinimized READ filterNotMinimized WRITE setFilterNotMinimized NOTIFY filterNotMinimizedChanged)
++ Q_PROPERTY(bool filterNotMaximized READ filterNotMaximized WRITE setFilterNotMaximized NOTIFY filterNotMaximized)
+
+ Q_PROPERTY(SortMode sortMode READ sortMode WRITE setSortMode NOTIFY sortModeChanged)
+ Q_PROPERTY(bool separateLaunchers READ separateLaunchers WRITE setSeparateLaunchers NOTIFY separateLaunchersChanged)
+@@ -295,6 +296,23 @@ public:
+ **/
+ void setFilterNotMinimized(bool filter);
+
++ /**
++ * Whether non-maximized tasks should be filtered. Defaults to
++ * @c false.
++ *
++ * @see setFilterNotMaximized
++ * @returns @c true if non-maximized tasks should be filtered.
++ **/
++ bool filterNotMaximized() const;
++
++ /**
++ * Set whether non-maximized tasks should be filtered.
++ *
++ * @see filterNotMaximized
++ * @param filter Whether non-maximized tasks should be filtered.
++ **/
++ void setFilterNotMaximized(bool filter);
++
+ /**
+ * The sort mode used in sorting tasks. Defaults to SortAlpha.
+ *
+@@ -848,6 +866,7 @@ Q_SIGNALS:
+ void filterByScreenChanged() const;
+ void filterByActivityChanged() const;
+ void filterNotMinimizedChanged() const;
++ void filterNotMaximizedChanged() const;
+ void sortModeChanged() const;
+ void separateLaunchersChanged() const;
+ void launchInPlaceChanged() const;
+diff --git a/shell/panelconfigview.cpp b/shell/panelconfigview.cpp
+index a331c0bb2..5637f3233 100644
+--- a/shell/panelconfigview.cpp
++++ b/shell/panelconfigview.cpp
+@@ -289,6 +289,17 @@ PanelView::VisibilityMode PanelConfigView::visibilityMode() const
+ return m_panelView->visibilityMode();
+ }
+
++void PanelConfigView::setOpacityMode(PanelView::OpacityMode mode)
++{
++ m_panelView->setOpacityMode(mode);
++ emit opacityModeChanged();
++}
++
++PanelView::OpacityMode PanelConfigView::opacityMode() const
++{
++ return m_panelView->opacityMode();
++}
++
+ Plasma::FrameSvg::EnabledBorders PanelConfigView::enabledBorders() const
+ {
+ return m_enabledBorders;
+diff --git a/shell/panelconfigview.h b/shell/panelconfigview.h
+index 8e0abd314..db2af6bf9 100644
+--- a/shell/panelconfigview.h
++++ b/shell/panelconfigview.h
+@@ -51,6 +51,7 @@ class PanelConfigView : public PlasmaQuick::ConfigView
+ {
+ Q_OBJECT
+ Q_PROPERTY(PanelView::VisibilityMode visibilityMode READ visibilityMode WRITE setVisibilityMode NOTIFY visibilityModeChanged)
++ Q_PROPERTY(PanelView::OpacityMode opacityMode READ opacityMode WRITE setOpacityMode NOTIFY opacityModeChanged)
+ Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged)
+
+ public:
+@@ -62,6 +63,9 @@ public:
+ PanelView::VisibilityMode visibilityMode() const;
+ void setVisibilityMode(PanelView::VisibilityMode mode);
+
++ PanelView::OpacityMode opacityMode() const;
++ void setOpacityMode(PanelView::OpacityMode mode);
++
+ Plasma::FrameSvg::EnabledBorders enabledBorders() const;
+
+ protected:
+@@ -84,6 +88,7 @@ private Q_SLOTS:
+
+ Q_SIGNALS:
+ void visibilityModeChanged();
++ void opacityModeChanged();
+ void enabledBordersChanged();
+
+ private:
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index 4654a7a72..a699cc84c 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -64,6 +64,7 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent
+ , m_alignment(Qt::AlignLeft)
+ , m_corona(corona)
+ , m_visibilityMode(NormalPanel)
++ , m_opacityMode(Adaptive)
+ , m_backgroundHints(Plasma::Types::StandardBackground)
+ , m_shellSurface(nullptr)
+ {
+@@ -76,8 +77,10 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent
+ setClearBeforeRendering(true);
+ setColor(QColor(Qt::transparent));
+ setFlags(Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
++ updateAdaptiveOpacityEnabled();
+
+ connect(&m_theme, &Plasma::Theme::themeChanged, this, &PanelView::updateMask);
++ connect(&m_theme, &Plasma::Theme::themeChanged, this, &PanelView::updateAdaptiveOpacityEnabled);
+ connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateMask);
+ connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateEnabledBorders);
+ // TODO: add finished/componentComplete signal to QuickViewSharedEngine,
+@@ -405,6 +408,37 @@ PanelView::VisibilityMode PanelView::visibilityMode() const
+ return m_visibilityMode;
+ }
+
++PanelView::OpacityMode PanelView::opacityMode() const
++{
++ if (!m_theme.adaptiveTransparencyEnabled()) {
++ return PanelView::Translucent;
++ }
++ return m_opacityMode;
++}
++
++bool PanelView::adaptiveOpacityEnabled()
++{
++ return m_theme.adaptiveTransparencyEnabled();
++}
++
++void PanelView::setOpacityMode(PanelView::OpacityMode mode)
++{
++ if (m_opacityMode != mode) {
++ m_opacityMode = mode;
++ if (config().isValid() && config().parent().isValid()) {
++ config().parent().writeEntry("panelOpacity", (int)mode);
++ m_corona->requestApplicationConfigSync();
++ }
++ emit opacityModeChanged();
++ }
++}
++
++void PanelView::updateAdaptiveOpacityEnabled()
++{
++ emit opacityModeChanged();
++ emit adaptiveOpacityEnabledChanged();
++}
++
+ void PanelView::positionPanel()
+ {
+ if (!containment()) {
+@@ -599,6 +633,7 @@ void PanelView::restore()
+ // the place for this config key is changed in Plasma 5.9
+ // Do NOT use readConfigValueWithFallBack
+ setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel)));
++ setOpacityMode((OpacityMode)readConfigValueWithFallBack("panelOpacity", PanelView::OpacityMode::Adaptive));
+ m_initCompleted = true;
+ resizePanel();
+ positionPanel();
+diff --git a/shell/panelview.h b/shell/panelview.h
+index 60e4d446e..c312d4907 100644
+--- a/shell/panelview.h
++++ b/shell/panelview.h
+@@ -100,6 +100,18 @@ class PanelView : public PlasmaQuick::ContainmentView
+ */
+ Q_PROPERTY(VisibilityMode visibilityMode READ visibilityMode WRITE setVisibilityMode NOTIFY visibilityModeChanged)
+
++ /**
++ * Property that determines how a panel's opacity behaves.
++ *
++ * @see OpacityMode
++ */
++ Q_PROPERTY(OpacityMode opacityMode READ opacityMode WRITE setOpacityMode NOTIFY opacityModeChanged)
++
++ /**
++ /* Property that determines whether adaptive opacity is used.
++ */
++ Q_PROPERTY(bool adaptiveOpacityEnabled READ adaptiveOpacityEnabled NOTIFY adaptiveOpacityEnabledChanged)
++
+ public:
+ enum VisibilityMode {
+ NormalPanel = 0, /** default, always visible panel, the windowmanager reserves a places for it */
+@@ -109,6 +121,14 @@ public:
+ };
+ Q_ENUM(VisibilityMode)
+
++ /** Enumeration of possible opacity modes. */
++ enum OpacityMode {
++ Adaptive = 0, /** The panel will change opacity depending on the presence of a maximized window */
++ Opaque, /** The panel will always be opaque */
++ Translucent /** The panel will always be translucent */
++ };
++ Q_ENUM(OpacityMode)
++
+ explicit PanelView(ShellCorona *corona, QScreen *targetScreen = nullptr, QWindow *parent = nullptr);
+ ~PanelView() override;
+
+@@ -147,6 +167,11 @@ public:
+ VisibilityMode visibilityMode() const;
+ void setVisibilityMode(PanelView::VisibilityMode mode);
+
++ PanelView::OpacityMode opacityMode() const;
++ bool adaptiveOpacityEnabled();
++ void setOpacityMode(PanelView::OpacityMode mode);
++ void updateAdaptiveOpacityEnabled();
++
+ /**
+ * @returns the geometry of the panel given a distance
+ */
+@@ -185,6 +210,8 @@ Q_SIGNALS:
+ // QWindow does not have a property for screen. Adding this property requires re-implementing the signal
+ void screenToFollowChanged(QScreen *screen);
+ void visibilityModeChanged();
++ void opacityModeChanged();
++ void adaptiveOpacityEnabledChanged();
+
+ protected Q_SLOTS:
+ /**
+@@ -235,6 +262,7 @@ private:
+ ShellCorona *m_corona;
+ QTimer m_strutsTimer;
+ VisibilityMode m_visibilityMode;
++ OpacityMode m_opacityMode;
+ Plasma::Theme m_theme;
+ QTimer m_positionPaneltimer;
+ QTimer m_unhideTimer;
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
index 711dd242a8..31b3b92188 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
@@ -143,7 +143,11 @@ 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}/${P}-transparency.patch" # KDE-bug 434202
+ "${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285
+)
src_prepare() {
ecm_src_prepare
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2021-05-05 3:00 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2021-05-05 3:00 UTC (permalink / raw
To: gentoo-commits
commit: a82cfe37988730033815c61bc4895642d6cc0dfb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 5 02:50:57 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 5 03:00:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a82cfe37
kde-plasma/plasma-workspace: Remove dangerous default shortcuts
Upstream commit e8e17c5ef8734fa56a78405e32277568e4e1095e
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=435954
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-workspace-5.21.5-dangerous-shortcuts.patch | 45 ++++++++++++++++++++++
.../plasma-workspace-5.21.5.ebuild | 1 +
2 files changed, 46 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch
new file mode 100644
index 0000000000..f04bb866d5
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch
@@ -0,0 +1,45 @@
+From e8e17c5ef8734fa56a78405e32277568e4e1095e Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 22 Apr 2021 08:38:18 -0600
+Subject: [PATCH] [ksmserver] Remove default shortcuts for "Without
+ Confirmation" actions
+
+These actions bypass the user setting for whether or not to show the
+logout screen and always log out/reboot/etc. immediately. Because they
+have default keyboard shortcuts, they can be triggered by accident and
+cause unexpected logouts/reboots/etc.
+
+BUG: 435954
+FIXED-IN: 5.22
+---
+ ksmserver/server.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
+index ac9da9f09..6f3179fb9 100644
+--- a/ksmserver/server.cpp
++++ b/ksmserver/server.cpp
+@@ -880,17 +880,17 @@ void KSMServer::setupShortcuts()
+
+ a = actionCollection->addAction(QStringLiteral("Log Out Without Confirmation"));
+ a->setText(i18n("Log Out Without Confirmation"));
+- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_Delete);
++ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence());
+ connect(a, &QAction::triggered, this, &KSMServer::logoutWithoutConfirmation);
+
+ a = actionCollection->addAction(QStringLiteral("Halt Without Confirmation"));
+ a->setText(i18n("Halt Without Confirmation"));
+- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown);
++ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence());
+ connect(a, &QAction::triggered, this, &KSMServer::haltWithoutConfirmation);
+
+ a = actionCollection->addAction(QStringLiteral("Reboot Without Confirmation"));
+ a->setText(i18n("Reboot Without Confirmation"));
+- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp);
++ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence());
+ connect(a, &QAction::triggered, this, &KSMServer::rebootWithoutConfirmation);
+ }
+ }
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
index 31b3b92188..b8e5237f6d 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
@@ -147,6 +147,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
"${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202
"${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285
+ "${FILESDIR}/${P}-dangerous-shortcuts.patch" # KDE-bug 435954
)
src_prepare() {
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2021-11-09 13:04 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2021-11-09 13:04 UTC (permalink / raw
To: gentoo-commits
commit: fdf904d0dbe13b7f91cb00d9720bc53e4b0f53fc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 20:53:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 9 13:01:48 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fdf904d0
kde-plasma/plasma-workspace: Fix krunner cwd
krunner starts applications with cwd "/" with init system other than systemd
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=432975
Thanks-to: Andrea Arcangeli <aarcange <AT> redhat.com>
Bug: https://bugs.gentoo.org/767478
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-workspace-5.22.5-krunner-cwd-at-home.patch | 30 ++++++++++++++++++++++
.../plasma-workspace-5.23.49.9999.ebuild | 5 +++-
.../plasma-workspace/plasma-workspace-9999.ebuild | 5 +++-
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
new file mode 100644
index 0000000000..27db136c29
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
@@ -0,0 +1,30 @@
+Commit 7ca34e0baa7fa65efc929eee5b6b0c3d2104db8e already reverted one
+change that caused the cwd of all apps spawned by krunner to
+erroneously be set to the root dir.
+
+That regressions is back so it's more robust to fix in within krunner.
+
+Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
+---
+ krunner/main.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/krunner/main.cpp b/krunner/main.cpp
+index 4593687ca..fa4a62ac4 100644
+--- a/krunner/main.cpp
++++ b/krunner/main.cpp
+@@ -12,6 +12,7 @@
+ #include <QDBusConnection>
+ #include <QDBusMessage>
+ #include <QDebug>
++#include <QDir>
+ #include <QQuickWindow>
+ #include <QSessionManager>
+ #include <QUrl>
+@@ -112,5 +113,6 @@ int main(int argc, char **argv)
+ }
+ });
+
++ QDir::setCurrent(QDir::homePath());
+ return app.exec();
+ }
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.49.9999.ebuild
index 0ea9e2eeda..b4f4d8416f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.49.9999.ebuild
@@ -148,7 +148,10 @@ RDEPEND="${COMMON_DEPEND}
BDEPEND="virtual/pkgconfig"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
+PATCHES=(
+ "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+)
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 f8672bc733..027fc1d4fe 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -148,7 +148,10 @@ RDEPEND="${COMMON_DEPEND}
BDEPEND="virtual/pkgconfig"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
+PATCHES=(
+ "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+)
src_prepare() {
ecm_src_prepare
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2022-02-21 11:47 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2022-02-21 11:47 UTC (permalink / raw
To: gentoo-commits
commit: b916ce3bacc42ce97341912e678d919f45ffe9d4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 11:33:39 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 11:47:06 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b916ce3b
kde-plasma/plasma-workspace: Rebase split-libkworkspace.patch
Closes: https://bugs.gentoo.org/833532
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...sma-workspace-5.24.80-split-libkworkspace.patch | 37 ++++++++++++++++++++++
.../plasma-workspace/plasma-workspace-9999.ebuild | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
new file mode 100644
index 0000000000..e605473e35
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
@@ -0,0 +1,37 @@
+From 19bbdcf391ea51c4798c770e87c7eada24f252b8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 21 Feb 2022 12:24:56 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ec5f0893..b022a20b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,6 +78,7 @@ set_package_properties(Qalculate PROPERTIES DESCRIPTION "Qalculate Library"
+ )
+
+ find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(LibKWorkspace 5.21.5)
+
+ find_package(KF5Screen CONFIG REQUIRED)
+ find_package(KScreenLocker 5.13.80 REQUIRED)
+@@ -233,7 +234,10 @@ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma
+ if(KF5DocTools_FOUND)
+ add_subdirectory(doc)
+ endif()
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++ message(STATUS "System LibKWorkspace not found, using bundled.")
++ add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 4d7868663b..3cf0eebb70 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -150,7 +150,7 @@ BDEPEND="virtual/pkgconfig"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
PATCHES=(
- "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+ "${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
)
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2022-02-21 11:47 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-22 18:14 [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-02-21 11:47 Andreas Sturmlechner
2021-11-09 13:04 Andreas Sturmlechner
2021-05-05 3:00 Andreas Sturmlechner
2021-05-04 21:12 Andreas Sturmlechner
2019-10-15 17:10 Andreas Sturmlechner
2019-05-14 6:28 Andreas Sturmlechner
2016-11-12 8:34 Michael Palimaka
2016-10-08 15:51 Michael Palimaka
2016-03-20 14:47 Michael Palimaka
2015-12-28 0:33 Marc Schiffbauer
2015-11-14 16:01 Michael Palimaka
2015-11-10 12:41 Michael Palimaka
2015-08-16 20:36 Johannes Huber
2015-07-04 14:48 Johannes Huber
2015-06-01 18:18 Michael Palimaka
2015-04-29 15:03 Michael Palimaka
2015-01-27 20:07 Johannes Huber
2015-01-21 20:48 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox