[SCM] plasma-framework packaging branch, master, updated. debian/5.28.0-1-12-g9259880

Maximiliano Curia maxy at moszumanska.debian.org
Sat Apr 8 15:16:05 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=ed112ff

The following commit has been merged in the master branch:
commit ed112ffe472bf6c22f63954fdede3cb8dbac2fcb
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Apr 8 15:38:37 2017 +0200

    Pick "it must also be possible for the status to be decreased again" (46c87d5)
    
    This fixes the autohide panel being broken the first time an applet like
    kickoff opens. when it closes again, the status has to be decreased
    again.
    
    Add upstream patch as:
     it-must-also-be-possible-for-the-status-to-be-decreased-a.patch
    
    Gbp-Dch: Full
---
 ...possible-for-the-status-to-be-decreased-a.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/it-must-also-be-possible-for-the-status-to-be-decreased-a.patch b/debian/patches/it-must-also-be-possible-for-the-status-to-be-decreased-a.patch
new file mode 100644
index 0000000..c45dd9d
--- /dev/null
+++ b/debian/patches/it-must-also-be-possible-for-the-status-to-be-decreased-a.patch
@@ -0,0 +1,24 @@
+From: Marco Martin <notmart at gmail.com>
+Date: Thu, 19 Jan 2017 14:25:16 +0100
+Subject: it must also be possible for the status to be decreased again
+
+this fixes the autohide panel being broken the first time an applet
+like kickoff opens. when it closes again, the status has to be
+decreased again
+---
+ src/plasma/private/containment_p.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plasma/private/containment_p.cpp b/src/plasma/private/containment_p.cpp
+index 646c80021..8ba9356a2 100644
+--- a/src/plasma/private/containment_p.cpp
++++ b/src/plasma/private/containment_p.cpp
+@@ -123,7 +123,7 @@ void ContainmentPrivate::checkStatus(Plasma::Types::ItemStatus appletStatus)
+         }
+     }
+ 
+-    if (appletStatus > q->status() && appletStatus != Plasma::Types::HiddenStatus) {
++    if (appletStatus != Plasma::Types::HiddenStatus) {
+         q->setStatus(appletStatus);
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 13d4213..9ab4c8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ consider-an-empty-panel-always-applets-loaded.patch
 Fix-374127-misplacement-of-popups-from-dock-wins.patch
 portait-prop-is-not-relevant-when-there-is-no-text.patch
 correctly-forward-status-from-applets-to-containment.patch
+it-must-also-be-possible-for-the-status-to-be-decreased-a.patch

-- 
plasma-framework packaging



More information about the pkg-kde-commits mailing list