Accepting request 436977 from KDE:Frameworks5

Minor fixup

OBS-URL: https://build.opensuse.org/request/show/436977
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=49
This commit is contained in:
2016-10-28 10:26:11 +00:00
committed by Git OBS Bridge
3 changed files with 39 additions and 1 deletions

View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Oct 23 11:59:55 UTC 2016 - fabian@ritter-vogt.de
- Remove Requires again, backport import removal
* remove-sddm-graphicaleffects-dep.patch
-------------------------------------------------------------------
Sat Oct 22 19:27:37 UTC 2016 - fabian@ritter-vogt.de
- Add Requires: libqt5-qtgraphicaleffects as used by the sddm theme
-------------------------------------------------------------------
Fri Oct 21 12:30:48 UTC 2016 - alarrosa@suse.com

View File

@@ -42,6 +42,8 @@ Patch3: add-tray-icon-cache.patch
Patch100: keep-wallpaper-aspect-ratio-wallpaper-on-screen-resolution-change.diff
# PATCH-FIX-UPSTREAM fix-sddm-theme-logic.diff boo#1003742 alarrosa@suse.com -- Fix sddm logic to use avatar list or text entry when usermodel.count is 0
Patch101: fix-sddm-theme-logic.diff
# PATCH-FIX-UPSTREAM remove-sddm-graphicaleffects-dep.patch kde#371493 kde@privat.broulik.de -- Remove unused import QtGraphicalEffects
Patch102: remove-sddm-graphicaleffects-dep.patch
# PATCHES 201-300 and above are from upstream master/5.9 branch
BuildRequires: breeze5-icons
BuildRequires: fdupes
@@ -136,7 +138,7 @@ Requires: kscreen5 >= %{_plasma5_version}
Requires: libkscreen2-plugin >= %{_plasma5_version}
# boo#912317
Requires: oxygen5-sounds >= %{_plasma5_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-components and plasma-framework-private packages, as upstream doesn't keep backwards compability there
%requires_ge plasma-framework-components
%requires_ge plasma-framework-private
Requires: kactivities5
@@ -214,6 +216,7 @@ workspace. Development files.
%patch3 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}

View File

@@ -0,0 +1,24 @@
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Sun, 23 Oct 2016 11:24:00 +0000
Subject: Remove unused import QtGraphicalEffects
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=b61c232722aa80567590ee6dfee655e93e95f7ff
---
Remove unused import QtGraphicalEffects
BUG: 371493
FIXED-IN: 5.8.3
---
--- a/sddm-theme/Background.qml
+++ b/sddm-theme/Background.qml
@@ -23,8 +23,6 @@
***************************************************************************/
import QtQuick 2.2
-import QtGraphicalEffects 1.0
-
FocusScope {
property alias source: image.source