OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=205

digitalclock-fix-show-seconds.patch

@@ -1,26 +0,0 @@
-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;
-         }
- 

kuiserver5_qApp.patch

@@ -1,34 +0,0 @@
-diff --git a/kuiserver/CMakeLists.txt b/kuiserver/CMakeLists.txt
-index 0f7c29e..b9638aa 100644
---- a/kuiserver/CMakeLists.txt
-+++ b/kuiserver/CMakeLists.txt
-@@ -61,6 +61,7 @@ endif ()
- 
- target_link_libraries(kdeinit_kuiserver5
-     Qt5::DBus
-+    Qt5::Widgets
-     KF5::ConfigWidgets
-     KF5::DBusAddons
-     KF5::ItemViews
-diff --git a/kuiserver/main.cpp b/kuiserver/main.cpp
-index 3cc118a..9dd1ad3 100644
---- a/kuiserver/main.cpp
-+++ b/kuiserver/main.cpp
-@@ -28,6 +28,7 @@
- #include <kdbusservice.h>
- 
- #include <QCommandLineParser>
-+#include <QApplication>
- 
- Q_LOGGING_CATEGORY(KUISERVER, "kuiserver")
- 
-@@ -35,7 +36,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
- {
-     QLoggingCategory::setFilterRules(QStringLiteral("kuiserver.debug = true"));
- 
--    QCoreApplication app(argc, argv);
-+    QApplication app(argc, argv);
-     app.setApplicationName(QStringLiteral("kuiserver"));
-     app.setApplicationVersion(QStringLiteral("2.0"));
-     app.setOrganizationDomain(QStringLiteral("kde.org"));
-

plasma5-workspace.changes

@@ -5,6 +5,8 @@ Sun May 15 16:50:24 UTC 2016 - hrvoje.senjan@gmail.com
   * New bugfix release
   * For more details please see:
     https://www.kde.org/announcements/plasma-5.6.4.php
+- Drop upstreamed patches:
+  digitalclock-fix-show-seconds.patch and kuiserver5_qApp.patch
 
 -------------------------------------------------------------------
 Tue Apr 19 20:56:06 UTC 2016 - wbauer@tmo.at

plasma5-workspace.spec

@@ -34,12 +34,8 @@ Patch0:         0001-Rename-qdbus-in-startkde.patch
 Patch1:         create_kdehome.patch
 # PATCH-FIX_OPENSUSE fix-breeze-sddm-theme-with-many-users.patch alarrosa@suse.com -- Asks for user/password and hide the user list when there's a large number of users
 Patch2:         fix-breeze-sddm-theme-with-many-users.patch
-# PATCH-FIX_OPENSUSE kuiserver5_qApp.patch -- kuiserver can't be a QCoreApplications as it uses QWidget
-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
@@ -209,11 +205,9 @@ workspace. Development files.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %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