pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 393694 from KDE:Frameworks5

Browse Source 
Update to 5.6.3

OBS-URL: https://build.opensuse.org/request/show/393694
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger 2016-05-08 08:43:53 +00:00 committed by Git OBS Bridge
commit d7c15820e7
5 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
digitalclock-fix-show-seconds.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/applets/digital-clock/package/contents/ui/DigitalClock.qml b/applets/digital-clock/package/contents/ui/DigitalClock.qml
index 95bb071..6fa8e39 100644
--- a/applets/digital-clock/package/contents/ui/DigitalClock.qml
+++ b/applets/digital-clock/package/contents/ui/DigitalClock.qml
@@ -478,11 +478,7 @@ Item {
// and Short does not provide seconds. So if seconds are enabled, we need to add it here.
//
// What happens here is that it looks for the delimiter between "h" and "m", takes it
- // and appends it after "mm" and then appends "ss" for the seconds. Also it checks
- // if the format string already does not contain the seconds part.
- //
- // It can happen that Qt uses the 'C' locale (it's a fallback) and that locale
- // has always ":ss" part in ShortFormat, so we need to remove it.
+ // and appends it after "mm" and then appends "ss" for the seconds.
function timeFormatCorrection(timeFormatString) {
var regexp = /(hh*)(.+)(mm)/i
var match = regexp.exec(timeFormatString);
@@ -498,7 +494,7 @@ Item {
// when uppercase H is used for hours, needs to be h or hh, so toLowerCase()
var result = hours.toLowerCase() + delimiter + minutes;
- if (main.showSeconds && timeFormatString.indexOf('s') == -1) {
+ if (main.showSeconds) {
result += delimiter + seconds;
}

3
plasma-workspace-5.6.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92ff2d455e1378119fd6cdf3e6dc20c8bafa3025802fbb05f1d787645d165a3f
size 7030116

3
plasma-workspace-5.6.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4cf8bfaa8bb5b759378cd65d8c439c716cef8c32061221ec248cb9187a098f5c
size 7030108

15
plasma5-workspace.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Apr 19 20:56:06 UTC 2016 - wbauer@tmo.at
- Add digitalclock-fix-show-seconds.patch: Fixes displaying seconds
in the digital clock which was broken with certain locales
("C" e.g.)
-------------------------------------------------------------------
Tue Apr 19 20:46:10 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.6.3
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.6.3.php
-------------------------------------------------------------------
Wed Apr 6 09:17:59 UTC 2016 - alarrosa@suse.com

9
plasma5-workspace.spec
View File

@ -18,9 +18,9 @@
%bcond_without lang
Name: plasma5-workspace
Version: 5.6.2
Version: 5.6.3
Release: 0
%define plasma_version 5.6.2
%define plasma_version 5.6.3
Summary: The KDE Plasma Workspace Components
License: GPL-2.0+
Group: System/GUI/KDE
@ -38,6 +38,8 @@ Patch2: fix-breeze-sddm-theme-with-many-users.patch
Patch3: kuiserver5_qApp.patch
# PATCH-FIX-OPENSUSE plasmashell-disable-windowclosing-on-logout.patch kde#349805 wbauer@tmo.at -- Prevent plasma from closing too early on logout resulting in an unusable desktop if the logout is cancelled
Patch4: plasmashell-disable-windowclosing-on-logout.patch
# PATCH-FIX-OPENSUSE digitalclock-fix-show-seconds.patch wbauer@tmo.at -- Fixes displaying seconds in the digital clock which was broken with certain locales
Patch5: digitalclock-fix-show-seconds.patch
# PATCHES 100-200 and above are from upstream 5.6 branch
# PATCHES 201-300 and above are from upstream master/5.7 branch
BuildRequires: kf5-filesystem
@ -73,7 +75,7 @@ BuildRequires: cmake(KF5Wayland) >= %{plasma_version}
BuildRequires: cmake(KF5XmlRpcClient)
BuildRequires: cmake(KScreenLocker) >= %{plasma_version}
BuildRequires: cmake(KWinDBusInterface) >= %{plasma_version}
BuildRequires: cmake(Phonon4Qt5) >= 4.6.60
BuildRequires: phonon4qt5-devel >= 4.6.60
BuildRequires: cmake(Qt5Concurrent) >= 5.4.0
BuildRequires: cmake(Qt5DBus) >= 5.4.0
BuildRequires: cmake(Qt5Network) >= 5.4.0
@ -211,6 +213,7 @@ workspace. Development files.
%if 0%{?is_opensuse} || 0%{?suse_version} > 1315
%patch4 -p1
%endif
%patch5 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5