* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2015-11-19 16:42 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2015-11-19 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 07a9384a8d8d17256904f67be3d039121dc3c799
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: Thu Nov 19 16:42:11 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a9384a
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 ++
.../plasma-workspace-5.4.3-r1.ebuild | 207 +++++++++++++++++++++
2 files changed, 223 insertions(+)
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-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
new file mode 100644
index 0000000..a0c34fd
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib pam qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="dbus +drkonqi +geolocation gps pam prison qalculate +systemmonitor"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep baloo)
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(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
+ dev-qt/qtdeclarative:5[widgets]
+ dev-qt/qtgui:5[jpeg]
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/xcb-util-keysyms
+ dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+ drkonqi? (
+ $(add_frameworks_dep kdewebkit)
+ dev-qt/qtwebkit:5
+ )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ pam? ( virtual/pam )
+ prison? ( media-libs/prison:5 )
+ qalculate? ( sci-libs/libqalculate )
+ systemmonitor? (
+ $(add_plasma_dep libksysguard processui)
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep milou)
+ dev-qt/qdbus:5
+ dev-qt/qtpaths:5
+ dev-qt/qtquickcontrols:5[widgets]
+ x11-apps/mkfontdir
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ 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
+ !kde-base/ksmserver:4
+ !kde-base/ksplash:4
+ !kde-base/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+
+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"
+
+src_prepare() {
+ # whole patch should be upstreamed, doesn't work in PATCHES
+ epatch "${FILESDIR}/${PN}-tests-optional.patch"
+
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+ if ! use drkonqi; then
+ comment_add_subdirectory drkonqi
+ fi
+
+ if ! use geolocation; then
+ punt_bogus_dep KF5 NetworkManagerQt
+ pushd dataengines > /dev/null || die
+ comment_add_subdirectory geolocation
+ popd > /dev/null || die
+ fi
+
+ if ! use systemmonitor; then
+ comment_add_subdirectory systemmonitor
+ pushd applets > /dev/null || die
+ comment_add_subdirectory systemmonitor
+ popd > /dev/null || die
+ pushd dataengines > /dev/null || die
+ comment_add_subdirectory systemmonitor
+ popd > /dev/null || die
+ fi
+}
+
+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)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ )
+
+ kde5_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"
+
+ 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 () {
+ kde5_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"
+ echo
+}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2016-06-26 17:19 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2016-06-26 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 1143b8d33309489ded30c7ea409a47c6b01efb72
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 17:18:37 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 17:19:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1143b8d3
kde-plasma/plasma-workspace: backport patch from upstream to fix panel geometry
This resolves a regression introduced by plasma-workspace-5.6.5-drop-kscreen-dep.patch.
Package-Manager: portage-2.3.0
.../files/plasma-workspace-5.6.5.1-struts.patch | 29 ++++
.../plasma-workspace-5.6.5.1-r1.ebuild | 167 +++++++++++++++++++++
2 files changed, 196 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch
new file mode 100644
index 0000000..4fc7bd2
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch
@@ -0,0 +1,29 @@
+From b866bbe75e04584f0a54980c2c21cba2eadc123b Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 13 Jun 2016 14:23:43 +0200
+Subject: [PATCH] use the whole geometry for the struts
+
+screen()->virtualSize() is the union of the sizes
+of all screens
+screen()->geometry().size() is the size of just the
+single screen
+---
+ shell/panelview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index fb965e8..b27c18b 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -856,7 +856,7 @@ void PanelView::updateStruts()
+ if (m_visibilityMode == NormalPanel) {
+ const QRect thisScreen = screen()->geometry();
+ // QScreen::virtualGeometry() is very unreliable (Qt 5.5)
+- const QRect wholeScreen = QRect(QPoint(0, 0), screen()->geometry().size());
++ const QRect wholeScreen = QRect(QPoint(0, 0), screen()->virtualSize());
+
+ //Extended struts against a screen edge near to another screen are really harmful, so windows maximized under the panel is a lesser pain
+ //TODO: force "windows can cover" in those cases?
+--
+2.7.3
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r1.ebuild
new file mode 100644
index 0000000..e4e3f55
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+geolocation gps prison qalculate"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep baloo)
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/libdbusmenu-qt[qt5]
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( media-libs/prison:5 )
+ qalculate? ( sci-libs/libqalculate )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_qt_dep qdbus)
+ $(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
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-base/freespacenotifier:4
+ !kde-base/libtaskmanager:4
+ !kde-base/kcminit:4
+ !kde-base/kdebase-startkde:4
+ !kde-base/klipper:4
+ !kde-base/krunner:4
+ !kde-base/ksmserver:4
+ !kde-base/ksplash:4
+ !kde-base/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.6.0-rpath.patch"
+ "${FILESDIR}/${PN}-5.6.5-drop-kscreen-dep.patch"
+ "${FILESDIR}/${PN}-5.6.5.1-struts.patch"
+)
+
+RESTRICT="test"
+
+S=${WORKDIR}/${PN}-5.6.5
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package gps libgps)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ 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] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2016-06-26 20:36 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2016-06-26 20:36 UTC (permalink / raw
To: gentoo-commits
commit: efda8b45cbcf960f15659fecd823a2c2ed7e316a
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 26 19:30:51 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 20:36:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efda8b45
kde-plasma/plasma-workspace: Add back legacy (gtk2) session mgmt
Upstream dropped it in 5.6 but later found out it was still in use by
Mozilla applications et al., thus reverted in Plasma/5.6 branch but
only after 5.6.5.1 release.
See also: https://bugs.kde.org/show_bug.cgi?id=362671
Package-Manager: portage-2.2.28
...sma-workspace-5.6.5.1-legacy-session-mgmt.patch | 558 +++++++++++++++++++++
.../plasma-workspace-5.6.5.1-r2.ebuild | 168 +++++++
2 files changed, 726 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-legacy-session-mgmt.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-legacy-session-mgmt.patch
new file mode 100644
index 0000000..94cc1df
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-legacy-session-mgmt.patch
@@ -0,0 +1,558 @@
+commit e4a76cd947759fd723935965ca30c00021601a45
+Author: Andreas Hartmetz <ahartmetz@gmail.com>
+Date: Thu Jun 23 19:36:18 2016 +0200
+
+ Revert "Remove legacy session management support."
+
+ This reverts commit 5f0ca1305db4a925dbdbf927f541497be334feff.
+
+ Firefox and some GTK+ 2 applications still seem to use the old way.
+ For shame.
+
+ BUG: 362671
+
+--- a/ksmserver/CMakeLists.txt
++++ b/ksmserver/CMakeLists.txt
+@@ -15,4 +15,5 @@ set(ksmserver_KDEINIT_SRCS
+ shutdowndlg.cpp
+ switchuserdialog.cpp
++ legacy.cpp
+ startup.cpp
+ shutdown.cpp
+--- /dev/null
++++ b/ksmserver/legacy.cpp
+@@ -0,0 +1,419 @@
++/*****************************************************************
++ksmserver - the KDE session management server
++
++Copyright 2000 Matthias Ettrich <ettrich@kde.org>
++Copyright 2005 Lubos Lunak <l.lunak@kde.org>
++
++relatively small extensions by Oswald Buddenhagen <ob6@inf.tu-dresden.de>
++
++some code taken from the dcopserver (part of the KDE libraries), which is
++Copyright 1999 Matthias Ettrich <ettrich@kde.org>
++Copyright 1999 Preston Brown <pbrown@kde.org>
++
++Permission is hereby granted, free of charge, to any person obtaining a copy
++of this software and associated documentation files (the "Software"), to deal
++in the Software without restriction, including without limitation the rights
++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++copies of the Software, and to permit persons to whom the Software is
++furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++******************************************************************/
++
++#include <QtX11Extras/QX11Info>
++#include <QDebug>
++
++#include <config-workspace.h>
++
++#include <ksmserver_debug.h>
++
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
++
++#include "server.h"
++
++#include <unistd.h>
++
++
++#include <kconfig.h>
++#include <kconfiggroup.h>
++#include <KSharedConfig>
++#include <kshell.h>
++#include <kwindowsystem.h>
++
++#include <X11/Xlib.h>
++#include <X11/Xutil.h>
++#include <X11/Xatom.h>
++
++/*
++* Legacy session management
++*/
++
++#ifndef NO_LEGACY_SESSION_MANAGEMENT
++static WindowMap* windowMapPtr = 0;
++
++static Atom wm_save_yourself = XNone;
++static Atom wm_protocols = XNone;
++static Atom wm_client_leader = XNone;
++static Atom sm_client_id = XNone;
++
++static int winsErrorHandler(Display *, XErrorEvent *ev)
++{
++ if (windowMapPtr) {
++ WindowMap::Iterator it = windowMapPtr->find(ev->resourceid);
++ if (it != windowMapPtr->end())
++ (*it).type = SM_ERROR;
++ }
++ return 0;
++}
++
++void KSMServer::performLegacySessionSave()
++{
++ qCDebug(KSMSERVER) << "Saving legacy session apps";
++ if (state == ClosingSubSession)
++ return; //FIXME implement later
++
++ KSharedConfig::Ptr config = KSharedConfig::openConfig();
++ config->reparseConfiguration(); // config may have changed in the KControl module
++ KConfigGroup cg( config, "General" );
++
++ int wmSaveYourselfTimeout = cg.readEntry( "legacySaveTimeoutSecs", 4 ) * 1000;
++
++ // Setup error handler
++ legacyWindows.clear();
++ windowMapPtr = &legacyWindows;
++ XErrorHandler oldHandler = XSetErrorHandler(winsErrorHandler);
++ // Compute set of leader windows that need legacy session management
++ // and determine which style (WM_COMMAND or WM_SAVE_YOURSELF)
++ if( wm_save_yourself == (Atom)XNone ) {
++ Atom atoms[ 4 ];
++ const char* const names[]
++ = { "WM_SAVE_YOURSELF", "WM_PROTOCOLS", "WM_CLIENT_LEADER", "SM_CLIENT_ID" };
++ XInternAtoms( QX11Info::display(), const_cast< char** >( names ), 4,
++ False, atoms );
++ wm_save_yourself = atoms[ 0 ];
++ wm_protocols = atoms[ 1 ];
++ wm_client_leader = atoms[ 2 ];
++ sm_client_id = atoms[ 3 ];
++ }
++ const QList<WId> windows = KWindowSystem::windows();
++ for ( QList<WId>::ConstIterator it = windows.begin();
++ it != windows.end(); ++it) {
++ WId leader = windowWmClientLeader( *it );
++ if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) {
++ SMType wtype = SM_WMCOMMAND;
++ int nprotocols = 0;
++ Atom *protocols = 0;
++ if( XGetWMProtocols(QX11Info::display(), leader, &protocols, &nprotocols)) {
++ for (int i=0; i<nprotocols; i++)
++ if (protocols[i] == wm_save_yourself) {
++ wtype = SM_WMSAVEYOURSELF;
++ break;
++ }
++ XFree((void*) protocols);
++ }
++ SMData data;
++ data.type = wtype;
++ XClassHint classHint;
++ if( XGetClassHint( QX11Info::display(), leader, &classHint ) ) {
++ data.wmclass1 = QString::fromLocal8Bit( classHint.res_name );
++ data.wmclass2 = QString::fromLocal8Bit( classHint.res_class );
++ XFree( classHint.res_name );
++ XFree( classHint.res_class );
++ }
++ legacyWindows.insert(leader, data);
++ }
++ }
++ // Open fresh display for sending WM_SAVE_YOURSELF
++ XSync(QX11Info::display(), False);
++ Display *newdisplay = XOpenDisplay(DisplayString(QX11Info::display()));
++ if (!newdisplay) {
++ windowMapPtr = NULL;
++ XSetErrorHandler(oldHandler);
++ return;
++ }
++ WId root = DefaultRootWindow(newdisplay);
++ XGrabKeyboard(newdisplay, root, False,
++ GrabModeAsync, GrabModeAsync, CurrentTime);
++ XGrabPointer(newdisplay, root, False, Button1Mask|Button2Mask|Button3Mask,
++ GrabModeAsync, GrabModeAsync, XNone, XNone, CurrentTime);
++ // Send WM_SAVE_YOURSELF messages
++ XEvent ev;
++ int awaiting_replies = 0;
++ for (WindowMap::Iterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) {
++ if ( (*it).type == SM_WMSAVEYOURSELF ) {
++ WId w = it.key();
++ awaiting_replies += 1;
++ memset(&ev, 0, sizeof(ev));
++ ev.xclient.type = ClientMessage;
++ ev.xclient.window = w;
++ ev.xclient.message_type = wm_protocols;
++ ev.xclient.format = 32;
++ ev.xclient.data.l[0] = wm_save_yourself;
++ ev.xclient.data.l[1] = QX11Info::appTime();
++ XSelectInput(newdisplay, w, PropertyChangeMask|StructureNotifyMask);
++ XSendEvent(newdisplay, w, False, 0, &ev);
++ qCDebug(KSMSERVER) << "sent >save yourself< to legacy app " << (*it).wmclass1 << (*it).wmclass2;
++ }
++ }
++ // Wait for change in WM_COMMAND with timeout
++ XFlush(newdisplay);
++ QTime start = QTime::currentTime();
++ while (awaiting_replies > 0) {
++ if (XPending(newdisplay)) {
++ /* Process pending event */
++ XNextEvent(newdisplay, &ev);
++ if ( ( ev.xany.type == UnmapNotify ) ||
++ ( ev.xany.type == PropertyNotify && ev.xproperty.atom == XA_WM_COMMAND ) ) {
++ WindowMap::Iterator it = legacyWindows.find( ev.xany.window );
++ if ( it != legacyWindows.end() && (*it).type != SM_WMCOMMAND ) {
++ awaiting_replies -= 1;
++ if ( (*it).type != SM_ERROR )
++ (*it).type = SM_WMCOMMAND;
++ }
++ }
++ } else {
++ /* Check timeout */
++ int msecs = start.elapsed();
++ if (msecs >= wmSaveYourselfTimeout) {
++ qCDebug(KSMSERVER) << "legacy timeout expired";
++ break;
++ }
++ /* Wait for more events */
++ fd_set fds;
++ FD_ZERO(&fds);
++ int fd = ConnectionNumber(newdisplay);
++ FD_SET(fd, &fds);
++ struct timeval tmwait;
++ tmwait.tv_sec = (wmSaveYourselfTimeout - msecs) / 1000;
++ tmwait.tv_usec = ((wmSaveYourselfTimeout - msecs) % 1000) * 1000;
++ ::select(fd+1, &fds, NULL, &fds, &tmwait);
++ }
++ }
++ // Terminate work in new display
++ XAllowEvents(newdisplay, ReplayPointer, CurrentTime);
++ XAllowEvents(newdisplay, ReplayKeyboard, CurrentTime);
++ XSync(newdisplay, False);
++ XCloseDisplay(newdisplay);
++ // Restore old error handler
++ XSync(QX11Info::display(), False);
++ XSetErrorHandler(oldHandler);
++ for (WindowMap::Iterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) {
++ if ( (*it).type != SM_ERROR) {
++ WId w = it.key();
++ (*it).wmCommand = windowWmCommand(w);
++ (*it).wmClientMachine = windowWmClientMachine(w);
++ }
++ }
++ qCDebug(KSMSERVER) << "Done saving " << legacyWindows.count() << " legacy session apps";
++}
++
++/*!
++Stores legacy session management data
++*/
++void KSMServer::storeLegacySession( KConfig* config )
++{
++ if (state == ClosingSubSession)
++ return; //FIXME implement later
++ // Write LegacySession data
++ config->deleteGroup( QStringLiteral( "Legacy" ) + sessionGroup );
++ KConfigGroup group( config, QStringLiteral( "Legacy" ) + sessionGroup );
++ int count = 0;
++ for (WindowMap::ConstIterator it = legacyWindows.constBegin(); it != legacyWindows.constEnd(); ++it) {
++ if ( (*it).type != SM_ERROR) {
++ if( excludeApps.contains( (*it).wmclass1.toLower())
++ || excludeApps.contains( (*it).wmclass2.toLower()))
++ continue;
++ if ( !(*it).wmCommand.isEmpty() && !(*it).wmClientMachine.isEmpty() ) {
++ count++;
++ QString n = QString::number(count);
++ group.writeEntry( QStringLiteral("command")+n, (*it).wmCommand );
++ group.writeEntry( QStringLiteral("clientMachine")+n, (*it).wmClientMachine );
++ }
++ }
++ }
++ group.writeEntry( "count", count );
++}
++
++/*!
++Restores legacy session management data (i.e. restart applications)
++*/
++void KSMServer::restoreLegacySession( KConfig* config )
++{
++ if( config->hasGroup( QStringLiteral( "Legacy" ) + sessionGroup )) {
++ KConfigGroup group( config, QStringLiteral( "Legacy" ) + sessionGroup );
++ restoreLegacySessionInternal( &group );
++ } else if( wm == QStringLiteral( "kwin" ) ) { // backwards comp. - get it from kwinrc
++ KConfigGroup group( config, sessionGroup );
++ int count = group.readEntry( "count", 0 );
++ for ( int i = 1; i <= count; i++ ) {
++ QString n = QString::number(i);
++ if ( group.readEntry( QStringLiteral("program")+n, QString() ) != wm )
++ continue;
++ QStringList restartCommand =
++ group.readEntry( QStringLiteral("restartCommand")+n, QStringList() );
++ for( QStringList::ConstIterator it = restartCommand.constBegin();
++ it != restartCommand.constEnd();
++ ++it ) {
++ if( (*it) == QStringLiteral( "-session" ) ) {
++ ++it;
++ if( it != restartCommand.constEnd()) {
++ KConfig cfg( QStringLiteral( "session/" ) + wm +
++ QLatin1Char( '_' ) + (*it) );
++ KConfigGroup group(&cfg, "LegacySession");
++ restoreLegacySessionInternal( &group, ' ' );
++ }
++ }
++ }
++ }
++ }
++}
++
++void KSMServer::restoreLegacySessionInternal( KConfigGroup* config, char sep )
++{
++ int count = config->readEntry( "count",0 );
++ for ( int i = 1; i <= count; i++ ) {
++ QString n = QString::number(i);
++ QStringList wmCommand = (sep == ',') ?
++ config->readEntry( QStringLiteral("command")+n, QStringList() ) :
++ KShell::splitArgs( config->readEntry( QStringLiteral("command")+n, QString() ) ); // close enough(?)
++ if( wmCommand.isEmpty())
++ continue;
++ if( isWM( wmCommand.first()))
++ continue;
++ startApplication( wmCommand,
++ config->readEntry( QStringLiteral("clientMachine")+n, QString() ),
++ config->readEntry( QStringLiteral("userId")+n, QString() ));
++ }
++}
++
++static QByteArray getQCStringProperty(WId w, Atom prop)
++{
++ Atom type;
++ int format, status;
++ unsigned long nitems = 0;
++ unsigned long extra = 0;
++ unsigned char *data = 0;
++ QByteArray result = "";
++ status = XGetWindowProperty( QX11Info::display(), w, prop, 0, 10000,
++ false, XA_STRING, &type, &format,
++ &nitems, &extra, &data );
++ if ( status == Success) {
++ if( data )
++ result = (char*)data;
++ XFree(data);
++ }
++ return result;
++}
++
++static QStringList getQStringListProperty(WId w, Atom prop)
++{
++ Atom type;
++ int format, status;
++ unsigned long nitems = 0;
++ unsigned long extra = 0;
++ unsigned char *data = 0;
++ QStringList result;
++
++ status = XGetWindowProperty( QX11Info::display(), w, prop, 0, 10000,
++ false, XA_STRING, &type, &format,
++ &nitems, &extra, &data );
++ if ( status == Success) {
++ if (!data)
++ return result;
++ for (int i=0; i<(int)nitems; i++) {
++ result << QLatin1String( (const char*)data + i );
++ while(data[i]) i++;
++ }
++ XFree(data);
++ }
++ return result;
++}
++
++QStringList KSMServer::windowWmCommand(WId w)
++{
++ QStringList ret = getQStringListProperty(w, XA_WM_COMMAND);
++ // hacks here
++ if( ret.count() == 1 ) {
++ QString command = ret.first();
++ // Mozilla is launched using wrapper scripts, so it's launched using "mozilla",
++ // but the actual binary is "mozilla-bin" or "<path>/mozilla-bin", and that's what
++ // will be also in WM_COMMAND - using this "mozilla-bin" doesn't work at all though
++ if( command.endsWith( QStringLiteral( "mozilla-bin" )))
++ return QStringList() << QStringLiteral( "mozilla" );
++ if( command.endsWith( QStringLiteral( "firefox-bin" )))
++ return QStringList() << QStringLiteral( "firefox" );
++ if( command.endsWith( QStringLiteral( "thunderbird-bin" )))
++ return QStringList() << QStringLiteral( "thunderbird" );
++ if( command.endsWith( QStringLiteral( "sunbird-bin" )))
++ return QStringList() << QStringLiteral( "sunbird" );
++ if( command.endsWith( QStringLiteral( "seamonkey-bin" )))
++ return QStringList() << QStringLiteral( "seamonkey" );
++ }
++ return ret;
++}
++
++QString KSMServer::windowWmClientMachine(WId w)
++{
++ QByteArray result = getQCStringProperty(w, XA_WM_CLIENT_MACHINE);
++ if (result.isEmpty()) {
++ result = "localhost";
++ } else {
++ // special name for the local machine (localhost)
++ char hostnamebuf[80];
++ if (gethostname (hostnamebuf, sizeof hostnamebuf) >= 0) {
++ hostnamebuf[sizeof(hostnamebuf)-1] = 0;
++ if (result == hostnamebuf)
++ result = "localhost";
++ if(char *dot = strchr(hostnamebuf, '.')) {
++ *dot = '\0';
++ if(result == hostnamebuf)
++ result = "localhost";
++ }
++ }
++ }
++ return QLatin1String(result);
++}
++
++WId KSMServer::windowWmClientLeader(WId w)
++{
++ Atom type;
++ int format, status;
++ unsigned long nitems = 0;
++ unsigned long extra = 0;
++ unsigned char *data = 0;
++ Window result = w;
++ status = XGetWindowProperty( QX11Info::display(), w, wm_client_leader, 0, 10000,
++ false, XA_WINDOW, &type, &format,
++ &nitems, &extra, &data );
++ if (status == Success ) {
++ if (data && nitems > 0)
++ result = *((Window*) data);
++ XFree(data);
++ }
++ return result;
++}
++
++
++/*
++Returns sessionId for this client,
++taken either from its window or from the leader window.
++*/
++QByteArray KSMServer::windowSessionId(WId w, WId leader)
++{
++ QByteArray result = getQCStringProperty(w, sm_client_id);
++ if (result.isEmpty() && leader != (WId)None && leader != w)
++ result = getQCStringProperty(leader, sm_client_id);
++ return result;
++}
++#endif
+diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
+--- a/ksmserver/server.cpp
++++ b/ksmserver/server.cpp
+@@ -959,6 +959,7 @@ void KSMServer::storeSession()
+ KConfigGroup cg2( config, "General");
+ cg2.writeEntry( "screenCount", ScreenCount(QX11Info::display()));
+
++ storeLegacySession(config.data());
+ config->sync();
+ }
+
+--- a/ksmserver/server.h
++++ b/ksmserver/server.h
+@@ -49,5 +49,6 @@ extern "C" {
+ #include <KConfigGroup>
+ #include <QTimer>
++#include <QTime>
+ #include <QMap>
+
+
+@@ -63,6 +64,16 @@ class KSMClient;
+ class OrgKdeKLauncherInterface;
+ class QDBusInterface;
+
++enum SMType { SM_ERROR, SM_WMCOMMAND, SM_WMSAVEYOURSELF };
++struct SMData
++ {
++ SMType type;
++ QStringList wmCommand;
++ QString wmClientMachine;
++ QString wmclass1, wmclass2;
++ };
++typedef QMap<WId,SMData> WindowMap;
++
+ class KSMServer : public QObject
+ {
+ Q_OBJECT
+@@ -147,4 +158,5 @@ private:
+ void startKilling();
+ void startKillingSubSession();
++ void performStandardKilling();
+ void completeKilling();
+ void completeKillingSubSession();
+@@ -177,4 +189,13 @@ private:
+ void setupXIOErrorHandler();
+
++ void performLegacySessionSave();
++ void storeLegacySession( KConfig* config );
++ void restoreLegacySession( KConfig* config );
++ void restoreLegacySessionInternal( KConfigGroup* config, char sep = ',' );
++ QStringList windowWmCommand(WId w);
++ QString windowWmClientMachine(WId w);
++ WId windowWmClientLeader(WId w);
++ QByteArray windowSessionId(WId w, WId leader);
++
+ bool checkStartupSuspend();
+ void finishStartup();
+@@ -184,6 +205,7 @@ private:
+ void runShutdownScripts();
+
+- // public D-Bus interface
+- public Q_SLOTS:
++ // public dcop interface
++
++ public Q_SLOTS: //public dcop interface
+ void logout( int, int, int );
+ bool canShutdown();
+@@ -256,4 +278,6 @@ private:
+ QStringList excludeApps;
+
++ WindowMap legacyWindows;
++
+ OrgKdeKLauncherInterface* klauncherSignals;
+ QDBusInterface* kcminitSignals;
+--- a/ksmserver/shutdown.cpp
++++ b/ksmserver/shutdown.cpp
+@@ -192,5 +192,8 @@ void KSMServer::shutdown( KWorkSpace::ShutdownConfirm confirm,
+ state = Shutdown;
+ wmPhase1WaitingCount = 0;
+- saveType = saveSession ? SmSaveBoth : SmSaveGlobal;
++ saveType = saveSession?SmSaveBoth:SmSaveGlobal;
++#ifndef NO_LEGACY_SESSION_MANAGEMENT
++ performLegacySessionSave();
++#endif
+ startProtection();
+ foreach( KSMClient* c, clients ) {
+@@ -248,5 +251,8 @@ void KSMServer::saveCurrentSession()
+ saveType = SmSaveLocal;
+ saveSession = true;
++#ifndef NO_LEGACY_SESSION_MANAGEMENT
++ performLegacySessionSave();
++#endif
+ foreach( KSMClient* c, clients ) {
+ c->resetState();
+ if( isWM( c ) )
+@@ -623,5 +629,9 @@ void KSMServer::saveSubSession(const QString &name, QStringList saveAndClose, QS
+ saveSession = true;
+ sessionGroup = QStringLiteral( "SubSession: " ) + name;
+
++#ifndef NO_LEGACY_SESSION_MANAGEMENT
++ //performLegacySessionSave(); FIXME
++#endif
++
+ startProtection();
+ foreach( KSMClient* c, clients ) {
+--- a/ksmserver/startup.cpp
++++ b/ksmserver/startup.cpp
+@@ -446,5 +446,7 @@ void KSMServer::autoStart2()
+ } else {
+ QTimer::singleShot(0, this, &KSMServer::kcmPhase2Done);
+ }
++ if( !defaultSession())
++ restoreLegacySession(KSharedConfig::openConfig().data());
+
+ qCDebug(KSMSERVER) << "Starting notification thread";
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild
new file mode 100644
index 0000000..50dd2d0
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+geolocation gps prison qalculate"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep baloo)
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/libdbusmenu-qt[qt5]
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( media-libs/prison:5 )
+ qalculate? ( sci-libs/libqalculate )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_qt_dep qdbus)
+ $(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
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-base/freespacenotifier:4
+ !kde-base/libtaskmanager:4
+ !kde-base/kcminit:4
+ !kde-base/kdebase-startkde:4
+ !kde-base/klipper:4
+ !kde-base/krunner:4
+ !kde-base/ksmserver:4
+ !kde-base/ksplash:4
+ !kde-base/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.6.0-rpath.patch"
+ "${FILESDIR}/${PN}-5.6.5-drop-kscreen-dep.patch"
+ "${FILESDIR}/${PN}-5.6.5.1-struts.patch"
+ "${FILESDIR}/${PN}-5.6.5.1-legacy-session-mgmt.patch" # backport in 5.6 after release
+)
+
+RESTRICT="test"
+
+S=${WORKDIR}/${PN}-5.6.5
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package gps libgps)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ 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] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2016-11-12 8:22 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2016-11-12 8:22 UTC (permalink / raw
To: gentoo-commits
commit: d69db82ebcb6677c10fad255ac3ca75872dd057b
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Nov 10 13:34:50 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 08:22:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69db82e
kde-plasma/plasma-workspace: Add several multiscreen fixes
Each of those closes several bugs.
Also adding a fix from master about too high cpuload with systray.
Dropped subslot operator from kde-frameworks/plasma.
Gentoo-bug: 598128, 569556
Package-Manager: portage-2.3.0
.../plasma-workspace-5.8.3-all-outputs-known.patch | 71 +++++++++
...plasma-workspace-5.8.3-dont-connect-twice.patch | 44 +++++
...a-workspace-5.8.3-screenpool-screenchange.patch | 95 +++++++++++
...workspace-5.8.3-sync-app-w-applets-config.patch | 22 +++
.../plasma-workspace-5.8.3-systray-cpuload.patch | 177 +++++++++++++++++++++
.../plasma-workspace-5.8.3-r1.ebuild | 175 ++++++++++++++++++++
6 files changed, 584 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-all-outputs-known.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-all-outputs-known.patch
new file mode 100644
index 00000000..8e5b0f3
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-all-outputs-known.patch
@@ -0,0 +1,71 @@
+From: Marco Martin <notmart@gmail.com>
+Date: Wed, 09 Nov 2016 14:54:42 +0000
+Subject: make sure all outputs are known
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=b8d3e09b3687082037a6d280d2032617121ae5e5
+---
+make sure all outputs are known
+
+at startup, if a screen id is missing from the screenpool mapping
+containment::screen() will return -1 for a moment in the startup
+phase even if it has a valid lastScreen
+
+populate mappings of eventual missing stuff at screenpool ctor
+
+make sure destroyed containments don't get assigned a view
+
+reviewed-by: David Edmundson
+
+CCBUG:372099
+CCBUG:371858
+CCBUG:371991
+CCBUG:371819
+CCBUG:371734
+---
+
+
+--- a/shell/screenpool.cpp
++++ b/shell/screenpool.cpp
+@@ -49,6 +49,17 @@
+ m_idForConnector[connector] = key.toInt();
+ } else if (m_idForConnector.value(connector) != key.toInt()) {
+ m_configGroup.deleteEntry(key);
++ }
++ }
++
++ // if there are already connected unknown screens, map those
++ // all needs to be populated as soon as possible, otherwise
++ // containment->screen() will return an incorrect -1
++ // at startup, if it' asked before corona::addOutput()
++ // is performed, driving to the creation of a new containment
++ for (QScreen* screen : qGuiApp->screens()) {
++ if (!m_idForConnector.contains(screen->name())) {
++ insertScreenMapping(firstAvailableId(), screen->name());
+ }
+ }
+ }
+
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -1178,7 +1178,12 @@
+ {
+ if (m_desktopContainments.contains(activity)) {
+ for (Plasma::Containment *cont : m_desktopContainments.value(activity)) {
+- if (cont->screen() == screenNum && cont->activity() == activity) {
++ //in the case of a corrupt config file
++ //with multiple containments with same lastScreen
++ //it can happen two insertContainment happen for
++ //the same screen, leading to the old containment
++ //to be destroyed
++ if (!cont->destroyed() && cont->screen() == screenNum && cont->activity() == activity) {
+ return cont;
+ }
+ }
+@@ -1832,6 +1837,7 @@
+ // qDebug() << "ShellCorona screenForContainment: " << containment << " Last screen is " << containment->lastScreen();
+
+ for (auto screen : qGuiApp->screens()) {
++ // containment->lastScreen() == m_screenPool->id(screen->name()) to check if the lastScreen refers to a screen that exists/it's known
+ if (containment->lastScreen() == m_screenPool->id(screen->name()) &&
+ (containment->activity() == m_activityController->currentActivity() ||
+ containment->containmentType() == Plasma::Types::PanelContainment || containment->containmentType() == Plasma::Types::CustomPanelContainment)) {
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-dont-connect-twice.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-dont-connect-twice.patch
new file mode 100644
index 00000000..81365eb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-dont-connect-twice.patch
@@ -0,0 +1,44 @@
+commit 8a472f17ce11f3b79d740cdc21096d82b8683f3d
+Author: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu Nov 10 10:28:16 2016 +0000
+
+ Avoid connecting to screen changed signals twice
+
+ Summary:
+ load() can be called multiple times; either from setShell or
+ loadLookAndFeelDefaultLayout. We still only want addOutput once when a
+ screen is added
+
+ Reviewers: #plasma, apol
+
+ Reviewed By: apol
+
+ Subscribers: plasma-devel
+
+ Tags: #plasma
+
+ Differential Revision: https://phabricator.kde.org/D3320
+
+ CCBUG:372099
+ CCBUG:371858
+ CBUG:371991
+ CCBUG:371819
+ CCBUG:371734
+
+diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
+index af2f555..0007f0b 100644
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -675,9 +675,9 @@ void ShellCorona::load()
+ addOutput(screen);
+ }
+ }
+- connect(qGuiApp, &QGuiApplication::screenAdded, this, &ShellCorona::addOutput);
+- connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &ShellCorona::primaryOutputChanged);
+- connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved);
++ connect(qGuiApp, &QGuiApplication::screenAdded, this, &ShellCorona::addOutput, Qt::UniqueConnection);
++ connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &ShellCorona::primaryOutputChanged, Qt::UniqueConnection);
++ connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved, Qt::UniqueConnection);
+
+ if (!m_waitingPanels.isEmpty()) {
+ m_waitingPanelsTimer.start();
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-screenpool-screenchange.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-screenpool-screenchange.patch
new file mode 100644
index 00000000..bd66874
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-screenpool-screenchange.patch
@@ -0,0 +1,95 @@
+commit 7154fb681adc73c482e862febc7ad008f77058dd
+Author: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu Nov 10 10:29:27 2016 +0000
+
+ Load screenpool at the same time as we connect to screenchanged signals
+
+ Summary:
+ Otherwise we have a gap during load (waiting querying kactivities))
+ between screen pool being created and us connecting to the screen
+ changed signals, which in turn are used to update screen pool.
+
+ In particular the primary screen can get out of sync between the current
+ state and the screen pool.
+
+ Test Plan: Based on Christopher Feck's research and initial patch
+
+ Reviewers: #plasma
+
+ Subscribers: mart, rwooninck, fvogt, cfeck, plasma-devel
+
+ Tags: #plasma
+
+ Differential Revision: https://phabricator.kde.org/D3319
+
+ CCBUG:372099
+ CCBUG:371858
+ CBUG:371991
+ CCBUG:371819
+ CCBUG:371734
+
+diff --git a/shell/autotests/screenpooltest.cpp b/shell/autotests/screenpooltest.cpp
+index 5d0522f..5fc844a 100644
+--- a/shell/autotests/screenpooltest.cpp
++++ b/shell/autotests/screenpooltest.cpp
+@@ -51,6 +51,7 @@ void ScreenPoolTest::initTestCase()
+ cg.deleteGroup();
+ cg.sync();
+ m_screenPool = new ScreenPool(KSharedConfig::openConfig(), this);
++ m_screenPool->load();
+ }
+
+ void ScreenPoolTest::cleanupTestCase()
+diff --git a/shell/screenpool.cpp b/shell/screenpool.cpp
+index 011300d..b60cca1 100644
+--- a/shell/screenpool.cpp
++++ b/shell/screenpool.cpp
+@@ -30,6 +30,14 @@ ScreenPool::ScreenPool(KSharedConfig::Ptr config, QObject *parent)
+ connect(&m_configSaveTimer, &QTimer::timeout, this, [this](){
+ m_configGroup.sync();
+ });
++}
++
++void ScreenPool::load()
++{
++ m_primaryConnector = QString();
++ m_connectorForId.clear();
++ m_idForConnector.clear();
++
+ QScreen *primary = qGuiApp->primaryScreen();
+ if (primary) {
+ m_primaryConnector = primary->name();
+diff --git a/shell/screenpool.h b/shell/screenpool.h
+index 046d18b..9b3a9af 100644
+--- a/shell/screenpool.h
++++ b/shell/screenpool.h
+@@ -33,6 +33,7 @@ class ScreenPool : public QObject {
+
+ public:
+ ScreenPool(KSharedConfig::Ptr config, QObject *parent = nullptr);
++ void load();
+ ~ScreenPool() override;
+
+ QString primaryConnector() const;
+diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
+index 0007f0b..1475374 100644
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -627,6 +627,8 @@ void ShellCorona::load()
+
+ disconnect(m_activityController, &KActivities::Controller::serviceStatusChanged, this, &ShellCorona::load);
+
++ m_screenPool->load();
++
+ //TODO: a kconf_update script is needed
+ QString configFileName(QStringLiteral("plasma-") + m_shell + QStringLiteral("-appletsrc"));
+
+@@ -1184,7 +1186,7 @@ Plasma::Containment *ShellCorona::createContainmentForActivity(const QString& ac
+ //in the case of a corrupt config file
+ //with multiple containments with same lastScreen
+ //it can happen two insertContainment happen for
+- //the same screen, leading to the old containment
++ //the same screen, leading to the old containment
+ //to be destroyed
+ if (!cont->destroyed() && cont->screen() == screenNum && cont->activity() == activity) {
+ return cont;
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-sync-app-w-applets-config.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-sync-app-w-applets-config.patch
new file mode 100644
index 00000000..44ec35f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-sync-app-w-applets-config.patch
@@ -0,0 +1,22 @@
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 09 Nov 2016 15:11:52 +0000
+Subject: Sync app config in sync with applets config
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=329f00dc90f6645ff6e531542212ea73fb8ef274
+---
+Sync app config in sync with applets config
+---
+
+
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -114,6 +114,9 @@
+ m_appConfigSyncTimer.setSingleShot(true);
+ m_appConfigSyncTimer.setInterval(s_configSyncDelay);
+ connect(&m_appConfigSyncTimer, &QTimer::timeout, this, &ShellCorona::syncAppConfig);
++ //we want our application config with screen mapping to always be in sync with the applets one, so a crash at any time will still
++ //leave containments pointing to the correct screens
++ connect(this, &Corona::configSynced, this, &ShellCorona::syncAppConfig);
+
+ m_waitingPanelsTimer.setSingleShot(true);
+ m_waitingPanelsTimer.setInterval(250);
+
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 00000000..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.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild
new file mode 100644
index 00000000..700f60e
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/libdbusmenu-qt[qt5]
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ calendar? ( $(add_kdeapps_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ 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)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(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
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-base/freespacenotifier:4
+ !kde-base/libtaskmanager:4
+ !kde-base/kcminit:4
+ !kde-base/kdebase-startkde:4
+ !kde-base/klipper:4
+ !kde-base/krunner:4
+ !kde-base/ksmserver:4
+ !kde-base/ksplash:4
+ !kde-base/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ # stable branch
+ "${FILESDIR}/${PN}-5.8.3-all-outputs-known.patch"
+ "${FILESDIR}/${PN}-5.8.3-sync-app-w-applets-config.patch"
+ "${FILESDIR}/${PN}-5.8.3-dont-connect-twice.patch"
+ "${FILESDIR}/${PN}-5.8.3-screenpool-screenchange.patch"
+ # master
+ "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
+ "${FILESDIR}/${PN}-5.8.3-systray-cpuload.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package gps libgps)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ 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] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2016-11-17 11:35 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2016-11-17 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 76e918e9731c0e30aeb93f2d91967b9b90adb550
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Nov 17 10:26:39 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 11:35:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e918e9
kde-plasma/plasma-workspace: Fix krunner crashfix
Upstream revert-fixed in 9e457e8c639f1db0b42a22036d61673aeac6a60f
and then fixed once more.
Package-Manager: portage-2.3.0
.../plasma-workspace-5.8.3-krunner-crash.patch | 452 +--------------------
.../plasma-workspace-5.8.3-r3.ebuild | 176 ++++++++
2 files changed, 193 insertions(+), 435 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
index 9b238b6..2d4f7ec 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
@@ -1,441 +1,23 @@
-From 3f859c3dbdded68cc96d4c695ff27d15c387da09 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Mon, 10 Oct 2016 16:30:24 +0200
-Subject: [PATCH] Port to new plasma-framework API
-
-Reduces unnecessary castings.
-Ports away the WindowedWidgets runner from KService
-
-REVIEW: 129101
----
- applets/systemtray/systemtray.cpp | 30 +++++++-------
- .../shellprivate/widgetexplorer/widgetexplorer.cpp | 14 +++----
- plasma-windowed/plasmawindowedcorona.cpp | 2 +-
- runners/windowedwidgets/windowedwidgetsrunner.cpp | 46 ++++++++++------------
- runners/windowedwidgets/windowedwidgetsrunner.h | 2 +-
- shell/alternativeshelper.cpp | 6 +--
- shell/containmentconfigview.cpp | 2 +-
- shell/scripting/containment.cpp | 4 +-
- shell/scripting/widget.cpp | 2 +-
- shell/shellcorona.cpp | 15 +++----
- 10 files changed, 60 insertions(+), 63 deletions(-)
-
-diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
-index e1cd610..ecc23a4 100644
---- a/applets/systemtray/systemtray.cpp
-+++ b/applets/systemtray/systemtray.cpp
-@@ -99,19 +99,19 @@ void SystemTray::init()
- {
- Containment::init();
-
-- for (const auto &info: Plasma::PluginLoader::self()->listAppletInfo(QString())) {
-- if (!info.isValid() || info.property(QStringLiteral("X-Plasma-NotificationArea")) != "true") {
-+ for (const auto &info: Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
-+ if (!info.isValid() || info.value(QStringLiteral("X-Plasma-NotificationArea")) != "true") {
- continue;
- }
-- m_systrayApplets[info.pluginName()] = info;
-+ m_systrayApplets[info.pluginId()] = KPluginInfo(info);
-
-- if (info.isPluginEnabledByDefault()) {
-- m_defaultPlasmoids += info.pluginName();
-+ if (info.isEnabledByDefault()) {
-+ m_defaultPlasmoids += info.pluginId();
- }
-- const QString dbusactivation = info.property(QStringLiteral("X-Plasma-DBusActivationService")).toString();
-+ const QString dbusactivation = info.value(QStringLiteral("X-Plasma-DBusActivationService"));
- if (!dbusactivation.isEmpty()) {
-- qCDebug(SYSTEM_TRAY) << "ST Found DBus-able Applet: " << info.pluginName() << dbusactivation;
-- m_dbusActivatableTasks[info.pluginName()] = dbusactivation;
-+ qCDebug(SYSTEM_TRAY) << "ST Found DBus-able Applet: " << info.pluginId() << dbusactivation;
-+ m_dbusActivatableTasks[info.pluginId()] = dbusactivation;
- }
- }
- }
-@@ -119,12 +119,12 @@ void SystemTray::init()
- void SystemTray::newTask(const QString &task)
- {
- foreach (Plasma::Applet *applet, applets()) {
-- if (!applet->pluginInfo().isValid()) {
-+ if (!applet->pluginMetaData().isValid()) {
- continue;
- }
-
- //only allow one instance per applet
-- if (task == applet->pluginInfo().pluginName()) {
-+ if (task == applet->pluginMetaData().pluginId()) {
- //Applet::destroy doesn't delete the applet from Containment::applets in the same event
- //potentially a dbus activated service being restarted can be added in this time.
- if (!applet->destroyed()) {
-@@ -156,7 +156,7 @@ void SystemTray::newTask(const QString &task)
- void SystemTray::cleanupTask(const QString &task)
- {
- foreach (Plasma::Applet *applet, applets()) {
-- if (!applet->pluginInfo().isValid() || task == applet->pluginInfo().pluginName()) {
-+ if (!applet->pluginMetaData().isValid() || task == applet->pluginMetaData().pluginId()) {
- //we are *not* cleaning the config here, because since is one
- //of those automatically loaded/unloaded by dbus, we want to recycle
- //the config the next time it's loaded, in case the user configured something here
-@@ -255,11 +255,11 @@ Q_INVOKABLE QString SystemTray::plasmoidCategory(QQuickItem *appletInterface) co
- }
-
- Plasma::Applet *applet = appletInterface->property("_plasma_applet").value<Plasma::Applet*>();
-- if (!applet || !applet->pluginInfo().isValid()) {
-+ if (!applet || !applet->pluginMetaData().isValid()) {
- return "UnknownCategory";
- }
-
-- const QString cat = applet->pluginInfo().property(QStringLiteral("X-Plasma-NotificationAreaCategory")).toString();
-+ const QString cat = applet->pluginMetaData().value(QStringLiteral("X-Plasma-NotificationAreaCategory"));
-
- if (cat.isEmpty()) {
- return "UnknownCategory";
-@@ -385,11 +385,11 @@ void SystemTray::restorePlasmoids()
- foreach (Plasma::Applet *applet, applets()) {
- //Here it should always be valid.
- //for some reason it not always is.
-- if (!applet->pluginInfo().isValid()) {
-+ if (!applet->pluginMetaData().isValid()) {
- applet->config().parent().deleteGroup();
- applet->deleteLater();
- } else {
-- const QString task = applet->pluginInfo().pluginName();
-+ const QString task = applet->pluginMetaData().pluginId();
- if (!m_allowedPlasmoids.contains(task)) {
- //in those cases we do delete the applet config completely
- //as they were explicitly disabled by the user
-diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.cpp b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
-index c2b38a8..b445897 100644
---- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp
-+++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
-@@ -249,14 +249,14 @@ void WidgetExplorerPrivate::addContainment(Containment *containment)
- QObject::connect(containment, SIGNAL(appletRemoved(Plasma::Applet*)), q, SLOT(appletRemoved(Plasma::Applet*)));
-
- foreach (Applet *applet, containment->applets()) {
-- if (applet->pluginInfo().isValid()) {
-+ if (applet->pluginMetaData().isValid()) {
- Containment *childContainment = applet->property("containment").value<Containment*>();
- if (childContainment) {
- addContainment(childContainment);
- }
-- runningApplets[applet->pluginInfo().pluginName()]++;
-+ runningApplets[applet->pluginMetaData().pluginId()]++;
- } else {
-- qDebug() << "Invalid plugininfo. :(";
-+ qDebug() << "Invalid plugin metadata. :(";
- }
- }
- }
-@@ -268,10 +268,10 @@ void WidgetExplorerPrivate::containmentDestroyed()
-
- void WidgetExplorerPrivate::appletAdded(Plasma::Applet *applet)
- {
-- if (!applet->pluginInfo().isValid()) {
-+ if (!applet->pluginMetaData().isValid()) {
- return;
- }
-- QString name = applet->pluginInfo().pluginName();
-+ QString name = applet->pluginMetaData().pluginId();
-
- runningApplets[name]++;
- appletNames.insert(applet, name);
-@@ -471,9 +471,9 @@ void WidgetExplorer::uninstall(const QString &pluginName)
- const auto &applets = c->applets();
-
- foreach (Applet *applet, applets) {
-- const auto &appletInfo = applet->pluginInfo();
-+ const auto &appletInfo = applet->pluginMetaData();
-
-- if (appletInfo.isValid() && appletInfo.pluginName() == pluginName) {
-+ if (appletInfo.isValid() && appletInfo.pluginId() == pluginName) {
- applet->destroy();
- }
- }
-diff --git a/plasma-windowed/plasmawindowedcorona.cpp b/plasma-windowed/plasmawindowedcorona.cpp
-index fbacbf8..b68d270 100644
---- a/plasma-windowed/plasmawindowedcorona.cpp
-+++ b/plasma-windowed/plasmawindowedcorona.cpp
-@@ -51,7 +51,7 @@ void PlasmaWindowedCorona::loadApplet(const QString &applet, const QVariantList
-
- //forbid more instances per applet (todo: activate the correpsponding already loaded applet)
- for (Plasma::Applet *a : cont->applets()) {
-- if (a->pluginInfo().pluginName() == applet) {
-+ if (a->pluginMetaData().pluginId() == applet) {
- return;
- }
- }
+commit 238ec3ee671bcf6716348122bebefb20c25d1101
+Author: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 17 Nov 2016 10:53:48 +0000
+
+ [Windowed Widgets Runner] Don't access invalid KPluginInfo
+
+ BUG: 372017
+ FIXED-IN: 5.8.4
+
diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-index 5ccbd27..7f093a7 100644
+index 5ccbd27..f86159a 100644
--- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
+++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-@@ -60,24 +60,22 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
-
- QList<Plasma::QueryMatch> matches;
-
-- foreach (const KPluginInfo &info, Plasma::PluginLoader::self()->listAppletInfo(QString())) {
-- KService::Ptr service = info.service();
--
-- if (((service->name().contains(term, Qt::CaseInsensitive) ||
-- service->genericName().contains(term, Qt::CaseInsensitive) ||
-- service->comment().contains(term, Qt::CaseInsensitive)) ||
-- service->categories().contains(term, Qt::CaseInsensitive) ||
-+ foreach (const KPluginMetaData &md, Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
-+ if (((md.name().contains(term, Qt::CaseInsensitive) ||
-+ md.value(QLatin1String("GenericName")).contains(term, Qt::CaseInsensitive) ||
-+ md.description().contains(term, Qt::CaseInsensitive)) ||
-+ md.category().contains(term, Qt::CaseInsensitive) ||
- term.startsWith(i18nc("Note this is a KRunner keyword", "mobile applications"))) &&
-- !info.property(QStringLiteral("NoDisplay")).toBool()) {
-+ !md.rawData().value(QStringLiteral("NoDisplay")).toBool()) {
-
-- QVariant val = info.property(QStringLiteral("X-Plasma-StandAloneApp"));
-+ QVariant val = md.value(QStringLiteral("X-Plasma-StandAloneApp"));
- if (!val.isValid() || !val.toBool()) {
- continue;
- }
-
- Plasma::QueryMatch match(this);
-- setupMatch(service, match);
-- if (service->name().compare(term, Qt::CaseInsensitive) == 0) {
-+ setupMatch(md, match);
-+ if (md.name().compare(term, Qt::CaseInsensitive) == 0) {
- match.setType(Plasma::QueryMatch::ExactMatch);
- match.setRelevance(1);
- } else {
-@@ -85,8 +83,6 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
- match.setRelevance(0.7);
- }
- matches << match;
--
-- qDebug() << service;
- }
- }
-
-@@ -100,27 +96,27 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
- void WindowedWidgetsRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
- {
- Q_UNUSED(context);
-- KService::Ptr service = KService::serviceByStorageId(match.data().toString());
-- if (service) {
-- QProcess::startDetached(QStringLiteral("plasmawindowed"), QStringList() << service->property(QStringLiteral("X-KDE-PluginInfo-Name"), QVariant::String).toString());
-+ KPluginMetaData md(match.data().toString());
-+ if (md.isValid()) {
-+ QProcess::startDetached(QStringLiteral("plasmawindowed"), QStringList() << md.pluginId());
- }
- }
-
--void WindowedWidgetsRunner::setupMatch(const KService::Ptr &service, Plasma::QueryMatch &match)
-+void WindowedWidgetsRunner::setupMatch(const KPluginMetaData &md, Plasma::QueryMatch &match)
- {
-- const QString name = service->name();
-+ const QString name = md.pluginId();
-
- match.setText(name);
-- match.setData(service->storageId());
-+ match.setData(md.metaDataFileName());
-
-- if (!service->genericName().isEmpty() && service->genericName() != name) {
-- match.setSubtext(service->genericName());
-- } else if (!service->comment().isEmpty()) {
-- match.setSubtext(service->comment());
-+ if (!md.name().isEmpty() && md.name() != name) {
-+ match.setSubtext(md.name());
-+ } else if (!md.description().isEmpty()) {
-+ match.setSubtext(md.description());
- }
-
-- if (!service->icon().isEmpty()) {
-- match.setIconName(service->icon());
-+ if (!md.iconName().isEmpty()) {
-+ match.setIconName(md.iconName());
- }
- }
-
-diff --git a/runners/windowedwidgets/windowedwidgetsrunner.h b/runners/windowedwidgets/windowedwidgetsrunner.h
-index 2294965..fbc8006 100644
---- a/runners/windowedwidgets/windowedwidgetsrunner.h
-+++ b/runners/windowedwidgets/windowedwidgetsrunner.h
-@@ -48,7 +48,7 @@ protected Q_SLOTS:
-
-
- protected:
-- void setupMatch(const KService::Ptr &service, Plasma::QueryMatch &action);
-+ void setupMatch(const KPluginMetaData &md, Plasma::QueryMatch &action);
- };
-
- #endif
-diff --git a/shell/alternativeshelper.cpp b/shell/alternativeshelper.cpp
-index d0f5dfd..6d76307 100644
---- a/shell/alternativeshelper.cpp
-+++ b/shell/alternativeshelper.cpp
-@@ -38,12 +38,12 @@ AlternativesHelper::~AlternativesHelper()
-
- QStringList AlternativesHelper::appletProvides() const
- {
-- return m_applet->pluginInfo().property(QStringLiteral("X-Plasma-Provides")).toStringList();
-+ return KPluginMetaData::readStringList(m_applet->pluginMetaData().rawData(), QStringLiteral("X-Plasma-Provides"));
- }
+@@ -60,6 +60,9 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
- QString AlternativesHelper::currentPlugin() const
- {
-- return m_applet->pluginInfo().pluginName();
-+ return m_applet->pluginMetaData().pluginId();
- }
-
- QQuickItem *AlternativesHelper::applet() const
-@@ -53,7 +53,7 @@ QQuickItem *AlternativesHelper::applet() const
-
- void AlternativesHelper::loadAlternative(const QString &plugin)
- {
-- if (plugin == m_applet->pluginInfo().pluginName() || m_applet->isContainment()) {
-+ if (plugin == m_applet->pluginMetaData().pluginId() || m_applet->isContainment()) {
- return;
- }
-
-diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp
-index cec067e..4c9d146 100644
---- a/shell/containmentconfigview.cpp
-+++ b/shell/containmentconfigview.cpp
-@@ -104,7 +104,7 @@ QAbstractItemModel *ContainmentConfigView::currentContainmentActionsModel()
-
- QString ContainmentConfigView::containmentPlugin() const
- {
-- return m_containment->pluginInfo().pluginName();
-+ return m_containment->pluginMetaData().pluginId();
- }
-
- void ContainmentConfigView::setContainmentPlugin(const QString &plugin)
-diff --git a/shell/scripting/containment.cpp b/shell/scripting/containment.cpp
-index 6040e62..96e2009 100644
---- a/shell/scripting/containment.cpp
-+++ b/shell/scripting/containment.cpp
-@@ -248,7 +248,7 @@ QScriptValue Containment::widgets(QScriptContext *context, QScriptEngine *engine
- int count = 0;
-
- foreach (Plasma::Applet *widget, c->d->containment.data()->applets()) {
-- if (widgetType.isEmpty() || widget->pluginInfo().pluginName() == widgetType) {
-+ if (widgetType.isEmpty() || widget->pluginMetaData().pluginId() == widgetType) {
- widgets.setProperty(count, env->wrap(widget));
- ++count;
- }
-@@ -273,7 +273,7 @@ QString Containment::type() const
- return QString();
- }
-
-- return d->containment.data()->pluginInfo().pluginName();
-+ return d->containment.data()->pluginMetaData().pluginId();
- }
-
- void Containment::remove()
-diff --git a/shell/scripting/widget.cpp b/shell/scripting/widget.cpp
-index a651c2a..b58822b 100644
---- a/shell/scripting/widget.cpp
-+++ b/shell/scripting/widget.cpp
-@@ -65,7 +65,7 @@ uint Widget::id() const
- QString Widget::type() const
- {
- if (d->applet) {
-- return d->applet.data()->pluginInfo().pluginName();
-+ return d->applet.data()->pluginMetaData().pluginId();
- }
-
- return QString();
-diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
-index 33259da..598fdb0 100644
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -406,7 +406,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
- || cont->location() == Plasma::Types::BottomEdge
- || cont->location() == Plasma::Types::LeftEdge
- || cont->location() == Plasma::Types::RightEdge) &&
-- cont->pluginInfo().pluginName() != QStringLiteral("org.kde.plasma.private.systemtray");
-+ cont->pluginMetaData().pluginId() != QStringLiteral("org.kde.plasma.private.systemtray");
- };
-
- auto isDesktop = [] (Plasma::Containment *cont) {
-@@ -493,7 +493,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
-
- KConfigGroup appletConfig = applet->config();
-
-- appletJson.insert("plugin", applet->pluginInfo().pluginName());
-+ appletJson.insert("plugin", applet->pluginMetaData().pluginId());
- appletJson.insert("config", dumpconfigGroupJS(appletConfig));
-
- appletsJsonArray << appletJson;
-@@ -560,7 +560,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
- QJsonObject appletJson;
-
- appletJson.insert("title", applet->title());
-- appletJson.insert("plugin", applet->pluginInfo().pluginName());
-+ appletJson.insert("plugin", applet->pluginMetaData().pluginId());
-
- appletJson.insert("geometry.x", geometry.x() / gridUnit);
- appletJson.insert("geometry.y", geometry.y() / gridUnit);
-@@ -1238,11 +1238,11 @@ void ShellCorona::handleContainmentAdded(Plasma::Containment *c)
-
- void ShellCorona::executeSetupPlasmoidScript(Plasma::Containment *containment, Plasma::Applet *applet)
- {
-- if (!applet->pluginInfo().isValid() || !containment->pluginInfo().isValid()) {
-+ if (!applet->pluginMetaData().isValid() || !containment->pluginMetaData().isValid()) {
- return;
- }
-
-- const QString scriptFile = m_lookAndFeelPackage.filePath("plasmoidsetupscripts", applet->pluginInfo().pluginName() + ".js");
-+ const QString scriptFile = m_lookAndFeelPackage.filePath("plasmoidsetupscripts", applet->pluginMetaData().pluginId() + ".js");
-
- if (scriptFile.isEmpty()) {
- return;
-@@ -1541,7 +1541,7 @@ Plasma::Containment *ShellCorona::setContainmentTypeForScreen(int screen, const
- //if creation failed or invalid plugin, give up
- if (!newContainment) {
- return oldContainment;
-- } else if (!newContainment->pluginInfo().isValid()) {
-+ } else if (!newContainment->pluginMetaData().isValid()) {
- newContainment->deleteLater();
- return oldContainment;
- }
-@@ -1975,7 +1975,8 @@ void ShellCorona::activateLauncherMenu()
- for (auto it = m_panelViews.constBegin(), end = m_panelViews.constEnd(); it != end; ++it) {
- const auto applets = it.key()->applets();
- for (auto applet : applets) {
-- if (applet->pluginInfo().property("X-Plasma-Provides").toStringList().contains(QStringLiteral("org.kde.plasma.launchermenu"))) {
-+ const auto provides = KPluginMetaData::readStringList(applet->pluginMetaData().rawData(), QStringLiteral("X-Plasma-Provides"));
-+ if (provides.contains(QLatin1String("org.kde.plasma.launchermenu"))) {
- if (!applet->globalShortcut().isEmpty()) {
- emit applet->activated();
- return;
---
-2.7.3
-
-From 59b2d1effcee8d449cbbcd237ba8cebaeb4dd949 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Mon, 14 Nov 2016 15:23:00 +0100
-Subject: [PATCH] [Windowed Widgets Runner] Don't access invalid
- KPluginMetaData
-
-BUG: 372017
-FIXED-IN: 5.8.4
-
-Differential Revision: https://phabricator.kde.org/D3356
----
- runners/windowedwidgets/windowedwidgetsrunner.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-index 7f093a7..706b1bb 100644
---- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
-+++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-@@ -61,6 +61,10 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
- QList<Plasma::QueryMatch> matches;
-
- foreach (const KPluginMetaData &md, Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
-+ if (!md.isValid()) {
+ foreach (const KPluginInfo &info, Plasma::PluginLoader::self()->listAppletInfo(QString())) {
+ KService::Ptr service = info.service();
++ if (!service || !service->isValid()) {
+ continue;
+ }
-+
- if (((md.name().contains(term, Qt::CaseInsensitive) ||
- md.value(QLatin1String("GenericName")).contains(term, Qt::CaseInsensitive) ||
- md.description().contains(term, Qt::CaseInsensitive)) ||
---
-2.7.3
-
+
+ if (((service->name().contains(term, Qt::CaseInsensitive) ||
+ service->genericName().contains(term, Qt::CaseInsensitive) ||
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r3.ebuild
new file mode 100644
index 00000000..c97f621
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/libdbusmenu-qt[qt5]
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ calendar? ( $(add_kdeapps_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ 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)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(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
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-base/freespacenotifier:4
+ !kde-base/libtaskmanager:4
+ !kde-base/kcminit:4
+ !kde-base/kdebase-startkde:4
+ !kde-base/klipper:4
+ !kde-base/krunner:4
+ !kde-base/ksmserver:4
+ !kde-base/ksplash:4
+ !kde-base/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ # stable branch
+ "${FILESDIR}/${PN}-5.8.3-all-outputs-known.patch"
+ "${FILESDIR}/${PN}-5.8.3-sync-app-w-applets-config.patch"
+ "${FILESDIR}/${PN}-5.8.3-dont-connect-twice.patch"
+ "${FILESDIR}/${PN}-5.8.3-screenpool-screenchange.patch"
+ "${FILESDIR}/${PN}-5.8.3-krunner-crash.patch"
+ # master
+ "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
+ "${FILESDIR}/${PN}-5.8.3-systray-cpuload.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package gps libgps)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ 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] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2017-06-09 19:24 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2017-06-09 19:24 UTC (permalink / raw
To: gentoo-commits
commit: e523ec3c5738860936173e5d006b42481a7cb8d0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 18:42:20 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 19:24:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e523ec3c
kde-plasma/plasma-workspace: Add Plasma/5.9 branch fixes
Both fixes are also in Plasma 5.8.7.
See also:
https://bugs.kde.org/show_bug.cgi?id=377280
https://bugs.kde.org/show_bug.cgi?id=379414
Package-Manager: Portage-2.3.5, Repoman-2.3.1
...plasma-workspace-5.9.5.1-pinned-launchers.patch | 56 +++++++
.../plasma-workspace-5.9.5.1-startup-crash.patch | 47 ++++++
.../plasma-workspace-5.9.5.1-r2.ebuild | 173 +++++++++++++++++++++
3 files changed, 276 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch
new file mode 100644
index 00000000000..ea1084d417d
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch
@@ -0,0 +1,56 @@
+From 89b244a1ff72925805da6e5f44979ad4cb647468 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org>
+Date: Mon, 22 May 2017 10:08:16 +0200
+Subject: We should not forget the launchers that are not currently shown
+
+Summary:
+The pinned launchers that are assigned to other activities
+will have a -1 as the order. We should not forget them
+when saving to the configuration file.
+
+Reviewers: hein, mart
+
+Reviewed By: hein
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D5933
+---
+ libtaskmanager/tasksmodel.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libtaskmanager/tasksmodel.cpp b/libtaskmanager/tasksmodel.cpp
+index 19f1bca..0150761 100644
+--- a/libtaskmanager/tasksmodel.cpp
++++ b/libtaskmanager/tasksmodel.cpp
+@@ -1545,6 +1545,7 @@ void TasksModel::syncLaunchers()
+ }
+
+ QMap<int, QString> sortedShownLaunchers;
++ QStringList sortedHiddenLaunchers;
+
+ foreach(const QString &launcherUrlStr, launcherList()) {
+ int row = -1;
+@@ -1564,6 +1565,8 @@ void TasksModel::syncLaunchers()
+
+ if (row != -1) {
+ sortedShownLaunchers.insert(row, launcherUrlStr);
++ } else {
++ sortedHiddenLaunchers << launcherUrlStr;
+ }
+ }
+
+@@ -1588,7 +1591,8 @@ void TasksModel::syncLaunchers()
+ d->sortedPreFilterRows.replace(sortMapIndices.at(i), preFilterRows.at(i));
+ }
+ }
+- setLauncherList(sortedShownLaunchers.values());
++
++ setLauncherList(sortedShownLaunchers.values() + sortedHiddenLaunchers);
+ d->launcherSortingDirty = false;
+ }
+
+--
+cgit v0.11.2
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch
new file mode 100644
index 00000000000..0c2e27c67ce
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch
@@ -0,0 +1,47 @@
+From d602198f6807bbfa175b6aaaa1bdf1708fce703e Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 22 May 2017 17:37:56 +0200
+Subject: don't check for panel visible during startup
+
+if any kscreen related activities occurred
+during startup, the panel wouldn't be visible
+yet, and this would assert. This often happens
+when a screen gets disabled at startup
+
+CCBUG:377280
+---
+ shell/panelview.cpp | 1 +
+ shell/shellcorona.cpp | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index 70d74cb..cacf0c0 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -117,6 +117,7 @@ PanelView::~PanelView()
+
+ KConfigGroup PanelView::panelConfig(ShellCorona *corona, Plasma::Containment *containment, QScreen *screen)
+ {
++ qWarning()<<"AAAA"<<containment<<screen;
+ if (!containment || !screen) {
+ return KConfigGroup();
+ }
+diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
+index e40da45..b6b5ed8 100644
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -778,7 +778,11 @@ void ShellCorona::screenInvariants() const
+ foreach (const PanelView *panel, panelsForScreen(screen)) {
+ Q_ASSERT(panel->containment());
+ Q_ASSERT(panel->containment()->screen() == id || panel->containment()->screen() == -1);
+- Q_ASSERT(panel->isVisible());
++ //If any kscreen related activities occurred
++ //during startup, the panel wouldn't be visible yet, and this would assert
++ if (panel->containment()->isUiReady()) {
++ Q_ASSERT(panel->isVisible());
++ }
+ }
+
+ screens.insert(screen);
+--
+cgit v0.11.2
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1-r2.ebuild
new file mode 100644
index 00000000000..3f8d7d47535
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1-r2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ calendar? ( $(add_kdeapps_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( $(add_frameworks_dep prison) )
+ qalculate? ( sci-libs/libqalculate:= )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(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
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-plasma/freespacenotifier:4
+ !kde-plasma/libtaskmanager:4
+ !kde-plasma/kcminit:4
+ !kde-plasma/kdebase-startkde:4
+ !kde-plasma/klipper:4
+ !kde-plasma/krunner:4
+ !kde-plasma/ksmserver:4
+ !kde-plasma/ksplash:4
+ !kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ # Plasma/5.9 branch
+ "${FILESDIR}/${P}-startup-crash.patch" # KDE bug #377280
+ "${FILESDIR}/${P}-pinned-launchers.patch" # KDE bug #379414
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+ # https://phabricator.kde.org/D4690
+ sed -e "/add_subdirectory(remote)/ s/^/#DONT/" -i kioslave/CMakeLists.txt || die
+ rm -r kioslave/remote || die
+ find po -name "kio_remote.po" -delete || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package gps libgps)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ 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] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2017-06-17 18:30 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2017-06-17 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 78f86a70ce899cd549825f5125df1d86ebc00381
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 18:09:01 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 18:29:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f86a70
kde-plasma/plasma-workspace: Fix xembedsniproxy memleak/crash
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../plasma-workspace-5.10.2-xembedsniproxy.patch | 32 ++++
.../plasma-workspace-5.10.2-r1.ebuild | 166 +++++++++++++++++++++
2 files changed, 198 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.2-xembedsniproxy.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.2-xembedsniproxy.patch
new file mode 100644
index 00000000000..7e47893dc6b
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.2-xembedsniproxy.patch
@@ -0,0 +1,32 @@
+From a17de5957d4ba0f07c77fa99860c9046ff8aa1be Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Sat, 17 Jun 2017 19:19:40 +0200
+Subject: [xembedsniproxy] Fix memleak and possible crash
+
+Check the return value of xcb_get_window_attributes_reply() to prevent a crash if getting the window attributes would fail for some reason.
+
+Also free the returned structure after usage to avoid memleaks.
+This is necessary according to https://xcb.freedesktop.org/windowcontextandmanipulation (see the end of the page).
+
+Differential Revision: https://phabricator.kde.org/D6252
+---
+ xembed-sni-proxy/sniproxy.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp
+index 5974baf..b2f64fb 100644
+--- a/xembed-sni-proxy/sniproxy.cpp
++++ b/xembed-sni-proxy/sniproxy.cpp
+@@ -209,8 +209,9 @@ SNIProxy::SNIProxy(xcb_window_t wid, QObject* parent):
+ //if the client does supports that we send directly, otherwise we'll use xtest
+ auto waCookie = xcb_get_window_attributes(c, wid);
+ auto windowAttributes = xcb_get_window_attributes_reply(c, waCookie, nullptr);
+- if (! (windowAttributes->all_event_masks & XCB_EVENT_MASK_BUTTON_PRESS)) {
++ if (windowAttributes && ! (windowAttributes->all_event_masks & XCB_EVENT_MASK_BUTTON_PRESS)) {
+ m_injectMode = XTest;
++ free(windowAttributes);
+ }
+
+ //there's no damage event for the first paint, and sometimes it's not drawn immediately
+--
+cgit v0.11.2
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.2-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.2-r1.ebuild
new file mode 100644
index 00000000000..81958ff0e7f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.2-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ calendar? ( $(add_kdeapps_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( $(add_frameworks_dep prison) )
+ qalculate? ( sci-libs/libqalculate:= )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(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
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-plasma/freespacenotifier:4
+ !kde-plasma/libtaskmanager:4
+ !kde-plasma/kcminit:4
+ !kde-plasma/kdebase-startkde:4
+ !kde-plasma/klipper:4
+ !kde-plasma/krunner:4
+ !kde-plasma/ksmserver:4
+ !kde-plasma/ksplash:4
+ !kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${P}-xembedsniproxy.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package gps libgps)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ 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] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2017-08-02 23:22 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2017-08-02 23:22 UTC (permalink / raw
To: gentoo-commits
commit: b216411002a45d0392987ccc4fe988e2b810f982
Author: José Pekkarinen <koalinux <AT> gmail <DOT> com>
AuthorDate: Tue Aug 1 20:19:37 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 2 23:17:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2164110
kde-plasma/plasma-workspace: Gentoo FHS script support for Wayland session
Gentoo-bug: 626746
Closes: https://github.com/gentoo/gentoo/pull/5270
...rkspace-5.10-startplasmacompositor-script.patch | 40 +++++
.../plasma-workspace-5.10.4-r2.ebuild | 170 +++++++++++++++++++++
2 files changed, 210 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
new file mode 100644
index 00000000000..de56ffe236c
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
@@ -0,0 +1,40 @@
+From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <koalinux@gmail.com>
+Date: Tue, 1 Aug 2017 23:09:24 +0300
+Subject: [PATCH] Source files in /etc/plasma/{startup,shutdown}
+
+---
+ startkde/startplasmacompositor.cmake | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
+index 5bcf26a..e965f19 100644
+--- a/startkde/startplasmacompositor.cmake
++++ b/startkde/startplasmacompositor.cmake
+@@ -157,6 +157,11 @@ for prefix in `echo $scriptpath`; do
+ done
+ done
+
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
++ test -r "${file}" && . "${file}"
++done
++
+ echo 'startplasmacompositor: Starting up...' 1>&2
+
+ # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
+@@ -232,6 +237,11 @@ fi
+
+ echo 'startplasmacompositor: Shutting down...' 1>&2
+
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
++ test -r "${file}" && . "${file}"
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+--
+2.13.0
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild
new file mode 100644
index 00000000000..9f18cb3c6c8
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ calendar? ( $(add_kdeapps_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( $(add_frameworks_dep prison) )
+ qalculate? ( sci-libs/libqalculate:= )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdesu)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(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
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-plasma/freespacenotifier:4
+ !kde-plasma/libtaskmanager:4
+ !kde-plasma/kcminit:4
+ !kde-plasma/kdebase-startkde:4
+ !kde-plasma/klipper:4
+ !kde-plasma/krunner:4
+ !kde-plasma/ksmserver:4
+ !kde-plasma/ksplash:4
+ !kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+ "${FILESDIR}/${P}-unused-dep.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ 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] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2019-10-29 22:22 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2019-10-29 22:22 UTC (permalink / raw
To: gentoo-commits
commit: 457145c9d97bbcaace74b8bdacf20af972c61693
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 21:27:28 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 22:21:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457145c9
kde-plasma/plasma-workspace: Drop translations of Plasma session name
We need to remove all translations in order to not reproduce the initial issue.
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...sma-workspace-5.17.2-waylandsessionrename.patch | 91 ++++++++++++++++++++++
.../plasma-workspace-5.17.2.ebuild | 2 +-
2 files changed, 92 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
new file mode 100644
index 00000000000..71d1ce4abb8
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
@@ -0,0 +1,91 @@
+From 36bc9bfd9661f88039a8945688e07b0626b48610 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 15 Oct 2019 18:33:45 +0200
+Subject: [PATCH 1/2] 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, fvogt, 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 64f997ea4..3e9b46bc9 100644
+--- a/login-sessions/plasmawayland.desktop.cmake
++++ b/login-sessions/plasmawayland.desktop.cmake
+@@ -2,51 +2,7 @@
+ Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
+ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
+ DesktopNames=KDE
+-Name=Plasma
+-Name[ar]=بلازما
+-Name[bs]=Plazma
+-Name[ca]=Plasma
+-Name[ca@valencia]=Plasma
+-Name[cs]=Plasma
+-Name[da]=Plasma
+-Name[de]=Plasma
+-Name[el]=Plasma
+-Name[en_GB]=Plasma
+-Name[es]=Plasma
+-Name[et]=Plasma
+-Name[eu]=Plasma
+-Name[fi]=Plasma
+-Name[fr]=Plasma
+-Name[gl]=Plasma
+-Name[he]=פלזמה
+-Name[hu]=Plasma
+-Name[id]=Plasma
+-Name[is]=Plasma
+-Name[it]=Plasma
+-Name[ja]=プラズマ
+-Name[ko]=Plasma
+-Name[lt]=Plasma
+-Name[nb]=Plasma
+-Name[nds]=Plasma
+-Name[nl]=Plasma
+-Name[nn]=Plasma
+-Name[pa]=ਪਲਾਜ਼ਮਾ
+-Name[pl]=Plazma
+-Name[pt]=Plasma
+-Name[pt_BR]=Plasma
+-Name[ru]=Plasma
+-Name[sk]=Plasma
+-Name[sl]=Plasma
+-Name[sr]=Плазма
+-Name[sr@ijekavian]=Плазма
+-Name[sr@ijekavianlatin]=Plasma
+-Name[sr@latin]=Plasma
+-Name[sv]=Plasma
+-Name[tr]=Plama
+-Name[uk]=Плазма
+-Name[x-test]=xxPlasmaxx
+-Name[zh_CN]=Plasma
+-Name[zh_TW]=Plasma
++Name=Plasma (Wayland)
+ Comment=Plasma by KDE
+ Comment[ar]=بلازما كدي
+ Comment[bs]=Plazma od strane KDe
+--
+2.23.0
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild
index 18496a7cf26..1e58c5789d8 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild
@@ -118,7 +118,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
- "${FILESDIR}/${PN}-5.17.0-waylandsessionrename.patch"
+ "${FILESDIR}/${P}-waylandsessionrename.patch"
)
RESTRICT+=" test"
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2019-12-17 23:49 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2019-12-17 23:49 UTC (permalink / raw
To: gentoo-commits
commit: dd1d973125f142537c32bddf814e081e8bf22c80
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 22:13:10 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 23:48:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1d9731
kde-plasma/plasma-workspace: Use the right value of EnableMagicMimeActions
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=409801
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ace-5.17.4-fix-disable-mime-based-actions.patch | 38 ++++
.../plasma-workspace-5.17.4-r1.ebuild | 206 +++++++++++++++++++++
2 files changed, 244 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch
new file mode 100644
index 00000000000..c6d2f4425da
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch
@@ -0,0 +1,38 @@
+From 895e31d6946b63ddba923e58eb08d1ece7de85df Mon Sep 17 00:00:00 2001
+From: Tranter Madi <trmdi@yandex.com>
+Date: Wed, 4 Dec 2019 20:34:49 -0700
+Subject: Use the right value of EnableMagicMimeActions
+
+Summary: BUG: 409801
+
+Test Plan: The bug is fixed.
+
+Reviewers: #plasma, ngraham, apol
+
+Reviewed By: ngraham
+
+Subscribers: davidedmundson, ngraham, plasma-devel, #plasma
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D25310
+---
+ klipper/urlgrabber.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
+index 28d8ce0..eef9784 100644
+--- a/klipper/urlgrabber.cpp
++++ b/klipper/urlgrabber.cpp
+@@ -102,8 +102,7 @@ void URLGrabber::setActionList( const ActionList& list )
+ void URLGrabber::matchingMimeActions(const QString& clipData)
+ {
+ QUrl url(clipData);
+- KConfigGroup cg(KSharedConfig::openConfig(), "Actions");
+- if(!cg.readEntry("EnableMagicMimeActions",true)) {
++ if(!KlipperSettings::enableMagicMimeActions()) {
+ //qCDebug(KLIPPER_LOG) << "skipping mime magic due to configuration";
+ return;
+ }
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild
new file mode 100644
index 00000000000..981850375fc
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+COMMON_DEPEND="
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kpeople-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ media-libs/phonon[qt5(+)]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ appstream? ( dev-libs/appstream[qt5] )
+ calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ qalculate? ( sci-libs/libqalculate:= )
+ qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-apps/kio-extras-19.04.3:5
+ >=kde-plasma/ksysguard-${PVCUT}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtpaths-${QTMIN}:5
+ >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ app-text/iso-codes
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.16.80:5
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch"
+ "${FILESDIR}/${P}-fix-disable-mime-based-actions.patch"
+)
+
+RESTRICT+=" test"
+
+# used for agent scripts migration
+OLDST=/etc/plasma/startup/10-agent-startup.sh
+NEWST=/etc/xdg/plasma-workspace/env/10-agent-startup.sh
+OLDSH=/etc/plasma/shutdown/10-agent-shutdown.sh
+NEWSH=/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+
+src_prepare() {
+ ecm_src_prepare
+
+ 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() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake_use_find_package qalculate Qalculate)
+ $(cmake_use_find_package qrcode KF5Prison)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ use gps && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto "$(dirname ${NEWST})"
+ doins "${FILESDIR}/$(basename ${NEWST})"
+
+ insinto "$(dirname ${NEWSH})"
+ doins "${FILESDIR}/$(basename ${NEWSH})"
+ fperms +x "${NEWSH}"
+}
+
+pkg_preinst() {
+ ecm_pkg_preinst
+
+ # migrate existing agent scripts to new layout if no files there yet
+ if [[ -r "${EROOT}${OLDST}" && ! -f "${EROOT}${NEWST}" ]]; then
+ mkdir -p "${EROOT}$(dirname ${NEWST})" && cp "${EROOT}${OLDST}" "${EROOT}${NEWST}" && \
+ elog "${EROOT}${OLDST} has been migrated to ${EROOT}${NEWST}, please delete old file."
+ fi
+ if [[ -r "${EROOT}${OLDSH}" && ! -f "${EROOT}${NEWSH}" ]]; then
+ mkdir -p "${EROOT}$(dirname ${NEWSH})" && cp "${EROOT}${OLDSH}" "${EROOT}${NEWSH}" && \
+ chmod +x "${EROOT}${NEWSH}" && \
+ elog "${EROOT}${OLDSH} has been migrated to ${EROOT}${NEWSH}, please delete old file."
+ fi
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ # warn about any leftover user scripts
+ if [[ -d "${EROOT}"/etc/plasma/startup && -n "$(ls "${EROOT}"/etc/plasma/startup)" ]] || \
+ [[ -d "${EROOT}"/etc/plasma/shutdown && -n "$(ls "${EROOT}"/etc/plasma/shutdown)" ]]; then
+ elog "You appear to have scripts in ${EROOT}/etc/plasma/{startup,shutdown}."
+ elog "They will no longer work since plasma-workspace-5.17"
+ fi
+
+ elog " * Edit ${EROOT}${NEWST} and uncomment"
+ elog " the lines enabling ssh-agent."
+ elog " * Edit ${EROOT}${NEWSH} uncomment"
+ elog " the respective lines to properly kill the agent when the session ends."
+}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2020-09-17 20:15 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2020-09-17 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 387c395751705c65010a74508f4df48be238f9df
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 17:01:42 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 20:14:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=387c3957
kde-plasma/plasma-workspace: Fix build with sci-geosciences/gpsd-3.21
Thanks-to: PhobosK <phobosk <AT> fastmail.fm>
Closes: https://bugs.gentoo.org/742392
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-workspace-5.19.5-gpsd-3.21.patch | 29 ++++++++++++++++++++++
.../plasma-workspace-5.19.5.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch
new file mode 100644
index 00000000000..64c5e106e10
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch
@@ -0,0 +1,29 @@
+From e3134289f522edb140797818fffd60d641b86cd8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 5 Aug 2020 14:07:24 +0200
+Subject: [PATCH] Fix build with gpsd 3.21
+
+Adapt to API changes
+---
+ dataengines/geolocation/location_gps.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
+index 021c29ac5..476117ca3 100644
+--- a/dataengines/geolocation/location_gps.cpp
++++ b/dataengines/geolocation/location_gps.cpp
+@@ -65,7 +65,11 @@ void Gpsd::run()
+ if (m_gpsdata->online) {
+ #endif
+ //qDebug() << "online";
++#if GPSD_API_MAJOR_VERSION >= 10
++ if (m_gpsdata->fix.status != STATUS_NO_FIX) {
++#else
+ if (m_gpsdata->status != STATUS_NO_FIX) {
++#endif
+ //qDebug() << "fix";
+ d["accuracy"] = 30;
+ d["latitude"] = QString::number(m_gpsdata->fix.latitude);
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild
index 2c1b32f36d4..049c17d6cda 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild
@@ -126,6 +126,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+ "${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392
)
RESTRICT+=" test"
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2020-09-17 20:15 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2020-09-17 20:15 UTC (permalink / raw
To: gentoo-commits
commit: b646d3586e628508cb3df0c28369081bdc410eab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 19:24:54 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 20:14:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b646d358
kde-plasma/plasma-workspace: Fix login button size
See also:
https://mail.kde.org/pipermail/distributions/2020-September/000853.html
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...plasma-workspace-5.19.5-login-button-size.patch | 36 ++++++++++++++++++++++
....5.ebuild => plasma-workspace-5.19.5-r1.ebuild} | 1 +
2 files changed, 37 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch
new file mode 100644
index 00000000000..aa30a4d2cf2
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch
@@ -0,0 +1,36 @@
+From 9a8fc811282e303ec2f93c978228a85961dae263 Mon Sep 17 00:00:00 2001
+From: Noah Davis <noahadvs@gmail.com>
+Date: Mon, 14 Sep 2020 10:18:57 -0400
+Subject: [PATCH] [sddm-theme/lockscreen] Fix login button size
+
+Some users reported this button becoming too small after KF5.74 was released, but I could not reproduce it myself. However, this code did look suspicious. Hopefully this fixes the issue.
+---
+ lookandfeel/contents/lockscreen/MainBlock.qml | 4 ++--
+ sddm-theme/Login.qml | 5 ++---
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+--- a/lookandfeel/contents/lockscreen/MainBlock.qml
++++ b/lookandfeel/contents/lockscreen/MainBlock.qml
+@@ -97,7 +97,8 @@
+ PlasmaComponents.Button {
+ id: loginButton
+ Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock")
+- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
++ Layout.preferredHeight: passwordBox.implicitHeight
++ Layout.preferredWidth: loginButton.Layout.preferredHeight
+
+ PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
+ anchors.fill: parent
+--- a/sddm-theme/Login.qml
++++ b/sddm-theme/Login.qml
+@@ -112,8 +112,8 @@
+ PlasmaComponents.Button {
+ id: loginButton
+ Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In")
+- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
+- Layout.rightMargin: 1 // prevents it from extending beyond the username field
++ Layout.preferredHeight: passwordBox.implicitHeight
++ Layout.preferredWidth: loginButton.Layout.preferredHeight
+
+ PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
+ anchors.fill: parent
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild
similarity index 99%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild
index 049c17d6cda..232540bdbe8 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild
@@ -127,6 +127,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
"${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392
+ "${FILESDIR}/${P}-login-button-size.patch"
)
RESTRICT+=" test"
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2021-01-23 0:25 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2021-01-23 0:25 UTC (permalink / raw
To: gentoo-commits
commit: 9e56b5723e5531ac89bd9200081786213f23fbb5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 20:52:13 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 00:25:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e56b572
kde-plasma/plasma-workspace: digitalclock: fix showing agenda view
Upstream commit aa5215a0b3f8febfe9eda2ab586d9bf8ba647c7c
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=431433
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...space-5.20.5-fix-digitalclock-agenda-view.patch | 37 ++++
.../plasma-workspace-5.20.5-r2.ebuild | 206 +++++++++++++++++++++
2 files changed, 243 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch
new file mode 100644
index 00000000000..a7580b44475
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch
@@ -0,0 +1,37 @@
+From aa5215a0b3f8febfe9eda2ab586d9bf8ba647c7c Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 11 Jan 2021 16:03:31 +0100
+Subject: [PATCH] [applets/digitalclock] Fix showing agenda view when enabling
+ plugins
+
+The agenda view is only shown when at least one event source is active.
+When going from 0 to 1 active sources the view wasn't updated correctly.
+
+This was because the visibility of rightColumn was bound to the
+visibility of its child, but since the visibility of the parent affects
+the visibility of its childred (https://doc.qt.io/qt-5/qml-qtquick-item.html#visible-prop) that resulted in a broken binding.
+
+Bind to the source property directly to avoid this
+
+BUG: 431433
+(cherry picked from commit 56064d80ff2e798460967b28243c8117ee6ebaec)
+---
+ applets/digital-clock/package/contents/ui/CalendarView.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/digital-clock/package/contents/ui/CalendarView.qml b/applets/digital-clock/package/contents/ui/CalendarView.qml
+index a7104100e..1541a3501 100644
+--- a/applets/digital-clock/package/contents/ui/CalendarView.qml
++++ b/applets/digital-clock/package/contents/ui/CalendarView.qml
+@@ -145,7 +145,7 @@ PlasmaComponents3.Page {
+ ColumnLayout {
+ id: rightColumn
+
+- visible: agenda.visible || worldClocks.visible
++ visible: calendar.showAgenda || calendar.showClocks
+
+ Layout.minimumWidth: units.gridUnit * 14
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild
new file mode 100644
index 00000000000..209e7b0694d
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT+=" test"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwayland-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kpeople-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/prison-${KFMIN}:5[qml]
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ >=media-libs/phonon-4.11.0
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ appstream? ( dev-libs/appstream[qt5] )
+ calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ qalculate? ( sci-libs/libqalculate:= )
+ screencast? (
+ >=media-video/pipewire-0.3:=
+ x11-libs/libdrm
+ )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.1.1
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtpaths-${QTMIN}:5
+ >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-apps/kio-extras-19.04.3:5
+ >=kde-frameworks/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/ksysguard-${PVCUT}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.19.80:5
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772
+ "${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711
+ "${FILESDIR}/${P}-fix-digitalclock-agenda-view.patch" # KDE-Bug 431433
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ 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
+
+ # TODO: try to get a build switch upstreamed
+ if ! use screencast; then
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
+ -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package fontconfig Fontconfig)
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake_use_find_package qalculate Qalculate)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${FILESDIR}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${FILESDIR}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ # Clean up pre-5.17.4 dirs
+ rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
+
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+ elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2021-01-23 0:25 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2021-01-23 0:25 UTC (permalink / raw
To: gentoo-commits
commit: c8f37e9a713ce4b2ac18071dcdaa1f96c7d1cf11
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 20:59:03 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 00:25:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f37e9a
kde-plasma/plasma-workspace: startplasma-wayland: fix XKB variable setup
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ace-5.20.5-wayland-fix-XKB-variable-setup.patch | 35 ++++++++++++++++++++++
.../plasma-workspace-5.20.5-r2.ebuild | 1 +
2 files changed, 36 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch
new file mode 100644
index 00000000000..3018b73cefa
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch
@@ -0,0 +1,35 @@
+From 2a6718ff53aa70d3a6c0d9a78a7aaa491907b130 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Mon, 18 Jan 2021 12:56:00 +0000
+Subject: [PATCH] startplasma-wayland: Fix XKB variable setup
+
+When this was ported to C++, it missed the actual variable assignments.
+
+
+(cherry picked from commit 76088e21ea2ec09d13bd462d61c4b8ffc7bc4729)
+---
+ startkde/startplasma-wayland.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
+index 500435853..38e325843 100644
+--- a/startkde/startplasma-wayland.cpp
++++ b/startkde/startplasma-wayland.cpp
+@@ -61,10 +61,10 @@ int main(int argc, char** argv)
+ qputenv(var, r.toUtf8());
+ };
+
+- queryAndSet("X11MODEL", QStringLiteral("X11Model"));
+- queryAndSet("X11LAYOUT", QStringLiteral("X11Layout"));
+- queryAndSet("X11VARIANT", QStringLiteral("X11Variant"));
+- queryAndSet("X11OPTIONS", QStringLiteral("X11Options"));
++ queryAndSet("XKB_DEFAULT_MODEL", QStringLiteral("X11Model"));
++ queryAndSet("XKB_DEFAULT_LAYOUT", QStringLiteral("X11Layout"));
++ queryAndSet("XKB_DEFAULT_VARIANT", QStringLiteral("X11Variant"));
++ queryAndSet("XKB_DEFAULT_OPTIONS", QStringLiteral("X11Options"));
+ } else {
+ qWarning() << "not a reply org.freedesktop.locale1" << resultMessage;
+ }
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild
index 209e7b0694d..c6598847b3c 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild
@@ -147,6 +147,7 @@ PATCHES=(
"${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772
"${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711
"${FILESDIR}/${P}-fix-digitalclock-agenda-view.patch" # KDE-Bug 431433
+ "${FILESDIR}/${P}-wayland-fix-XKB-variable-setup.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2021-01-24 19:44 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2021-01-24 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 99a6c9cb20f32c96d9d79c7bb8fb2b01744b4acc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 11:48:14 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:42:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a6c9cb
kde-plasma/plasma-workspace: drop 5.19.5*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
| 44 ----
.../files/plasma-workspace-5.19.5-gpsd-3.21.patch | 29 ---
...-5.19.5-guard-against-no-virtual-desktops.patch | 46 -----
...plasma-workspace-5.19.5-login-button-size.patch | 36 ----
kde-plasma/plasma-workspace/metadata.xml | 1 -
.../plasma-workspace-5.19.5-r2.ebuild | 225 ---------------------
7 files changed, 382 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index b318c4b031a..9d60abe75ce 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
deleted file mode 100644
index 527e199cc66..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From faef126255222f727219bf69ac2b89857dc61ab2 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 14 Jun 2020 09:08:21 -0600
-Subject: [PATCH] Port applets to use PlasmaExtras.PlaceholderMessage
-
-The Kirigami version uses QQC2 elements which don't respect the plasma
-theme and color scheme, leading to thing slooking out of place
-especially when using a dark color theme or scheme.
-
-Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
----
- applets/clipboard/contents/ui/Menu.qml | 2 +-
- .../notifications/package/contents/ui/FullRepresentation.qml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml
-index 0bd6064a5..cac8380db 100644
---- a/applets/clipboard/contents/ui/Menu.qml
-+++ b/applets/clipboard/contents/ui/Menu.qml
-@@ -55,7 +55,7 @@ PlasmaExtras.ScrollArea {
- onAction: menu.action(uuid)
- }
-
-- Kirigami.PlaceholderMessage {
-+ PlasmaExtras.PlaceholderMessage {
- id: emptyHint
-
- anchors.centerIn: parent
-diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml
-index b34dee7af..989cb4341 100644
---- a/applets/notifications/package/contents/ui/FullRepresentation.qml
-+++ b/applets/notifications/package/contents/ui/FullRepresentation.qml
-@@ -585,7 +585,7 @@ PlasmaComponents3.Page {
- }
- }
-
-- Kirigami.PlaceholderMessage {
-+ PlasmaExtras.PlaceholderMessage {
- anchors.centerIn: parent
- width: parent.width - (units.largeSpacing * 4)
-
---
-2.27.0
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch
deleted file mode 100644
index 64c5e106e10..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e3134289f522edb140797818fffd60d641b86cd8 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Wed, 5 Aug 2020 14:07:24 +0200
-Subject: [PATCH] Fix build with gpsd 3.21
-
-Adapt to API changes
----
- dataengines/geolocation/location_gps.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
-index 021c29ac5..476117ca3 100644
---- a/dataengines/geolocation/location_gps.cpp
-+++ b/dataengines/geolocation/location_gps.cpp
-@@ -65,7 +65,11 @@ void Gpsd::run()
- if (m_gpsdata->online) {
- #endif
- //qDebug() << "online";
-+#if GPSD_API_MAJOR_VERSION >= 10
-+ if (m_gpsdata->fix.status != STATUS_NO_FIX) {
-+#else
- if (m_gpsdata->status != STATUS_NO_FIX) {
-+#endif
- //qDebug() << "fix";
- d["accuracy"] = 30;
- d["latitude"] = QString::number(m_gpsdata->fix.latitude);
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
deleted file mode 100644
index 21e33531590..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 5cb38daedbfa5ef26a47d82d197c96230a004b0f Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 30 Sep 2020 08:56:16 +0000
-Subject: [PATCH] [containmentactions] Guard against having no virtual desktops
-
-It can apparently happen that virtual desktops is empty at a given point
-in time. Potentially due to other bugs on the system.
-
-Calls to desktopIds.at(N) will fail.
-
-BUG: 427106
-
-
-(cherry picked from commit 2441c82a2a92535ccc0a9643715427eb362c98e8)
----
- containmentactions/switchdesktop/desktop.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/containmentactions/switchdesktop/desktop.cpp b/containmentactions/switchdesktop/desktop.cpp
-index 809543a49..dda78c584 100644
---- a/containmentactions/switchdesktop/desktop.cpp
-+++ b/containmentactions/switchdesktop/desktop.cpp
-@@ -85,6 +85,10 @@ void SwitchDesktop::switchTo()
- void SwitchDesktop::performNextAction()
- {
- const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
-+ if (desktopIds.isEmpty()) {
-+ return;
-+ }
-+
- const QVariant ¤tDesktop = m_virtualDesktopInfo->currentDesktop();
- const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
-
-@@ -100,6 +104,9 @@ void SwitchDesktop::performNextAction()
- void SwitchDesktop::performPreviousAction()
- {
- const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
-+ if (desktopIds.isEmpty()) {
-+ return;
-+ }
- const QVariant ¤tDesktop = m_virtualDesktopInfo->currentDesktop();
- const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch
deleted file mode 100644
index aa30a4d2cf2..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9a8fc811282e303ec2f93c978228a85961dae263 Mon Sep 17 00:00:00 2001
-From: Noah Davis <noahadvs@gmail.com>
-Date: Mon, 14 Sep 2020 10:18:57 -0400
-Subject: [PATCH] [sddm-theme/lockscreen] Fix login button size
-
-Some users reported this button becoming too small after KF5.74 was released, but I could not reproduce it myself. However, this code did look suspicious. Hopefully this fixes the issue.
----
- lookandfeel/contents/lockscreen/MainBlock.qml | 4 ++--
- sddm-theme/Login.qml | 5 ++---
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
---- a/lookandfeel/contents/lockscreen/MainBlock.qml
-+++ b/lookandfeel/contents/lockscreen/MainBlock.qml
-@@ -97,7 +97,8 @@
- PlasmaComponents.Button {
- id: loginButton
- Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock")
-- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
-+ Layout.preferredHeight: passwordBox.implicitHeight
-+ Layout.preferredWidth: loginButton.Layout.preferredHeight
-
- PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
- anchors.fill: parent
---- a/sddm-theme/Login.qml
-+++ b/sddm-theme/Login.qml
-@@ -112,8 +112,8 @@
- PlasmaComponents.Button {
- id: loginButton
- Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In")
-- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
-- Layout.rightMargin: 1 // prevents it from extending beyond the username field
-+ Layout.preferredHeight: passwordBox.implicitHeight
-+ Layout.preferredWidth: loginButton.Layout.preferredHeight
-
- PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
- anchors.fill: parent
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index b52b6b48585..599877f90bf 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -9,7 +9,6 @@
<flag name="appstream">Enable AppStream software metadata support</flag>
<flag name="geolocation">Enables dataengine providing location information</flag>
<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
- <flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag>
<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
</use>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
deleted file mode 100644
index 472f6c66c2d..00000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5[jpeg]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kpeople-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- appstream? ( dev-libs/appstream[qt5] )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- qalculate? ( sci-libs/libqalculate:= )
- qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/qtconcurrent-${QTMIN}:5
- x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtpaths-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-apps/kio-extras-19.04.3:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-frameworks/kdesu-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-plasma/ksysguard-${PVCUT}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- systemd? ( sys-apps/dbus[user-session] )
- !systemd? ( sys-apps/dbus )
- !<kde-plasma/plasma-desktop-5.16.80:5
-"
-PDEPEND="
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
- "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
- "${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392
- "${FILESDIR}/${P}-login-button-size.patch"
- "${FILESDIR}/${P}-guard-against-no-virtual-desktops.patch" # KDE-Bug #427106
-)
-
-RESTRICT+=" test"
-
-pkg_setup() {
- ecm_pkg_setup
-
- local md5
- local srcfile=/etc/plasma/XX/10-agent-XX.sh
- local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
-
- if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
- md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
- if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
- elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
- elog "Copying to ${newdir}/env/10-agent-startup.sh..."
- cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
- fi
- fi
-
- if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
- md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
- if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
- elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
- elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
- cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
- fi
- fi
-}
-
-src_prepare() {
- ecm_src_prepare
-
- if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
- cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
- fi
- if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
- cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
- fi
-
- 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() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package qalculate Qalculate)
- $(cmake_use_find_package qrcode KF5Prison)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${T}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${T}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- # Clean up pre-5.17.4 scripts
- if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
- rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
- elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
- fi
- if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
- rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
- elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
- fi
- rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
-
- elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
- elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2021-09-14 13:39 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2021-09-14 13:39 UTC (permalink / raw
To: gentoo-commits
commit: 3dbebfcbf698947655af1d3ed9a8444f36772e94
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 13:38:32 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 13:39:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dbebfcb
kde-plasma/plasma-workspace: Use FindFontconfig.cmake from KF-5.82
Hotfix for build with kde-frameworks/extra-cmake-modules-5.85.0 while
KDE Plasma 5.22.5 is being stabilised.
Closes: https://bugs.gentoo.org/813041
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-workspace-5.21.5-FindFontconfig.cmake | 96 ++++++++++++++++++++++
.../plasma-workspace-5.21.5.ebuild | 2 +
2 files changed, 98 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-FindFontconfig.cmake b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-FindFontconfig.cmake
new file mode 100644
index 00000000000..db5f18300ed
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-FindFontconfig.cmake
@@ -0,0 +1,96 @@
+# SPDX-FileCopyrightText: 2006, 2007 Laurent Montel <montel@kde.org>
+# SPDX-FileCopyrightText: 2018 Volker Krause <vkrause@kde.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#[=======================================================================[.rst:
+FindFontconfig
+--------------
+
+Try to find Fontconfig.
+Once done this will define the following variables:
+
+``Fontconfig_FOUND``
+ True if Fontconfig is available
+``Fontconfig_INCLUDE_DIRS``
+ The include directory to use for the Fontconfig headers
+``Fontconfig_LIBRARIES``
+ The Fontconfig libraries for linking
+``Fontconfig_DEFINITIONS``
+ Compiler switches required for using Fontconfig
+``Fontconfig_VERSION``
+ The version of Fontconfig that has been found
+
+If ``Fontconfig_FOUND`` is TRUE, it will also define the following
+imported target:
+
+``Fontconfig::Fontconfig``
+
+Since 5.57.0.
+#]=======================================================================]
+
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
+
+set(Fontconfig_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
+
+find_path(Fontconfig_INCLUDE_DIRS fontconfig/fontconfig.h
+ PATHS
+ ${PC_FONTCONFIG_INCLUDE_DIRS}
+ /usr/X11/include
+)
+
+find_library(Fontconfig_LIBRARIES NAMES fontconfig
+ PATHS
+ ${PC_FONTCONFIG_LIBRARY_DIRS}
+)
+
+set(Fontconfig_VERSION ${PC_FONTCONFIG_VERSION})
+if (NOT Fontconfig_VERSION)
+ find_file(Fontconfig_VERSION_HEADER
+ NAMES "fontconfig/fontconfig.h"
+ HINTS ${Fontconfig_INCLUDE_DIRS}
+ )
+ mark_as_advanced(Fontconfig_VERSION_HEADER)
+ if (Fontconfig_VERSION_HEADER)
+ file(READ ${Fontconfig_VERSION_HEADER} _fontconfig_version_header_content)
+ string(REGEX MATCH "#define FC_MAJOR[ \t]+[0-9]+" Fontconfig_MAJOR_VERSION_MATCH ${_fontconfig_version_header_content})
+ string(REGEX MATCH "#define FC_MINOR[ \t]+[0-9]+" Fontconfig_MINOR_VERSION_MATCH ${_fontconfig_version_header_content})
+ string(REGEX MATCH "#define FC_REVISION[ \t]+[0-9]+" Fontconfig_PATCH_VERSION_MATCH ${_fontconfig_version_header_content})
+ string(REGEX REPLACE ".*FC_MAJOR[ \t]+(.*)" "\\1" Fontconfig_MAJOR_VERSION ${Fontconfig_MAJOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*FC_MINOR[ \t]+(.*)" "\\1" Fontconfig_MINOR_VERSION ${Fontconfig_MINOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*FC_REVISION[ \t]+(.*)" "\\1" Fontconfig_PATCH_VERSION ${Fontconfig_PATCH_VERSION_MATCH})
+ set(Fontconfig_VERSION "${Fontconfig_MAJOR_VERSION}.${Fontconfig_MINOR_VERSION}.${Fontconfig_PATCH_VERSION}")
+ endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Fontconfig
+ FOUND_VAR Fontconfig_FOUND
+ REQUIRED_VARS Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS
+ VERSION_VAR Fontconfig_VERSION
+)
+mark_as_advanced(Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS)
+
+if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig)
+ add_library(Fontconfig::Fontconfig UNKNOWN IMPORTED)
+ set_target_properties(Fontconfig::Fontconfig PROPERTIES
+ IMPORTED_LOCATION "${Fontconfig_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${Fontconfig_INCLUDE_DIRS}"
+ INTERFACE_COMPILER_DEFINITIONS "${Fontconfig_DEFINITIONS}"
+ )
+endif()
+
+# backward compatibility, remove in kf6
+set(FONTCONFIG_INCLUDE_DIR "${Fontconfig_INCLUDE_DIRS}")
+set(FONTCONFIG_LIBRARIES "${Fontconfig_LIBRARIES}")
+set(FONTCONFIG_DEFINITIONS "${Fontconfig_DEFINITIONS}")
+mark_as_advanced(FONTCONFIG_INCLUDE_DIR FONTCONFIG_LIBRARIES FONTCONFIG_DEFINITIONS)
+
+include(FeatureSummary)
+set_package_properties(Fontconfig PROPERTIES
+ URL "https://www.fontconfig.org/"
+ DESCRIPTION "Fontconfig is a library for configuring and customizing font access"
+)
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 f23f675a038..22adfc762f4 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
@@ -170,6 +170,8 @@ src_prepare() {
# KDE-bug: 433730
use calculator ||
cmake_run_in runners cmake_comment_add_subdirectory calculator
+
+ cp "${FILESDIR}"/${P}-FindFontconfig.cmake cmake/FindFontconfig.cmake || die # bug 813041
}
src_configure() {
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2021-09-30 17:24 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2021-09-30 17:24 UTC (permalink / raw
To: gentoo-commits
commit: e71b6df109fb99ae46412b8d03c422e9bd3f6867
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 17:11:51 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 17:22:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71b6df1
kde-plasma/plasma-workspace: Fix build with gpsd-3.23.1
See also:
https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1078
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-workspace-5.22.5-gpsd-3.23.1.patch | 30 ++++++++++++++++++++++
.../plasma-workspace-5.22.5-r2.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
new file mode 100644
index 00000000000..cb35751d446
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
@@ -0,0 +1,30 @@
+From e6cab5d96f7b51a5cf4be3d93a7e2d4fee1cddae Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Thu, 23 Sep 2021 19:29:05 +0300
+Subject: [PATCH] Fix build with gpsd 3.23.1
+
+STATUS_NO_FIX was renamed to STATUS_UNK.
+
+https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427
+---
+ dataengines/geolocation/location_gps.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
+index 858059ada..ec9ec14ae 100644
+--- a/dataengines/geolocation/location_gps.cpp
++++ b/dataengines/geolocation/location_gps.cpp
+@@ -52,7 +52,9 @@ void Gpsd::run()
+ #else
+ if (m_gpsdata->online) {
+ #endif
+-#if GPSD_API_MAJOR_VERSION >= 10
++#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version
++ if (m_gpsdata->fix.status != STATUS_UNK) {
++#elif GPSD_API_MAJOR_VERSION >= 10
+ if (m_gpsdata->fix.status != STATUS_NO_FIX) {
+ #else
+ if (m_gpsdata->status != STATUS_NO_FIX) {
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
index 2a5454791b8..21b2c64d565 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
@@ -151,6 +151,7 @@ PATCHES=(
"${FILESDIR}/${P}-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
"${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675
"${FILESDIR}/${P}-fix-hotplug-notifications.patch" # KDE-bug 438874, bug 814284
+ "${FILESDIR}/${P}-gpsd-3.23.1.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2021-11-23 14:59 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2021-11-23 14:59 UTC (permalink / raw
To: gentoo-commits
commit: fe17673799c4432e586d0bf20b1a306371d2ea56
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 17:17:21 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 14:59:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe176737
kde-plasma/plasma-workspace: systemtray: fix crash and race condition
Upstream commits:
931a5441746daf10d9476409f347263719ef6c63
a9fba8b5416dd3b130045ccac40e5412714563ea
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=443961
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...systemtray-check-if-service-already-added.patch | 41 ++++++++++++++++
...pace-5.23.3-systemtray-fix-race-condition.patch | 54 ++++++++++++++++++++++
.../plasma-workspace-5.23.3-r2.ebuild | 2 +
3 files changed, 97 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch
new file mode 100644
index 000000000000..6258b66f6e70
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch
@@ -0,0 +1,41 @@
+From 931a5441746daf10d9476409f347263719ef6c63 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Mon, 1 Nov 2021 22:17:53 +0800
+Subject: [PATCH] systemtray: Check if a service is already added before
+ processing QDBusReply
+
+Due to async nature of QDBusPendingReply, services could be already
+registered by QDBusServiceWatcher when the pending reply takes a long
+time to finish, so it's possible that QDBusServiceWatcher::serviceRegistered
+signal is emitted before the pending reply emits QDBusPendingCallWatcher::finished,
+which will make the same service added twice and crash plasmashell.
+
+We need to check if a service is already added in m_sniServices before
+processing registered items in QDBusReply.
+
+BUG: 443961
+
+
+(cherry picked from commit c0b8f6871e75bbc268165844ad5780f13a5f88ac)
+---
+ applets/systemtray/statusnotifieritemhost.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/applets/systemtray/statusnotifieritemhost.cpp b/applets/systemtray/statusnotifieritemhost.cpp
+index c17eedd6c..4108b2b82 100644
+--- a/applets/systemtray/statusnotifieritemhost.cpp
++++ b/applets/systemtray/statusnotifieritemhost.cpp
+@@ -101,7 +101,9 @@ void StatusNotifierItemHost::registerWatcher(const QString &service)
+ QDBusReply<QDBusVariant> reply = *watcher;
+ QStringList registeredItems = reply.value().variant().toStringList();
+ foreach (const QString &service, registeredItems) {
+- addSNIService(service);
++ if (!m_sniServices.contains(service)) { // due to async nature of this call, service may be already there
++ addSNIService(service);
++ }
+ }
+ });
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch
new file mode 100644
index 000000000000..bbe9a152c608
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch
@@ -0,0 +1,54 @@
+From a9fba8b5416dd3b130045ccac40e5412714563ea Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Sat, 20 Nov 2021 21:04:06 +0800
+Subject: [PATCH] systemtray: Connect to StatusNotifierWatcher before
+ initializing QDBusPendingReply
+
+This fixes a race condition.
+
+
+(cherry picked from commit 644588739e617cfde8ee097dff4a72cc08c421aa)
+---
+ applets/systemtray/statusnotifieritemhost.cpp | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/applets/systemtray/statusnotifieritemhost.cpp b/applets/systemtray/statusnotifieritemhost.cpp
+index 4108b2b82..117c29f17 100644
+--- a/applets/systemtray/statusnotifieritemhost.cpp
++++ b/applets/systemtray/statusnotifieritemhost.cpp
+@@ -93,6 +93,15 @@ void StatusNotifierItemHost::registerWatcher(const QString &service)
+ m_statusNotifierWatcher->path(),
+ m_statusNotifierWatcher->connection());
+
++ connect(m_statusNotifierWatcher,
++ &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemRegistered,
++ this,
++ &StatusNotifierItemHost::serviceRegistered);
++ connect(m_statusNotifierWatcher,
++ &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemUnregistered,
++ this,
++ &StatusNotifierItemHost::serviceUnregistered);
++
+ QDBusPendingReply<QDBusVariant> pendingItems = propetriesIface.Get(m_statusNotifierWatcher->interface(), "RegisteredStatusNotifierItems");
+
+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingItems, this);
+@@ -106,16 +115,6 @@ void StatusNotifierItemHost::registerWatcher(const QString &service)
+ }
+ }
+ });
+-
+- connect(m_statusNotifierWatcher,
+- &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemRegistered,
+- this,
+- &StatusNotifierItemHost::serviceRegistered);
+- connect(m_statusNotifierWatcher,
+- &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemUnregistered,
+- this,
+- &StatusNotifierItemHost::serviceUnregistered);
+-
+ } else {
+ delete m_statusNotifierWatcher;
+ m_statusNotifierWatcher = nullptr;
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
index 5bc9e1a28269..9d9161b72295 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
@@ -151,6 +151,8 @@ 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
"${FILESDIR}/${P}-baloosearchrunner-emit-DBus-error-when-disabled.patch" # KDE-bug 445342
+ "${FILESDIR}/${P}-systemtray-check-if-service-already-added.patch" # KDE-bug 443961
+ "${FILESDIR}/${P}-systemtray-fix-race-condition.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2022-01-25 9:49 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2022-01-25 9:49 UTC (permalink / raw
To: gentoo-commits
commit: 1fcf181c500d30bbe73a5e032de5e050ed35ab81
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 19 08:41:30 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 09:43:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fcf181c
kde-plasma/plasma-workspace: drop 5.23.4*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
....4-fix-klipper-actions-content-truncation.patch | 33 ----
...orkspace-5.23.4-fix-klipper-use-full-text.patch | 34 ----
...workspace-5.23.4-fix-systemsettings-crash.patch | 31 ---
.../plasma-workspace-5.23.4-r1.ebuild | 213 ---------------------
5 files changed, 312 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index e5b78db71c63..1dd7e4ec752d 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
DIST plasma-workspace-5.23.90.tar.xz 18479952 BLAKE2B cb7a6115230c27504a8c9b6439362baaacd70706bc76533c32d9c793bdae3d504b645ba2b6172254d81224d02c29468278cf1d9939a636cf3990633b118f45f1 SHA512 521f6a33649549af9a15c55c1143b364fa0d094ee1265f8a9d113e8f1730fb766a31aa60a10aab35bd07b2e669b8390e426ab0aeb7ba2313c05bb2c983b21cf5
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
deleted file mode 100644
index 1153c9f006f1..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From beb34e3d9781c7728260d486a835c52be21a6d83 Mon Sep 17 00:00:00 2001
-From: ValdikSS ValdikSS <iam@valdikss.org.ru>
-Date: Sun, 5 Dec 2021 15:46:00 +0300
-Subject: [PATCH] Fix Klipper Actions content truncation
-
-Commit f9669af2 introduced a regression with Klipper Actions: it used
-truncated text as a source for the action, which resulted in truncated
-output.
-
-BUG: 444365
-
-
-(cherry picked from commit 49365857623f7e986013bee7d3160594d2272fe2)
----
- klipper/urlgrabber.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
-index fb7c0d0a2..185a6a5d6 100644
---- a/klipper/urlgrabber.cpp
-+++ b/klipper/urlgrabber.cpp
-@@ -245,7 +245,7 @@ void URLGrabber::execute(const ClipAction *action, int cmdIdx) const
- ClipCommand command = action->command(cmdIdx);
-
- if (command.isEnabled) {
-- QString text(m_myClipItem->text());
-+ QString text(m_myClipItem->mimeData()->text());
- if (m_stripWhiteSpace) {
- text = text.trimmed();
- }
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
deleted file mode 100644
index 29640f8262e6..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c8b8c8dd389ae381831fdd23f354617f48f3edd4 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Sun, 5 Dec 2021 08:26:45 +0000
-Subject: [PATCH] [klipper] Use full text for DBus return values
-
-In a recent commit HistoryItem::text() became the visual representation
-of the mimedata; often a truncated string.
-
-mimeData()->text() always returns the full value.
-
-BUG: 446441
-
-
-(cherry picked from commit 2db375f6a71cb730e1e099f9ff17ef7092850d9d)
----
- klipper/klipper.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
-index b090a2409..3b12d1f95 100644
---- a/klipper/klipper.cpp
-+++ b/klipper/klipper.cpp
-@@ -838,7 +838,7 @@ QString Klipper::getClipboardHistoryItem(int i)
- if (item) {
- do {
- if (i-- == 0) {
-- return item->text();
-+ return item->mimeData()->text();
- }
- item = history()->find(item->next_uuid());
- } while (item != history()->first());
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
deleted file mode 100644
index d46f33486785..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8b613505e326dd047707e0a0e4d6f5ecc4a9baa Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Wed, 8 Dec 2021 18:25:36 +0100
-Subject: [PATCH] lookandfeel: Add missing check if list of files is empty
-
-BUG: 439797
-
-
-(cherry picked from commit d168d2a50366c528dab65415cd4f6e82afdfb645)
----
- kcms/lookandfeel/kcm.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
-index 75ce19197..349761aad 100644
---- a/kcms/lookandfeel/kcm.cpp
-+++ b/kcms/lookandfeel/kcm.cpp
-@@ -123,7 +123,9 @@ void KCMLookandFeel::knsEntryChanged(KNSCore::EntryWrapper *wrapper)
- if (entry.status() == KNS3::Entry::Deleted && !entry.uninstalledFiles().isEmpty()) {
- removeItemFromModel();
- } else if (entry.status() == KNS3::Entry::Installed && !entry.installedFiles().isEmpty()) {
-- removeItemFromModel(); // In case we updated it we don't want to have it in twice
-+ if (!entry.uninstalledFiles().isEmpty()) {
-+ removeItemFromModel(); // In case we updated it we don't want to have it in twice
-+ }
- KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
- pkg.setPath(entry.installedFiles().constFirst());
- addKPackageToModel(pkg);
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
deleted file mode 100644
index e2c646f9117d..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
- >=dev-libs/wayland-1.15
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwayland-${QTMIN}:5=
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kpeople-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kunitconversion-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5[qml]
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/layer-shell-qt-${PVCUT}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- appstream? ( dev-libs/appstream[qt5] )
- calculator? ( sci-libs/libqalculate:= )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- fontconfig? (
- >=dev-qt/qtprintsupport-${QTMIN}:5
- media-libs/fontconfig
- x11-libs/libXft
- x11-libs/xcb-util-image
- )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- screencast? (
- >=dev-qt/qtgui-${QTMIN}:5=[egl]
- media-libs/libglvnd
- >=media-video/pipewire-0.3:=
- x11-libs/libdrm
- )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.1.1
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtpaths-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- kde-apps/kio-extras:5
- >=kde-frameworks/kdesu-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- sys-apps/dbus
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- !<kde-plasma/breeze-5.22.90:5
- !<kde-plasma/plasma-desktop-5.21.90:5
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-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
- # 5.23 branch
- "${FILESDIR}"/${P}-fix-klipper-use-full-text.patch # KDE-bug 446441
- "${FILESDIR}"/${P}-fix-klipper-actions-content-truncation.patch # KDE-bug 444365
- "${FILESDIR}"/${P}-fix-systemsettings-crash.patch # KDE-bug 439797
-)
-
-src_prepare() {
- ecm_src_prepare
-
- 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
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
- fi
-
- # KDE-bug: 433730
- use calculator ||
- cmake_run_in runners cmake_comment_add_subdirectory calculator
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${FILESDIR}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${FILESDIR}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
- elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2022-08-07 15:51 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2022-08-07 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 95cbc8e4766866e53718a048f86c3c0a094fadf4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 20:01:34 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 15:43:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95cbc8e4
kde-plasma/plasma-workspace: drop 5.24.5-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
| 40 ----
...cker-refresh-RootModel-on-session-backend.patch | 92 ---------
...ystemtray-prefer-IconName-over-IconPixmap.patch | 137 -------------
...asmashell-crash-on-panel-w-systray-remove.patch | 34 ----
...ms-desktoptheme-detect-installed-styles-1.patch | 41 ----
...ms-desktoptheme-detect-installed-styles-2.patch | 72 -------
...sddm-theme-KeyboardButton-fix-layout-name.patch | 39 ----
...s-image-fix-missing-folder-action-buttons.patch | 30 ---
.../plasma-workspace-5.24.5-r1.ebuild | 226 ---------------------
10 files changed, 712 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index c602a730f753..dc9351add211 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
DIST plasma-workspace-5.24.6.tar.xz 18500752 BLAKE2B 1e469e91e8f1828f0b819aaa03f2918fa7df551786d7bbc963c7b4f7078719e9655176c5ddeea262175c36b14ba360e143e182dad78e369f833338ef147af06a SHA512 4e49f59d565e0b84951122155158966a54c05a6999ff99503bfff667c780fac6cfc076326f0cac7d53629bfc1d81599b30e919848168f6beb79a4dc7cf7c5560
DIST plasma-workspace-5.25.4.tar.xz 18616536 BLAKE2B 1674728254c7ab5e7572b1feb6c66e04794c06dde4e61ef26a5d2f73fe3d4899c195a572359fdaeff1c7a016fa22ec597072bd07481b87f5055bae4a49c627f6 SHA512 4f06eedcae47d3c03e0d604a95242d13284bf64891d1c982884a482583ff81ba60202b60e63cc46c3f7e35b98e2910bf69e451fe1aedb64af387add8bcaf4e87
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch
deleted file mode 100644
index d61877300d27..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Wed, 4 May 2022 10:45:52 -0600
-Subject: [PATCH 2/8] applets/appmenu: fix top-level menu text coloration
-
-28537cf3ff3cd9210f7568f40334ac3a2c9bed18 made the color dynamic, but
-neglected to respect the Plasma color scheme, if any. This causes
-problems with Plasma themes that have their own colors and don't
-respect the systemwide color scheme, such as Breeze Twilight.
-
-Fix it by using the appropriate colors from the PlasmaCore color scheme
-object, not the systemwide object provided by Qt.
-
-BUG: 453348
-FIXED-IN: 5.24.6
-
-
-(cherry picked from commit 19d9bc7e395d8c6e007afdc3b3b5c11a7d02190e)
----
- applets/appmenu/package/contents/ui/MenuDelegate.qml | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/applets/appmenu/package/contents/ui/MenuDelegate.qml b/applets/appmenu/package/contents/ui/MenuDelegate.qml
-index 441e99016..afb37589a 100644
---- a/applets/appmenu/package/contents/ui/MenuDelegate.qml
-+++ b/applets/appmenu/package/contents/ui/MenuDelegate.qml
-@@ -66,9 +66,6 @@ AbstractButton {
-
- contentItem: PC3.Label {
- text: controlRoot.Kirigami.MnemonicData.richTextLabel
-- // Kirigami.Theme.highlightedTextColor returns different colors
-- // depending on window focus, which does not apply to this applet
-- // instead, we use palette.highlightedText here, which returns consistent result
-- color: background.state == MenuDelegate.State.Rest ? palette.windowText : palette.highlightedText
-+ color: background.state == MenuDelegate.State.Rest ? PlasmaCore.Theme.textColor : PlasmaCore.Theme.highlightedTextColor
- }
- }
---
-2.35.1
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch
deleted file mode 100644
index 8cffd8d372ed..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From d0340868619c26de5892f8bd095456dc5a32d0ce Mon Sep 17 00:00:00 2001
-From: Amy Rose <amy@fluff.tech>
-Date: Tue, 17 May 2022 07:38:03 +0000
-Subject: [PATCH 8/8] applets/kicker: refresh RootModel on session backend
- state change
-
-BUG: 427530
-
-Hunting this one down since mid-March...
-
-In "native" Plasma containments like the panel, desktop, and plasmawindowed, the `LogindSessionBackend` in `libkworkspace` enters the "Ready" state nearly instantly, before any signals can even be attached. In other containments like Latte Dock and plasmoidviewer, however, the initialization takes some time to complete (unsure why). RootModel was not watching or waiting to check what the session backend's state was, resulting in validity checks being done too soon and never checked again.
-
-
-(cherry picked from commit 2cc819f39bcce9ca83ab3767c42beb1e500e55b1)
----
- applets/kicker/plugin/rootmodel.cpp | 1 +
- applets/kicker/plugin/systementry.cpp | 1 +
- applets/kicker/plugin/systementry.h | 1 +
- applets/kicker/plugin/systemmodel.cpp | 2 ++
- applets/kicker/plugin/systemmodel.h | 3 +++
- 5 files changed, 8 insertions(+)
-
-diff --git a/applets/kicker/plugin/rootmodel.cpp b/applets/kicker/plugin/rootmodel.cpp
-index 4ec323683..837108744 100644
---- a/applets/kicker/plugin/rootmodel.cpp
-+++ b/applets/kicker/plugin/rootmodel.cpp
-@@ -449,6 +449,7 @@ void RootModel::refresh()
- }
-
- m_systemModel = new SystemModel(this);
-+ QObject::connect(m_systemModel, &SystemModel::sessionManagementStateChanged, this, &RootModel::refresh);
-
- if (m_showPowerSession) {
- m_entryList << new GroupEntry(this, i18n("Power / Session"), QStringLiteral("system-log-out"), m_systemModel);
-diff --git a/applets/kicker/plugin/systementry.cpp b/applets/kicker/plugin/systementry.cpp
-index fdd86ece3..939e2119e 100644
---- a/applets/kicker/plugin/systementry.cpp
-+++ b/applets/kicker/plugin/systementry.cpp
-@@ -79,6 +79,7 @@ void SystemEntry::refresh()
- {
- if (!s_sessionManagement) {
- s_sessionManagement = new SessionManagement();
-+ QObject::connect(s_sessionManagement, &SessionManagement::stateChanged, this, &SystemEntry::sessionManagementStateChanged);
- }
-
- bool valid = false;
-diff --git a/applets/kicker/plugin/systementry.h b/applets/kicker/plugin/systementry.h
-index a0a258024..981a3a5f5 100644
---- a/applets/kicker/plugin/systementry.h
-+++ b/applets/kicker/plugin/systementry.h
-@@ -54,6 +54,7 @@ public:
-
- Q_SIGNALS:
- void isValidChanged() const;
-+ void sessionManagementStateChanged();
-
- private Q_SLOTS:
- void refresh();
-diff --git a/applets/kicker/plugin/systemmodel.cpp b/applets/kicker/plugin/systemmodel.cpp
-index 656bbdc4e..844f80d09 100644
---- a/applets/kicker/plugin/systemmodel.cpp
-+++ b/applets/kicker/plugin/systemmodel.cpp
-@@ -92,10 +92,12 @@ void SystemModel::populate()
-
- auto addIfValid = [=](const SystemEntry::Action action) {
- SystemEntry *entry = new SystemEntry(this, action);
-+ QObject::connect(entry, &SystemEntry::sessionManagementStateChanged, this, &SystemModel::sessionManagementStateChanged);
-
- if (entry->isValid()) {
- m_entries << entry;
- }
-+
- QObject::connect(entry, &SystemEntry::isValidChanged, this, &AbstractModel::refresh, Qt::UniqueConnection);
- };
-
-diff --git a/applets/kicker/plugin/systemmodel.h b/applets/kicker/plugin/systemmodel.h
-index cd9048de1..29ae9e428 100644
---- a/applets/kicker/plugin/systemmodel.h
-+++ b/applets/kicker/plugin/systemmodel.h
-@@ -25,6 +25,9 @@ public:
-
- Q_INVOKABLE bool trigger(int row, const QString &actionId, const QVariant &argument) override;
-
-+Q_SIGNALS:
-+ void sessionManagementStateChanged();
-+
- protected Q_SLOTS:
- void refresh() override;
-
---
-2.35.1
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch
deleted file mode 100644
index 0ac8ed788ade..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From ea2833e4dd7114f8bf22a322a26c6c05ebf767f2 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Mon, 25 Apr 2022 21:58:58 +0300
-Subject: [PATCH 3/8] applets/systemtray: Prefer IconName over IconPixmap
-
-In case both IconName and IconPixmap are provided, the system tray
-applet is going to prefer the pixmap.
-
-That can create a dark icon on dark background bug because plasma can't
-recolor pixmaps.
-
-The SNI spec recommends visualizations to prefer icons over pixmaps:
-
-> An icon can either be identified by its Freedesktop-compliant icon
-> name, carried by this property of by the icon data itself, carried by
-> the property IconPixmap. Visualizations are encouraged to prefer icon
-> names over icon pixmaps if both are available (FIXME: still not very
-> defined: could e the pixmap used as fallback if an icon name is not found?)
-
-BUG: 418996
-
-- Unset iconName when icon can't be loaded
-- no code duplication
-(cherry picked from commit 7363d0e0f3c1a447e6264e92762735bd33da2682)
----
- .../systemtray/statusnotifieritemsource.cpp | 82 ++++++++-----------
- 1 file changed, 33 insertions(+), 49 deletions(-)
-
-diff --git a/applets/systemtray/statusnotifieritemsource.cpp b/applets/systemtray/statusnotifieritemsource.cpp
-index f67845e42..731aecadc 100644
---- a/applets/systemtray/statusnotifieritemsource.cpp
-+++ b/applets/systemtray/statusnotifieritemsource.cpp
-@@ -286,68 +286,52 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call)
- QIcon overlay;
- QStringList overlayNames;
-
-- // Icon
-+ // Overlay icon
- {
-- KDbusImageVector image;
-- QIcon icon;
-- QString iconName;
--
-- properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image;
-- if (image.isEmpty()) {
-- QString iconName = properties[QStringLiteral("OverlayIconName")].toString();
-- m_overlayIconName = iconName;
-- if (!iconName.isEmpty()) {
-+ m_overlayIconName = QString();
-+
-+ const QString iconName = properties[QStringLiteral("OverlayIconName")].toString();
-+ if (!iconName.isEmpty()) {
-+ overlay = QIcon(new KIconEngine(iconName, iconLoader()));
-+ if (!overlay.isNull()) {
-+ m_overlayIconName = iconName;
- overlayNames << iconName;
-- overlay = QIcon(new KIconEngine(iconName, iconLoader()));
- }
-- } else {
-- overlay = imageVectorToPixmap(image);
- }
-+ if (overlay.isNull()) {
-+ KDbusImageVector image;
-+ properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image;
-+ if (!image.isEmpty()) {
-+ overlay = imageVectorToPixmap(image);
-+ }
-+ }
-+ }
-
-- properties[QStringLiteral("IconPixmap")].value<QDBusArgument>() >> image;
-- if (image.isEmpty()) {
-- iconName = properties[QStringLiteral("IconName")].toString();
-- if (!iconName.isEmpty()) {
-- icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
--
-- if (overlayNames.isEmpty() && !overlay.isNull()) {
-+ auto loadIcon = [this, &properties, &overlay, &overlayNames](const QString &iconKey, const QString &pixmapKey) -> std::tuple<QIcon, QString> {
-+ const QString iconName = properties[iconKey].toString();
-+ if (!iconName.isEmpty()) {
-+ QIcon icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
-+ if (!icon.isNull()) {
-+ if (!overlay.isNull() && overlayNames.isEmpty()) {
- overlayIcon(&icon, &overlay);
- }
-+ return {icon, iconName};
- }
-- } else {
-- icon = imageVectorToPixmap(image);
-+ }
-+ KDbusImageVector image;
-+ properties[pixmapKey].value<QDBusArgument>() >> image;
-+ if (!image.isEmpty()) {
-+ QIcon icon = imageVectorToPixmap(image);
- if (!icon.isNull() && !overlay.isNull()) {
- overlayIcon(&icon, &overlay);
- }
-+ return {icon, QString()};
- }
-- m_icon = icon;
-- m_iconName = iconName;
-- }
-+ return {};
-+ };
-
-- // Attention icon
-- {
-- KDbusImageVector image;
-- QIcon attentionIcon;
--
-- properties[QStringLiteral("AttentionIconPixmap")].value<QDBusArgument>() >> image;
-- if (image.isEmpty()) {
-- QString iconName = properties[QStringLiteral("AttentionIconName")].toString();
-- m_attentionIconName = iconName;
-- if (!iconName.isEmpty()) {
-- attentionIcon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
--
-- if (overlayNames.isEmpty() && !overlay.isNull()) {
-- overlayIcon(&attentionIcon, &overlay);
-- }
-- }
-- } else {
-- attentionIcon = imageVectorToPixmap(image);
-- if (!attentionIcon.isNull() && !overlay.isNull()) {
-- overlayIcon(&attentionIcon, &overlay);
-- }
-- }
-- m_attentionIcon = attentionIcon;
-- }
-+ std::tie(m_icon, m_iconName) = loadIcon(QStringLiteral("IconName"), QStringLiteral("IconPixmap"));
-+ std::tie(m_attentionIcon, m_attentionIconName) = loadIcon(QStringLiteral("AttentionIconName"), QStringLiteral("AttentionIconPixmap"));
-
- // ToolTip
- {
---
-2.35.1
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch
deleted file mode 100644
index 609ab0f011cd..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7795e5fb4f7e2a79e15a9e5711149f71144e73c9 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Fri, 13 May 2022 14:43:44 +0800
-Subject: [PATCH 5/8] applets/systemtray: disconnect KConfigLoader signal when
- instance is about to be deleted
-
-When an applet is about to be deleted, it will save its config
-automatically, but in this case the system tray doesn't need to load the
-config again.
-
-BUG: 453726
-
-
-(cherry picked from commit 6da91d053b4f142277d60db4a1a17eded9249d11)
----
- applets/systemtray/systemtray.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
-index 3b7f688a6..0d889b3f0 100644
---- a/applets/systemtray/systemtray.cpp
-+++ b/applets/systemtray/systemtray.cpp
-@@ -40,6 +40,8 @@ SystemTray::SystemTray(QObject *parent, const KPluginMetaData &data, const QVari
-
- SystemTray::~SystemTray()
- {
-+ // When the applet is about to be deleted, delete now to avoid calling loadConfig()
-+ delete m_settings;
- }
-
- void SystemTray::init()
---
-2.35.1
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch
deleted file mode 100644
index 57477173acbb..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1a966d3fb979cf0f0080c805aed248ee77978800 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Mon, 16 May 2022 16:18:00 +0800
-Subject: [PATCH 6/8] kcms/desktoptheme: find metadata.json when loading
- ThemesModel
-
-Before this commit ThemesModel only finds metadata.desktop, but after
-KF5.94, the default theme metadata files have been ported to json format.
-
-BUG: 453830
-
-
-(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e)
----
- kcms/desktoptheme/themesmodel.cpp | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp
-index 6f0ecf4e3..296951742 100644
---- a/kcms/desktoptheme/themesmodel.cpp
-+++ b/kcms/desktoptheme/themesmodel.cpp
-@@ -155,7 +155,15 @@ void ThemesModel::load()
- const QDir cd(ppath);
- const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot);
- for (const QString &pack : entries) {
-- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop");
-+ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator());
-+
-+ QString _metadata = QStringLiteral("%1json").arg(prefix);
-+ if (QFile::exists(_metadata)) {
-+ themes << _metadata;
-+ continue;
-+ }
-+
-+ _metadata = QStringLiteral("%1desktop").arg(prefix);
- if (QFile::exists(_metadata)) {
- themes << _metadata;
- }
---
-2.35.1
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch
deleted file mode 100644
index 2a379c707efe..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From c602c52578da1331d2466ff9803c7e0b9287c24c Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Mon, 16 May 2022 14:49:46 +0200
-Subject: [PATCH 7/8] kcms/desktoptheme: Fix reading of metadata in ThemesModel
-
-We can not use KConfig to read the desktop file.
-
-CCBUG: 453830
-
-
-(cherry picked from commit 43ae993da35bb408b4fabb5c4514feff97628e0d)
----
- kcms/desktoptheme/themesmodel.cpp | 27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp
-index 296951742..ce3cac14b 100644
---- a/kcms/desktoptheme/themesmodel.cpp
-+++ b/kcms/desktoptheme/themesmodel.cpp
-@@ -16,6 +16,7 @@
-
- #include <KColorScheme>
- #include <KDesktopFile>
-+#include <KPluginMetaData>
-
- #include <KConfigGroup>
- #include <KSharedConfig>
-@@ -176,15 +177,25 @@ void ThemesModel::load()
- int themeNameSepIndex = themeRoot.lastIndexOf(QLatin1Char('/'), -1);
- const QString packageName = themeRoot.right(themeRoot.length() - themeNameSepIndex - 1);
-
-- KDesktopFile df(theme);
-+ QString name;
-+ QString comment;
-
-- if (df.noDisplay()) {
-- continue;
-- }
-+ if (theme.endsWith(QLatin1String(".json"))) {
-+ KPluginMetaData data = KPluginMetaData::fromJsonFile(theme);
-+ name = data.name();
-+ comment = data.description();
-+ } else {
-+ KDesktopFile df(theme);
-
-- QString name = df.readName();
-- if (name.isEmpty()) {
-- name = packageName;
-+ if (df.noDisplay()) {
-+ continue;
-+ }
-+
-+ name = df.readName();
-+ if (name.isEmpty()) {
-+ name = packageName;
-+ }
-+ comment = df.readComment();
- }
- const bool isLocal = QFileInfo(theme).isWritable();
- bool hasPluginName = std::any_of(m_data.begin(), m_data.end(), [&](const ThemesModelData &item) {
-@@ -205,7 +216,7 @@ void ThemesModel::load()
- type = LightTheme;
- }
- }
-- ThemesModelData item{name, packageName, df.readComment(), type, isLocal, false};
-+ ThemesModelData item{name, packageName, comment, type, isLocal, false};
- m_data.append(item);
- }
- }
---
-2.35.1
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch
deleted file mode 100644
index 594efe7df172..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e2b631d43528c3e41d53c8a359b6129c616bc271 Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Sat, 30 Apr 2022 03:20:11 +0300
-Subject: [PATCH 1/8] [sddm-theme] KeyboardButton: Fix layout name not being
- shown
-
-It used to cause an error like this:
-
- [03:21:31.246] (WW) GREETER: file:///usr/share/sddm/themes/breeze/KeyboardButton.qml:19: TypeError: Cannot read property 'shortName' of null
-
-(cherry picked from commit 2e9020ca6c1d55842a4b014623f0d88697972000)
----
- sddm-theme/KeyboardButton.qml | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml
-index d5d5a446c..712096d87 100644
---- a/sddm-theme/KeyboardButton.qml
-+++ b/sddm-theme/KeyboardButton.qml
-@@ -10,7 +10,7 @@ PlasmaComponents.ToolButton {
-
- property int currentIndex: -1
-
-- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName)
-+ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", keyboard.layouts[currentIndex].shortName)
- implicitWidth: minimumWidth
-
- visible: menu.items.length > 1
-@@ -27,7 +27,6 @@ PlasmaComponents.ToolButton {
- onObjectRemoved: keyboardMenu.removeItem( object )
- delegate: QQC.MenuItem {
- text: modelData.longName
-- property string shortName: modelData.shortName
- onTriggered: {
- keyboard.currentLayout = model.index
- }
---
-2.35.1
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch
deleted file mode 100644
index d09b60ce6ce4..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From dd8f1b5e302717c84f6a05af36c621122ead6d99 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Fri, 6 May 2022 21:36:09 +0800
-Subject: [PATCH 4/8] wallpapers/image: Fix missing folder action buttons
-
-The width of the action area needs to be substracted in contentItem's
-width.
-
-Also use `Kirigami.Units.gridUnit * 4` because `overlayWidth` was
-introduced in Frameworks 5.94, and people using Plasma 5.24 may have an
-older Frameworks version.
----
- wallpapers/image/imagepackage/contents/ui/config.qml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/wallpapers/image/imagepackage/contents/ui/config.qml b/wallpapers/image/imagepackage/contents/ui/config.qml
-index 97f9f81a5..7bb675f23 100644
---- a/wallpapers/image/imagepackage/contents/ui/config.qml
-+++ b/wallpapers/image/imagepackage/contents/ui/config.qml
-@@ -331,6 +331,7 @@ ColumnLayout {
- // Don't need a highlight or hover effects
- hoverEnabled: false
- contentItem: Kirigami.BasicListItem {
-+ width: slidePathsView.width - (parent.hasOwnProperty("overlayWidth") ? overlayWidth : Kirigami.Units.gridUnit * 4)
- // Don't need a highlight or hover effects
- hoverEnabled: false
- separatorVisible: false
---
-2.35.1
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
deleted file mode 100644
index ff25b6a845ef..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calendar +fontconfig geolocation gps +policykit
-screencast +semantic-desktop telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
- >=dev-libs/wayland-1.15
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwayland-${QTMIN}:5=
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kpeople-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kunitconversion-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5[qml]
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/layer-shell-qt-${PVCUT}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- sci-libs/libqalculate:=
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- appstream? ( dev-libs/appstream[qt5] )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- fontconfig? (
- >=dev-qt/qtprintsupport-${QTMIN}:5
- media-libs/fontconfig
- x11-libs/libXft
- x11-libs/xcb-util-image
- )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- policykit? ( virtual/libcrypt:= )
- screencast? (
- >=dev-qt/qtgui-${QTMIN}:5=[egl]
- media-libs/libglvnd
- >=media-video/pipewire-0.3:=
- x11-libs/libdrm
- )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.6.0
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:*
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtpaths-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- kde-apps/kio-extras:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- sys-apps/dbus
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- !<kde-plasma/breeze-5.22.90:5
- !<kde-plasma/plasma-desktop-5.23.90:5
- policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="
- >=dev-qt/qtwaylandscanner-${QTMIN}:5
- virtual/pkgconfig
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-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
- "${FILESDIR}"/${P}-sddm-theme-KeyboardButton-fix-layout-name.patch
- "${FILESDIR}"/${P}-applets-appmenu-fix-top-level-menu-text-coloration.patch # KDE-bug 453348
- "${FILESDIR}"/${P}-applets-systemtray-prefer-IconName-over-IconPixmap.patch # KDE-bug 418996
- "${FILESDIR}"/${P}-wallpapers-image-fix-missing-folder-action-buttons.patch
- "${FILESDIR}"/${P}-fix-plasmashell-crash-on-panel-w-systray-remove.patch # KDE-bug 453726
- "${FILESDIR}"/${P}-kcms-desktoptheme-detect-installed-styles-{1,2}.patch # KDE-bug 453830
- "${FILESDIR}"/${P}-applets-kicker-refresh-RootModel-on-session-backend.patch # KDE-bug 427530
-)
-
-src_prepare() {
- ecm_src_prepare
-
- 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
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
- fi
-
- # TODO: try to get a build switch upstreamed
- if use geolocation; then
- use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
- -i dataengines/geolocation/CMakeLists.txt || die
- fi
-
- if ! use policykit; then
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
- ecm_punt_kf_module Su
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${FILESDIR}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${FILESDIR}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
- elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2022-09-23 20:07 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2022-09-23 20:07 UTC (permalink / raw
To: gentoo-commits
commit: decd45a692fd074be7165ffd4f5e269fc94bf2dd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 17:16:25 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 20:07:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=decd45a6
kde-plasma/plasma-workspace: Prevent panel going out of screen boundaries
See also: https://bugs.kde.org/show_bug.cgi?id=450068
Upstream commit 9c7ac7061c5c85d63875eaee70793ba04334c1d0
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=353975
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=438114
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ace-5.25.5-prevent-panel-go-out-of-screen.patch | 33 ++++++++++++++++++++++
.../plasma-workspace-5.25.5-r3.ebuild | 1 +
2 files changed, 34 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
new file mode 100644
index 000000000000..457470f0807c
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
@@ -0,0 +1,33 @@
+From 9c7ac7061c5c85d63875eaee70793ba04334c1d0 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 16 Sep 2022 14:34:27 +0000
+Subject: [PATCH] Revert "Revert "Prevent panel going out of screen
+ boundaries""
+
+This reverts commit 17774bc4c673294a7c8a6e80660d83cce1ba8891
+
+There is still a known culprit (duplicate display names) so the hack shouldn't be reverted.
+
+CCBUG: 353975
+CCBUG: 438114
+---
+ shell/panelview.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index b5c87bbf71..4be1e26ca4 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -859,6 +859,9 @@ void PanelView::moveEvent(QMoveEvent *ev)
+ updateEnabledBorders();
+ m_strutsTimer.start(STRUTSTIMERDELAY);
+ PlasmaQuick::ContainmentView::moveEvent(ev);
++ if (m_screenToFollow && !m_screenToFollow->geometry().contains(geometry())) {
++ positionPanel();
++ }
+ }
+
+ void PanelView::keyPressEvent(QKeyEvent *event)
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
index 5e8c8067b58e..212a7c1e7178 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
@@ -159,6 +159,7 @@ PATCHES=(
"${FILESDIR}/${P}-widgetexplorer-recurse-containments.patch" # https://mail.kde.org/pipermail/distributions/2022-September/001287.html
"${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6
"${FILESDIR}/${P}-fonts-honor-and-present-system-defaults.patch" # KDE-bug 416140
+ "${FILESDIR}/${P}-prevent-panel-go-out-of-screen.patch" # git master and Plasma/5.24 branch double revert
)
src_prepare() {
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2022-09-23 20:07 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2022-09-23 20:07 UTC (permalink / raw
To: gentoo-commits
commit: a495637d3bf85df7b5923da57bbd86e9a3470125
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 17:06:22 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 20:07:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a495637d
kde-plasma/plasma-workspace: fonts: honor & present system defaults
Upstream commit dc24b7c1c4e2c9dfb74090f716da029e44e209ff
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=416140
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...5-fonts-honor-and-present-system-defaults.patch | 55 ++++++++++++++++++++++
.../plasma-workspace-5.25.5-r3.ebuild | 1 +
2 files changed, 56 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch
new file mode 100644
index 000000000000..4e2b579646fc
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch
@@ -0,0 +1,55 @@
+From dc24b7c1c4e2c9dfb74090f716da029e44e209ff Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Mon, 19 Sep 2022 12:39:54 +0200
+Subject: [PATCH] fonts: honor & present system defaults
+
+previously we'd pretend that a missing value meant our "plasma-ish"
+defaults would apply but that is utterly false. when no hitting is set,
+no hinting is set. this can happen when the system default fontconfigs
+don't set up any hinting.
+
+BUG: 416140
+
+
+(cherry picked from commit 5dd8cc919f54bf28152a80e1fa6f3f649ea4e47a)
+---
+ kcms/fonts/fontsaasettings.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/kcms/fonts/fontsaasettings.cpp b/kcms/fonts/fontsaasettings.cpp
+index a7159b0e63..e7192aa89d 100644
+--- a/kcms/fonts/fontsaasettings.cpp
++++ b/kcms/fonts/fontsaasettings.cpp
+@@ -1,5 +1,6 @@
+ /*
+ SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>
++ SPDX-FileCopyrightText: 2022 Harald Sitter <sitter@kde.org>
+
+ SPDX-License-Identifier: GPL-2.0-or-later
+ */
+@@ -211,18 +212,18 @@ public:
+ // sub pixel
+ KXftConfig::SubPixel::Type spType = KXftConfig::SubPixel::NotSet;
+ xft.getSubPixelType(spType);
+- // if it is not set, we set it to rgb
++ // if it is not set, we have no subpixel hinting
+ if (spType == KXftConfig::SubPixel::NotSet) {
+- spType = KXftConfig::SubPixel::Rgb;
++ spType = KXftConfig::SubPixel::None;
+ }
+ setSubPixel(spType);
+
+ // hinting
+ KXftConfig::Hint::Style hStyle = KXftConfig::Hint::NotSet;
+ xft.getHintStyle(hStyle);
+- // if it is not set, we set it to slight hinting
++ // if it is not set, we have no hinting
+ if (hStyle == KXftConfig::Hint::NotSet) {
+- hStyle = KXftConfig::Hint::Slight;
++ hStyle = KXftConfig::Hint::None;
+ }
+ setHinting(hStyle);
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
index d89fa2ebf96d..5e8c8067b58e 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
@@ -158,6 +158,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
"${FILESDIR}/${P}-widgetexplorer-recurse-containments.patch" # https://mail.kde.org/pipermail/distributions/2022-September/001287.html
"${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6
+ "${FILESDIR}/${P}-fonts-honor-and-present-system-defaults.patch" # KDE-bug 416140
)
src_prepare() {
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2022-10-10 9:54 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2022-10-10 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 5813befc983f8ffd250c573a1f18195c55f5ecc0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 12:13:53 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 09:47:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5813befc
kde-plasma/plasma-workspace: drop 5.24.6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
...asma-workspace-5.21.5-split-libkworkspace.patch | 33 ----
.../plasma-workspace-5.24.6.ebuild | 219 ---------------------
3 files changed, 253 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 75d849b0d314..27d9ff3b8069 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-5.24.6.tar.xz 18500752 BLAKE2B 1e469e91e8f1828f0b819aaa03f2918fa7df551786d7bbc963c7b4f7078719e9655176c5ddeea262175c36b14ba360e143e182dad78e369f833338ef147af06a SHA512 4e49f59d565e0b84951122155158966a54c05a6999ff99503bfff667c780fac6cfc076326f0cac7d53629bfc1d81599b30e919848168f6beb79a4dc7cf7c5560
DIST plasma-workspace-5.25.5.tar.xz 18638932 BLAKE2B f83aabf84b775c0bf9d1e60db03f94400e3363fa8f45767bdc471706682cda7323fae4948cffa156188cc7ed2d30d05349a385dd370ef941c16464ddddf8fa01 SHA512 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
deleted file mode 100644
index c96c0ba623d6..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 67f82cfb7..88a8c09b4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
-
- find_package(KF5TextEditor)
- find_package(KWinDBusInterface CONFIG REQUIRED)
-+find_package(LibKWorkspace 5.21.5)
-
- find_package(KF5Screen CONFIG REQUIRED)
- find_package(KScreenLocker 5.13.80 REQUIRED)
-@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS)
- option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE)
-
- add_subdirectory(doc)
--add_subdirectory(libkworkspace)
-+if(NOT LibKWorkspace_FOUND)
-+ message(STATUS "System LibKWorkspace not found, using bundled.")
-+ add_subdirectory(libkworkspace)
-+endif()
- add_subdirectory(libdbusmenuqt)
- add_subdirectory(appmenu)
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.6.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.6.ebuild
deleted file mode 100644
index b170c0126c20..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.6.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.92.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="appstream +calendar +fontconfig geolocation gps +policykit
-screencast +semantic-desktop telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
- >=dev-libs/wayland-1.15
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwayland-${QTMIN}:5=
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kpeople-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kunitconversion-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5[qml]
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/layer-shell-qt-${PVCUT}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- sci-libs/libqalculate:=
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- appstream? ( dev-libs/appstream[qt5] )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- fontconfig? (
- >=dev-qt/qtprintsupport-${QTMIN}:5
- media-libs/fontconfig
- x11-libs/libXft
- x11-libs/xcb-util-image
- )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- policykit? ( virtual/libcrypt:= )
- screencast? (
- >=dev-qt/qtgui-${QTMIN}:5=[egl]
- media-libs/libglvnd
- >=media-video/pipewire-0.3:=
- x11-libs/libdrm
- )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.6.0
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:*
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtpaths-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- kde-apps/kio-extras:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- sys-apps/dbus
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- !<kde-plasma/breeze-5.22.90:5
- !<kde-plasma/plasma-desktop-5.23.90:5
- policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="
- >=dev-qt/qtwaylandscanner-${QTMIN}:5
- virtual/pkgconfig
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-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
-
- 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
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
- fi
-
- # TODO: try to get a build switch upstreamed
- if use geolocation; then
- use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
- -i dataengines/geolocation/CMakeLists.txt || die
- fi
-
- if ! use policykit; then
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
- ecm_punt_kf_module Su
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${FILESDIR}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${FILESDIR}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
- elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2023-03-22 23:01 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2023-03-22 23:01 UTC (permalink / raw
To: gentoo-commits
commit: 57ffdfd5a407a5df48c142758eee2fc5d9ff924e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 21:33:58 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 23:01:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ffdfd5
kde-plasma/plasma-workspace: Backport 5.27.4 fixes
Upstream commits:
32982eff1abe7653f96f746cc15c0d6d1bbbb249
29eb56d4d16c9a5544ba2b1da2369a9ed3190bb7
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=465303
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...space-5.27.3-dashboard-skip-task-switcher.patch | 33 +++
...pace-5.27.3-nightcolor-fix-timing-strings.patch | 52 +++++
.../plasma-workspace-5.27.3-r1.ebuild | 231 +++++++++++++++++++++
3 files changed, 316 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-dashboard-skip-task-switcher.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-dashboard-skip-task-switcher.patch
new file mode 100644
index 000000000000..2ebb9aa09fd6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-dashboard-skip-task-switcher.patch
@@ -0,0 +1,33 @@
+From 29eb56d4d16c9a5544ba2b1da2369a9ed3190bb7 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 5 Feb 2023 16:49:04 +0100
+Subject: [PATCH] [dashboard] Skip task switcher
+
+CCBUG: 465303
+(cherry picked from commit 813dcc46c125fbdff4a208a23cec0ae1363f7cd8)
+---
+ applets/kicker/plugin/dashboardwindow.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/applets/kicker/plugin/dashboardwindow.cpp b/applets/kicker/plugin/dashboardwindow.cpp
+index fc6baedcb8..ac7522aab8 100644
+--- a/applets/kicker/plugin/dashboardwindow.cpp
++++ b/applets/kicker/plugin/dashboardwindow.cpp
+@@ -124,12 +124,12 @@ bool DashboardWindow::event(QEvent *event)
+ if (event->type() == QEvent::Expose) {
+ // FIXME TODO: We can remove this once we depend on Qt 5.6.1+.
+ // See: https://bugreports.qt.io/browse/QTBUG-26978
+- KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
++ KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
+ } else if (event->type() == QEvent::PlatformSurface) {
+ const QPlatformSurfaceEvent *pSEvent = static_cast<QPlatformSurfaceEvent *>(event);
+
+ if (pSEvent->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) {
+- KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
++ KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
+ }
+ } else if (event->type() == QEvent::Show) {
+ updateTheme();
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-nightcolor-fix-timing-strings.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-nightcolor-fix-timing-strings.patch
new file mode 100644
index 000000000000..9230e2b2354f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-nightcolor-fix-timing-strings.patch
@@ -0,0 +1,52 @@
+From 32982eff1abe7653f96f746cc15c0d6d1bbbb249 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 14 Mar 2023 14:29:54 -0600
+Subject: [PATCH] kcms/nightcolor: fix timing strings with narrow window widths
+
+These labels lived in an item that had `anchors.centerIn: parent` set on
+it, which makes it have no maximum width and it can overflow. Clearly it
+was the intent to avoid that, because all the child items had their
+properties set up correctly for it.
+
+To fix this, instead anchor to the parent's size and center the
+contents, and then make the parent fill the available width.
+
+Resolves https://invent.kde.org/plasma/plasma-mobile/-/issues/244
+
+
+(cherry picked from commit 16a243c88b6f5e36ec4d3f9108f2e967b4e97ad8)
+---
+ kcms/nightcolor/package/contents/ui/main.qml | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/kcms/nightcolor/package/contents/ui/main.qml b/kcms/nightcolor/package/contents/ui/main.qml
+index 60605b3180..c37cc0ea9a 100644
+--- a/kcms/nightcolor/package/contents/ui/main.qml
++++ b/kcms/nightcolor/package/contents/ui/main.qml
+@@ -406,7 +406,7 @@ KCM.SimpleKCM {
+ visible: kcm.nightColorSettings.mode === NightColorMode.Automatic || kcm.nightColorSettings.mode === NightColorMode.Location
+ && kcm.nightColorSettings.active
+ Layout.topMargin: Kirigami.Units.largeSpacing * 4
+- Layout.alignment: Qt.AlignHCenter
++ Layout.fillWidth: true
+
+ Kirigami.LoadingPlaceholder {
+ visible: kcm.nightColorSettings.active && kcm.nightColorSettings.mode === NightColorMode.Automatic && (!locator || !root.doneLocating)
+@@ -416,9 +416,13 @@ KCM.SimpleKCM {
+
+ TimingsView {
+ id: timings
++ anchors {
++ top: parent.top
++ left: parent.left
++ right: parent.right
++ }
+ visible: kcm.nightColorSettings.mode === NightColorMode.Location ||
+ (kcm.nightColorSettings.mode === NightColorMode.Automatic && root.doneLocating) && kcm.nightColorSettings.active
+- anchors.centerIn: parent
+ enabled: kcm.nightColorSettings.active
+ latitude: kcm.nightColorSettings.mode === NightColorMode.Automatic
+ && (locator !== undefined) ? locator.latitude : kcm.nightColorSettings.latitudeFixed
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild
new file mode 100644
index 000000000000..b62e1cf969f0
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.102.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.7
+VIRTUALX_REQUIRED="test"
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry +wallpaper-metadata"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+ dev-libs/icu:=
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwayland-${QTMIN}:5=
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kinit-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kpeople-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kunitconversion-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/prison-${KFMIN}:5[qml]
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/layer-shell-qt-${PVCUT}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ >=media-libs/phonon-4.11.0
+ sci-libs/libqalculate:=
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ appstream? ( dev-libs/appstream[qt5] )
+ calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+ fontconfig? (
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ media-libs/fontconfig
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ policykit? (
+ sys-auth/polkit-qt
+ virtual/libcrypt:=
+ )
+ screencast? (
+ >=dev-qt/qtgui-${QTMIN}:5=[egl]
+ >=kde-plasma/kpipewire-${PVCUT}:5
+ media-libs/libglvnd
+ >=media-video/pipewire-0.3:=
+ x11-libs/libdrm
+ )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ telemetry? ( dev-libs/kuserfeedback:5 )
+ wallpaper-metadata? ( kde-apps/libkexiv2:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+ >=dev-libs/wayland-protocols-1.31
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<kde-plasma/breeze-5.22.90:5
+ !<kde-plasma/plasma-desktop-5.27.0:5
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:*
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtpaths-${QTMIN}:5
+ >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ kde-apps/kio-extras:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ sys-apps/dbus
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ >=dev-util/wayland-scanner-1.19.0
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ virtual/pkgconfig
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+ "${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
+ "${FILESDIR}/${P}-dashboard-skip-task-switcher.patch" # KDE-bug 465303
+ "${FILESDIR}/${P}-nightcolor-fix-timing-strings.patch"
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ cmake_comment_add_subdirectory libkworkspace
+ # delete colliding libkworkspace translations
+ find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+
+ # TODO: try to get a build switch upstreamed
+ if ! use screencast; then
+ ecm_punt_bogus_dep KPipeWire
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if use geolocation; then
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+ -i dataengines/geolocation/CMakeLists.txt || die
+ fi
+
+ if ! use policykit; then
+ cmake_run_in kcms cmake_comment_add_subdirectory users
+ fi
+
+ if ! use fontconfig; then
+ ecm_punt_bogus_dep XCB IMAGE
+ sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ -DGLIBC_LOCALE_GEN=$(usex policykit)
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package fontconfig Fontconfig)
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${FILESDIR}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${FILESDIR}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+ elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2023-08-16 16:31 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2023-08-16 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 689a94610502fa85fa4e6aaedf2d1f299aca7f3a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 14:16:51 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 16:03:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689a9461
kde-plasma/plasma-workspace: drop 5.27.6-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
...-5.27.6-fix-libtaskmanager-potential-leak.patch | 28 ---
.../plasma-workspace-5.27.6-r1.ebuild | 229 ---------------------
3 files changed, 258 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 8821f648f0d1..f8d7bebc8445 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-workspace-5.27.6.tar.xz 19459172 BLAKE2B d1b1a1ccb8a76149882ed49ed662a561a04963d154ada7259665f8d228af17004dfb464ee684c5c14402166261ec176e322642f736f7fd55f233d31f11bcf256 SHA512 090c65ecb1664d5e55d52ff7a11e6402a2b9bb7a31c99fe3406c2c4111aada6102aaf3f5a110c6a13223e88ee164caf209d859fcb6823b638ca42bcbb683984d
DIST plasma-workspace-5.27.7-patchset-1.tar.xz 2816 BLAKE2B 167142839927092b35d52407c81522d6eddfd49f563df2312512fd465f2959c4d7f97a6bdf2ea2cecaa575c84f219d7e418cfff89adfd1af92289a7b3a61d102 SHA512 2db99d64dd806a4193983a0dc17208b6c477dda065b58b03801ea32faf38815c692d326518fdffa0949aa107a447cd9cd043d9e53b3ad13eca723829ee8adfdc
DIST plasma-workspace-5.27.7.tar.xz 19465984 BLAKE2B e6b1a4aac29798f6aa2f18b1877d00e33ae6e8ca2daa5999b34a1d29bc149c870486f2e4021e6308d7e848df3a0af83f2bc0298f1def4100f17e4b69c6a7a0ae SHA512 7359d087cb94280ed0c191b0328b8aa2ec42460a6eb057a06bae0de3abcfa8e3cd7c374b47a4b1d08b56fc292892bac4c0f501527574e2c799c3d4c87591892f
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch
deleted file mode 100644
index 18a11b2504e5..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2f67e4b63d664490310e485d59fdd500b7eb0bc5 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Fri, 23 Jun 2023 07:55:44 +0800
-Subject: [PATCH] libtaskmanager: fix a potential leak
-
-Pointers in rowMap are not deleted before they are removed in rowMap.
-
-
-(cherry picked from commit 19c0022735e74cf028daa93e36d257c804862954)
----
- libtaskmanager/taskgroupingproxymodel.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libtaskmanager/taskgroupingproxymodel.cpp b/libtaskmanager/taskgroupingproxymodel.cpp
-index afdde61d97..ea68bee556 100644
---- a/libtaskmanager/taskgroupingproxymodel.cpp
-+++ b/libtaskmanager/taskgroupingproxymodel.cpp
-@@ -778,6 +778,7 @@ void TaskGroupingProxyModel::setSourceModel(QAbstractItemModel *sourceModel)
- connect(sourceModel, &QSortFilterProxyModel::modelReset, this, std::bind(&TaskGroupingProxyModel::Private::sourceModelReset, dd));
- connect(sourceModel, &QSortFilterProxyModel::dataChanged, this, std::bind(&TaskGroupingProxyModel::Private::sourceDataChanged, dd, _1, _2, _3));
- } else {
-+ qDeleteAll(d->rowMap);
- d->rowMap.clear();
- }
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.6-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.6-r1.ebuild
deleted file mode 100644
index 618a409c075a..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.6-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.9
-inherit ecm plasma.kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="appstream +calendar +fontconfig geolocation gps +policykit
-screencast +semantic-desktop telemetry +wallpaper-metadata"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
- dev-libs/icu:=
- >=dev-libs/wayland-1.15
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwayland-${QTMIN}:5=
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kpeople-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kunitconversion-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5[qml]
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/layer-shell-qt-${PVCUT}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- sci-libs/libqalculate:=
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/xcb-util
- appstream? ( dev-libs/appstream[qt5] )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- fontconfig? (
- >=dev-qt/qtprintsupport-${QTMIN}:5
- media-libs/fontconfig
- x11-libs/libXft
- x11-libs/xcb-util-image
- )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- policykit? (
- sys-auth/polkit-qt
- virtual/libcrypt:=
- )
- screencast? (
- >=dev-qt/qtgui-${QTMIN}:5=[egl]
- >=kde-plasma/kpipewire-${PVCUT}:5
- media-libs/libglvnd
- >=media-video/pipewire-0.3:=
- x11-libs/libdrm
- )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
- wallpaper-metadata? ( kde-apps/libkexiv2:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.6.0
- >=dev-libs/wayland-protocols-1.31
- >=dev-qt/qtconcurrent-${QTMIN}:5
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/breeze-5.22.90:5
- !<kde-plasma/plasma-desktop-5.27.0:5
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:*
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtpaths-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- kde-apps/kio-extras:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- sys-apps/dbus
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="
- >=dev-qt/qtwaylandscanner-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
- >=kde-frameworks/kcmutils-${KFMIN}:5
- virtual/pkgconfig
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
- "${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
- "${FILESDIR}/${P}-fix-libtaskmanager-potential-leak.patch" # in 5.27.7
-)
-
-src_prepare() {
- ecm_src_prepare
-
- cmake_comment_add_subdirectory libkworkspace
- # delete colliding libkworkspace translations
- find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- ecm_punt_bogus_dep KPipeWire
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
- fi
-
- # TODO: try to get a build switch upstreamed
- if use geolocation; then
- use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
- -i dataengines/geolocation/CMakeLists.txt || die
- fi
-
- if ! use policykit; then
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
- if ! use fontconfig; then
- ecm_punt_bogus_dep XCB IMAGE
- sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- -DGLIBC_LOCALE_GEN=$(usex policykit)
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${FILESDIR}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${FILESDIR}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
- elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2023-11-11 1:03 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2023-11-11 1:03 UTC (permalink / raw
To: gentoo-commits
commit: 44f3223e4332708dad89b72a4e43c738e9c91be3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 22:42:57 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 01:03:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f3223e
kde-plasma/plasma-workspace: add 5.27.9.1
Additional backports over upstream's point release:
- kcms/region_language: Fix check for GLIBC_LOCALE
- Reset KSMClient state even when logout is cancelled
- kcms/nightcolor: Fix nightcolor with automatic location
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=469730
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 +
...a-workspace-5.27.9-fix-GLIBC_LOCALE-check.patch | 28 +++
...kspace-5.27.9-fix-nightcolor-autolocation.patch | 47 +++++
...ma-workspace-5.27.9-reset-KSMClient-state.patch | 29 +++
.../plasma-workspace-5.27.9.1.ebuild | 234 +++++++++++++++++++++
5 files changed, 339 insertions(+)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 32719af4b3fb..6a64313fd8ff 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,3 @@
DIST plasma-workspace-5.27.8.tar.xz 19465764 BLAKE2B 61ac21353482ad7eea4de975be83755d4feed2ff1bb188f4b1b8e333c8aac8469691017c1c394eec90fdbd8cc44ad1015dccc0cb74fae5a249ee6c832b02b05b SHA512 d75da7d8cea3124f921813643ebda333376d3cc2ecbe2aaeee86e54a828e6a9767fa84b76991cfe282efdbf583abebee4a0bfe54a6b590c184ceb3d2995e9fcb
+DIST plasma-workspace-5.27.9.1.tar.xz 19468088 BLAKE2B 23244e093bbae33adb5aad2572566e53ad436b4eacf4f4439f3acdb923aeaade65758672a2951b3ad2a0a0e52f24901f79220d7050c0a0b7bfc4a0a7335588f3 SHA512 6aa1e69bba9b293646d5d2c819ec8ab1ba8b82b3a050f7122cdfa8c3580bffe8a7fe1e6422bb0f6e87d716df609e5fd49f2e20ebbe7296e43663eeca6d897442
DIST plasma-workspace-5.27.9.tar.xz 19467152 BLAKE2B 8b88c2a65f2a8c3b1e0d93b1b3b805685afbd75117e218ab1ae8cfa4ea143d0cfff50fdd96c3355aea436d186b81df2ec7632f28cb4666f21bfc6d7b247e4f87 SHA512 11eefc03fa4e327454d13d873a3c4fbdaa6fc9a1ad0033d16986d31bf313005bd47dff2948f97aab801837620f9631f5e96acca3348491ee95486bdfbbbe3cc2
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-GLIBC_LOCALE-check.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-GLIBC_LOCALE-check.patch
new file mode 100644
index 000000000000..0dee8bce65f5
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-GLIBC_LOCALE-check.patch
@@ -0,0 +1,28 @@
+From 292822e16ada9122594ac2c8573633e5a50e63dd Mon Sep 17 00:00:00 2001
+From: Gleb Popov <6yearold@gmail.com>
+Date: Tue, 24 Oct 2023 22:03:20 +0300
+Subject: [PATCH] kcms/region_language: Fix check for GLIBC_LOCALE.
+
+The GLIBC_LOCALE_AUTO is created by the #cmakedefine01 directive and thus is
+always defined.
+
+(cherry picked from commit 196966b02bf40a971bdf8888a2fa8ba7db0106f1)
+---
+ config-workspace.h.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake
+index b696cd8fa5..e05f1c9749 100644
+--- a/config-workspace.h.cmake
++++ b/config-workspace.h.cmake
+@@ -15,6 +15,6 @@
+ #cmakedefine01 GLIBC_LOCALE_AUTO
+ #cmakedefine01 GLIBC_LOCALE_GENERATED
+
+-#if defined(GLIBC_LOCALE_AUTO) || defined(GLIBC_LOCALE_GENERATED)
++#if GLIBC_LOCALE_AUTO == 1 || GLIBC_LOCALE_GENERATED == 1
+ #define GLIBC_LOCALE
+ #endif
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-nightcolor-autolocation.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-nightcolor-autolocation.patch
new file mode 100644
index 000000000000..17286608fc8d
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-nightcolor-autolocation.patch
@@ -0,0 +1,47 @@
+From b8544fc070e88614feb9c198f6ea910c91f3c5d5 Mon Sep 17 00:00:00 2001
+From: Ismael Asensio <isma.af@gmail.com>
+Date: Mon, 6 Nov 2023 19:13:37 +0000
+Subject: [PATCH] kcms/nightcolor: Fix nightcolor with automatic location
+
+As it turns out that the UI never send the geo-location to the
+backend so backend always fallbacks to (0, 0) lat and lon
+coordinates unless manually changed by `qdbus` commad..
+
+BUG: 469730
+FIXED-IN: 5.27.10
+
+
+(cherry picked from commit cb2b0e9c036d844d87fd104a3ae031b59243eaa5)
+---
+ kcms/nightcolor/package/contents/ui/main.qml | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/kcms/nightcolor/package/contents/ui/main.qml b/kcms/nightcolor/package/contents/ui/main.qml
+index c7d237f13b..418c05d42f 100644
+--- a/kcms/nightcolor/package/contents/ui/main.qml
++++ b/kcms/nightcolor/package/contents/ui/main.qml
+@@ -60,6 +60,21 @@ KCM.SimpleKCM {
+ }
+ }
+
++ // Update backend when locator is changed
++ Connections {
++ target: locator
++ function onLatitudeChanged() {
++ if (root.doneLocating) {
++ kcm.nightColorSettings.latitudeAuto = locator.latitude
++ }
++ }
++ function onLongitudeChanged() {
++ if (root.doneLocating) {
++ kcm.nightColorSettings.longitudeAuto = locator.latitude
++ }
++ }
++ }
++
+ header: ColumnLayout{
+ Kirigami.InlineMessage {
+ id: errorMessage
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-reset-KSMClient-state.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-reset-KSMClient-state.patch
new file mode 100644
index 000000000000..26a35bba5c91
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-reset-KSMClient-state.patch
@@ -0,0 +1,29 @@
+From 6e88325d25c06d3e8fdca49d13dd5a6d5ccefc0c Mon Sep 17 00:00:00 2001
+From: xiaofeng zhou <rpg2010@yeah.net>
+Date: Wed, 1 Nov 2023 18:14:22 +0000
+Subject: [PATCH] Reset KSMClient state even when logout is cancelled
+
+Now the KSMClient state is properly reset when a log out is canceled, preventing some funny business
+when the state is not cleared. For example inside of KSMServer::handlePendingInteractions, when it
+checks if a client has pending interactions.
+
+(cherry picked from commit b5b2c757e98511a7eb6c56b9e009e98f0e132c26)
+---
+ ksmserver/logout.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ksmserver/logout.cpp b/ksmserver/logout.cpp
+index f267338860..fb912714ba 100644
+--- a/ksmserver/logout.cpp
++++ b/ksmserver/logout.cpp
+@@ -346,6 +346,7 @@ void KSMServer::cancelShutdown(KSMClient *c)
+ if (!discard.isEmpty())
+ executeCommand(discard);
+ }
++ c->resetState();
+ }
+ }
+ state = Idle;
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild
new file mode 100644
index 000000000000..97b1871d3410
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.9
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry +wallpaper-metadata"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+ dev-libs/icu:=
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwayland-${QTMIN}:5=
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kinit-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kpeople-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kunitconversion-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/prison-${KFMIN}:5[qml]
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/layer-shell-qt-${PVCUT}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ >=media-libs/phonon-4.11.0
+ sci-libs/libqalculate:=
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ appstream? ( dev-libs/appstream[qt5] )
+ calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+ fontconfig? (
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ media-libs/fontconfig
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ policykit? (
+ sys-auth/polkit-qt
+ virtual/libcrypt:=
+ )
+ screencast? (
+ >=dev-qt/qtgui-${QTMIN}:5=[egl]
+ >=kde-plasma/kpipewire-${PVCUT}:5
+ media-libs/libglvnd
+ >=media-video/pipewire-0.3:=
+ x11-libs/libdrm
+ )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ telemetry? ( dev-libs/kuserfeedback:5 )
+ wallpaper-metadata? ( kde-apps/libkexiv2:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+ >=dev-libs/wayland-protocols-1.31
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<kde-plasma/breeze-5.22.90:5
+ !<kde-plasma/plasma-desktop-5.27.0:5
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:*
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtpaths-${QTMIN}:5
+ >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ kde-apps/kio-extras:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ sys-apps/dbus
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ >=dev-util/wayland-scanner-1.19.0
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ virtual/pkgconfig
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+ "${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
+ "${FILESDIR}/${PN}-5.27.9-fix-GLIBC_LOCALE-check.patch"
+ "${FILESDIR}/${PN}-5.27.9-fix-nightcolor-autolocation.patch"
+ "${FILESDIR}/${PN}-5.27.9-reset-KSMClient-state.patch" # KDE-bug 469730
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ cmake_comment_add_subdirectory libkworkspace
+ # delete colliding libkworkspace translations
+ find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+
+ # TODO: try to get a build switch upstreamed
+ if ! use screencast; then
+ ecm_punt_bogus_dep KPipeWire
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if use geolocation; then
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+ -i dataengines/geolocation/CMakeLists.txt || die
+ fi
+
+ if ! use policykit; then
+ cmake_run_in kcms cmake_comment_add_subdirectory users
+ fi
+
+ if ! use fontconfig; then
+ ecm_punt_bogus_dep XCB IMAGE
+ sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ -DGLIBC_LOCALE_GEN=$(usex policykit)
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package fontconfig Fontconfig)
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ $(cmake_use_find_package wallpaper-metadata KF5KExiv2)
+ )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${FILESDIR}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${FILESDIR}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+ elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2024-09-02 20:13 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2024-09-02 20:13 UTC (permalink / raw
To: gentoo-commits
commit: 3d0e9144fae9ae900ad88bb9c7a6517bfdcf4679
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 2 19:41:05 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 2 20:13:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0e9144
kde-plasma/plasma-workspace: Backport a couple of fixes from 6.1.5
See also:
https://bugs.kde.org/show_bug.cgi?id=491509
https://bugs.kde.org/show_bug.cgi?id=491488
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...workspace-6.1.4-klipper-fix-copying-cells.patch | 36 ++++
...asma-workspace-6.1.4-xembedsniproxy-crash.patch | 34 +++
.../plasma-workspace-6.1.4-r2.ebuild | 237 +++++++++++++++++++++
3 files changed, 307 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch
new file mode 100644
index 000000000000..310015c7d70f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch
@@ -0,0 +1,36 @@
+From fead4fa8174aeb6e61354390e9ddee4627b31166 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 23 Aug 2024 17:03:52 +0000
+Subject: [PATCH] klipper: fix copying cells when images are ignored
+
+When copying a cell to the clipboard, both the image and the plain text
+will be copied, and the plain text should be saved to the history when
+images are ignored.
+
+BUG: 491488
+FIXED-IN: 6.1.5
+
+
+(cherry picked from commit b83bc9a076fc0ae091f0df1eddce84d0d1dea5fd)
+
+Co-authored-by: Fushan Wen <qydwhotmail@gmail.com>
+---
+ klipper/klipper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
+index b41129d2e1b..24446e216ef 100644
+--- a/klipper/klipper.cpp
++++ b/klipper/klipper.cpp
+@@ -640,7 +640,7 @@ void Klipper::checkClipData(QClipboard::Mode mode, const QMimeData *data)
+ if (selectionMode && m_bSelectionTextOnly && !data->hasText())
+ return;
+
+- if (m_bIgnoreImages && data->hasImage() && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) {
++ if (m_bIgnoreImages && data->hasImage() && !data->hasText() /*BUG 491488*/ && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) {
+ return;
+ }
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch
new file mode 100644
index 000000000000..58a367a386ae
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch
@@ -0,0 +1,34 @@
+From dec0608369e1fe50685ce94113681ec9ed1bc43c Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 13 Aug 2024 09:09:06 +0000
+Subject: [PATCH] xembedsniproxy: Guard against crash when xcb_query_tree_reply
+ is null
+
+BUG:491509
+FIXED-IN:6.1.5
+
+
+(cherry picked from commit 85eb56e174bf887ccb8311e8f1a871e1ec453e04)
+
+Co-authored-by: David Redondo <kde@david-redondo.de>
+---
+ xembed-sni-proxy/sniproxy.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp
+index 41e1fb0550c..21d74c566d5 100644
+--- a/xembed-sni-proxy/sniproxy.cpp
++++ b/xembed-sni-proxy/sniproxy.cpp
+@@ -76,6 +76,9 @@ static bool checkWindowOrDescendantWantButtonEvents(xcb_window_t window)
+ }
+ auto treeCookie = xcb_query_tree(connection, window);
+ UniqueCPointer<xcb_query_tree_reply_t> tree(xcb_query_tree_reply(connection, treeCookie, nullptr));
++ if (!tree) {
++ return false;
++ }
+ std::span<xcb_window_t> children(xcb_query_tree_children(tree.get()), xcb_query_tree_children_length(tree.get()));
+ return std::ranges::any_of(children, &checkWindowOrDescendantWantButtonEvents);
+ }
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild
new file mode 100644
index 000000000000..6fdc40a5dfdb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop systemd telemetry +wallpaper-metadata"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+ dev-libs/icu:=
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qt5compat-${QTMIN}:6[qml]
+ >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,sql,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+ >=dev-qt/qtshadertools-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=dev-qt/qtwayland-${QTMIN}:6=
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kauth-${KFMIN}:6
+ >=kde-frameworks/kbookmarks-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kdeclarative-${KFMIN}:6
+ >=kde-frameworks/kded-${KFMIN}:6
+ >=kde-frameworks/kglobalaccel-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kidletime-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-frameworks/kitemviews-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/knotifyconfig-${KFMIN}:6
+ >=kde-frameworks/kpackage-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/krunner-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+ >=kde-frameworks/ksvg-${KFMIN}:6
+ >=kde-frameworks/ktexteditor-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kunitconversion-${KFMIN}:6
+ >=kde-frameworks/kwallet-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/prison-${KFMIN}:6[qml]
+ >=kde-frameworks/solid-${KFMIN}:6
+ >=kde-plasma/breeze-${PVCUT}:6
+ >=kde-plasma/kscreenlocker-${PVCUT}:6
+ >=kde-plasma/kwayland-${PVCUT}:6
+ >=kde-plasma/kwin-${PVCUT}:6
+ >=kde-plasma/layer-shell-qt-${PVCUT}:6
+ >=kde-plasma/libkscreen-${PVCUT}:6
+ >=kde-plasma/libksysguard-${PVCUT}:6
+ >=kde-plasma/libplasma-${PVCUT}:6
+ >=kde-plasma/plasma-activities-${PVCUT}:6
+ >=kde-plasma/plasma-activities-stats-${PVCUT}:6
+ >=kde-plasma/plasma5support-${PVCUT}:6
+ media-libs/libcanberra
+ >=media-libs/phonon-4.12.0[qt6]
+ sci-libs/libqalculate:=
+ sys-libs/zlib
+ virtual/libudev:=
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ appstream? ( >=dev-libs/appstream-1[qt6] )
+ calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 )
+ fontconfig? (
+ media-libs/fontconfig
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
+ gps? ( sci-geosciences/gpsd )
+ policykit? (
+ >=sys-auth/polkit-qt-0.175[qt6]
+ virtual/libcrypt:=
+ )
+ screencast? (
+ >=dev-qt/qtbase-${QTMIN}:6=[opengl]
+ >=kde-plasma/kpipewire-${PVCUT}:6
+ media-libs/libglvnd
+ >=media-video/pipewire-0.3:=
+ x11-libs/libdrm
+ )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+ systemd? ( sys-apps/systemd:= )
+ telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+ wallpaper-metadata? ( kde-apps/libkexiv2:6 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.13.0
+ dev-libs/qcoro[dbus]
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-plasma/libkworkspace:5
+ !<kde-plasma/plasma-desktop-5.27.0:5
+ !kde-plasma/xembed-sni-proxy:*
+ app-text/iso-codes
+ dev-libs/kirigami-addons:6
+ >=dev-qt/qttools-${QTMIN}:*[qdbus]
+ kde-apps/kio-extras:6
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/kquickcharts-${KFMIN}:6
+ >=kde-plasma/kactivitymanagerd-${PVCUT}:6
+ >=kde-plasma/kde-cli-tools-${PVCUT}:*[kdesu]
+ >=kde-plasma/milou-${PVCUT}:6
+ >=kde-plasma/plasma-integration-${PVCUT}:6
+ sys-apps/dbus
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+ >=dev-qt/qtwayland-${QTMIN}:6
+ >=dev-util/wayland-scanner-1.19.0
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ virtual/pkgconfig
+ test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] )
+"
+
+PATCHES=(
+ # TODO upstream: KDE-bug 432975, bug 767478
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch"
+ # upstream Plasma/6.1 branch (fixed in 6.1.5)
+ "${FILESDIR}/${P}-restart-unhide-timer-on-dnd.patch" # KDE-bug 450579
+ "${FILESDIR}"/${P}-fix-mediacontroller-{1,2}.patch # KDE-bug 490569
+ "${FILESDIR}/${P}-fix-svg-images.patch" # KDE-bug 491369
+ "${FILESDIR}/${P}-xembedsniproxy-crash.patch" # KDE-bug 491509
+ "${FILESDIR}/${P}-klipper-fix-copying-cells.patch" # KDE-bug 491488
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ # TODO: try to get a build switch upstreamed
+ if ! use screencast; then
+ ecm_punt_bogus_dep KPipeWire
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if use geolocation; then
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+ -i dataengines/geolocation/CMakeLists.txt || die
+ fi
+
+ if ! use policykit; then
+ cmake_run_in kcms cmake_comment_add_subdirectory users
+ fi
+
+ if ! use fontconfig; then
+ ecm_punt_bogus_dep XCB IMAGE
+ sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if ! use systemd; then
+ sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_X11=ON # TODO: broken upstream, fix it if you can
+ -DGLIBC_LOCALE_GEN=$(usex policykit)
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF6Holidays)
+ $(cmake_use_find_package fontconfig Fontconfig)
+ $(cmake_use_find_package geolocation KF6NetworkManagerQt)
+ $(cmake_use_find_package semantic-desktop KF6Baloo)
+ $(cmake_use_find_package telemetry KF6UserFeedback)
+ $(cmake_use_find_package wallpaper-metadata KExiv2Qt6)
+ )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${FILESDIR}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${FILESDIR}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+ elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2024-09-10 17:58 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2024-09-10 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 6694455981d6614be9fd667b27cb7a2a482bd5a0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 17:02:27 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 17:58:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66944559
kde-plasma/plasma-workspace: drop 6.1.4-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...workspace-6.1.4-klipper-fix-copying-cells.patch | 36 ----
...asma-workspace-6.1.4-xembedsniproxy-crash.patch | 34 ---
.../plasma-workspace-6.1.4-r2.ebuild | 237 ---------------------
3 files changed, 307 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch
deleted file mode 100644
index 310015c7d70f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fead4fa8174aeb6e61354390e9ddee4627b31166 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Fri, 23 Aug 2024 17:03:52 +0000
-Subject: [PATCH] klipper: fix copying cells when images are ignored
-
-When copying a cell to the clipboard, both the image and the plain text
-will be copied, and the plain text should be saved to the history when
-images are ignored.
-
-BUG: 491488
-FIXED-IN: 6.1.5
-
-
-(cherry picked from commit b83bc9a076fc0ae091f0df1eddce84d0d1dea5fd)
-
-Co-authored-by: Fushan Wen <qydwhotmail@gmail.com>
----
- klipper/klipper.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
-index b41129d2e1b..24446e216ef 100644
---- a/klipper/klipper.cpp
-+++ b/klipper/klipper.cpp
-@@ -640,7 +640,7 @@ void Klipper::checkClipData(QClipboard::Mode mode, const QMimeData *data)
- if (selectionMode && m_bSelectionTextOnly && !data->hasText())
- return;
-
-- if (m_bIgnoreImages && data->hasImage() && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) {
-+ if (m_bIgnoreImages && data->hasImage() && !data->hasText() /*BUG 491488*/ && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) {
- return;
- }
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch
deleted file mode 100644
index 58a367a386ae..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From dec0608369e1fe50685ce94113681ec9ed1bc43c Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Tue, 13 Aug 2024 09:09:06 +0000
-Subject: [PATCH] xembedsniproxy: Guard against crash when xcb_query_tree_reply
- is null
-
-BUG:491509
-FIXED-IN:6.1.5
-
-
-(cherry picked from commit 85eb56e174bf887ccb8311e8f1a871e1ec453e04)
-
-Co-authored-by: David Redondo <kde@david-redondo.de>
----
- xembed-sni-proxy/sniproxy.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp
-index 41e1fb0550c..21d74c566d5 100644
---- a/xembed-sni-proxy/sniproxy.cpp
-+++ b/xembed-sni-proxy/sniproxy.cpp
-@@ -76,6 +76,9 @@ static bool checkWindowOrDescendantWantButtonEvents(xcb_window_t window)
- }
- auto treeCookie = xcb_query_tree(connection, window);
- UniqueCPointer<xcb_query_tree_reply_t> tree(xcb_query_tree_reply(connection, treeCookie, nullptr));
-+ if (!tree) {
-+ return false;
-+ }
- std::span<xcb_window_t> children(xcb_query_tree_children(tree.get()), xcb_query_tree_children_length(tree.get()));
- return std::ranges::any_of(children, &checkWindowOrDescendantWantButtonEvents);
- }
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild
deleted file mode 100644
index 6fdc40a5dfdb..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.2
-inherit ecm plasma.kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="appstream +calendar +fontconfig geolocation gps +policykit
-screencast +semantic-desktop systemd telemetry +wallpaper-metadata"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
-# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
- dev-libs/icu:=
- >=dev-libs/wayland-1.15
- >=dev-qt/qt5compat-${QTMIN}:6[qml]
- >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,sql,widgets,xml]
- >=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
- >=dev-qt/qtshadertools-${QTMIN}:6
- >=dev-qt/qtsvg-${QTMIN}:6
- >=dev-qt/qtwayland-${QTMIN}:6=
- >=kde-frameworks/karchive-${KFMIN}:6
- >=kde-frameworks/kauth-${KFMIN}:6
- >=kde-frameworks/kbookmarks-${KFMIN}:6
- >=kde-frameworks/kcmutils-${KFMIN}:6
- >=kde-frameworks/kcompletion-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kcrash-${KFMIN}:6
- >=kde-frameworks/kdbusaddons-${KFMIN}:6
- >=kde-frameworks/kdeclarative-${KFMIN}:6
- >=kde-frameworks/kded-${KFMIN}:6
- >=kde-frameworks/kglobalaccel-${KFMIN}:6
- >=kde-frameworks/kguiaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kidletime-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kitemmodels-${KFMIN}:6
- >=kde-frameworks/kitemviews-${KFMIN}:6
- >=kde-frameworks/kjobwidgets-${KFMIN}:6
- >=kde-frameworks/knewstuff-${KFMIN}:6
- >=kde-frameworks/knotifications-${KFMIN}:6
- >=kde-frameworks/knotifyconfig-${KFMIN}:6
- >=kde-frameworks/kpackage-${KFMIN}:6
- >=kde-frameworks/kparts-${KFMIN}:6
- >=kde-frameworks/krunner-${KFMIN}:6
- >=kde-frameworks/kservice-${KFMIN}:6
- >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
- >=kde-frameworks/ksvg-${KFMIN}:6
- >=kde-frameworks/ktexteditor-${KFMIN}:6
- >=kde-frameworks/ktextwidgets-${KFMIN}:6
- >=kde-frameworks/kunitconversion-${KFMIN}:6
- >=kde-frameworks/kwallet-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
- >=kde-frameworks/kxmlgui-${KFMIN}:6
- >=kde-frameworks/prison-${KFMIN}:6[qml]
- >=kde-frameworks/solid-${KFMIN}:6
- >=kde-plasma/breeze-${PVCUT}:6
- >=kde-plasma/kscreenlocker-${PVCUT}:6
- >=kde-plasma/kwayland-${PVCUT}:6
- >=kde-plasma/kwin-${PVCUT}:6
- >=kde-plasma/layer-shell-qt-${PVCUT}:6
- >=kde-plasma/libkscreen-${PVCUT}:6
- >=kde-plasma/libksysguard-${PVCUT}:6
- >=kde-plasma/libplasma-${PVCUT}:6
- >=kde-plasma/plasma-activities-${PVCUT}:6
- >=kde-plasma/plasma-activities-stats-${PVCUT}:6
- >=kde-plasma/plasma5support-${PVCUT}:6
- media-libs/libcanberra
- >=media-libs/phonon-4.12.0[qt6]
- sci-libs/libqalculate:=
- sys-libs/zlib
- virtual/libudev:=
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/xcb-util
- appstream? ( >=dev-libs/appstream-1[qt6] )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 )
- fontconfig? (
- media-libs/fontconfig
- x11-libs/libXft
- x11-libs/xcb-util-image
- )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
- gps? ( sci-geosciences/gpsd )
- policykit? (
- >=sys-auth/polkit-qt-0.175[qt6]
- virtual/libcrypt:=
- )
- screencast? (
- >=dev-qt/qtbase-${QTMIN}:6=[opengl]
- >=kde-plasma/kpipewire-${PVCUT}:6
- media-libs/libglvnd
- >=media-video/pipewire-0.3:=
- x11-libs/libdrm
- )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
- systemd? ( sys-apps/systemd:= )
- telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
- wallpaper-metadata? ( kde-apps/libkexiv2:6 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.13.0
- dev-libs/qcoro[dbus]
- >=dev-qt/qtbase-${QTMIN}:6[concurrent]
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-plasma/libkworkspace:5
- !<kde-plasma/plasma-desktop-5.27.0:5
- !kde-plasma/xembed-sni-proxy:*
- app-text/iso-codes
- dev-libs/kirigami-addons:6
- >=dev-qt/qttools-${QTMIN}:*[qdbus]
- kde-apps/kio-extras:6
- >=kde-frameworks/kirigami-${KFMIN}:6
- >=kde-frameworks/kquickcharts-${KFMIN}:6
- >=kde-plasma/kactivitymanagerd-${PVCUT}:6
- >=kde-plasma/kde-cli-tools-${PVCUT}:*[kdesu]
- >=kde-plasma/milou-${PVCUT}:6
- >=kde-plasma/plasma-integration-${PVCUT}:6
- sys-apps/dbus
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="
- >=dev-qt/qtwayland-${QTMIN}:6
- >=dev-util/wayland-scanner-1.19.0
- >=kde-frameworks/kcmutils-${KFMIN}:6
- virtual/pkgconfig
- test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] )
-"
-
-PATCHES=(
- # TODO upstream: KDE-bug 432975, bug 767478
- "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch"
- # upstream Plasma/6.1 branch (fixed in 6.1.5)
- "${FILESDIR}/${P}-restart-unhide-timer-on-dnd.patch" # KDE-bug 450579
- "${FILESDIR}"/${P}-fix-mediacontroller-{1,2}.patch # KDE-bug 490569
- "${FILESDIR}/${P}-fix-svg-images.patch" # KDE-bug 491369
- "${FILESDIR}/${P}-xembedsniproxy-crash.patch" # KDE-bug 491509
- "${FILESDIR}/${P}-klipper-fix-copying-cells.patch" # KDE-bug 491488
-)
-
-src_prepare() {
- ecm_src_prepare
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- ecm_punt_bogus_dep KPipeWire
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
- fi
-
- # TODO: try to get a build switch upstreamed
- if use geolocation; then
- use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
- -i dataengines/geolocation/CMakeLists.txt || die
- fi
-
- if ! use policykit; then
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
- if ! use fontconfig; then
- ecm_punt_bogus_dep XCB IMAGE
- sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
- fi
-
- # TODO: try to get a build switch upstreamed
- if ! use systemd; then
- sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_X11=ON # TODO: broken upstream, fix it if you can
- -DGLIBC_LOCALE_GEN=$(usex policykit)
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF6Holidays)
- $(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package geolocation KF6NetworkManagerQt)
- $(cmake_use_find_package semantic-desktop KF6Baloo)
- $(cmake_use_find_package telemetry KF6UserFeedback)
- $(cmake_use_find_package wallpaper-metadata KExiv2Qt6)
- )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${FILESDIR}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${FILESDIR}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
- elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2024-09-14 21:37 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2024-09-14 21:37 UTC (permalink / raw
To: gentoo-commits
commit: f96ec66d2293f8ab2b6728c2fbfeb270f92c5507
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 21:09:03 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 21:09:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96ec66d
kde-plasma/plasma-workspace: startkde: Fix wayland session restore saving
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=436318
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-6.1.5-fix-wayland-session-restore-saving.patch | 32 +++
.../plasma-workspace-6.1.5-r1.ebuild | 231 +++++++++++++++++++++
2 files changed, 263 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch
new file mode 100644
index 000000000000..925be20afcc9
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch
@@ -0,0 +1,32 @@
+From 4dff1973116597210cf9fb1c102e5c9433d13b1d Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sat, 14 Sep 2024 13:22:05 +0000
+Subject: [PATCH] startkde: Fix wayland session restore saving
+
+When we added manual saving support to plasma-shutdown a guard was
+changed in the normal shutdown path. This guard was wrong, we want to
+check we're in the restorePreviousLogout path here.
+
+This amends 804976c5ecec1fbf5f6e7e09970a8269bdf748d2
+
+BUG: 436318
+---
+ startkde/plasma-shutdown/shutdown.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/startkde/plasma-shutdown/shutdown.cpp b/startkde/plasma-shutdown/shutdown.cpp
+index 11c002bcd80..ab93cca6ef7 100644
+--- a/startkde/plasma-shutdown/shutdown.cpp
++++ b/startkde/plasma-shutdown/shutdown.cpp
+@@ -84,7 +84,7 @@ void Shutdown::ksmServerComplete()
+ {
+ const KConfigGroup c(KSharedConfig::openConfig(QStringLiteral("ksmserverrc")), QStringLiteral("General"));
+
+- if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restoreSavedSession")) {
++ if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restorePreviousLogout")) {
+ // Now record windows that are not session managed
+ int ret = QProcess::execute(QStringLiteral(PLASMA_FALLBACK_SESSION_SAVE_BIN));
+ if (ret) {
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r1.ebuild
new file mode 100644
index 000000000000..2042824ee0f6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop systemd telemetry +wallpaper-metadata"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+ dev-libs/icu:=
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qt5compat-${QTMIN}:6[qml]
+ >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,sql,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+ >=dev-qt/qtshadertools-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=dev-qt/qtwayland-${QTMIN}:6=
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kauth-${KFMIN}:6
+ >=kde-frameworks/kbookmarks-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kdeclarative-${KFMIN}:6
+ >=kde-frameworks/kded-${KFMIN}:6
+ >=kde-frameworks/kglobalaccel-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kidletime-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-frameworks/kitemviews-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/knotifyconfig-${KFMIN}:6
+ >=kde-frameworks/kpackage-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/krunner-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+ >=kde-frameworks/ksvg-${KFMIN}:6
+ >=kde-frameworks/ktexteditor-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kunitconversion-${KFMIN}:6
+ >=kde-frameworks/kwallet-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/prison-${KFMIN}:6[qml]
+ >=kde-frameworks/solid-${KFMIN}:6
+ >=kde-plasma/breeze-${PVCUT}:6
+ >=kde-plasma/kscreenlocker-${PVCUT}:6
+ >=kde-plasma/kwayland-${PVCUT}:6
+ >=kde-plasma/kwin-${PVCUT}:6
+ >=kde-plasma/layer-shell-qt-${PVCUT}:6
+ >=kde-plasma/libkscreen-${PVCUT}:6
+ >=kde-plasma/libksysguard-${PVCUT}:6
+ >=kde-plasma/libplasma-${PVCUT}:6
+ >=kde-plasma/plasma-activities-${PVCUT}:6
+ >=kde-plasma/plasma-activities-stats-${PVCUT}:6
+ >=kde-plasma/plasma5support-${PVCUT}:6
+ media-libs/libcanberra
+ >=media-libs/phonon-4.12.0[qt6(+)]
+ sci-libs/libqalculate:=
+ sys-libs/zlib
+ virtual/libudev:=
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ appstream? ( >=dev-libs/appstream-1[qt6] )
+ calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 )
+ fontconfig? (
+ media-libs/fontconfig
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
+ gps? ( sci-geosciences/gpsd )
+ policykit? (
+ >=sys-auth/polkit-qt-0.175[qt6(+)]
+ virtual/libcrypt:=
+ )
+ screencast? (
+ >=dev-qt/qtbase-${QTMIN}:6=[opengl]
+ >=kde-plasma/kpipewire-${PVCUT}:6
+ media-libs/libglvnd
+ >=media-video/pipewire-0.3:=
+ x11-libs/libdrm
+ )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+ systemd? ( sys-apps/systemd:= )
+ telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+ wallpaper-metadata? ( kde-apps/libkexiv2:6 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.13.0
+ dev-libs/qcoro[dbus]
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-plasma/libkworkspace:5
+ !<kde-plasma/plasma-desktop-5.27.0:5
+ !kde-plasma/xembed-sni-proxy:*
+ app-text/iso-codes
+ dev-libs/kirigami-addons:6
+ >=dev-qt/qttools-${QTMIN}:*[qdbus]
+ kde-apps/kio-extras:6
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/kquickcharts-${KFMIN}:6
+ >=kde-plasma/kactivitymanagerd-${PVCUT}:6
+ >=kde-plasma/kdesu-gui-${PVCUT}:*
+ >=kde-plasma/milou-${PVCUT}:6
+ >=kde-plasma/plasma-integration-${PVCUT}:6
+ sys-apps/dbus
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+ >=dev-qt/qtwayland-${QTMIN}:6
+ >=dev-util/wayland-scanner-1.19.0
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ virtual/pkgconfig
+ test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+ "${FILESDIR}/${P}-fix-wayland-session-restore-saving.patch" # KDE-bug 436318
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ # TODO: try to get a build switch upstreamed
+ if ! use screencast; then
+ ecm_punt_bogus_dep KPipeWire
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if use geolocation; then
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+ -i dataengines/geolocation/CMakeLists.txt || die
+ fi
+
+ if ! use policykit; then
+ cmake_run_in kcms cmake_comment_add_subdirectory users
+ fi
+
+ if ! use fontconfig; then
+ ecm_punt_bogus_dep XCB IMAGE
+ sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if ! use systemd; then
+ sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_X11=ON # TODO: broken upstream, fix it if you can
+ -DGLIBC_LOCALE_GEN=$(usex policykit)
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF6Holidays)
+ $(cmake_use_find_package fontconfig Fontconfig)
+ $(cmake_use_find_package geolocation KF6NetworkManagerQt)
+ $(cmake_use_find_package semantic-desktop KF6Baloo)
+ $(cmake_use_find_package telemetry KF6UserFeedback)
+ $(cmake_use_find_package wallpaper-metadata KExiv2Qt6)
+ )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${FILESDIR}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${FILESDIR}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+ elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
@ 2024-09-20 17:11 Andreas Sturmlechner
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2024-09-20 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 0b7b1cde21233ef797b09e5bff8a6287bc642f58
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 17:02:54 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 17:11:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7b1cde
kde-plasma/plasma-workspace: Fix a systemsettings crash
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=486922
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-workspace-6.1.5-fix-systemsettings-crash.patch | 41 ++++++++++++++++++++++
.../plasma-workspace-6.1.5-r2.ebuild | 1 +
2 files changed, 42 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch
new file mode 100644
index 000000000000..b199921e9dc1
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch
@@ -0,0 +1,41 @@
+From e81dde14d9f9c98bdce4cc5536b105a6adc3613b Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 1 Sep 2024 14:24:08 +0200
+Subject: [PATCH] [krdb] Don't manually process events when applying Qt
+ settings
+
+Manually processing events like this can cause unpredictable behavior and for QML apps like systemsettings cause crashes
+
+It's also not necessary, the config we are applying isn't used by systemsettings/modern Qt apps anyway
+
+BUG: 486922
+
+SENTRY: SYSTEMSETTINGS-3RP
+(cherry picked from commit aaf0cc601a7a9ed455e2a61906ed46b6e275f007)
+---
+ kcms/krdb/krdb.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
+index eefa0d36a0..39bcb7317d 100644
+--- a/kcms/krdb/krdb.cpp
++++ b/kcms/krdb/krdb.cpp
+@@ -484,7 +484,6 @@ void runRdb(unsigned int flags)
+ applyQtSettings(kglobalcfg, *settings); // For kcmstyle
+
+ delete settings;
+- QCoreApplication::processEvents();
+ #if HAVE_X11
+ if (qApp->platformName() == QLatin1String("xcb")) {
+ // We let KIPC take care of ourselves, as we are in a KDE app with
+@@ -514,7 +513,6 @@ void runRdb(unsigned int flags)
+ PropModeReplace,
+ (unsigned char *)stamp.buffer().data(),
+ stamp.buffer().size());
+- qApp->processEvents();
+ }
+ #endif
+ }
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild
index 317637695d40..e1943f0f6ff9 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild
@@ -163,6 +163,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
"${FILESDIR}/${P}-fix-wayland-session-restore-saving.patch" # KDE-bug 436318
"${FILESDIR}/${P}-fix-x11-logout-w-session-restore.patch" # bug 938925, KDE-bug 488853
+ "${FILESDIR}/${P}-fix-systemsettings-crash.patch" # KDE-bug 486922
)
src_prepare() {
^ permalink raw reply related [flat|nested] 30+ messages in thread
end of thread, other threads:[~2024-09-20 17:11 UTC | newest]
Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-17 20:15 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-09-20 17:11 Andreas Sturmlechner
2024-09-14 21:37 Andreas Sturmlechner
2024-09-10 17:58 Andreas Sturmlechner
2024-09-02 20:13 Andreas Sturmlechner
2023-11-11 1:03 Andreas Sturmlechner
2023-08-16 16:31 Andreas Sturmlechner
2023-03-22 23:01 Andreas Sturmlechner
2022-10-10 9:54 Andreas Sturmlechner
2022-09-23 20:07 Andreas Sturmlechner
2022-09-23 20:07 Andreas Sturmlechner
2022-08-07 15:51 Andreas Sturmlechner
2022-01-25 9:49 Andreas Sturmlechner
2021-11-23 14:59 Andreas Sturmlechner
2021-09-30 17:24 Andreas Sturmlechner
2021-09-14 13:39 Andreas Sturmlechner
2021-01-24 19:44 Andreas Sturmlechner
2021-01-23 0:25 Andreas Sturmlechner
2021-01-23 0:25 Andreas Sturmlechner
2020-09-17 20:15 Andreas Sturmlechner
2019-12-17 23:49 Andreas Sturmlechner
2019-10-29 22:22 Andreas Sturmlechner
2017-08-02 23:22 Andreas Sturmlechner
2017-06-17 18:30 Andreas Sturmlechner
2017-06-09 19:24 Andreas Sturmlechner
2016-11-17 11:35 Michael Palimaka
2016-11-12 8:22 Michael Palimaka
2016-06-26 20:36 Michael Palimaka
2016-06-26 17:19 Michael Palimaka
2015-11-19 16:42 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox