From 6b1361b9d9124ea7b80db43b4dff49b9ca4f9b02be9ca510ced6d003257545d7 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 19 Apr 2016 20:51:52 +0000 Subject: [PATCH 1/3] 5.6.3 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=200 --- plasma-workspace-5.6.2.tar.xz | 3 --- plasma-workspace-5.6.3.tar.xz | 3 +++ plasma5-workspace.changes | 8 ++++++++ plasma5-workspace.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 plasma-workspace-5.6.2.tar.xz create mode 100644 plasma-workspace-5.6.3.tar.xz diff --git a/plasma-workspace-5.6.2.tar.xz b/plasma-workspace-5.6.2.tar.xz deleted file mode 100644 index 9c2a17f..0000000 --- a/plasma-workspace-5.6.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92ff2d455e1378119fd6cdf3e6dc20c8bafa3025802fbb05f1d787645d165a3f -size 7030116 diff --git a/plasma-workspace-5.6.3.tar.xz b/plasma-workspace-5.6.3.tar.xz new file mode 100644 index 0000000..d1b3ad8 --- /dev/null +++ b/plasma-workspace-5.6.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cf8bfaa8bb5b759378cd65d8c439c716cef8c32061221ec248cb9187a098f5c +size 7030108 diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index f77c185..12bf43c 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index cd4b20b..13d5794 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -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 From 0a1073dcf8f54761a5e8dd62bde1d894b96235ca1ea61b8c74458c439c616744 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 20 Apr 2016 06:02:26 +0000 Subject: [PATCH 2/3] Accepting request 390735 from home:wolfi323:KDE:Frameworks5 - Add digitalclock-fix-show-seconds.patch: Fixes displaying seconds in the digital clock which was broken with certain locales ("C" e.g.) OBS-URL: https://build.opensuse.org/request/show/390735 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=201 --- digitalclock-fix-show-seconds.patch | 26 ++++++++++++++++++++++++++ plasma5-workspace.changes | 7 +++++++ plasma5-workspace.spec | 3 +++ 3 files changed, 36 insertions(+) create mode 100644 digitalclock-fix-show-seconds.patch diff --git a/digitalclock-fix-show-seconds.patch b/digitalclock-fix-show-seconds.patch new file mode 100644 index 0000000..e28650f --- /dev/null +++ b/digitalclock-fix-show-seconds.patch @@ -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; + } + diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 12bf43c..a037584 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 13d5794..4e6eaf8 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -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 @@ -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 From cef9d4eed5d93f0a28028e9d81affe2813d3ba3dc9ad2e05f0d4ea616e1618a4 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 20 Apr 2016 06:03:13 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=202 --- plasma5-workspace.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 4e6eaf8..3ccf03c 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -75,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