diff --git a/0001-OSD-Fix-size-calculation-for-progress-value.patch b/0001-OSD-Fix-size-calculation-for-progress-value.patch new file mode 100644 index 0000000..b73476b --- /dev/null +++ b/0001-OSD-Fix-size-calculation-for-progress-value.patch @@ -0,0 +1,63 @@ +From 94b2c3d1d4a72d70d487513954601c2cf723e673 Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik +Date: Tue, 1 Aug 2023 19:47:52 +0200 +Subject: [PATCH] OSD: Fix size calculation for progress value + +Use a common function for formatting the percent, so placeholder 100% label will +use the exact formatting used by the label next to the progress bar. + +Also use font advanceWidth, which is the appropriate means of calculating the +bounding box of text in this case. Also ceil it to avoid subpixel alignment. + +And to be absolutely sure disable word wrapping. + +BUG: 469576 +(cherry picked from commit 9737efa79440b65db303030f34f0039f1c9cd6a0) +--- + lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml b/lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml +index fa892cb23..bc60efc15 100644 +--- a/lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml ++++ b/lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml +@@ -26,6 +26,10 @@ RowLayout { + // false for displaying the value as normal text + property bool showingProgress: false + ++ function formatPercent(number) { ++ return i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Percentage value", "%1%", number); ++ } ++ + spacing: PlasmaCore.Units.smallSpacing + + Layout.preferredWidth: Math.max(Math.min(Screen.desktopAvailableWidth / 2, implicitWidth), PlasmaCore.Units.gridUnit * 15) +@@ -63,7 +67,7 @@ RowLayout { + // to the maximum width to avoid the progress bad resizing itself + TextMetrics { + id: widestLabelSize +- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "100%") ++ text: formatPercent(100) + font: percentageLabel.font + } + +@@ -71,13 +75,14 @@ RowLayout { + PlasmaExtra.Heading { + id: percentageLabel + Layout.fillHeight: true +- Layout.preferredWidth: widestLabelSize.width ++ Layout.preferredWidth: Math.ceil(widestLabelSize.advanceWidth) + Layout.rightMargin: PlasmaCore.Units.smallSpacing + Layout.alignment: Qt.AlignVCenter + level: 3 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter +- text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Percentage value", "%1%", progressBar.value) ++ text: formatPercent(progressBar.value) ++ wrapMode: Text.NoWrap + visible: showingProgress + // Display a subtle visual indication that the volume might be + // dangerously high +-- +2.41.0 + diff --git a/plasma-workspace-5.27.6.tar.xz b/plasma-workspace-5.27.6.tar.xz deleted file mode 100644 index 520dde0..0000000 --- a/plasma-workspace-5.27.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ce6f70f7bb909b9ed9c213bc5528a4e7c264f570a9c94f2f4fb25c1528f8883 -size 19459172 diff --git a/plasma-workspace-5.27.6.tar.xz.sig b/plasma-workspace-5.27.6.tar.xz.sig deleted file mode 100644 index d1a9b9c..0000000 --- a/plasma-workspace-5.27.6.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmSRqwIACgkQ11dEg7tX -sY2L6Q//Zo191iiMt6UmZHrU3DvKzqMdN5RpvmmVUykkTJfhnXQEYjY/42O8OfnZ -ObSerA/YfUQ0KlFCNozXFqAZqeUq89G6TeN0v/jM7J08fjBGg6UUOBC+QOSHiA0h -2PV4EFRNPkrnmrnGRQB/BPEaVS2qFjOTGS0gsXnFYGZeMkBUDjmusQxoyNMgeFCQ -wynYlJAJNwOIB5F+6go7V9P9gL/BjzyRbsbZObYp537FLU6aJVqp0DXyWxtQsAVm -ShKmteYSrw7answUsxfjpYX4vjmlsTnO8QUFQSLnV7v2YZo1x51Oy+CdedII7lsK -2NTnw9OLgnbsnNvfcVD5QKBidf+9iV+AohY+CRbQcbTLyfZvULHKnyPpHJn39nMn -iQF6mmJWgen30D0ndUiODKt2siwYj09ng9V5GZPWhHhCubxeQbW9fMWmXJWAb6ej -5CM/IZEB4o3KynRZrsHQmk4RtBgkhO3qiVlw1lWRyqL7feXyyKDovR+Tuy8KpF2r -7Q8ngaQqS8OKAV6u+9H34Q2xLRB4nhDu+HUX8C+7jXNBQvEaSN6lIItEcZ+Duk5D -jpc9VPX9mJcLhoOnZ2wkmpoiSjytMMPoaNWvc4ZyAd6XidcZhWolir5Vu13cT6Pp -+7Xm8IpdOn6YGmrWkPQ/OxxJ19anYGT5y/GalTHM0Xuw/v+SgTY= -=pQxF ------END PGP SIGNATURE----- diff --git a/plasma-workspace-5.27.7.tar.xz b/plasma-workspace-5.27.7.tar.xz new file mode 100644 index 0000000..5220225 --- /dev/null +++ b/plasma-workspace-5.27.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0642941dcdf513ac201494897e2c5097a2f2db8be6dcdb597cae1a43d82ece5f +size 19465984 diff --git a/plasma-workspace-5.27.7.tar.xz.sig b/plasma-workspace-5.27.7.tar.xz.sig new file mode 100644 index 0000000..28305a8 --- /dev/null +++ b/plasma-workspace-5.27.7.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmTI0CAACgkQ11dEg7tX +sY2rhg/9HWjPf3AYnAKaHvlnzVvxAo70CSxPV4xN7nMvRFlWwcvU+fLbFNNA1ufA +nc0msBpUgBuB4d1QCmSK/74+Z05gLPcafGInxkqHrXJJQ6PVpF/v4Um7Tc56EYv6 +qYvs6XDPCEVGz7GD/LBp4PwZ+nlzJ0cc2wQJj6dr8mUndhkJjEWXZpub9qRHORPA +H67YwJySJCDqmmJHpKVFoBJxSEAbo37fPado1iZIhNKRsRTFmLrgrwsX77+AsJQo +D0Ou3TGOIFP4GL7Ts5L3zBtRpyZYJWRdtu36rWm7ONHcGcMw5UwPK6JQWchp0b7i +DctIZbxRTWCjFt5Tl2j5gyU2bXhiw5UzOSSv9a3EqgATRqhl1bot0EpSjYenLLg0 +RdBIfsdH2Gb3qLTY/NEMPlLwuhUDg/er+xjB8IMfJhJBFlmHXJrTeJQ+pXmzcHD4 +7/RpLujOnNy/2tClUEGXT3rXRvfXZ4Sy0gmTuV8kd33jpOlXNakx+VVU49+b1wZE +SkDKhcvXCrTc83h3pOcjpDOxbTqyVTCnty5I94oIRg02G+wMjfO9BUCF4aC0oY3a +A3lvggZyhvH8wBy9RQoTvp8ldoP2RTwx8hguDl223iT8YdOMVymb1P7bkk4cWPDv +tZ1kd2jAKYDjovVr9dKSJMZr5iRl1KFHUXbvtxxrUZMvXbgs6bg= +=qLrx +-----END PGP SIGNATURE----- diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index f4c86c6..0edfe10 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Tue Aug 1 20:07:29 UTC 2023 - Fabian Vogt + +- Add patch to fix line wrapping of "100 %" in OSDs (kde#469576): + * 0001-OSD-Fix-size-calculation-for-progress-value.patch + +------------------------------------------------------------------- +Tue Aug 1 11:19:31 UTC 2023 - Fabian Vogt + +- Update to 5.27.7 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.27.7 +- Changes since 5.27.6: + * libtaskmanager: fix unable to change order of launchers (kde#472812) + * Reorder removals to ensure launcher url is deallocated after last use + * Fix crash in LauncherTasksModel::Private::requestRemoveLauncherFromActivities (kde#472378) + * libtaskmanager: skip empty appId when matching '*.appId.desktop' (kde#472576,kde#428559) + * Do not write empty path to desktop file (kde#433304) + * Fix crash in TasksModel::move (kde#472524) + * kcm/region_language: fix enum order (kde#472108) + * kcms/region_language: Read from $LANGUAGE in options model + * kcms/region_language: Improve isSupportedLanguage detection + * kcms/region_language: Chop off the UTF-8 codepoint again + * kcms/region_language: Check if the language setting is default as well + * kcms/region_language: Simplify the language settings read + * kcms/region_language: Read the LANGUAGE environment variable for the default language value + * TriangleMouseFilter: remove unnecessary return + * TriangleMouseFilter: make `resendHoverEvents` actually work + * TriangleMouseFilter: fix incorrect handling of hover events and inactive state (kde#467426) + * TriangularMouseFilter: Filter event everytime when there was no movement at all + * Improve responsiveness of triangular filter + * shell: move `forceActiveFocus` to `PanelView` + * applets/mediacontroller: use PauseAnimation to delay showing busy indicator + * applets/mediacontroller: remove duplicate opacity animation + * applets/notifications: add workaround for QTBUG-100392 (kde#468180) + * Notifications: Also try X-SnapInstanceName for desktop file resolution + * libtaskmanager: fix a potential leak + ------------------------------------------------------------------- Sat Jun 24 20:37:55 UTC 2023 - Fabian Vogt diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 92acc84..5498ed0 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -30,7 +30,7 @@ Name: plasma5-workspace %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF) %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} -Version: 5.27.6 +Version: 5.27.7 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0-or-later @@ -42,6 +42,8 @@ Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspa Source2: plasma.keyring %endif Source3: xprop-kde-full-session.desktop +# PATCH-FIX-UPSTREAM +Patch1: 0001-OSD-Fix-size-calculation-for-progress-value.patch # PATCHES 501-??? are PATCH-FIX-OPENSUSE Patch501: 0001-Use-qdbus-qt5.patch Patch502: 0001-Ignore-default-sddm-face-icons.patch