Accepting request 349239 from KDE:Frameworks5
Update to 5.5.1 OBS-URL: https://build.opensuse.org/request/show/349239 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=29
This commit is contained in:
commit
247e7bbf64
@ -1,22 +1,24 @@
|
|||||||
Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml
|
Index: plasma-workspace-5.5.0/lookandfeel/contents/components/UserSelect.qml
|
||||||
===================================================================
|
===================================================================
|
||||||
--- plasma-workspace-5.4.3.orig/lookandfeel/contents/components/UserSelect.qml 2015-11-11 16:10:23.021419038 +0100
|
--- plasma-workspace-5.5.0.orig/lookandfeel/contents/components/UserSelect.qml
|
||||||
+++ plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml 2015-11-11 15:25:12.570242837 +0100
|
+++ plasma-workspace-5.5.0/lookandfeel/contents/components/UserSelect.qml
|
||||||
@@ -27,9 +27,13 @@
|
@@ -27,11 +27,15 @@ FocusScope {
|
||||||
id: root
|
id: root
|
||||||
property alias model: usersList.model
|
property alias model: usersList.model
|
||||||
property alias selectedUser: usersList.selectedUser
|
property alias selectedUser: usersList.selectedUser
|
||||||
+ property var username: usersList.visible ? usersList.selectedUser : userPasswordPrompt.username
|
+ property var username: usersList.visible ? usersList.selectedUser : userPasswordPrompt.username
|
||||||
+ property alias password: userPasswordPrompt.password
|
+ property alias password: userPasswordPrompt.password
|
||||||
property alias selectedIndex: usersList.currentIndex
|
property alias selectedIndex: usersList.currentIndex
|
||||||
|
property alias selectedItem: usersList.currentItem
|
||||||
property alias delegate: usersList.delegate
|
property alias delegate: usersList.delegate
|
||||||
property alias notification: notificationLabel.text
|
property alias notification: notificationLabel.text
|
||||||
|
property alias infoPaneVisible: infoPaneLoader.active
|
||||||
+ property bool showUserList: (usersList.model.count && usersList.model.disableAvatarsThreshold) ? usersList.model.count <= usersList.model.disableAvatarsThreshold : true
|
+ property bool showUserList: (usersList.model.count && usersList.model.disableAvatarsThreshold) ? usersList.model.count <= usersList.model.disableAvatarsThreshold : true
|
||||||
+ property alias pwFieldEnabled: userPasswordPrompt.pwFieldEnabled
|
+ property alias pwFieldEnabled: userPasswordPrompt.pwFieldEnabled
|
||||||
|
|
||||||
activeFocusOnTab: true
|
activeFocusOnTab: true
|
||||||
|
|
||||||
@@ -41,6 +45,10 @@
|
@@ -43,6 +47,10 @@ FocusScope {
|
||||||
usersList.decrementCurrentIndex()
|
usersList.decrementCurrentIndex()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -24,19 +26,19 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml
|
|||||||
+ userPasswordPrompt.reenablePasswordInput();
|
+ userPasswordPrompt.reenablePasswordInput();
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
InfoPane {
|
Loader {
|
||||||
id: infoPane
|
id: infoPaneLoader
|
||||||
anchors {
|
anchors {
|
||||||
@@ -54,6 +62,7 @@
|
@@ -57,6 +65,7 @@ FocusScope {
|
||||||
id: usersList
|
id: usersList
|
||||||
|
|
||||||
focus: true
|
focus: true
|
||||||
+ visible: root.showUserList
|
+ visible: root.showUserList
|
||||||
|
|
||||||
Rectangle {//debug
|
anchors {
|
||||||
visible: debug
|
top: parent.top
|
||||||
@@ -84,6 +93,21 @@
|
@@ -96,6 +105,21 @@ FocusScope {
|
||||||
}
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
+ UserPasswordPrompt {
|
+ UserPasswordPrompt {
|
||||||
@ -120,7 +122,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- plasma-workspace-5.4.3.orig/lookandfeel/contents/loginmanager/Main.qml 2015-11-05 13:49:30.000000000 +0100
|
--- plasma-workspace-5.4.3.orig/lookandfeel/contents/loginmanager/Main.qml 2015-11-05 13:49:30.000000000 +0100
|
||||||
+++ plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml 2015-11-11 15:25:12.832242854 +0100
|
+++ plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml 2015-11-11 15:25:12.832242854 +0100
|
||||||
@@ -71,6 +71,9 @@
|
@@ -74,6 +74,9 @@ Image {
|
||||||
|
|
||||||
initialItem: BreezeBlock {
|
initialItem: BreezeBlock {
|
||||||
id: loginPrompt
|
id: loginPrompt
|
||||||
@ -130,7 +132,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
|
|||||||
|
|
||||||
//Enable clipping whilst animating, otherwise the items would be shifted to other screens in multiscreen setups
|
//Enable clipping whilst animating, otherwise the items would be shifted to other screens in multiscreen setups
|
||||||
//As there are only 2 items (loginPrompt and logoutScreenComponent), it's sufficient to do it only in this component
|
//As there are only 2 items (loginPrompt and logoutScreenComponent), it's sufficient to do it only in this component
|
||||||
@@ -126,13 +129,14 @@
|
@@ -129,13 +132,14 @@ Image {
|
||||||
echoMode: TextInput.Password
|
echoMode: TextInput.Password
|
||||||
onAccepted: loginPrompt.startLogin()
|
onAccepted: loginPrompt.startLogin()
|
||||||
focus: true
|
focus: true
|
||||||
@ -146,7 +148,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
|
|||||||
onTriggered: passwordInput.forceActiveFocus()
|
onTriggered: passwordInput.forceActiveFocus()
|
||||||
}
|
}
|
||||||
//end hack
|
//end hack
|
||||||
@@ -218,9 +222,13 @@
|
@@ -221,9 +225,13 @@ Image {
|
||||||
target: sddm
|
target: sddm
|
||||||
onLoginFailed: {
|
onLoginFailed: {
|
||||||
//Re-enable button and textfield
|
//Re-enable button and textfield
|
||||||
@ -163,7 +165,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
|
|||||||
loginButton.enabled = true;
|
loginButton.enabled = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -229,11 +237,12 @@
|
@@ -232,11 +240,12 @@ Image {
|
||||||
|
|
||||||
function startLogin () {
|
function startLogin () {
|
||||||
//Disable button and textfield while password check is running
|
//Disable button and textfield while password check is running
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
Index: plasma-workspace-5.4.1/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- plasma-workspace-5.4.1.orig/CMakeLists.txt
|
|
||||||
+++ plasma-workspace-5.4.1/CMakeLists.txt
|
|
||||||
@@ -90,7 +90,7 @@ set_package_properties(KF5Wayland PROPER
|
|
||||||
TYPE REQUIRED
|
|
||||||
PURPOSE "Required for building screenlocker")
|
|
||||||
find_package(WaylandScanner)
|
|
||||||
-find_package(Wayland 1.3 COMPONENTS Client Server)
|
|
||||||
+find_package(Wayland 1.2 COMPONENTS Client Server)
|
|
||||||
set_package_properties(Wayland PROPERTIES
|
|
||||||
TYPE REQUIRED
|
|
||||||
PURPOSE "Required for building screenlocker")
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:bfe459234e1bcd8ed5c3a64524061330e92e38ec693099d5007048a483c71d0c
|
|
||||||
size 8648136
|
|
3
plasma-workspace-5.5.1.1.tar.xz
Normal file
3
plasma-workspace-5.5.1.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:7e91dac2301975ae8ee788deddc9e4ac8c5f699865e85d09cefe0f9f29ac3705
|
||||||
|
size 7383100
|
@ -1,3 +1,47 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 15 17:50:01 UTC 2015 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
- Update to 5.5.1:
|
||||||
|
* Bugfix release
|
||||||
|
* For more details please see:
|
||||||
|
https://www.kde.org/announcements/plasma-5.5.1.php
|
||||||
|
- Drop upstreamed patches:
|
||||||
|
0001-notifications-Check-if-the-popup-is-visible-before-u.patch
|
||||||
|
0002-notifications-Move-reading-globalConfig-from-ctor-to.patch
|
||||||
|
0003-Make-comment-section-of-the-timezones-configuration-.patch
|
||||||
|
0004-notifications-Fix-default-notification-position-sett.patch
|
||||||
|
0001-Forward-mouse-enter-and-leave-events-on-feathered-ed.patch
|
||||||
|
kde355684.patch
|
||||||
|
use-old-connect-syntax.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Dec 12 17:32:52 UTC 2015 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
- Update to 5.5.0:
|
||||||
|
* For more details please see:
|
||||||
|
https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork
|
||||||
|
- Move to cmake(...) BuildRequires where possible
|
||||||
|
- Drop no longer needed fix-wayland-requirement.patch and rb125743.patch
|
||||||
|
- Added patches from upstream:
|
||||||
|
0001-notifications-Check-if-the-popup-is-visible-before-u.patch
|
||||||
|
0002-notifications-Move-reading-globalConfig-from-ctor-to.patch
|
||||||
|
0003-Make-comment-section-of-the-timezones-configuration-.patch
|
||||||
|
0004-notifications-Fix-default-notification-position-sett.patch
|
||||||
|
0001-Forward-mouse-enter-and-leave-events-on-feathered-ed.patch
|
||||||
|
kde355684.patch
|
||||||
|
use-old-connect-syntax.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 4 12:02:33 UTC 2015 - alarrosa@suse.com
|
||||||
|
|
||||||
|
- Rebased fix-breeze-sddm-theme-with-many-users.patch in preparation
|
||||||
|
for 5.5.0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 25 23:58:24 UTC 2015 - opensuse@cboltz.de
|
||||||
|
|
||||||
|
- add dependency on xprop (called by /usr/bin/startkde)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Nov 20 15:03:49 UTC 2015 - alarrosa@suse.com
|
Fri Nov 20 15:03:49 UTC 2015 - alarrosa@suse.com
|
||||||
|
|
||||||
|
@ -18,8 +18,9 @@
|
|||||||
|
|
||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
Name: plasma5-workspace
|
Name: plasma5-workspace
|
||||||
Version: 5.4.3
|
Version: 5.5.1.1
|
||||||
Release: 0
|
Release: 0
|
||||||
|
%define plasma_version 5.5.1
|
||||||
Summary: The KDE Plasma Workspace Components
|
Summary: The KDE Plasma Workspace Components
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
Group: System/GUI/KDE
|
Group: System/GUI/KDE
|
||||||
@ -31,111 +32,106 @@ Source99: %{name}-rpmlintrc
|
|||||||
Patch0: 0001-Rename-qdbus-in-startkde.patch
|
Patch0: 0001-Rename-qdbus-in-startkde.patch
|
||||||
# PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8
|
# PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8
|
||||||
Patch1: create_kdehome.patch
|
Patch1: create_kdehome.patch
|
||||||
# PATCH-FIX_OPENSUSE fix-wayland-requirement.patch alarrosa@suse.com -- Change wayland requirement from 1.3.0 to 1.2.1
|
|
||||||
Patch2: fix-wayland-requirement.patch
|
|
||||||
Patch3: rb125743.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
|
# 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
|
||||||
Patch4: fix-breeze-sddm-theme-with-many-users.patch
|
Patch2: fix-breeze-sddm-theme-with-many-users.patch
|
||||||
# PATCHES 100-200 and above are from upstream 5.3 branch
|
# PATCHES 100-200 and above are from upstream 5.5 branch
|
||||||
# PATCHES 201-300 and above are from upstream master/5.4 branch
|
# PATCHES 201-300 and above are from upstream master/5.6 branch
|
||||||
|
|
||||||
BuildRequires: alsa-devel
|
|
||||||
BuildRequires: baloo5-devel >= %{version}
|
|
||||||
BuildRequires: kactivities5-devel >= 5.12.0
|
|
||||||
BuildRequires: kcmutils-devel >= 5.12.0
|
|
||||||
BuildRequires: kcoreaddons-devel >= 5.12.0
|
|
||||||
BuildRequires: kcrash-devel >= 5.12.0
|
|
||||||
BuildRequires: kdbusaddons-devel >= 5.12.0
|
|
||||||
BuildRequires: kdeclarative-devel >= 5.12.0
|
|
||||||
BuildRequires: kdelibs4support-devel >= 5.12.0
|
|
||||||
BuildRequires: kdesu-devel >= 5.12.0
|
|
||||||
BuildRequires: kdewebkit-devel >= 5.12.0
|
|
||||||
BuildRequires: kdoctools-devel >= 5.12.0
|
|
||||||
BuildRequires: kf5-filesystem
|
BuildRequires: kf5-filesystem
|
||||||
BuildRequires: kglobalaccel-devel >= 5.12.0
|
|
||||||
BuildRequires: kidletime-devel >= 5.12.0
|
|
||||||
BuildRequires: kjsembed-devel >= 5.12.0
|
|
||||||
BuildRequires: knewstuff-devel >= 5.12.0
|
|
||||||
BuildRequires: knotifyconfig-devel >= 5.12.0
|
|
||||||
BuildRequires: kpackage-devel >= 5.12.0
|
|
||||||
BuildRequires: krunner-devel >= 5.12.0
|
|
||||||
BuildRequires: ktexteditor-devel >= 5.12.0
|
|
||||||
BuildRequires: kwallet-framework-devel >= 5.12.0
|
|
||||||
BuildRequires: kwayland-devel >= %{version}
|
|
||||||
BuildRequires: kwin5-devel >= %{version}
|
|
||||||
BuildRequires: kxmlrpcclient5-devel >= 5.12.0
|
|
||||||
BuildRequires: libKF5NetworkManagerQt-devel >= 5.12.0
|
|
||||||
BuildRequires: libkscreen2-devel >= %{version}
|
|
||||||
BuildRequires: libksysguard5-devel >= %{version}
|
|
||||||
BuildRequires: libxcb-devel
|
|
||||||
BuildRequires: pam-devel
|
|
||||||
BuildRequires: phonon4qt5-devel
|
|
||||||
BuildRequires: plasma-framework-devel >= 5.12.0
|
|
||||||
BuildRequires: solid-devel >= 5.12.0
|
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
%if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse}
|
BuildRequires: cmake(KF5Activities) >= 5.15.0
|
||||||
# We have a patched wayland 1.2.1 version in SLE12 with the required features from 1.3.0
|
BuildRequires: cmake(KF5Baloo)
|
||||||
BuildRequires: wayland-devel >= 1.2.1
|
BuildRequires: cmake(KF5CoreAddons) >= 5.15.0
|
||||||
%else
|
BuildRequires: cmake(KF5Crash) >= 5.15.0
|
||||||
BuildRequires: wayland-devel >= 1.3.0
|
BuildRequires: cmake(KF5DBusAddons) >= 5.15.0
|
||||||
%endif
|
BuildRequires: cmake(KF5Declarative) >= 5.15.0
|
||||||
BuildRequires: pam-config
|
BuildRequires: cmake(KF5DocTools) >= 5.15.0
|
||||||
BuildRequires: xz
|
BuildRequires: cmake(KF5GlobalAccel) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.4.0
|
BuildRequires: cmake(KF5I18n) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0
|
BuildRequires: cmake(KF5IdleTime) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(Qt5Qml) >= 5.4.0
|
BuildRequires: cmake(KF5JsEmbed) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(Qt5Quick) >= 5.4.0
|
BuildRequires: cmake(KF5KCMUtils) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(Qt5Script) >= 5.4.0
|
BuildRequires: cmake(KF5KDELibs4Support) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(Qt5Sql) >= 5.4.0
|
BuildRequires: cmake(KF5NetworkManagerQt) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(Qt5Test) >= 5.4.0
|
BuildRequires: cmake(KF5NewStuff) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0
|
BuildRequires: cmake(KF5NotifyConfig) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0
|
BuildRequires: cmake(KF5Package) >= 5.15.0
|
||||||
BuildRequires: pkgconfig(dbusmenu-qt5)
|
BuildRequires: cmake(KF5Plasma) >= 5.15.0
|
||||||
|
BuildRequires: cmake(KF5PlasmaQuick)
|
||||||
|
BuildRequires: cmake(KF5Runner) >= 5.15.0
|
||||||
|
BuildRequires: cmake(KF5Screen) >= 5.0.93
|
||||||
|
BuildRequires: cmake(KF5Solid) >= 5.15.0
|
||||||
|
BuildRequires: cmake(KF5Su) >= 5.15.0
|
||||||
|
BuildRequires: cmake(KF5SysGuard) >= %{plasma_version}
|
||||||
|
BuildRequires: cmake(KF5TextEditor)
|
||||||
|
BuildRequires: cmake(KF5TextWidgets) >= 5.15.0
|
||||||
|
BuildRequires: cmake(KF5Wallet) >= 5.15.0
|
||||||
|
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: cmake(Qt5Concurrent) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5DBus) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5Network) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5Qml) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5Quick) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5QuickWidgets) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5Script) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5Sql) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5Test) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5Widgets) >= 5.4.0
|
||||||
|
BuildRequires: cmake(Qt5X11Extras) >= 5.4.0
|
||||||
|
BuildRequires: cmake(ScreenSaverDBusInterface) >= %{plasma_version}
|
||||||
|
BuildRequires: cmake(dbusmenu-qt5)
|
||||||
|
BuildRequires: pkgconfig(libgps)
|
||||||
BuildRequires: pkgconfig(libqalculate)
|
BuildRequires: pkgconfig(libqalculate)
|
||||||
BuildRequires: pkgconfig(sm)
|
BuildRequires: pkgconfig(sm)
|
||||||
BuildRequires: pkgconfig(x11)
|
BuildRequires: pkgconfig(x11)
|
||||||
BuildRequires: pkgconfig(xcb-icccm)
|
BuildRequires: pkgconfig(xcb)
|
||||||
|
BuildRequires: pkgconfig(xcb-composite)
|
||||||
|
BuildRequires: pkgconfig(xcb-damage)
|
||||||
BuildRequires: pkgconfig(xcb-image)
|
BuildRequires: pkgconfig(xcb-image)
|
||||||
BuildRequires: pkgconfig(xcb-keysyms)
|
BuildRequires: pkgconfig(xcb-randr)
|
||||||
BuildRequires: pkgconfig(xcursor)
|
BuildRequires: pkgconfig(xcb-shm)
|
||||||
BuildRequires: pkgconfig(xi)
|
BuildRequires: pkgconfig(xcb-util)
|
||||||
BuildRequires: pkgconfig(xrender)
|
BuildRequires: pkgconfig(xcb-xfixes)
|
||||||
BuildRequires: pkgconfig(zlib)
|
BuildRequires: pkgconfig(zlib)
|
||||||
Requires(post): pam-config
|
|
||||||
Conflicts: kdebase4-workspace < 5.3.0
|
Conflicts: kdebase4-workspace < 5.3.0
|
||||||
# Some files have been moved from kio-extras5 to plasma5-workspace in 5.4. This should prevent a possible file conflict. (boo#944656)
|
# Some files have been moved from kio-extras5 to plasma5-workspace in 5.4. This should prevent a possible file conflict. (boo#944656)
|
||||||
Conflicts: kio-extras5 < 15.08.0
|
Conflicts: kio-extras5 < 15.08.0
|
||||||
Requires: %{name}-branding = %{version}
|
Requires: %{name}-branding = %{plasma_version}
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
# used within startup
|
# used within startup
|
||||||
Requires: kde-cli-tools5 >= %{version}
|
Requires: kde-cli-tools5 >= %{plasma_version}
|
||||||
Requires: kded
|
Requires: kded
|
||||||
Requires: kdelibs4support
|
Requires: kdelibs4support
|
||||||
Requires: kinit
|
Requires: kinit
|
||||||
Requires: kwin5 >= %{version}
|
Requires: kscreenlocker >= %{plasma_version}
|
||||||
|
Requires: kwin5 >= %{plasma_version}
|
||||||
Requires: libqt5-qttools >= 5.4.0
|
Requires: libqt5-qttools >= 5.4.0
|
||||||
|
# /usr/bin/startkde calls xprop
|
||||||
|
Requires: xprop
|
||||||
# contains default style, cursors, etc
|
# contains default style, cursors, etc
|
||||||
Requires: breeze >= %{version}
|
Requires: breeze >= %{plasma_version}
|
||||||
# needed by krunner
|
# needed by krunner
|
||||||
Requires: milou5 >= %{version}
|
Requires: milou5 >= %{plasma_version}
|
||||||
# heavily used by plasma
|
# heavily used by plasma
|
||||||
Requires: libqt5-qtquickcontrols
|
Requires: libqt5-qtquickcontrols
|
||||||
# battery applet
|
# battery applet
|
||||||
Requires: drkonqi5 >= %{version}
|
Requires: drkonqi5 >= %{plasma_version}
|
||||||
Requires: kglobalaccel5 >= %{version}
|
Requires: kglobalaccel5 >= %{plasma_version}
|
||||||
Requires: solid-imports
|
Requires: solid-imports
|
||||||
# dialog/platformtheme/etc
|
# dialog/platformtheme/etc
|
||||||
Requires: frameworkintegration-plugin
|
Requires: frameworkintegration-plugin
|
||||||
Requires: kscreen5 >= %{version}
|
Requires: kscreen5 >= %{plasma_version}
|
||||||
Requires: libkscreen2-plugin >= %{version}
|
Requires: libkscreen2-plugin >= %{plasma_version}
|
||||||
# boo#912317
|
# boo#912317
|
||||||
Requires: oxygen5-sounds >= %{version}
|
Requires: oxygen5-sounds >= %{plasma_version}
|
||||||
# hardcode versions of plasma-framework-componets and plasma-framework-private packages, as upstream doesn't keep backwards compability there
|
# hardcode versions of plasma-framework-componets and plasma-framework-private packages, as upstream doesn't keep backwards compability there
|
||||||
%requires_ge plasma-framework-components
|
%requires_ge plasma-framework-components
|
||||||
%requires_ge plasma-framework-private
|
%requires_ge plasma-framework-private
|
||||||
Requires: kactivities5
|
Requires: kactivities5
|
||||||
Requires: kio-extras5
|
Requires: kio-extras5
|
||||||
Requires: xembed-sni-proxy
|
|
||||||
# notifications...
|
# notifications...
|
||||||
Recommends: phonon4qt5-backend
|
Recommends: phonon4qt5-backend
|
||||||
# people should be able to adjust desktop
|
# people should be able to adjust desktop
|
||||||
@ -143,6 +139,8 @@ Recommends: systemsettings5
|
|||||||
# so Qt4-only apps have some colors in tray
|
# so Qt4-only apps have some colors in tray
|
||||||
Recommends: sni-qt
|
Recommends: sni-qt
|
||||||
Recommends: %{name}-lang
|
Recommends: %{name}-lang
|
||||||
|
Provides: xembed-sni-proxy = %{version}
|
||||||
|
Obsoletes: xembed-sni-proxy < %{version}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -151,7 +149,7 @@ This package contains the basic packages for a Plasma workspace.
|
|||||||
%package branding-upstream
|
%package branding-upstream
|
||||||
Summary: The KDE Plasma Workspace Components
|
Summary: The KDE Plasma Workspace Components
|
||||||
Group: System/GUI/KDE
|
Group: System/GUI/KDE
|
||||||
Provides: %{name}-branding = %{version}
|
Provides: %{name}-branding = %{plasma_version}
|
||||||
Supplements: packageand(plasma5-workspace:branding-upstream)
|
Supplements: packageand(plasma5-workspace:branding-upstream)
|
||||||
Conflicts: otherproviders(%{name}-branding)
|
Conflicts: otherproviders(%{name}-branding)
|
||||||
|
|
||||||
@ -190,6 +188,7 @@ workspace.
|
|||||||
Summary: The KDE Plasma Workspace Components
|
Summary: The KDE Plasma Workspace Components
|
||||||
Group: Development/Libraries/KDE
|
Group: Development/Libraries/KDE
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
|
Requires: cmake(KF5SysGuard) >= %{plasma_version}
|
||||||
Conflicts: kdebase4-workspace-devel
|
Conflicts: kdebase4-workspace-devel
|
||||||
Provides: plasma-workspace5-devel = %{version}
|
Provides: plasma-workspace5-devel = %{version}
|
||||||
Obsoletes: plasma-workspace5-devel <= %{version}
|
Obsoletes: plasma-workspace5-devel <= %{version}
|
||||||
@ -200,14 +199,10 @@ workspace. Development files.
|
|||||||
|
|
||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n plasma-workspace-%{version}
|
%setup -q -n plasma-workspace-%{plasma_version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse}
|
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%endif
|
|
||||||
%patch3 -p1
|
|
||||||
%patch4 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
|
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
|
||||||
@ -219,12 +214,9 @@ workspace. Development files.
|
|||||||
%{buildroot}/usr/bin/installdbgsymbols.sh
|
%{buildroot}/usr/bin/installdbgsymbols.sh
|
||||||
# we have a separate package for Plasma5 session
|
# we have a separate package for Plasma5 session
|
||||||
rm -rfv %{buildroot}%{_kf5_sharedir}/xsessions
|
rm -rfv %{buildroot}%{_kf5_sharedir}/xsessions
|
||||||
|
rm -rfv %{buildroot}%{_kf5_sharedir}/wayland-sessions
|
||||||
|
|
||||||
%post
|
%post -p /sbin/ldconfig
|
||||||
# boo#931296
|
|
||||||
/usr/sbin/pam-config -d --unix2 || :
|
|
||||||
/usr/sbin/pam-config -a --unix || :
|
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
@ -243,6 +235,7 @@ workspace. Development files.
|
|||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc COPYING*
|
%doc COPYING*
|
||||||
|
%{_kf5_bindir}/xembedsniproxy
|
||||||
%{_kf5_bindir}/kcheckrunning
|
%{_kf5_bindir}/kcheckrunning
|
||||||
%{_kf5_bindir}/kcminit
|
%{_kf5_bindir}/kcminit
|
||||||
%{_kf5_bindir}/kcminit_startup
|
%{_kf5_bindir}/kcminit_startup
|
||||||
@ -261,12 +254,11 @@ workspace. Development files.
|
|||||||
%{_kf5_configdir}/autostart/org.kde.klipper.desktop
|
%{_kf5_configdir}/autostart/org.kde.klipper.desktop
|
||||||
%{_kf5_configdir}/autostart/plasmashell.desktop
|
%{_kf5_configdir}/autostart/plasmashell.desktop
|
||||||
%{_kf5_configdir}/autostart/krunner.desktop
|
%{_kf5_configdir}/autostart/krunner.desktop
|
||||||
|
%{_kf5_configdir}/autostart/xembedsniproxy.desktop
|
||||||
%config %{_kf5_configdir}/plasmoids.knsrc
|
%config %{_kf5_configdir}/plasmoids.knsrc
|
||||||
%config %{_kf5_configdir}/wallpaper.knsrc
|
%config %{_kf5_configdir}/wallpaper.knsrc
|
||||||
%config %{_kf5_configdir}/taskmanagerrulesrc
|
%config %{_kf5_configdir}/taskmanagerrulesrc
|
||||||
%dir %{_kf5_libdir}/libexec
|
%dir %{_kf5_libdir}/libexec
|
||||||
%{_kf5_libdir}/libexec/kcheckpass
|
|
||||||
%{_kf5_libdir}/libexec/kscreenlocker_greet
|
|
||||||
%{_kf5_libdir}/libexec/ksyncdbusenv
|
%{_kf5_libdir}/libexec/ksyncdbusenv
|
||||||
%{_kf5_libdir}/libexec/startplasma
|
%{_kf5_libdir}/libexec/startplasma
|
||||||
%{_kf5_libdir}/libkdeinit5_kcminit.so
|
%{_kf5_libdir}/libkdeinit5_kcminit.so
|
||||||
@ -289,7 +281,6 @@ workspace. Development files.
|
|||||||
%{_kf5_notifydir}/
|
%{_kf5_notifydir}/
|
||||||
%{_kf5_servicesdir}/
|
%{_kf5_servicesdir}/
|
||||||
%{_kf5_servicetypesdir}/
|
%{_kf5_servicetypesdir}/
|
||||||
%{_kf5_sharedir}/kconf_update/
|
|
||||||
%{_kf5_sharedir}/ksmserver/
|
%{_kf5_sharedir}/ksmserver/
|
||||||
%{_kf5_sharedir}/ksplash/
|
%{_kf5_sharedir}/ksplash/
|
||||||
%{_kf5_sharedir}/kstyle/
|
%{_kf5_sharedir}/kstyle/
|
||||||
@ -323,7 +314,6 @@ workspace. Development files.
|
|||||||
%{_kf5_libdir}/cmake/KSMServerDBusInterface/
|
%{_kf5_libdir}/cmake/KSMServerDBusInterface/
|
||||||
%{_kf5_libdir}/cmake/LibKWorkspace/
|
%{_kf5_libdir}/cmake/LibKWorkspace/
|
||||||
%{_kf5_libdir}/cmake/LibTaskManager/
|
%{_kf5_libdir}/cmake/LibTaskManager/
|
||||||
%{_kf5_libdir}/cmake/ScreenSaverDBusInterface/
|
|
||||||
%{_kf5_libdir}/libkworkspace5.so
|
%{_kf5_libdir}/libkworkspace5.so
|
||||||
%{_kf5_libdir}/libplasma-geolocation-interface.so
|
%{_kf5_libdir}/libplasma-geolocation-interface.so
|
||||||
%{_kf5_libdir}/libtaskmanager.so
|
%{_kf5_libdir}/libtaskmanager.so
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
diff --git a/lookandfeel/contents/splash/Splash.qml b/lookandfeel/contents/splash/Splash.qml
|
|
||||||
index fdeb1ea..b783263 100644
|
|
||||||
--- a/lookandfeel/contents/splash/Splash.qml
|
|
||||||
+++ b/lookandfeel/contents/splash/Splash.qml
|
|
||||||
@@ -22,6 +22,7 @@ import QtQuick 2.2
|
|
||||||
Image {
|
|
||||||
id: root
|
|
||||||
source: "../components/artwork/background.png"
|
|
||||||
+ fillMode: Image.PreserveAspectFit
|
|
||||||
|
|
||||||
property int stage
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user