Hello community, here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2015-09-24 07:15:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old) and /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes 2015-09-02 07:53:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes 2015-09-24 07:15:17.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Sep 16 18:39:29 UTC 2015 - [email protected] + +- Add fix-logout-button-sizing.patch: Upstream fix to ensure that + logout/shutdown and cancel buttons on the logout screen have + all the same size. + +------------------------------------------------------------------- +Thu Sep 10 17:19:32 UTC 2015 - [email protected] + +- Update to 5.4.1: + * For more details please see: + https://www.kde.org/announcements/plasma-5.4.1.php + +------------------------------------------------------------------- +Tue Sep 8 10:36:15 UTC 2015 - [email protected] + +- Add an explicit conflict with kio-extras5 < 15.08.0. Some files + from kio-extras5 have been moved to plasma5-workspace in 5.4, + this should prevent a possible file conflict. (boo#944656) + +------------------------------------------------------------------- Old: ---- plasma-workspace-5.4.0.tar.xz New: ---- fix-logout-button-sizing.patch plasma-workspace-5.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace.spec ++++++ --- /var/tmp/diff_new_pack.rRVELq/_old 2015-09-24 07:15:18.000000000 +0200 +++ /var/tmp/diff_new_pack.rRVELq/_new 2015-09-24 07:15:18.000000000 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: plasma5-workspace -Version: 5.4.0 +Version: 5.4.1 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0+ @@ -31,8 +31,11 @@ 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 [email protected] -- Ensure all logout buttons have the same size +Patch2: fix-logout-button-sizing.patch # PATCHES 100-200 and above are from upstream 5.3 branch # PATCHES 201-300 and above are from upstream master/5.4 branch + BuildRequires: alsa-devel BuildRequires: baloo5-devel >= %{version} BuildRequires: kactivities5-devel >= 5.12.0 @@ -90,6 +93,8 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(zlib) 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) +Conflicts: kio-extras5 < 15.08.0 Requires: %{name}-branding = %{version} Requires: %{name}-libs = %{version}-%{release} # used within startup @@ -187,6 +192,7 @@ %setup -q -n plasma-workspace-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ fix-logout-button-sizing.patch ++++++ From: Aleix Pol <[email protected]> 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 ++++++ plasma-workspace-5.4.0.tar.xz -> plasma-workspace-5.4.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/plasma5-workspace/plasma-workspace-5.4.0.tar.xz /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma-workspace-5.4.1.tar.xz differ: char 27, line 1
