diff --git a/0001-Some-UI-fixes-for-logout-dialog.patch b/0001-Some-UI-fixes-for-logout-dialog.patch deleted file mode 100644 index 7a4507e..0000000 --- a/0001-Some-UI-fixes-for-logout-dialog.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 553535ea35c9e3a2b82fc46e76e0b72fbd2143a6 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Sun, 9 Apr 2017 13:34:21 +0200 -Subject: [PATCH] Some UI fixes for logout dialog - -Less intrusive parts of 5f2f343ef ('UI fixes for logout dialog'): -* add an OK button, that was complained a lot -* Stop timer with arrow keys -* Hide timer label if timer not running ---- - lookandfeel/contents/logout/Logout.qml | 22 +++++++++++++++++++--- - lookandfeel/contents/logout/LogoutButton.qml | 1 + - 2 files changed, 20 insertions(+), 3 deletions(-) - -diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml -index 839c390f..e1573f5e 100644 ---- a/lookandfeel/contents/logout/Logout.qml -+++ b/lookandfeel/contents/logout/Logout.qml -@@ -74,6 +74,7 @@ PlasmaCore.ColorScope { - } - - Timer { -+ id: countDownTimer - running: true - repeat: true - interval: 1000 -@@ -155,6 +156,14 @@ PlasmaCore.ColorScope { - - PlasmaComponents.Label { - Layout.alignment: Qt.AlignHCenter -+ //opacity, as visible would re-layout -+ opacity: countDownTimer.running ? 1 : 0 -+ Behavior on opacity { -+ OpacityAnimator { -+ duration: units.longDuration -+ easing.type: Easing.InOutQuad -+ } -+ } - text: { - switch (sdtype) { - case ShutdownType.ShutdownTypeReboot: -@@ -167,10 +176,17 @@ PlasmaCore.ColorScope { - } - } - -- PlasmaComponents.Button { -+ RowLayout { - Layout.alignment: Qt.AlignHCenter -- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Cancel") -- onClicked: root.cancelRequested() -+ PlasmaComponents.Button { -+ enabled: root.currentAction != null -+ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "OK") -+ onClicked: root.currentAction() -+ } -+ PlasmaComponents.Button { -+ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Cancel") -+ onClicked: root.cancelRequested() -+ } - } - } - } -diff --git a/lookandfeel/contents/logout/LogoutButton.qml b/lookandfeel/contents/logout/LogoutButton.qml -index 4c92657e..4de0b0d3 100644 ---- a/lookandfeel/contents/logout/LogoutButton.qml -+++ b/lookandfeel/contents/logout/LogoutButton.qml -@@ -35,4 +35,5 @@ ActionButton { - easing.type: Easing.InOutQuad - } - } -+ Keys.onPressed: countDownTimer.running = false - } --- -2.12.0 - diff --git a/change-kioremote-severity.patch b/change-kioremote-severity.patch deleted file mode 100644 index 9fd4d55..0000000 --- a/change-kioremote-severity.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Fabian Vogt -Subject: Change default log severity for log_kioremote -References: boo#997173 - -This category has a lot of debug output, so it should be disabled by -default. - ---- - kioslave/remote/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: plasma-workspace-5.7.95/kioslave/remote/CMakeLists.txt -=================================================================== ---- plasma-workspace-5.7.95.orig/kioslave/remote/CMakeLists.txt -+++ plasma-workspace-5.7.95/kioslave/remote/CMakeLists.txt -@@ -10,7 +10,7 @@ set(kio_remote_SRCS - ecm_qt_declare_logging_category(kio_remote_SRCS HEADER debug.h - IDENTIFIER KIOREMOTE_LOG - CATEGORY_NAME log_kioremote -- DEFAULT_SEVERITY Info) -+ DEFAULT_SEVERITY Debug) - - add_library(kio_remote MODULE ${kio_remote_SRCS}) - target_link_libraries(kio_remote KF5::KIOCore KF5::I18n) - diff --git a/plasma-workspace-5.9.5.tar.xz b/plasma-workspace-5.9.5.tar.xz deleted file mode 100644 index c3fbe5e..0000000 --- a/plasma-workspace-5.9.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:abe34e01d455b8367a58ea135be63af91122338d3129f14bc51d52887e6b6b55 -size 6937764 diff --git a/plasma-workspace-5.9.95.tar.xz b/plasma-workspace-5.9.95.tar.xz new file mode 100644 index 0000000..b9af888 --- /dev/null +++ b/plasma-workspace-5.9.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bcbe4c6e984f56ec837f83d7805b7a6e96028cdfc843e31108738345e711274 +size 6955360 diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index a4b827f..434bb8e 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu May 11 20:26:32 CEST 2017 - fabian@ritter-vogt.de + +- Update to 5.9.95 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.9.95.php +- Too many changes to list here +- Remove patches, now upstream: + * change-kioremote-severity.patch + * 0001-Some-UI-fixes-for-logout-dialog.patch + * revert-autostart-krun.patch + ------------------------------------------------------------------- Thu Apr 27 21:06:41 UTC 2017 - lbeltrame@kde.org diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 8a948e1..ee44541 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -16,34 +16,28 @@ # -%define kf5_version 5.29.0 +%define kf5_version 5.34.0 %bcond_without lang Name: plasma5-workspace -Version: 5.9.5 +Version: 5.9.95 Release: 0 -# Full Plasma 5 version (e.g. 5.9.4) +# Full Plasma 5 version (e.g. 5.9.1) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} -# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.4 in KUF) +# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF) %{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} Summary: The KDE Plasma Workspace Components License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org/ -Source: http://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz +Source: plasma-workspace-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde Patch0: 0001-Rename-qdbus-in-startkde.patch -# PATCH-FIX-OPENSUSE change-kioremote-severity.patch boo#997173 fabian@ritter-vogt.de -- Change default log severity for log_kioremote -Patch1: change-kioremote-severity.patch # PATCH-FIX-OPENSUSE 0001-Ignore-default-sddm-face-icons.patch boo#1001364 fabian@ritter-vogt.de -- Ignore default sddm face icons -Patch2: 0001-Ignore-default-sddm-face-icons.patch +Patch1: 0001-Ignore-default-sddm-face-icons.patch # PATCHES 100-200 and above are from upstream 5.9 branch -# PATCH-FIX-UPSTREAM -Patch100: revert-autostart-krun.patch # PATCHES 201-300 and above are from upstream master/5.10 branch -# PATCH-FIX-UPSTREAM -Patch201: 0001-Some-UI-fixes-for-logout-dialog.patch BuildRequires: breeze5-icons BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -215,9 +209,6 @@ workspace. Development files. %setup -q -n plasma-workspace-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch100 -p1 -%patch201 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} @@ -276,6 +267,7 @@ workspace. Development files. %{_kf5_bindir}/startkde %{_kf5_bindir}/startplasmacompositor %{_kf5_bindir}/systemmonitor +%{_kf5_bindir}/plasma_waitforname %{_kf5_configdir}/autostart/plasmashell.desktop %{_kf5_configdir}/autostart/klipper.desktop %{_kf5_configdir}/autostart/krunner.desktop @@ -301,6 +293,7 @@ workspace. Development files. %{_kf5_configkcfgdir}/freespacenotifier.kcfg %{_kf5_sharedir}/dbus-1/services/kf5_org.kde.kuiserver.service %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service +%{_kf5_sharedir}/dbus-1/services/org.freedesktop.Notifications.service %{_kf5_sharedir}/desktop-directories/ %{_kf5_sharedir}/kconf_update/ %dir %{_kf5_htmldir} diff --git a/revert-autostart-krun.patch b/revert-autostart-krun.patch deleted file mode 100644 index 8a40e31..0000000 --- a/revert-autostart-krun.patch +++ /dev/null @@ -1,82 +0,0 @@ -From ea3f87c5df0251838da71c473fd7b790c932d8b0 Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Thu, 27 Apr 2017 15:52:39 +0100 -Subject: Revert "launch autostart apps in ksmserver using KRun" - -KRun::runApplication will show blocking error dialogs if it fails to -find the executable -This means we don't autostart the next app, which could be fatal if it -comes before... - -Summary: -...kwin/plasma -We shouldn't be having blocking calls in ksmserver it can deadlock -And even in the best case we'd still end up blocking ksplash for 30 -seconds - -We then port to KProcess which was part of the motivation behind the -patch as it -has better stdout handling - -This reverts commit 0f19e92f3e85d064de9cebf280fa8e085485c2e0. - -BUG: 379254 - -Also added port of autostarting applications to KProcess -It has better stdout handling - -Test Plan: Logged in, still got my main session - -Reviewers: #plasma, mart - -Reviewed By: mart - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D5618 ---- - ksmserver/startup.cpp | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp -index e51278b..767116d 100644 ---- a/ksmserver/startup.cpp -+++ b/ksmserver/startup.cpp -@@ -68,9 +68,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include - #include -+#include - #include - #include --#include - #include - #include - -@@ -679,8 +679,19 @@ void KSMServer::slotAutoStart() - } - KService service(serviceName); - qCInfo(KSMSERVER) << "Starting autostart service " << serviceName; -- if( !KRun::runApplication( service, QList(), nullptr, KRun::RunFlags(), QString(), "0" )) -- qCInfo(KSMSERVER) << "autostart service" << serviceName << "failed to launch"; -+ auto p = new KProcess(this); -+ auto arguments = KIO::DesktopExecParser(service, QList()).resultingArguments(); -+ if (arguments.isEmpty()) { -+ qCInfo(KSMSERVER) << "failed to parse" << serviceName << "for autostart"; -+ continue; -+ } -+ auto program = arguments.takeFirst(); -+ p->setProgram(program, arguments); -+ p->start(); -+ connect(p, static_cast(&QProcess::finished), [p](int exitCode) { -+ qCInfo(KSMSERVER) << "autostart service" << p->program() << "finished with exit code " << exitCode; -+ p->deleteLater(); -+ }); - } while (true); - // Loop till we find a service that we can start. - } --- -cgit v0.11.2 -