[kde-workspace] eDP patch (kde#289760)

Rex Dieter rdieter at fedoraproject.org
Thu Feb 2 16:02:47 UTC 2012


commit 94c95ab9b84f4f373d343fca54f2067f9f23a96e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Feb 2 10:02:46 2012 -0600

    eDP patch (kde#289760)

 kde-workspace-4.8.0-eDP.patch |   30 ++++++++++++++++++++++++++++++
 kde-workspace.spec            |    9 ++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-4.8.0-eDP.patch b/kde-workspace-4.8.0-eDP.patch
new file mode 100644
index 0000000..229ba92
--- /dev/null
+++ b/kde-workspace-4.8.0-eDP.patch
@@ -0,0 +1,30 @@
+commit 4c98afbd97f190e740ac7127f9af99b5333a741a
+Author: Alex Fiestas <afiestas at kde.org>
+Date:   Thu Feb 2 16:07:38 2012 +0100
+
+    Adding eDP port as "laptop port" just like LVDS
+    
+    eDP are just like LVDS but more modern, so they should be
+    considered as a laptop screen and inhibit when only it is
+    available.
+    
+    This will fix the inhibition problem probably for the rest
+    of the affected users.
+    
+    amichair thanks for the debugging :)
+    
+    CCBUG:289760
+
+diff --git a/kcontrol/randr/module/randrmonitor.cpp b/kcontrol/randr/module/randrmonitor.cpp
+index f1a42f3..e83d6b3 100644
+--- a/kcontrol/randr/module/randrmonitor.cpp
++++ b/kcontrol/randr/module/randrmonitor.cpp
+@@ -213,7 +213,7 @@ void RandrMonitorModule::checkInhibition()
+     Q_FOREACH(const QString monitor, activeMonitorsList) {
+         //LVDS is the default type reported by most drivers, default is needed because the
+         //NVIDIA binary blob always report default as active monitor.
+-        if (!monitor.contains("LVDS") && !monitor.contains("default")) {
++        if (!monitor.contains("LVDS") && !monitor.contains("default") && !monitor.contains("eDP")) {
+             inhibit = true;
+             break;
+         }
diff --git a/kde-workspace.spec b/kde-workspace.spec
index d2fd4fb..1ef833a 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -6,7 +6,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.8.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -86,6 +86,9 @@ Patch53: kde-workspace-4.7.95-kdm_xauth.patch
 Patch54: kde-workspace-4.7.97-gcc47.patch
 
 ## upstream patches
+# https://projects.kde.org/projects/kde/kde-workspace/repository/revisions/4c98afbd97f190e740ac7127f9af99b5333a741a
+# http://bugs.kde.org/289760
+Patch100: kde-workspace-4.8.0-eDP.patch
 
 ## plasma active patches
 # adapted version of wac-html-widgets.patch
@@ -396,6 +399,7 @@ Requires: akonadi
 %patch54 -p1 -b .gcc47
 
 # upstream patches
+%patch100 -p1 -b .eDP
 
 # plasma-active
 %patch153 -p1 -b .wac-html-widgets
@@ -935,6 +939,9 @@ fi
 
 
 %changelog
+* Thu Feb 02 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-4
+- eDP patch (kde#289760)
+
 * Tue Jan 31 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-3
 - kgreeter-plugins subpkg (#785817)
 


More information about the scm-commits mailing list