[SCM] plasma-framework packaging branch, master, updated. debian/5.28.0-2-19-g26d3b71
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Jul 8 07:22:46 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=1bbf39f
The following commit has been merged in the master branch:
commit 1bbf39f08c1d8b1a15b6d31b116e6b7ef3960526
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sun Jul 2 18:30:19 2017 +0200
Drop upstream patches
---
...TextChanged-if-it-changes-in-response-to-.patch | 40 --------
...127-misplacement-of-popups-from-dock-wins.patch | 101 ---------------------
...x-logic-for-arrow-handling-in-RTL-locales.patch | 42 ---------
...taEngines-even-if-the-metadata-is-invalid.patch | 64 -------------
...ider-an-empty-panel-always-applets-loaded.patch | 28 ------
...orward-status-from-applets-to-containment.patch | 56 ------------
...possible-for-the-status-to-be-decreased-a.patch | 24 -----
...rop-is-not-relevant-when-there-is-no-text.patch | 26 ------
debian/patches/series | 9 --
...ult-hints-when-repr-doesn-t-export-Layout.patch | 38 --------
10 files changed, 428 deletions(-)
diff --git a/debian/patches/Emit-toolTipMainTextChanged-if-it-changes-in-response-to-.patch b/debian/patches/Emit-toolTipMainTextChanged-if-it-changes-in-response-to-.patch
deleted file mode 100644
index 186cba9..0000000
--- a/debian/patches/Emit-toolTipMainTextChanged-if-it-changes-in-response-to-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: David Edmundson <kde at davidedmundson.co.uk>
-Date: Tue, 20 Dec 2016 12:09:52 +0000
-Subject: Emit toolTipMainTextChanged if it changes in response to a title
- change
-
-Summary:
-The fallback for toolTipMainText is showing the applet title.
-
-When the applet title changes, it may result in a change of
-toolTipMainText.
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D3760
----
- src/scriptengines/qml/plasmoid/appletinterface.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/scriptengines/qml/plasmoid/appletinterface.cpp b/src/scriptengines/qml/plasmoid/appletinterface.cpp
-index f24bc5152..cfd411010 100644
---- a/src/scriptengines/qml/plasmoid/appletinterface.cpp
-+++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp
-@@ -82,6 +82,13 @@ AppletInterface::AppletInterface(DeclarativeAppletScript *script, const QVariant
- connect(applet(), &Plasma::Applet::titleChanged,
- this, &AppletInterface::titleChanged);
-
-+ connect(applet(), &Plasma::Applet::titleChanged,
-+ this, [this]() {
-+ if (m_toolTipMainText.isNull()) {
-+ emit toolTipMainTextChanged();
-+ }
-+ });
-+
- connect(applet(), &Plasma::Applet::iconChanged,
- this, &AppletInterface::iconChanged);
-
diff --git a/debian/patches/Fix-374127-misplacement-of-popups-from-dock-wins.patch b/debian/patches/Fix-374127-misplacement-of-popups-from-dock-wins.patch
deleted file mode 100644
index 6afc3d5..0000000
--- a/debian/patches/Fix-374127-misplacement-of-popups-from-dock-wins.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From: Michail Vourlakos <mvourlakos at gmail.com>
-Date: Sun, 25 Dec 2016 13:15:35 +0200
-Subject: Fix #374127 misplacement of popups from dock wins
-
---the dialogs shown from dock type windows when
-the dock uses masking are placed far from the
-the element that triggered them. This patch
-fixes this bug and provide also an auto test.
----
- autotests/dialognativetest.cpp | 19 +++++++++++++++++++
- autotests/dialognativetest.h | 2 ++
- src/plasmaquick/dialog.cpp | 3 ++-
- 3 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/autotests/dialognativetest.cpp b/autotests/dialognativetest.cpp
-index 9c9646c06..6378e1e6b 100644
---- a/autotests/dialognativetest.cpp
-+++ b/autotests/dialognativetest.cpp
-@@ -38,14 +38,24 @@ void DialogNativeTest::initTestCase()
- m_panel2->setGeometry(100, 0, 50, 50);
- m_panel2->setFlags(Qt::FramelessWindowHint|Qt::WindowDoesNotAcceptFocus);
-
-+ m_panel3 = new QQuickView;
-+ m_panel3->setGeometry(200, 0, 50, 50);
-+ m_panel3->setFlags(Qt::FramelessWindowHint|Qt::WindowDoesNotAcceptFocus);
-+
- m_content = new QQuickItem;
- m_content->setWidth(100);
- m_content->setHeight(100);
- m_dialog->setMainItem(m_content);
-
-+ m_content2 = new QQuickItem(m_panel3->contentItem());
-+ m_content2->setWidth(50);
-+ m_content2->setHeight(25);
-+
- m_panel->show();
- m_panel2->show();
-+ m_panel3->show();
- KWindowSystem::setType(m_panel->winId(), NET::Dock);
-+ KWindowSystem::setType(m_panel3->winId(), NET::Dock);
- m_dialog->setVisualParent(m_panel->contentItem());
- m_dialog->show();
- }
-@@ -55,6 +65,7 @@ void DialogNativeTest::cleanupTestCase()
- delete m_dialog;
- delete m_panel;
- delete m_panel2;
-+ delete m_panel3;
-
- m_cacheDir.removeRecursively();
- }
-@@ -68,6 +79,9 @@ void DialogNativeTest::size()
- QCOMPARE(m_dialog->width(), 112);
- QCOMPARE(m_dialog->height(), 112);
-
-+ QCOMPARE(m_content2->width(), (qreal)50);
-+ QCOMPARE(m_content2->height(), (qreal)25);
-+
- QCOMPARE(m_dialog->margins()->property("left").value<qreal>(), (qreal)6.0);
- QCOMPARE(m_dialog->margins()->property("top").value<qreal>(), (qreal)6.0);
- QCOMPARE(m_dialog->margins()->property("right").value<qreal>(), (qreal)6.0);
-@@ -85,6 +99,11 @@ void DialogNativeTest::position()
- m_dialog->setVisualParent(m_panel2->contentItem());
- QCOMPARE(m_dialog->x(), 69);
- QCOMPARE(m_dialog->y(), 49);
-+
-+ m_panel3->setMask(QRect(0, 0, 50, 25));
-+ m_dialog->setVisualParent(m_content2);
-+ QCOMPARE(m_dialog->x(), 169);
-+ QCOMPARE(m_dialog->y(), 24);
- #endif
- }
-
-diff --git a/autotests/dialognativetest.h b/autotests/dialognativetest.h
-index d696cad80..780bc8eec 100644
---- a/autotests/dialognativetest.h
-+++ b/autotests/dialognativetest.h
-@@ -42,7 +42,9 @@ private Q_SLOTS:
- private:
- QQuickView *m_panel;
- QQuickView *m_panel2;
-+ QQuickView *m_panel3;
- QQuickItem *m_content;
-+ QQuickItem *m_content2;
- PlasmaQuick::Dialog *m_dialog;
- QDir m_cacheDir;
- };
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index 6e2041aa7..7a97efe4e 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -873,7 +873,8 @@ QPoint Dialog::popupPosition(QQuickItem *item, const QSize &size)
-
- //if the item is in a dock or in a window that ignores WM we want to position the popups outside of the dock
- const KWindowInfo winInfo = KWindowSystem::windowInfo(item->window()->winId(), NET::WMWindowType);
-- const bool outsideParentWindow = (winInfo.windowType(NET::AllTypesMask) == NET::Dock) || (item->window()->flags() & Qt::X11BypassWindowManagerHint);
-+ const bool outsideParentWindow = ((winInfo.windowType(NET::AllTypesMask) == NET::Dock) || (item->window()->flags() & Qt::X11BypassWindowManagerHint))
-+ && item->window()->mask().isNull();
-
- QRect parentGeometryBounds;
- if (outsideParentWindow) {
diff --git a/debian/patches/Fix-logic-for-arrow-handling-in-RTL-locales.patch b/debian/patches/Fix-logic-for-arrow-handling-in-RTL-locales.patch
deleted file mode 100644
index 314c8c3..0000000
--- a/debian/patches/Fix-logic-for-arrow-handling-in-RTL-locales.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Eike Hein <hein at kde.org>
-Date: Sun, 18 Dec 2016 08:30:46 +0900
-Subject: Fix logic for arrow handling in RTL locales.
-
-Summary: BUG:373749
-
-Reviewers: #plasma, mart
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D3718
----
- .../plasmacomponents/qml/private/TabBarLayout.qml | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml b/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
-index 49f08a7b2..0d75ccfe5 100644
---- a/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
-+++ b/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
-@@ -74,14 +74,12 @@ Item {
- onHeightChanged: layoutTimer.restart()
-
- Keys.onPressed: {
-- if (event.key == Qt.Key_Right || event.key == Qt.Key_Left) {
-- if (event.key == Qt.Key_Right || priv.mirrored) {
-- priv.goNextTab()
-- event.accepted = true
-- } else if (event.key == Qt.Key_Left || priv.mirrored) {
-- priv.goPreviousTab()
-- event.accepted = true
-- }
-+ if (event.key == Qt.Key_Right) {
-+ (priv.mirrored ? priv.goPreviousTab : priv.goNextTab)();
-+ event.accepted = true
-+ } else if (event.key == Qt.Key_Left || priv.mirrored) {
-+ (priv.mirrored ? priv.goNextTab : priv.goPreviousTab)();
-+ event.accepted = true
- }
- }
-
diff --git a/debian/patches/Ref-deref-DataEngines-even-if-the-metadata-is-invalid.patch b/debian/patches/Ref-deref-DataEngines-even-if-the-metadata-is-invalid.patch
deleted file mode 100644
index d461a5b..0000000
--- a/debian/patches/Ref-deref-DataEngines-even-if-the-metadata-is-invalid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: David Edmundson <kde at davidedmundson.co.uk>
-Date: Mon, 6 Mar 2017 00:12:27 +0000
-Subject: Ref/deref DataEngines even if the metadata is invalid
-
-Summary:
-Just because the metadata is invalid doesn't mean the DataEngine
-actually failed to load, we're still returning a valid object, and as
-seen with the MPris DataEngine bug. It's important that we still release
-it properly.
-
-It looks like this was designed to make sure you don't delete the null
-data engine multiple times, but that shouldn't cause an issue here.
-
-Test Plan: #plasma
-
-Reviewers: #plasma, mart
-
-Reviewed By: mart
-
-Subscribers: plasma-devel, #frameworks
-
-Tags: #plasma, #frameworks
-
-Differential Revision: https://phabricator.kde.org/D4556
----
- src/plasma/dataengine.cpp | 2 --
- src/plasma/dataengineconsumer.cpp | 7 +------
- 2 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/src/plasma/dataengine.cpp b/src/plasma/dataengine.cpp
-index 1c3efb656..dc03b13bd 100644
---- a/src/plasma/dataengine.cpp
-+++ b/src/plasma/dataengine.cpp
-@@ -425,8 +425,6 @@ DataEnginePrivate::DataEnginePrivate(DataEngine *e, const KPluginInfo &info, con
- if (dataEngineDescription.isValid()) {
- valid = true;
- e->setObjectName(dataEngineDescription.name());
-- } else {
-- e->setObjectName(QStringLiteral("NullEngine"));
- }
-
- if (dataEngineDescription.isValid()) {
-diff --git a/src/plasma/dataengineconsumer.cpp b/src/plasma/dataengineconsumer.cpp
-index f734a9cca..b761aa076 100644
---- a/src/plasma/dataengineconsumer.cpp
-+++ b/src/plasma/dataengineconsumer.cpp
-@@ -95,16 +95,11 @@ DataEngine *DataEngineConsumer::dataEngine(const QString &name)
- DataEngine *engine = DataEngineManager::self()->engine(name);
- if (engine->isValid()) {
- return engine;
-- } else {
-- d->loadedEngines.remove(name);
- }
- }
-
- DataEngine *engine = DataEngineManager::self()->loadEngine(name);
-- if (engine->isValid()) {
-- d->loadedEngines.insert(name);
-- }
--
-+ d->loadedEngines.insert(name);
- return engine;
- }
-
diff --git a/debian/patches/consider-an-empty-panel-always-applets-loaded.patch b/debian/patches/consider-an-empty-panel-always-applets-loaded.patch
deleted file mode 100644
index baf3861..0000000
--- a/debian/patches/consider-an-empty-panel-always-applets-loaded.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Marco Martin <notmart at gmail.com>
-Date: Wed, 21 Dec 2016 18:10:04 +0100
-Subject: consider an empty panel always "applets loaded"
-
-if a panel doesn't ahve applets, it can't have a "currently
-loading" as the status of its applets.
-this fixes panels sometimes not showing up when reconnecting screens
-
-CCBUG:373836
----
- src/plasma/containment.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/plasma/containment.cpp b/src/plasma/containment.cpp
-index 133220a6a..b9c8c8b56 100644
---- a/src/plasma/containment.cpp
-+++ b/src/plasma/containment.cpp
-@@ -297,6 +297,10 @@ void Containment::restoreContents(KConfigGroup &group)
- d->createApplet(plugin, QVariantList(), appId);
- }
-
-+ //if there are no applets, none of them is "loading"
-+ if (Containment::applets().isEmpty()) {
-+ d->appletsUiReady = true;
-+ }
- foreach (Applet *applet, Containment::applets()) {
- if (!applet->pluginMetaData().isValid()) {
- applet->updateConstraints(Plasma::Types::UiReadyConstraint);
diff --git a/debian/patches/correctly-forward-status-from-applets-to-containment.patch b/debian/patches/correctly-forward-status-from-applets-to-containment.patch
deleted file mode 100644
index ba6e1ea..0000000
--- a/debian/patches/correctly-forward-status-from-applets-to-containment.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Marco Martin <notmart at gmail.com>
-Date: Tue, 17 Jan 2017 17:23:07 +0100
-Subject: correctly forward status from applets to containment
-
-Summary:
-unfortunately hiddenvisibility is the "biggest" status
-that makes computing the proper status tricky.
-if an applet in the containment is hidden, we must not mark as
-hidden the whole containment, because it's as if hidden was
-(as it should be) the smallest in the enum
-
-BUG:372062
-
-Test Plan: touchpad plasmoid no longer hides the systray
-
-Reviewers: #plasma, davidedmundson
-
-Reviewed By: #plasma, davidedmundson
-
-Subscribers: plasma-devel, #frameworks
-
-Tags: #plasma, #frameworks
-
-Differential Revision: https://phabricator.kde.org/D4174
----
- src/plasma/plasma.h | 1 +
- src/plasma/private/containment_p.cpp | 4 +++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/plasma/plasma.h b/src/plasma/plasma.h
-index 523e32915..eb34aee3f 100644
---- a/src/plasma/plasma.h
-+++ b/src/plasma/plasma.h
-@@ -255,6 +255,7 @@ public:
- NeedsAttentionStatus = 3, /**< The Item needs attention **/
- RequiresAttentionStatus = 4, /**< The Item needs persistent attention **/
- AcceptingInputStatus = 5, /**< The Item is accepting input **/
-+ //FIXME KF6: this should be the smallest status
- HiddenStatus = 6 /**< The Item will be hidden totally **/
- };
- Q_ENUMS(ItemStatus)
-diff --git a/src/plasma/private/containment_p.cpp b/src/plasma/private/containment_p.cpp
-index 061176b95..646c80021 100644
---- a/src/plasma/private/containment_p.cpp
-+++ b/src/plasma/private/containment_p.cpp
-@@ -123,7 +123,9 @@ void ContainmentPrivate::checkStatus(Plasma::Types::ItemStatus appletStatus)
- }
- }
-
-- q->setStatus(appletStatus);
-+ if (appletStatus > q->status() && appletStatus != Plasma::Types::HiddenStatus) {
-+ q->setStatus(appletStatus);
-+ }
- }
-
- void ContainmentPrivate::triggerShowAddWidgets()
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
deleted file mode 100644
index c45dd9d..0000000
--- a/debian/patches/it-must-also-be-possible-for-the-status-to-be-decreased-a.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/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
deleted file mode 100644
index ac15def..0000000
--- a/debian/patches/portait-prop-is-not-relevant-when-there-is-no-text.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index a01aa28..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-correctly-forward-status-from-applets-to-containment.patch
-it-must-also-be-possible-for-the-status-to-be-decreased-a.patch
-set-default-hints-when-repr-doesn-t-export-Layout.patch
-Ref-deref-DataEngines-even-if-the-metadata-is-invalid.patch
diff --git a/debian/patches/set-default-hints-when-repr-doesn-t-export-Layout.patch b/debian/patches/set-default-hints-when-repr-doesn-t-export-Layout.patch
deleted file mode 100644
index 095ea27..0000000
--- a/debian/patches/set-default-hints-when-repr-doesn-t-export-Layout.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Marco Martin <notmart at gmail.com>
-Date: Fri, 3 Mar 2017 17:52:41 +0100
-Subject: set default hints when repr doesn't export Layout.*
-
-when we go from full to compact repr, if the compact
-doesn't export a Layout attached property, the hints shouldn't
-remain those of the full repr, so reset to default values
-
-BUG:377153
-Reviewed-by:Eike Hein
----
- src/plasmaquick/appletquickitem.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/plasmaquick/appletquickitem.cpp b/src/plasmaquick/appletquickitem.cpp
-index e2fd40ece..30a6f321d 100644
---- a/src/plasmaquick/appletquickitem.cpp
-+++ b/src/plasmaquick/appletquickitem.cpp
-@@ -92,7 +92,19 @@ void AppletQuickItemPrivate::connectLayoutAttached(QObject *item)
- }
- }
-
-+ //if the compact repr doesn't export a Layout.* attached property,
-+ //reset our own with default values
- if (!layout) {
-+ if (ownLayout) {
-+ ownLayout->setProperty("minimumWidth", 0);
-+ ownLayout->setProperty("minimumHeight", 0);
-+ ownLayout->setProperty("preferredWidth", -1);
-+ ownLayout->setProperty("preferredHeight", -1);
-+ ownLayout->setProperty("maximumWidth", std::numeric_limits<qreal>::infinity());
-+ ownLayout->setProperty("maximumHeight", std::numeric_limits<qreal>::infinity());
-+ ownLayout->setProperty("fillWidth", false);
-+ ownLayout->setProperty("fillHeight", false);
-+ }
- return;
- }
-
--
plasma-framework packaging
More information about the pkg-kde-commits
mailing list