summaryrefslogtreecommitdiff
path: root/kde-frameworks/plasma
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /kde-frameworks/plasma
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'kde-frameworks/plasma')
-rw-r--r--kde-frameworks/plasma/Manifest6
-rw-r--r--kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch29
-rw-r--r--kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch280
-rw-r--r--kde-frameworks/plasma/plasma-5.73.0.ebuild (renamed from kde-frameworks/plasma/plasma-5.71.0-r1.ebuild)7
4 files changed, 3 insertions, 319 deletions
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index ecf421813afa..59e3e2d7b8cd 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,7 +1,5 @@
-AUX plasma-5.71.0-access-expandedView.item.patch 1079 BLAKE2B 136f75a730a9a9c864f341cf33e92a76eb1eac4932a8cc006b2c048f9fb4d60cd96db6f3a778027b568c0a5f604391eec08ea89f23c90274686d5fb4fbe23b28 SHA512 34b9abbb8a98638a89c4f28d08b687d22b5902b9a3766221fbcdb88bf350fdd9d974842da47f44fb2316f9737653f7993274e869df46b46bf97c9ad1a81ec9f5
-AUX plasma-5.71.0-introduce-PlaceholderMessage.patch 8863 BLAKE2B fabd80feda6496b465a4b0d6b2aaa00eb7c9c792b8367f4c9d63db8104814b83055c4e79c773c750721d9051e43b0abdb03c2c2758aeb2adda53bdc851958114 SHA512 751ddf6450d8270011053b03f7cd40cdae33d5fbbcc848058e581f3ea4a802eea24c57d8f6c3f40f060c0b08fb3b50b9323a11143395c813fedbe1a35fc7d1dc
DIST plasma-framework-5.70.1.tar.xz 3132736 BLAKE2B 6f6dc34c6e9f5c433e2a6302fffc7172a7dbf187cc8ebeef1a5c47dc3b329269d71891508e41c3b0a7a7d8de8af519d7a9c320defec6726e9fdf9b859d158017 SHA512 2b022f0e1e6abec8b7cf0ff77dd862a78f17692d17a78ad5a42a1a784c98a57070a5a721b44e808e299f374248769b90449201ae3c6dba17a292726e3b646930
-DIST plasma-framework-5.71.0.tar.xz 3137672 BLAKE2B dc079b0d0dc17126a361fef849931ed63bbad9099f983405cc14a28abab4d592fb9b92fe66bc347dacbee1f93b48da03e449db25f2ecbc298a62b8b734b1e2c4 SHA512 900172458cd4d16e6374f6116470c2a5bf6cf16e52da5910b976b86e03a3c69182f1eefdc01aea2eac0471ae7416c82542e5e87c7af42ed15c9d9f3f228805ef
+DIST plasma-framework-5.73.0.tar.xz 3137788 BLAKE2B 5a0cf3f91c5baa3d21d496f5b35f71be298ab0c171dddd23ce781c768f20b70d31e3dcef6f1f401feb363f228673aa32fd8aeed287530d5caa5bf46ea975e998 SHA512 57f8781673f32848759aaf6138070bb4242a93985a836669d074ea830a9b2f92937f333fb5e8738b64e496f5a23ddf70719538ec62e0933d094c3773a7b8fddb
EBUILD plasma-5.70.1.ebuild 1927 BLAKE2B 3b100a046afc977d7a11aba841275d4be2ba0e7ba6e489afb03f0cc4c7dd4c43b1abdb2b40240a55e4a70e783f24d75caf6fd5d341261ad78b6c55d965f738b6 SHA512 c7e7f6021addbd03c6cdf463376a4bdaadba600f070aff8365f0e86fd6fa47004846b6732717fa72d664e2fb0c6b6c93d221bd043fb0b142ffe80272279f053f
-EBUILD plasma-5.71.0-r1.ebuild 2028 BLAKE2B d921255742a08ddc793c1aee986b6599bc429d8d1644604cf9c5452bcd5382f65de90cec80b0d2e17dd1ca8dae9ad53c84bfe54aee6f007ece13aac604a9fae2 SHA512 086a6dfc34f16fcf628fefdfce2cee7aebb6024fa9c3a54f28590b4b8375aafbcb2e6f4094cb3d9f33c07b39ad69efe7e499ef04015e404b7b4703745b04aa4d
+EBUILD plasma-5.73.0.ebuild 1873 BLAKE2B 2c0723714f1f7fc5874370eaa641effc20a3aba9af14883120dfc35aef7f7cb58d65578ad5a93e12b9692d06dd074dd5744203f903bd6145477afe867c1ca4bf SHA512 8f7e26d1259c5274f6aae10fea0ab26eddb739b29da59028f1e6ccdc1f4f9b2d2052bf57e2ae847704651aae6b829f8d6ed2e8b617f4716c6ddccbab03d35d89
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch b/kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch
deleted file mode 100644
index ba1b35afbdeb..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7f9e189d87c040a952533713ff48d32872e0eadd Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 7 Jun 2020 08:46:39 -0600
-Subject: [PATCH] Add property to access the ExpandableListItem loader's item
-
----
- .../plasmaextracomponents/qml/ExpandableListItem.qml | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
-index d9d0662ee..ed21ab8e4 100644
---- a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
-+++ b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
-@@ -261,6 +261,12 @@ Item {
- */
- property var customExpandedViewContent: actionsListComponent
-
-+ /*
-+ * The actual instance of the custom view content, if loaded
-+ * @since 5.72
-+ */
-+ property alias customExpandedViewContentItem: expandedView.item
-+
- /*
- * isBusy: bool
- * Whether or not to display a busy indicator on the list item. Set to true
---
-2.27.0
-
diff --git a/kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch b/kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch
deleted file mode 100644
index 4255d235d1a6..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-From e1475e090747088288b05279633d19f12ae257aa Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 19 Jun 2020 22:45:19 +0000
-Subject: [PATCH] Introduce PlaceholderMessage
-
-This is a clone of the Kirigami component that we can use in Plasma
-applets until we arrive at a solution for styling QQC2 items using the
-Plasma style (https://phabricator.kde.org/T13256).
-
-See dependent patches:
-- plasma-workspace: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/73
-- bluedevil: https://invent.kde.org/plasma/bluedevil/-/merge_requests/1
-- print-manager: https://invent.kde.org/utilities/print-manager/-/merge_requests/1
-- plasma-vault: https://invent.kde.org/plasma/plasma-vault/-/merge_requests/3
-
-Merge request: https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
----
- .../qml/PlaceholderMessage.qml | 237 ++++++++++++++++++
- .../plasmaextracomponents/qml/qmldir | 1 +
- 2 files changed, 238 insertions(+)
- create mode 100644 src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
-
-diff --git a/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
-new file mode 100644
-index 000000000..958399a8f
---- /dev/null
-+++ b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
-@@ -0,0 +1,237 @@
-+/*
-+ * Copyright 2020 Nate Graham <nate@kde.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Library General Public License as
-+ * published by the Free Software Foundation; either version 2, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Library General Public License for more details
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this program; if not, write to the
-+ * Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+import QtQuick 2.0
-+import QtQuick.Layouts 1.12
-+import QtQuick.Controls 2.12 as QQC2
-+
-+import org.kde.plasma.core 2.0 as PlasmaCore
-+import org.kde.plasma.components 3.0 as PlasmaComponents3
-+import org.kde.plasma.extras 2.0 as PlasmaExtras
-+
-+/**
-+ * A placeholder message indicating that a list view is empty. The message
-+ * comprises a label with lightened text, an optional icon above the text, and
-+ * an optional button below the text which can be used to easily show the user
-+ * what to do next to add content to the view.
-+ *
-+ * The top-level component is a ColumnLayout, so additional components items can
-+ * simply be added as child items and they will be positioned sanely.
-+ *
-+ * Example usage:
-+ *
-+ * @code{.qml}
-+ ** Shows how to use PlaceholderMessage to implement a "this view is empty" message
-+ * import QtQuick 2.12
-+ * import org.kde.plasma.extras 2.0 as PlasmaExtras
-+ *
-+ * ListView {
-+ * id: listView
-+ * model: [...]
-+ * delegate: [...]
-+ *
-+ * PlasmaExtras.PlaceholderMessage {
-+ * anchors.centerIn: parent
-+ * width: parent.width - (units.largeSpacing * 4)
-+ *
-+ * visible: listView.count == 0
-+ *
-+ * text: "There are no items in this list"
-+ * }
-+ * }
-+ * @endcode
-+ * @code{.qml}
-+ ** Shows how to use PlaceholderMessage to implement a "here's how to proceed" message
-+ * import QtQuick 2.12
-+ * import QtQuick.Controls 2.12 as QQC2
-+ * import org.kde.plasma.extras 2.0 as PlasmaExtras
-+ *
-+ * ListView {
-+ * id: listView
-+ * model: [...]
-+ * delegate: [...]
-+ *
-+ * PlasmaExtras.PlaceholderMessage {
-+ * anchors.centerIn: parent
-+ * width: parent.width - (units.largeSpacing * 4)
-+ *
-+ * visible: listView.count == 0
-+ *
-+ * text: "Add an item to proceed"
-+ *
-+ * helpfulAction: QQC2.Action {
-+ * icon.name: "list-add"
-+ * text: "Add item..."
-+ * onTriggered: {
-+ * [...]
-+ * }
-+ * }
-+ * }
-+ * [...]
-+ * }
-+ * @endcode
-+ * @code{.qml}
-+ ** Shows how to use PlaceholderMessage to implement a "there was a problem here" message
-+ * import org.kde.plasma.components 3.0 as PlasmaComponents3
-+ * import org.kde.plasma.extras 2.0 as PlasmaExtras
-+ *
-+ * PlasmaComponents3.Page {
-+ * id: root
-+ * readonly property bool networkConnected: [...]
-+ *
-+ * PlasmaExtras.PlaceholderMessage {
-+ * anchors.centerIn: parent
-+ * width: parent.width - (units.largeSpacing * 4)
-+ *
-+ * visible: root.networkConnected
-+ *
-+ * icon.name: "network-disconnect"
-+ * text: "Network disconnected; unable to load content"
-+ * }
-+ * }
-+ * @endcode
-+ * @code{.qml}
-+ * import org.kde.plasma.components 3.0 as PlasmaComponents3
-+ * import org.kde.plasma.extras 2.0 as PlasmaExtras
-+ *
-+ ** Shows how to use PlaceholderMessage to implement a loading indicator
-+ * PlasmaComponents3.Page {
-+ * id: root
-+ * readonly property bool loading: [...]
-+ * readonly property int completionStatus: [...]
-+ *
-+ * PlasmaExtras.PlaceholderMessage {
-+ * anchors.centerIn: parent
-+ * width: parent.width - (units.largeSpacing * 4)
-+ *
-+ * visible: root.loading
-+ *
-+ * icon.name: "my-awesome-app-icon"
-+ * text: "Loading this awesome app"
-+ *
-+ * PlasmaComponents3.ProgressBar {
-+ * Layout.preferredWidth: units.gridUnit * 20
-+ * value: root.completionStatus
-+ * from: 0
-+ * to: 100
-+ * }
-+ * }
-+ * }
-+ * @endcode
-+ * @code{.qml}
-+ * import QtQuick.Controls 2.12 as QQC2
-+ * import org.kde.plasma.components 3.0 as PlasmaComponents3
-+ * import org.kde.plasma.extras 2.0 as PlasmaExtras
-+ *
-+ ** Shows how to use PlaceholderMessage to implement a "Here's what you do next" button
-+ * PlasmaComponents3.Page {
-+ * id: root
-+ *
-+ * PlasmaExtras.PlaceholderMessage {
-+ * anchors.centerIn: parent
-+ * width: parent.width - (units.largeSpacing * 4)
-+ *
-+ * visible: root.loading
-+ *
-+ * helpfulAction: QQC2.Action {
-+ * icon.name: "list-add"
-+ * text: "Add item..."
-+ * onTriggered: {
-+ * [...]
-+ * }
-+ * }
-+ * }
-+ * }
-+ * @endcode
-+ * @since 5.72
-+ */
-+ColumnLayout {
-+ id: root
-+
-+ /**
-+ * text: string
-+ * The text to show as a placeholder label
-+ *
-+ * Optional. Not setting any text is useful when you only want to display
-+ * an icon, action button, and/or other custom content
-+ *
-+ * @since 5.72
-+ */
-+ property alias text: label.text
-+
-+ /**
-+ * iconName: string
-+ * The icon to show above the text label.
-+ *
-+ * Optional
-+ * Falls back to `undefined` if the specified icon is not valid or cannot
-+ * be loaded.
-+ *
-+ * @since 5.72
-+ * @see Icon::source
-+ */
-+ property string iconName: string
-+
-+ /**
-+ * helpfulAction: QtQuickControls2 Action
-+ * An action that helps the user proceed. Typically used to guide the user
-+ * to the next step for adding content or items to an empty view.
-+ *
-+ * Optional
-+ *
-+ * @since 5.72
-+ */
-+ property alias helpfulAction: actionButton.action
-+
-+ spacing: units.largeSpacing
-+
-+ PlasmaCore.IconItem {
-+ visible: source != undefined
-+ opacity: 0.5
-+
-+ Layout.alignment: Qt.AlignHCenter
-+ Layout.preferredWidth: units.iconSizes.huge
-+ Layout.preferredHeight: units.iconSizes.huge
-+
-+ source: root.iconName || null
-+ }
-+
-+ PlasmaExtras.Heading {
-+ id: label
-+
-+ visible: text.length > 0
-+ opacity: 0.5
-+
-+ Layout.fillWidth: true
-+ Layout.alignment: Qt.AlignHCenter
-+ horizontalAlignment: Qt.AlignHCenter
-+
-+ level: 2
-+
-+ wrapMode: Text.WordWrap
-+ }
-+
-+ PlasmaComponents3.Button {
-+ id: actionButton
-+
-+ Layout.alignment: Qt.AlignHCenter
-+
-+ visible: action && action.enabled
-+ }
-+}
-diff --git a/src/declarativeimports/plasmaextracomponents/qml/qmldir b/src/declarativeimports/plasmaextracomponents/qml/qmldir
-index 4ba4ed7b7..6eb4af8a9 100644
---- a/src/declarativeimports/plasmaextracomponents/qml/qmldir
-+++ b/src/declarativeimports/plasmaextracomponents/qml/qmldir
-@@ -7,6 +7,7 @@ ExpandableListItem 2.0 ExpandableListItem.qml
- Heading 2.0 Heading.qml
- Paragraph 2.0 Paragraph.qml
- PageRow 2.0 PageRow.qml
-+PlaceholderMessage 2.0 PlaceholderMessage.qml
- ScrollArea 2.0 ScrollArea.qml
- Title 2.0 Title.qml
- DescriptiveLabel 2.0 DescriptiveLabel.qml
---
-2.27.0
-
diff --git a/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.73.0.ebuild
index a088f837b6bd..4dd229e01593 100644
--- a/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.73.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
KDE_ORG_NAME="${PN}-framework"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.1
+QTMIN=5.14.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -61,11 +61,6 @@ DEPEND="${RDEPEND}
RESTRICT+=" test"
-PATCHES=(
- "${FILESDIR}"/${P}-access-expandedView.item.patch # KDE-bug #423093
- "${FILESDIR}"/${P}-introduce-PlaceholderMessage.patch # KDE-bug #422684
-)
-
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package !gles2-only OpenGL)