[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=72713cb

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

    Pick "portait prop is not relevant when there is no text" (12a4709)
    
    This fixes a binding loop on this property when there is no label.
    
    Add upstream patch as:
     portait-prop-is-not-relevant-when-there-is-no-text.patch
    This fixes KDE#374815
    
    Gbp-Dch: Full
---
 ...rop-is-not-relevant-when-there-is-no-text.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/portait-prop-is-not-relevant-when-there-is-no-text.patch b/debian/patches/portait-prop-is-not-relevant-when-there-is-no-text.patch
new file mode 100644
index 0000000..ac15def
--- /dev/null
+++ b/debian/patches/portait-prop-is-not-relevant-when-there-is-no-text.patch
@@ -0,0 +1,26 @@
+From: Marco Martin <notmart at gmail.com>
+Date: Mon, 9 Jan 2017 16:29:32 +0100
+Subject: portait prop is not relevant when there is no text
+
+this fixes a binding loop on this property
+when there is no label
+
+BUG:374815
+Change-Id: I71616a6c86cd4acdaff47f141ed5c676358db496
+---
+ src/declarativeimports/plasmacomponents/qml/TabButton.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/declarativeimports/plasmacomponents/qml/TabButton.qml b/src/declarativeimports/plasmacomponents/qml/TabButton.qml
+index 748354582..ff1af52ad 100644
+--- a/src/declarativeimports/plasmacomponents/qml/TabButton.qml
++++ b/src/declarativeimports/plasmacomponents/qml/TabButton.qml
+@@ -122,7 +122,7 @@ Item {
+ 
+         property Item tabBar: Utils.findParent(root, "currentTab")
+         property Item tabGroup: Utils.findParent(tab, "currentTab")
+-        property bool portrait: (root != undefined) && (label != undefined) && root.height >= label.paintedHeight + units.iconSizes.small
++        property bool portrait: (root != undefined) && (label != undefined) &&  label.text != "" && root.height >= label.paintedHeight + units.iconSizes.small
+ 
+         function click() {
+             root.clicked()
diff --git a/debian/patches/series b/debian/patches/series
index ab0aa30..c6d5796 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Fix-logic-for-arrow-handling-in-RTL-locales.patch
 Emit-toolTipMainTextChanged-if-it-changes-in-response-to-.patch
 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

-- 
plasma-framework packaging



More information about the pkg-kde-commits mailing list