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

Accepting request 339669 from KDE:Frameworks5

Browse Source 
- Move sddm theme to upstream branding subpackage, so we can have
  branded sddm theme (boo#950796)

- Let XEmbed icons appear in plasma, i.e. require xembed-sni-proxy
  package (boo#913339)

- Add fix-wayland-requirement.patch that reduces the requirement
  of wayland 1.3 in CMakeLists.txt to 1.2 for SLE12 since the 1.2
  version in SLE12 is patched to include the needed features from 1.3

- Update to 5.4.2:
  * For more details please see:
    https://www.kde.org/announcements/plasma-5.4.2.php
- Drop fix-logout-button-sizing.patch, upstreamed

OBS-URL: https://build.opensuse.org/request/show/339669
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2015-10-19 20:44:25 +00:00 committed by Git OBS Bridge
commit 8cb006b98d
6 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fix-logout-button-sizing.patch
View File

@ -1,30 +0,0 @@
From: Aleix Pol <aleixpol@kde.org>
Date: Tue, 15 Sep 2015 09:16:16 +0000
Subject: Make sure the cancel and shutdown/logout button have the same size
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=93bf81eea152e2b8261ac4a854207af448ed7c43
---
Make sure the cancel and shutdown/logout button have the same size
REVIEW: 125235
---
--- a/lookandfeel/contents/components/LogoutScreen.qml
+++ b/lookandfeel/contents/components/LogoutScreen.qml
@@ -130,12 +130,15 @@
anchors.centerIn: parent
PlasmaComponents.Button {
+ id: cancelButton
text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Cancel")
onClicked: root.cancel()
+ Layout.preferredWidth: Math.max(commitButton.implicitWidth, cancelButton.implicitWidth)
}
PlasmaComponents.Button {
id: commitButton
+ Layout.preferredWidth: Math.max(commitButton.implicitWidth, cancelButton.implicitWidth)
onClicked: root.currentAction()
focus: true

13
fix-wayland-requirement.patch Normal file
View File

@ -0,0 +1,13 @@
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")

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

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6084d5885d815301115dd18d65c739e8968c3feb854f5d052348b5062a381795
size 6957164

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36c7b04b30533b9b14440b1286f1130222f2212bfa8f2f033a4ff928a923d22f
size 6959316

27
plasma5-workspace.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Sun Oct 18 16:21:21 UTC 2015 - hrvoje.senjan@gmail.com
- Move sddm theme to upstream branding subpackage, so we can have
branded sddm theme (boo#950796)
-------------------------------------------------------------------
Fri Oct 16 17:02:09 UTC 2015 - hrvoje.senjan@gmail.com
- Let XEmbed icons appear in plasma, i.e. require xembed-sni-proxy
package (boo#913339)
-------------------------------------------------------------------
Mon Oct 5 18:25:46 UTC 2015 - alarrosa@suse.com
- Add fix-wayland-requirement.patch that reduces the requirement
of wayland 1.3 in CMakeLists.txt to 1.2 for SLE12 since the 1.2
version in SLE12 is patched to include the needed features from 1.3
-------------------------------------------------------------------
Sun Oct 4 10:44:29 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.4.2:
* For more details please see:
https://www.kde.org/announcements/plasma-5.4.2.php
- Drop fix-logout-button-sizing.patch, upstreamed
-------------------------------------------------------------------
Wed Sep 16 18:39:29 UTC 2015 - lbeltrame@kde.org

18
plasma5-workspace.spec
View File

@ -18,7 +18,7 @@
%bcond_without lang
Name: plasma5-workspace
Version: 5.4.1
Version: 5.4.2
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0+
@ -31,8 +31,8 @@ Source99: %{name}-rpmlintrc
Patch0: 0001-Rename-qdbus-in-startkde.patch
# PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8
Patch1: create_kdehome.patch
# PATCH-FIX-UPSTREAM: fix-logout-button-sizing.patch lbeltrame@kde.org -- Ensure all logout buttons have the same size
Patch2: fix-logout-button-sizing.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
# PATCHES 100-200 and above are from upstream 5.3 branch
# PATCHES 201-300 and above are from upstream master/5.4 branch
@ -70,7 +70,12 @@ BuildRequires: phonon4qt5-devel
BuildRequires: plasma-framework-devel >= 5.12.0
BuildRequires: solid-devel >= 5.12.0
BuildRequires: update-desktop-files
%if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse}
# We have a patched wayland 1.2.1 version in SLE12 with the required features from 1.3.0
BuildRequires: wayland-devel >= 1.2.1
%else
BuildRequires: wayland-devel >= 1.3.0
%endif
BuildRequires: xz
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.4.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0
@ -125,6 +130,7 @@ Requires: oxygen5-sounds >= %{version}
%requires_ge plasma-framework-private
Requires: kactivities5
Requires: kio-extras5
Requires: xembed-sni-proxy
# notifications...
Recommends: phonon4qt5-backend
# people should be able to adjust desktop
@ -192,7 +198,9 @@ workspace. Development files.
%setup -q -n plasma-workspace-%{version}
%patch0 -p1
%patch1 -p1
%if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse}
%patch2 -p1
%endif
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
@ -276,7 +284,6 @@ workspace. Development files.
%{_kf5_sharedir}/kstyle/
%{_kf5_plasmadir}/
%{_kf5_sharedir}/solid/
%{_kf5_sharedir}/sddm/
%{_kf5_sharedir}/kio_desktop/
%files -n drkonqi5
@ -290,6 +297,9 @@ workspace. Development files.
%files branding-upstream
%defattr(-,root,root)
%doc COPYING*
%dir %{_kf5_sharedir}/sddm
%dir %{_kf5_sharedir}/sddm/themes
%{_kf5_sharedir}/sddm/themes/breeze/
%files devel
%defattr(-,root,root)