* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/
@ 2020-07-12 23:07 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-07-12 23:07 UTC (permalink / raw
To: gentoo-commits
commit: 5d170a453d5720368254851819282919aba4a477
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul 12 20:00:30 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 23:07:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d170a45
kde-frameworks/plasma: remove unused patch(es)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16681
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-5.71.0-access-expandedView.item.patch | 29 ---
...lasma-5.71.0-introduce-PlaceholderMessage.patch | 280 ---------------------
2 files changed, 309 deletions(-)
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 ba1b35afbde..00000000000
--- 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 4255d235d1a..00000000000
--- 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
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/
@ 2022-07-19 15:42 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-07-19 15:42 UTC (permalink / raw
To: gentoo-commits
commit: b3f281089f110f0f588dd34f78637f7a8c4abb0f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 15:41:48 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 15:41:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f28108
kde-frameworks/plasma/files: Drop obsolete patches
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...a-5.95.0-fix-sizeForLabels-double-scaling.patch | 38 --------------------
.../plasma-5.95.0-revert-QT_FEATURE_foo.patch | 42 ----------------------
2 files changed, 80 deletions(-)
diff --git a/kde-frameworks/plasma/files/plasma-5.95.0-fix-sizeForLabels-double-scaling.patch b/kde-frameworks/plasma/files/plasma-5.95.0-fix-sizeForLabels-double-scaling.patch
deleted file mode 100644
index 84022d815b55..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.95.0-fix-sizeForLabels-double-scaling.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 26ae86dff198fbce05ba3824b89786224b3792a9 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Thu, 23 Jun 2022 12:47:32 -0600
-Subject: [PATCH] Units: Fix sizeForLabels double-scaling icons with Plasma
- scaling
-
-The sizeForLabels unit internally uses roundToIconSize(), giving it a
-value and feeding that into devicePixelIconSize() to take into account
-required icons size differences when using Plasma scaling. But
-roundToIconSize() internally does that automatically! So as a result,
-the size is double-scaled and looks too big. To fix this, we simply have
-to stop using devicePixelIconSize() for this unit.
-
-BUG: 454131
-FIXED-IN: 5.96
----
- src/declarativeimports/core/units.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp
-index 0cdffcbfd..8d655d11f 100644
---- a/src/declarativeimports/core/units.cpp
-+++ b/src/declarativeimports/core/units.cpp
-@@ -115,8 +115,9 @@ void Units::iconLoaderSettingsChanged()
- m_iconSizes->insert(QStringLiteral("large"), devicePixelIconSize(KIconLoader::SizeLarge));
- m_iconSizes->insert(QStringLiteral("huge"), devicePixelIconSize(KIconLoader::SizeHuge));
- m_iconSizes->insert(QStringLiteral("enormous"), devicePixelIconSize(KIconLoader::SizeEnormous));
-- // gridUnit is always the font height here
-- m_iconSizes->insert(QStringLiteral("sizeForLabels"), devicePixelIconSize(roundToIconSize(QFontMetrics(QGuiApplication::font()).height())));
-+ // We deliberately don't feed the result into devicePixelIconSize() because
-+ // roundToIconSize() already does that internally.
-+ m_iconSizes->insert(QStringLiteral("sizeForLabels"), roundToIconSize(QFontMetrics(QGuiApplication::font()).height()));
-
- m_iconSizeHints->insert(QStringLiteral("panel"), devicePixelIconSize(KIconLoader::global()->currentSize(KIconLoader::Panel)));
- m_iconSizeHints->insert(QStringLiteral("desktop"), devicePixelIconSize(KIconLoader::global()->currentSize(KIconLoader::Desktop)));
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch b/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch
deleted file mode 100644
index 300612763336..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From dff1b034c1162062aa2292099d3d01fc53dafdf6 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Tue, 14 Jun 2022 14:05:32 +0200
-Subject: [PATCH] Revert "Use QT_FEATURE_foo to detect opengl* support, and
- TARGET for glesv2"
-
-This reverts commit 31884dc195c815054bfa6b15a90753d2d0ae1ea9.
----
- CMakeLists.txt | 3 ++-
- src/declarativeimports/core/CMakeLists.txt | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6698a2091..63229cdfb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -118,7 +118,8 @@ set_package_properties(EGL PROPERTIES
- TYPE OPTIONAL
- )
-
--if(OpenGL_GLX_FOUND AND X11_FOUND AND QT_FEATURE_opengl)
-+get_target_property(QtGui_Enabled_Features Qt${QT_MAJOR_VERSION}::Gui QT_ENABLED_PUBLIC_FEATURES)
-+if(OpenGL_GLX_FOUND AND X11_FOUND AND (QtGui_Enabled_Features MATCHES "opengl"))
- add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.")
- set(HAVE_GLX 1)
- else()
-diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt
-index d08b4c619..2136bb985 100644
---- a/src/declarativeimports/core/CMakeLists.txt
-+++ b/src/declarativeimports/core/CMakeLists.txt
-@@ -70,7 +70,7 @@ else()
-
- endif()
-
--if(TARGET Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
-+if(QtGui_Enabled_Features MATCHES "opengles2")
- target_link_libraries(corebindingsplugin Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
- endif()
-
---
-GitLab
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-19 15:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-19 15:42 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-07-12 23:07 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox