* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2017-04-15 20:31 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-04-15 20:31 UTC (permalink / raw
To: gentoo-commits
commit: a5decb2f6b741174c2906759260db3fac6beb96d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 19:50:26 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 20:31:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5decb2f
kde-frameworks/plasma: Add upstream fixes
- Wrong/weird toolbox icon sizes
- Wrong language locale in calendar popup
- Plasmashell runtime crashes caused by systray applets
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/plasma-5.33.0-calendar-locale.patch | 49 ++++++
.../plasma/files/plasma-5.33.0-iconsize.patch | 164 +++++++++++++++++++++
.../plasma-5.33.0-systray-crash-plasmashell.patch | 55 +++++++
kde-frameworks/plasma/plasma-5.33.0-r1.ebuild | 76 ++++++++++
4 files changed, 344 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.33.0-calendar-locale.patch b/kde-frameworks/plasma/files/plasma-5.33.0-calendar-locale.patch
new file mode 100644
index 00000000000..554ac228d65
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.33.0-calendar-locale.patch
@@ -0,0 +1,49 @@
+commit a01e4fb69efeb7a803e6d3a272c62224d7df2494
+Author: David Rosca <nowrep@gmail.com>
+Date: Sat Apr 8 10:40:27 2017 +0200
+
+ Calendar: Use correct language for month and day names
+
+ Apply fix for bug 353715 also on QML side.
+
+ Differential Revision: https://phabricator.kde.org/D5345
+
+diff --git a/src/declarativeimports/calendar/qml/DaysCalendar.qml b/src/declarativeimports/calendar/qml/DaysCalendar.qml
+index 02b23b6e5..2b3ce446c 100644
+--- a/src/declarativeimports/calendar/qml/DaysCalendar.qml
++++ b/src/declarativeimports/calendar/qml/DaysCalendar.qml
+@@ -312,7 +312,7 @@ Item {
+ Components.Label {
+ width: daysCalendar.cellWidth
+ height: daysCalendar.cellHeight
+- text: Qt.locale().dayName(calendarBackend.firstDayOfWeek + index, Locale.ShortFormat)
++ text: Qt.locale(Qt.locale().uiLanguages[0]).dayName(calendarBackend.firstDayOfWeek + index, Locale.ShortFormat)
+ font.pixelSize: Math.max(theme.smallestFont.pixelSize, daysCalendar.cellHeight / 3)
+ opacity: 0.4
+ horizontalAlignment: Text.AlignHCenter
+diff --git a/src/declarativeimports/calendar/qml/MonthMenu.qml b/src/declarativeimports/calendar/qml/MonthMenu.qml
+index aa5d3b46d..beddf6852 100644
+--- a/src/declarativeimports/calendar/qml/MonthMenu.qml
++++ b/src/declarativeimports/calendar/qml/MonthMenu.qml
+@@ -28,7 +28,7 @@ PlasmaComponents.Menu {
+ property Instantiator items: Instantiator {
+ model: 12
+ PlasmaComponents.MenuItem {
+- text: capitalizeFirstLetter(Qt.locale().standaloneMonthName(index))
++ text: capitalizeFirstLetter(Qt.locale(Qt.locale().uiLanguages[0]).standaloneMonthName(index))
+ onClicked: calendarBackend.displayedDate = new Date(year, index, 1)
+ }
+ onObjectAdded: testMenu.addMenuItem(object)
+diff --git a/src/declarativeimports/calendar/qml/MonthView.qml b/src/declarativeimports/calendar/qml/MonthView.qml
+index a2229e5f2..e3c0e95d0 100644
+--- a/src/declarativeimports/calendar/qml/MonthView.qml
++++ b/src/declarativeimports/calendar/qml/MonthView.qml
+@@ -143,7 +143,7 @@ PinchArea {
+ Component.onCompleted: {
+ for (var i = 0; i < 12; ++i) {
+ append({
+- label: Qt.locale().standaloneMonthName(i, Locale.LongFormat),
++ label: Qt.locale(Qt.locale().uiLanguages[0]).standaloneMonthName(i, Locale.LongFormat),
+ monthNumber: i + 1,
+ isCurrent: true
+ })
diff --git a/kde-frameworks/plasma/files/plasma-5.33.0-iconsize.patch b/kde-frameworks/plasma/files/plasma-5.33.0-iconsize.patch
new file mode 100644
index 00000000000..b74c8224fde
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.33.0-iconsize.patch
@@ -0,0 +1,164 @@
+commit fb8ed07651a7101c2f9c41c6e6676ac8196c1225
+Author: Marco Martin <notmart@gmail.com>
+Date: Mon Apr 3 15:42:29 2017 +0200
+
+ if the user did set an implicit size, keep it
+
+ Summary:
+ if the user code did something like
+ IconItem {
+ implicitWidth: 32
+ implicitHeight: 32
+ }
+
+ then never automatically update implicitWidth or height.
+ this favors compatibility and fixes the desktop
+ toolbox appearance
+
+ Test Plan:
+ textbox works, other icon items in plasmashell seems properly sized.
+ applet alternatives fix is still needed
+
+ Reviewers: #plasma, hein
+
+ Reviewed By: #plasma, hein
+
+ Subscribers: hein, davidedmundson, plasma-devel, #frameworks
+
+ Tags: #plasma, #frameworks
+
+ Differential Revision: https://phabricator.kde.org/D5243
+
+diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
+index e1666aa32..2b96c619d 100644
+--- a/src/declarativeimports/core/iconitem.cpp
++++ b/src/declarativeimports/core/iconitem.cpp
+@@ -49,6 +49,8 @@ IconItem::IconItem(QQuickItem *parent)
+ m_sizeChanged(false),
+ m_allowNextAnimation(false),
+ m_blockNextAnimation(false),
++ m_implicitHeightSetByUser(false),
++ m_implicitWidthSetByUser(false),
+ m_colorGroup(Plasma::Theme::NormalColorGroup),
+ m_animValue(0)
+ {
+@@ -75,6 +77,9 @@ IconItem::IconItem(QQuickItem *parent)
+ connect(this, SIGNAL(overlaysChanged()),
+ this, SLOT(schedulePixmapUpdate()));
+
++ connect(this, &IconItem::implicitWidthChanged, this, &IconItem::implicitWidthChanged2);
++ connect(this, &IconItem::implicitHeightChanged, this, &IconItem::implicitHeightChanged2);
++
+ updateImplicitSize();
+ }
+
+@@ -88,7 +93,13 @@ void IconItem::updateImplicitSize()
+ const QSize &s = m_imageIcon.size();
+
+ if (s.isValid()) {
+- setImplicitSize(s.width(), s.height());
++ if (!m_implicitWidthSetByUser && !m_implicitHeightSetByUser) {
++ setImplicitSize(s.width(), s.height());
++ } else if (!m_implicitWidthSetByUser) {
++ setImplicitWidth(s.width());
++ } else if (!m_implicitHeightSetByUser) {
++ setImplicitHeight(s.height());
++ }
+
+ return;
+ }
+@@ -105,7 +116,13 @@ void IconItem::updateImplicitSize()
+ s = m_svgIcon->size();
+ }
+ if (s.isValid()) {
+- setImplicitSize(s.width(), s.height());
++ if (!m_implicitWidthSetByUser && !m_implicitHeightSetByUser) {
++ setImplicitSize(s.width(), s.height());
++ } else if (!m_implicitWidthSetByUser) {
++ setImplicitWidth(s.width());
++ } else if (!m_implicitHeightSetByUser) {
++ setImplicitHeight(s.height());
++ }
+
+ return;
+ }
+@@ -113,7 +130,14 @@ void IconItem::updateImplicitSize()
+
+ // Fall back to initializing implicit size to the Dialog size.
+ const int implicitSize = KIconLoader::global()->currentSize(KIconLoader::Dialog);
+- setImplicitSize(implicitSize, implicitSize);
++
++ if (!m_implicitWidthSetByUser && !m_implicitHeightSetByUser) {
++ setImplicitSize(implicitSize, implicitSize);
++ } else if (!m_implicitWidthSetByUser) {
++ setImplicitWidth(implicitSize);
++ } else if (!m_implicitHeightSetByUser) {
++ setImplicitHeight(implicitSize);
++ }
+ }
+
+ void IconItem::setSource(const QVariant &source)
+@@ -418,6 +442,20 @@ Plasma::Svg::Status IconItem::status() const
+ return m_status;
+ }
+
++void IconItem::setImplicitHeight2(int height)
++{
++ m_implicitHeightSetByUser = true;
++ setImplicitHeight(height);
++ emit implicitHeightChanged2();
++}
++
++void IconItem::setImplicitWidth2(int width)
++{
++ m_implicitWidthSetByUser = true;
++ setImplicitWidth(width);
++ emit implicitWidthChanged2();
++}
++
+ void IconItem::updatePolish()
+ {
+ QQuickItem::updatePolish();
+diff --git a/src/declarativeimports/core/iconitem.h b/src/declarativeimports/core/iconitem.h
+index e4b2a959d..8b524e7a0 100644
+--- a/src/declarativeimports/core/iconitem.h
++++ b/src/declarativeimports/core/iconitem.h
+@@ -119,6 +119,10 @@ class IconItem : public QQuickItem
+ */
+ Q_PROPERTY(int paintedHeight READ paintedHeight NOTIFY paintedSizeChanged)
+
++ Q_PROPERTY(int implicitHeight READ implicitHeight WRITE setImplicitHeight2 NOTIFY implicitHeightChanged2)
++
++ Q_PROPERTY(int implicitWidth READ implicitWidth WRITE setImplicitWidth2 NOTIFY implicitWidthChanged2)
++
+ public:
+ IconItem(QQuickItem *parent = 0);
+ ~IconItem();
+@@ -155,6 +159,9 @@ public:
+ void setStatus(Plasma::Svg::Status status);
+ Plasma::Svg::Status status() const;
+
++ void setImplicitHeight2(int height);
++ void setImplicitWidth2(int height);
++
+ void updatePolish() Q_DECL_OVERRIDE;
+ QSGNode* updatePaintNode(QSGNode * oldNode, UpdatePaintNodeData * updatePaintNodeData) Q_DECL_OVERRIDE;
+
+@@ -176,6 +183,8 @@ Q_SIGNALS:
+ void colorGroupChanged();
+ void paintedSizeChanged();
+ void statusChanged();
++ void implicitHeightChanged2();
++ void implicitWidthChanged2();
+
+ private Q_SLOTS:
+ void schedulePixmapUpdate();
+@@ -210,6 +219,8 @@ private:
+ bool m_sizeChanged;
+ bool m_allowNextAnimation;
+ bool m_blockNextAnimation;
++ bool m_implicitHeightSetByUser;
++ bool m_implicitWidthSetByUser;
+
+ QPixmap m_iconPixmap;
+ QPixmap m_oldIconPixmap;
diff --git a/kde-frameworks/plasma/files/plasma-5.33.0-systray-crash-plasmashell.patch b/kde-frameworks/plasma/files/plasma-5.33.0-systray-crash-plasmashell.patch
new file mode 100644
index 00000000000..64a50b9c164
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.33.0-systray-crash-plasmashell.patch
@@ -0,0 +1,55 @@
+commit 1387b5efe31e330777c8ffd9029f79063cc7a7a9
+Author: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu Apr 13 10:41:40 2017 +0100
+
+ Guard against Applet not loading AppletInterface
+
+ Summary:
+ This can happen if an applet has invalid metadata, it doesn't have a
+ script engine set (X-Plasma-API) so it won't load the DeclarativeAppletScripts
+ Having invalid metadata could come from the applet, or from the fallback applet
+ created in Containment::Private::createApplet.
+
+ We guard against it in appletAdded but not in appletRemoved, which is
+ inconsistent. We also apparently must have guards elsewhere otherwise
+ we'd see the crash more.
+
+ BUG: 377050
+
+ Test Plan: Had corrupt applet, used to crash, now doesn't
+
+ Reviewers: #plasma
+
+ Subscribers: plasma-devel, #frameworks
+
+ Tags: #plasma, #frameworks
+
+ Differential Revision: https://phabricator.kde.org/D5423
+
+diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
+index 2ba4a8218..e311f6018 100644
+--- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp
++++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
+@@ -821,7 +821,8 @@ void ContainmentInterface::appletAddedForward(Plasma::Applet *applet)
+ // qDebug() << "Applet added on containment:" << m_containment->title() << contGraphicObject
+ // << "Applet: " << applet << applet->title() << appletGraphicObject;
+
+- //Every applet should have a graphics object, otherwise don't disaplay anything
++ //applets can not have a graphic object if they don't have a script engine loaded
++ //this can happen if they were loaded with an invalid metadata
+ if (!appletGraphicObject) {
+ return;
+ }
+@@ -843,8 +844,10 @@ void ContainmentInterface::appletAddedForward(Plasma::Applet *applet)
+ void ContainmentInterface::appletRemovedForward(Plasma::Applet *applet)
+ {
+ AppletInterface *appletGraphicObject = applet->property("_plasma_graphicObject").value<AppletInterface *>();
+- m_appletInterfaces.removeAll(appletGraphicObject);
+- appletGraphicObject->m_positionBeforeRemoval = appletGraphicObject->mapToItem(this, QPointF());
++ if (appletGraphicObject) {
++ m_appletInterfaces.removeAll(appletGraphicObject);
++ appletGraphicObject->m_positionBeforeRemoval = appletGraphicObject->mapToItem(this, QPointF());
++ }
+ emit appletRemoved(appletGraphicObject);
+ emit appletsChanged();
+ }
diff --git a/kde-frameworks/plasma/plasma-5.33.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.33.0-r1.ebuild
new file mode 100644
index 00000000000..c2e74f8b08e
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.33.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gles2 wayland X"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui 'gles2=')
+ $(add_qt_dep qtquickcontrols)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ !gles2? ( virtual/opengl )
+ wayland? (
+ $(add_frameworks_dep kwayland)
+ media-libs/mesa[egl]
+ )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kdoctools)
+ X? ( x11-proto/xproto )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<kde-apps/kapptemplate-15.08.3-r1:5
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-iconsize.patch"
+ "${FILESDIR}/${P}-calendar-locale.patch"
+ "${FILESDIR}/${P}-systray-crash-plasmashell.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package !gles2 OpenGL)
+ $(cmake-utils_use_find_package wayland EGL)
+ $(cmake-utils_use_find_package wayland KF5Wayland)
+ $(cmake-utils_use_find_package X X11)
+ $(cmake-utils_use_find_package X XCB)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2019-03-13 11:05 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2019-03-13 11:05 UTC (permalink / raw
To: gentoo-commits
commit: a16899591d3ef4c626c0c98a2564d6b6cb0830f9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 11:03:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 11:03:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1689959
kde-frameworks/plasma: Drop 5.56.0, 5.56.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
kde-frameworks/plasma/Manifest | 1 -
.../plasma/files/plasma-5.56.0-crashfix.patch | 40 ------------
kde-frameworks/plasma/plasma-5.56.0-r1.ebuild | 73 ----------------------
kde-frameworks/plasma/plasma-5.56.0.ebuild | 71 ---------------------
4 files changed, 185 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 77e8505d233..92c96f3893b 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
DIST plasma-framework-5.54.0.tar.xz 4631204 BLAKE2B c7c68f96524be0bc359b0f4b36c79c2d581a8659a53ab432ad64bbeec00b4004630170d2354a887e0ae6d2c15c50d9895fbb5f27def6d8574fd051e5f1612551 SHA512 618f2beb3b8a25cacf7c11339ba15cae10db461c61e278a5ba845e9afac7e9edb48fde16bd78b4bb7d16c07001f8d9fbdbf5bfd58593488a544fa183b3df8c15
-DIST plasma-framework-5.56.0.tar.xz 4636296 BLAKE2B 77f94585d7129917d0b3a1689a07242a4a593ac7dd45e92c417e1dcef994be9c5b3d949bccbd50158c3471ad30b2a773d67e892b4e58968fea5a98c2604d4260 SHA512 7dee5e0fc9345f81a166c1c381ebc6e660eb38ae34eea169977740151ad67bd93d07fc1933ea4d3f2ec0236ca9d40dbd2c160b379b85e28faf184f15a80b9bcc
DIST plasma-framework-5.56.1.tar.xz 4636412 BLAKE2B 516c50e9540f5e82c97dd9ea767b9fb79647ad74f54da767930119292f3a3dea69bbea0df2b00ef0a0300a558663cdc14f97883bf8c19346a53272e1c7d083b3 SHA512 4cf9387016b25fa060e9b1859a2d3894d48e0e698130886b2fab94a92023c438566bc509b2066c58d1273214e91a63705b05f4f8cad9121d8e84ebed4a7d11af
diff --git a/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch b/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch
deleted file mode 100644
index 844ddf6a234..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ebae2d63033647950cf0f9d97410723a8c7db1f3 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Tue, 12 Mar 2019 07:03:10 +0100
-Subject: Remove crash in plasmashell
-
-Summary: remove bug in plasmashell Bug 405341
-
-Test Plan: can't reproduce bug
-
-Reviewers: dfaure, #frameworks, #plasma, broulik
-
-Reviewed By: #plasma, broulik
-
-Subscribers: broulik, kde-frameworks-devel
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D19698
----
- src/declarativeimports/core/datamodel.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/declarativeimports/core/datamodel.cpp b/src/declarativeimports/core/datamodel.cpp
-index 50dc6c5..03bea20 100644
---- a/src/declarativeimports/core/datamodel.cpp
-+++ b/src/declarativeimports/core/datamodel.cpp
-@@ -64,7 +64,10 @@ void SortFilterModel::syncRoleNames()
-
- QHash<int,QByteArray> SortFilterModel::roleNames() const
- {
-- return sourceModel()->roleNames();
-+ if (sourceModel()) {
-+ return sourceModel()->roleNames();
-+ }
-+ return {};
- }
-
- int SortFilterModel::roleNameToId(const QString &name) const
---
-cgit v1.1
diff --git a/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild
deleted file mode 100644
index fce285228be..00000000000
--- a/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="${PN}-framework"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma framework"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="gles2 wayland X"
-
-BDEPEND="
- $(add_frameworks_dep kdoctools)
-"
-RDEPEND="
- $(add_frameworks_dep kactivities)
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kirigami)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kpackage)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui 'gles2=')
- $(add_qt_dep qtquickcontrols)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- !gles2? ( virtual/opengl )
- wayland? (
- $(add_frameworks_dep kwayland)
- media-libs/mesa[egl]
- )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package !gles2 OpenGL)
- $(cmake-utils_use_find_package wayland EGL)
- $(cmake-utils_use_find_package wayland KF5Wayland)
- $(cmake-utils_use_find_package X X11)
- $(cmake-utils_use_find_package X XCB)
- )
-
- kde5_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.56.0.ebuild b/kde-frameworks/plasma/plasma-5.56.0.ebuild
deleted file mode 100644
index 8da657de064..00000000000
--- a/kde-frameworks/plasma/plasma-5.56.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="${PN}-framework"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma framework"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="gles2 wayland X"
-
-BDEPEND="
- $(add_frameworks_dep kdoctools)
-"
-RDEPEND="
- $(add_frameworks_dep kactivities)
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kirigami)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kpackage)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui 'gles2=')
- $(add_qt_dep qtquickcontrols)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- !gles2? ( virtual/opengl )
- wayland? (
- $(add_frameworks_dep kwayland)
- media-libs/mesa[egl]
- )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package !gles2 OpenGL)
- $(cmake-utils_use_find_package wayland EGL)
- $(cmake-utils_use_find_package wayland KF5Wayland)
- $(cmake-utils_use_find_package X X11)
- $(cmake-utils_use_find_package X XCB)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2020-02-13 23:20 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-02-13 23:20 UTC (permalink / raw
To: gentoo-commits
commit: a7a8f145cae9b34c3260585ba418bd22550d2661
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 22:07:34 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 23:19:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a8f145
kde-frameworks/plasma: Remove hardcoded colors
See also: https://mail.kde.org/pipermail/plasma-devel/2020-February/111114.html
Dark panels have white corners
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=417511
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-5.67.0-remove-hardcoded-colors.patch | 140 +++++++++++++++++++++
kde-frameworks/plasma/plasma-5.67.0-r2.ebuild | 80 ++++++++++++
2 files changed, 220 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.67.0-remove-hardcoded-colors.patch b/kde-frameworks/plasma/files/plasma-5.67.0-remove-hardcoded-colors.patch
new file mode 100644
index 00000000000..8b408749052
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.67.0-remove-hardcoded-colors.patch
@@ -0,0 +1,140 @@
+From 1ed47e7c4188ed0f047dda40093ea0213ae4a433 Mon Sep 17 00:00:00 2001
+From: Niccol Venerandi <niccolo@venerandi.com>
+Date: Wed, 12 Feb 2020 20:12:05 +0100
+Subject: Remove hardcoded colors
+
+Summary:
+Fixes https://www.reddit.com/r/kde/comments/f2mxd3/517_seeing_weird_white_corners_on_my_autohiding/
+
+BUG:417511
+
+Reviewers: ndavis
+
+Reviewed By: ndavis
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D27354
+---
+ .../breeze/translucent/widgets/panel-background.svg | 8 ++++----
+ src/desktoptheme/breeze/widgets/panel-background.svg | 18 +++++++++---------
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/desktoptheme/breeze/translucent/widgets/panel-background.svg b/src/desktoptheme/breeze/translucent/widgets/panel-background.svg
+index eae58ed..9c9c3dd 100644
+--- a/src/desktoptheme/breeze/translucent/widgets/panel-background.svg
++++ b/src/desktoptheme/breeze/translucent/widgets/panel-background.svg
+@@ -1025,28 +1025,28 @@
+ sodipodi:nodetypes="cccccccccssccc"
+ class="ColorScheme-Background"
+ inkscape:connector-curvature="0"
+- style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+ d="m 158.49999,954.61232 v -1.37503 -5.5001 -1.37503 h 1.37503 1.37502 4.12508 1.37503 v 1.37503 2.75005 c 0,2.75005 -1.37503,4.12508 -4.12508,4.12508 h -1.37503 -1.37502 z"
+ id="mask-bottomright" />
+ <path
+ sodipodi:nodetypes="cccccccccssccc"
+ class="ColorScheme-Background"
+ inkscape:connector-curvature="0"
+- style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+ d="m 131,954.6123 v -1.37503 -5.5001 -1.37503 h -1.37503 -1.37502 -4.12508 -1.37503 v 1.37503 2.75005 c 0,2.75005 1.37503,4.12508 4.12508,4.12508 h 1.37503 1.37502 z"
+ id="mask-bottomleft" />
+ <path
+ sodipodi:nodetypes="cccccccccssccc"
+ class="ColorScheme-Background"
+ inkscape:connector-curvature="0"
+- style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+ d="m 131.00016,910.61202 v 1.37503 5.5001 1.37503 h -1.37503 -1.37502 -4.12508 -1.37503 v -1.37503 -2.75005 c 0,-2.75005 1.37503,-4.12508 4.12508,-4.12508 h 1.37503 1.37502 z"
+ id="mask-topleft" />
+ <path
+ sodipodi:nodetypes="cccccccccssccc"
+ class="ColorScheme-Background"
+ inkscape:connector-curvature="0"
+- style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+ d="m 158.49998,910.61202 v 1.37503 5.5001 1.37503 h 1.37503 1.37502 4.12508 1.37503 v -1.37503 -2.75005 c 0,-2.75005 -1.37503,-4.12508 -4.12508,-4.12508 h -1.37503 -1.37502 z"
+ id="mask-topright" />
+ <g
+diff --git a/src/desktoptheme/breeze/widgets/panel-background.svg b/src/desktoptheme/breeze/widgets/panel-background.svg
+index 9b9bb99..4f2a832 100644
+--- a/src/desktoptheme/breeze/widgets/panel-background.svg
++++ b/src/desktoptheme/breeze/widgets/panel-background.svg
+@@ -1017,35 +1017,35 @@
+ sodipodi:nodetypes="cccccccccssccc"
+ class="ColorScheme-Background"
+ inkscape:connector-curvature="0"
+- style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+ d="m 159.49999,954.61234 v -1.37503 -5.5001 -1.37503 h 1.37503 1.37502 4.12508 1.37503 v 1.37503 2.75005 c 0,2.75005 -1.37503,4.12508 -4.12508,4.12508 h -1.37503 -1.37502 z"
+ id="mask-bottomright" />
+ <path
+ sodipodi:nodetypes="cccccccccssccc"
+ class="ColorScheme-Background"
+ inkscape:connector-curvature="0"
+- style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+ d="m 132,954.61232 v -1.37503 -5.5001 -1.37503 h -1.37503 -1.37502 -4.12508 -1.37503 v 1.37503 2.75005 c 0,2.75005 1.37503,4.12508 4.12508,4.12508 h 1.37503 1.37502 z"
+ id="mask-bottomleft" />
+ <path
+ sodipodi:nodetypes="cccccccccssccc"
+ class="ColorScheme-Background"
+ inkscape:connector-curvature="0"
+- style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+ d="m 132.00016,910.61204 v 1.37503 5.5001 1.37503 h -1.37503 -1.37502 -4.12508 -1.37503 v -1.37503 -2.75005 c 0,-2.75005 1.37503,-4.12508 4.12508,-4.12508 h 1.37503 1.37502 z"
+ id="mask-topleft" />
+ <path
+ sodipodi:nodetypes="cccccccccssccc"
+ class="ColorScheme-Background"
+ inkscape:connector-curvature="0"
+- style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+ d="m 159.49998,910.61204 v 1.37503 5.5001 1.37503 h 1.37503 1.37502 4.12508 1.37503 v -1.37503 -2.75005 c 0,-2.75005 -1.37503,-4.12508 -4.12508,-4.12508 h -1.37503 -1.37502 z"
+ id="mask-topright" />
+ <g
+ transform="translate(0,-2.0185303e-5)"
+ id="topleft">
+ <path
+- style="color:#eff0f1;opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
++ style="opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 16,6 c -2,0 -3,1 -3,3 v 2 1 h 4 1 1 V 11 7 6 h -1 1 z"
+ transform="translate(0,904.36218)"
+ id="rect4159"
+@@ -1057,7 +1057,7 @@
+ transform="translate(0,-2.0185303e-5)"
+ id="topright">
+ <path
+- style="color:#eff0f1;opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
++ style="opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 51,6 v 1 4 1 h 1 1 3 1 V 11 9 C 57,7 56,6 54,6 h -1 -1 z"
+ transform="translate(0,904.36218)"
+ id="rect4177"
+@@ -1070,7 +1070,7 @@
+ id="bottomleft">
+ <path
+ inkscape:connector-curvature="0"
+- style="color:#eff0f1;opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
++ style="opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 19,954.36218 v -1 -4 -1 h -1 -1 -3 -1 v 1 2 c 0,2 1,3 3,3 h 1 1 z"
+ id="path5048"
+ class="ColorScheme-Background"
+@@ -1078,11 +1078,11 @@
+ </g>
+ <g
+ transform="translate(0,-2.0185303e-5)"
+- id="bottomright">
++ id="bottomright">
+ <path
+ id="rect4177-6"
+ d="m 51,954.36218 v -1 -4 -1 h 1 1 3 1 v 1 2 c 0,2 -1,3 -3,3 h -1 -1 z"
+- style="color:#eff0f1;opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
++ style="opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0"
+ class="ColorScheme-Background"
+ sodipodi:nodetypes="cccccccccssccc" />
+--
+cgit v1.1
diff --git a/kde-frameworks/plasma/plasma-5.67.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.67.0-r2.ebuild
new file mode 100644
index 00000000000..7155e18e8ab
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.67.0-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2 wayland X"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+ >=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2? ( virtual/opengl )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/mesa[egl]
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-construct-nullengine-w-KPluginMetadata.patch" # KDE-Bug #417548
+ "${FILESDIR}/${P}-remove-hardcoded-colors.patch" # KDE-Bug #417511
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2 OpenGL)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2020-04-17 20:59 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-04-17 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 217c7b8085ffb5ce72873dab745e18074ef5f856
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 20:22:33 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 20:58:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217c7b80
kde-frameworks/plasma: Fix crash w/ Qt-5.15 on panel right click
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma/files/plasma-5.69.0-qt-5.15-crash.patch | 60 +++++++++++++++++
kde-frameworks/plasma/plasma-5.69.0-r1.ebuild | 77 ++++++++++++++++++++++
2 files changed, 137 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch b/kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch
new file mode 100644
index 00000000000..f48b82f7223
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch
@@ -0,0 +1,60 @@
+From 0417bf61d53a61879702aa6e5bc64d1da557db27 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Mon, 6 Apr 2020 12:21:45 +0100
+Subject: [configview] Simplify code / workaround Qt5.15 crash
+
+Summary:
+QQmlComponent::beginCreate and completeCreate are useful if you need to
+set properties on the object explicitly. We're not doing that here, we
+can just call create.
+
+Test Plan:
+On Qt5.15
+Right click a panel
+choose edit
+
+Reviewers: #plasma, apol
+
+Reviewed By: apol
+
+Subscribers: apol, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D28599
+---
+ src/plasmaquick/configview.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/plasmaquick/configview.cpp b/src/plasmaquick/configview.cpp
+index ff43753..c5e2228 100644
+--- a/src/plasmaquick/configview.cpp
++++ b/src/plasmaquick/configview.cpp
+@@ -134,9 +134,13 @@ void ConfigViewPrivate::init()
+
+ q->setResizeMode(QQuickView::SizeViewToRootObject);
+
++ auto plasmoid = applet.data()->property("_plasma_graphicObject").value<QObject *>();
++ q->engine()->rootContext()->setContextProperties({QQmlContext::PropertyPair{QStringLiteral("plasmoid"), QVariant::fromValue(plasmoid)},
++ QQmlContext::PropertyPair{QStringLiteral("configDialog"), QVariant::fromValue(q)}});
++
+ //config model local of the applet
+ QQmlComponent *component = new QQmlComponent(q->engine(), applet.data()->kPackage().fileUrl("configmodel"), q);
+- QObject *object = component->beginCreate(q->engine()->rootContext());
++ QObject *object = component->create(q->engine()->rootContext());
+ configModel = qobject_cast<ConfigModel *>(object);
+
+ if (configModel) {
+@@ -172,9 +176,6 @@ void ConfigViewPrivate::init()
+ }
+ }
+
+- q->engine()->rootContext()->setContextProperty(QStringLiteral("plasmoid"), applet.data()->property("_plasma_graphicObject").value<QObject *>());
+- q->engine()->rootContext()->setContextProperty(QStringLiteral("configDialog"), q);
+- component->completeCreate();
+ delete component;
+ }
+
+--
+cgit v1.1
+
diff --git a/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild
new file mode 100644
index 00000000000..7d9816e2277
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only wayland X"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+ >=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2-only? ( virtual/opengl )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/mesa[egl]
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.15-crash.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2020-10-26 19:06 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-10-26 19:06 UTC (permalink / raw
To: gentoo-commits
commit: c17cd5d329e6d248bde037cb385a503cfffa7e47
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 18:29:40 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 19:06:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17cd5d3
kde-frameworks/plasma: Fix slow krunner input
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=426746
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...plasma-5.75.0-krunner-terribly-slow-input.patch | 45 +++++++++++++
kde-frameworks/plasma/plasma-5.75.0-r1.ebuild | 78 ++++++++++++++++++++++
2 files changed, 123 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.75.0-krunner-terribly-slow-input.patch b/kde-frameworks/plasma/files/plasma-5.75.0-krunner-terribly-slow-input.patch
new file mode 100644
index 00000000000..8e25425627b
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.75.0-krunner-terribly-slow-input.patch
@@ -0,0 +1,45 @@
+From e0e7840a0307deaee7a0b63f341973f8e3508873 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Thu, 8 Oct 2020 16:35:39 +0200
+Subject: [PATCH] BusyIndicator: Do not rotate when invisible
+
+It seems like the "visible" property is catching there is the wrong one
+and would still rotate while invisible.
+
+CCBUG: 426746
+
+From d578c2a1540a52ff9ccbb0658dc24b9be394bbd9 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sat, 17 Oct 2020 13:45:15 +0200
+Subject: [PATCH] Fix BusyIndicator rotating even when invisible, again
+
+After "BusyIndicator: Do not rotate when invisible", plasmashell started
+consuming 100% CPU due to plasma-nm's icon having an invisible BusyIndicator.
+Adding the "visible" property back into the equation avoids this.
+
+Third time's the charm?
+---
+ src/declarativeimports/plasmacomponents3/BusyIndicator.qml | 3 +-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/declarativeimports/plasmacomponents3/BusyIndicator.qml b/src/declarativeimports/plasmacomponents3/BusyIndicator.qml
+index ec4ccaf13..6321d88cf 100644
+--- a/src/declarativeimports/plasmacomponents3/BusyIndicator.qml
++++ b/src/declarativeimports/plasmacomponents3/BusyIndicator.qml
+@@ -25,6 +25,7 @@
+ padding: 0
+
+ contentItem: Item {
++ id: baseItem
+ /* implicitWidth and implicitHeight won't work unless they come
+ * from a child of the contentItem. No idea why.
+ */
+@@ -61,7 +62,7 @@
+ to: 360
+ duration: 2000
+ loops: Animation.Infinite
+- running: visible
++ running: visible && (control.running || baseItem.opacity > 0)
+ }
+ }
+ }
diff --git a/kde-frameworks/plasma/plasma-5.75.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.75.0-r1.ebuild
new file mode 100644
index 00000000000..d3b855483a1
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.75.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only wayland X"
+
+BDEPEND="
+ >=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2-only? ( virtual/opengl )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/mesa[egl]
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-krunner-terribly-slow-input.patch # KDE-Bug 426746
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2020-11-16 23:41 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-11-16 23:41 UTC (permalink / raw
To: gentoo-commits
commit: ddc4c629e1e7e6a1104bf5d127fa870bce622768
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 23:18:12 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 23:40:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc4c629
kde-frameworks/plasma: drop 5.75.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
...plasma-5.75.0-krunner-terribly-slow-input.patch | 45 -------------
kde-frameworks/plasma/plasma-5.75.0-r1.ebuild | 78 ----------------------
3 files changed, 124 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index b48a574883b..6cef17b792b 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
DIST plasma-framework-5.74.0.tar.xz 3140648 BLAKE2B dfc8df92d351446a146204f48c42cd4d6325f2652b5b61e0a530b27763fb3b6f07bf14319c86a54f933a58329d214977545e00f261cc784c0d8659eebd8cddb0 SHA512 7aae44d94a175dcdbd779a6801626d20e8d986597d1d05c82c5c035997b874ebb9b4412191e1fa7a26aa4e045ceaf22a7ef359d3e817d812357d51219eb5fb46
-DIST plasma-framework-5.75.0.tar.xz 3146028 BLAKE2B cfce54f3cdd7dbe0efa16705d7d22b428342aea05a462bb87fad783f87c40af611080557b7e54387fb1507508a9db8bd2738d45912619b0056bf3d77b3c007f3 SHA512 951503ae1472f0713179d5f668451487d496c6b88c3266639451bfd869240cd065ef47889a36acb327a34ffe0a669385de347556a506f386ec8b3e3af892e045
DIST plasma-framework-5.76.0.tar.xz 3146848 BLAKE2B 54217dcd1ecd73e4006f70726b6c9417ae1622880734a9ebe56740bfa7075538f9c8f2f09612e992260124e3b4ec63ff7cf2a0fd10192dbc500befa501404962 SHA512 ac42cdafc029bd422274f5d70e3dca89ef24016cd55c7f472dde74c5a3b72540c5c09f48867593017fd229a349df1e5dc0879d93678e0fcb25fad314e29de768
diff --git a/kde-frameworks/plasma/files/plasma-5.75.0-krunner-terribly-slow-input.patch b/kde-frameworks/plasma/files/plasma-5.75.0-krunner-terribly-slow-input.patch
deleted file mode 100644
index 8e25425627b..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.75.0-krunner-terribly-slow-input.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e0e7840a0307deaee7a0b63f341973f8e3508873 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Thu, 8 Oct 2020 16:35:39 +0200
-Subject: [PATCH] BusyIndicator: Do not rotate when invisible
-
-It seems like the "visible" property is catching there is the wrong one
-and would still rotate while invisible.
-
-CCBUG: 426746
-
-From d578c2a1540a52ff9ccbb0658dc24b9be394bbd9 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sat, 17 Oct 2020 13:45:15 +0200
-Subject: [PATCH] Fix BusyIndicator rotating even when invisible, again
-
-After "BusyIndicator: Do not rotate when invisible", plasmashell started
-consuming 100% CPU due to plasma-nm's icon having an invisible BusyIndicator.
-Adding the "visible" property back into the equation avoids this.
-
-Third time's the charm?
----
- src/declarativeimports/plasmacomponents3/BusyIndicator.qml | 3 +-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/declarativeimports/plasmacomponents3/BusyIndicator.qml b/src/declarativeimports/plasmacomponents3/BusyIndicator.qml
-index ec4ccaf13..6321d88cf 100644
---- a/src/declarativeimports/plasmacomponents3/BusyIndicator.qml
-+++ b/src/declarativeimports/plasmacomponents3/BusyIndicator.qml
-@@ -25,6 +25,7 @@
- padding: 0
-
- contentItem: Item {
-+ id: baseItem
- /* implicitWidth and implicitHeight won't work unless they come
- * from a child of the contentItem. No idea why.
- */
-@@ -61,7 +62,7 @@
- to: 360
- duration: 2000
- loops: Animation.Infinite
-- running: visible
-+ running: visible && (control.running || baseItem.opacity > 0)
- }
- }
- }
diff --git a/kde-frameworks/plasma/plasma-5.75.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.75.0-r1.ebuild
deleted file mode 100644
index d3b855483a1..00000000000
--- a/kde-frameworks/plasma/plasma-5.75.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only wayland X"
-
-BDEPEND="
- >=kde-frameworks/kdoctools-${PVCUT}:5
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( virtual/opengl )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/mesa[egl]
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-krunner-terribly-slow-input.patch # KDE-Bug 426746
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2021-01-11 12:28 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-01-11 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 727163033fc81841ea21d818d28aa1ceaf35af80
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 09:49:33 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 12:27:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72716303
kde-frameworks/plasma: drop 5.74.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
...sma-5.74.0-fix-pc3-button-icons-color-set.patch | 28 --------
kde-frameworks/plasma/plasma-5.74.0-r1.ebuild | 76 ----------------------
3 files changed, 105 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 82eba89f444..239ea89391a 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,4 +1,3 @@
DIST plasma-5.77.0-fix-broken-background.patch.xz 3732 BLAKE2B 19c656de212e3b2162e5f43e6ee2aface46d9169169179b6ac8af3eee01e64ec54139ac0001a6009f2a6d3cc4a59775951a3e10e8c33c7d04bf2b78543564137 SHA512 a262bebc754102709d1b41a2e5571938e58bfbcfd027dce9d0c1dd5cbdb8adee44a1c18b716976dc36d7f55b1d7e16d0536615e9f2895fa62eebb5f08cf05098
-DIST plasma-framework-5.74.0.tar.xz 3140648 BLAKE2B dfc8df92d351446a146204f48c42cd4d6325f2652b5b61e0a530b27763fb3b6f07bf14319c86a54f933a58329d214977545e00f261cc784c0d8659eebd8cddb0 SHA512 7aae44d94a175dcdbd779a6801626d20e8d986597d1d05c82c5c035997b874ebb9b4412191e1fa7a26aa4e045ceaf22a7ef359d3e817d812357d51219eb5fb46
DIST plasma-framework-5.77.0.tar.xz 3152748 BLAKE2B 717d620fd5249887d47bbc6ed8ec42f103b56c4e566b0baae3624e64403b48977b5d36ebdbb30b52ae6cbec7694645050cf76eceaf6ab28c3690bcafcf8c7a07 SHA512 abcbb0b5bf063cdda728b0fc03f0d51f0ad84b4c45fb428efe54556aeb27b4cc3c488244ba0f7e3a435c31e802551d09f758bde815ca0a5aa43cf18e916d1ea4
DIST plasma-framework-5.78.0.tar.xz 3154276 BLAKE2B 6df7761e4477629c9effd0b5df16334d1c4402475beb3ccf286afcbb3305bc73382e4a74d09897f6a404ec0698c28e93b2a47bd6054df4abade08107ee66448e SHA512 fb5969e43d634ec750706137753e2e6f8adf3d533cdf23d9322fa3350e454cf5f130eeed02cc0f2b5841c1402f0d1ed098a30f08a0ed522b99b592a15026013c
diff --git a/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch b/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch
deleted file mode 100644
index 8f938b00b89..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3167717797d07a8645391e093fa91526c4645f4f Mon Sep 17 00:00:00 2001
-From: Noah Davis <noahadvs@gmail.com>
-Date: Wed, 23 Sep 2020 20:23:08 -0400
-Subject: [PATCH] Fix PC3 Button/ToolButton icons not always having the right
- color set
-
-BUG: 426556
-FIXED-IN: 5.75
----
- .../plasmacomponents3/private/ButtonContent.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml b/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml
-index 6dc2ce085..91428bdb3 100644
---- a/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml
-+++ b/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml
-@@ -42,7 +42,7 @@ GridLayout {
-
- implicitWidth: root.parent.icon.width > 0 ? root.parent.icon.width : defaultIconSize
- implicitHeight: root.parent.icon.height > 0 ? root.parent.icon.height : defaultIconSize
--
-+ colorGroup: parent.PlasmaCore.ColorScope.colorGroup
- visible: source.length > 0 && root.parent.display !== T.Button.TextOnly
- source: root.parent.icon ? (root.parent.icon.name || root.parent.icon.source) : ""
- status: usingFocusBackground ? PlasmaCore.Svg.Selected : PlasmaCore.Svg.Normal
---
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
deleted file mode 100644
index 214f69e939b..00000000000
--- a/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gles2-only wayland X"
-
-BDEPEND="
- >=kde-frameworks/kdoctools-${PVCUT}:5
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( virtual/opengl )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/mesa[egl]
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-pc3-button-icons-color-set.patch )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2021-08-15 18:57 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-08-15 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 19f8c459f7a27534e261a378ca4828b0e6e1ab03
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 15 18:18:58 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 18:56:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f8c459
kde-frameworks/plasma: Fix Plasma (non-Qt) icon scaling
...with integer scale factors.
See also:
https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/320
Upstream commit 837bb6975f6a0661d211107823b7587808fc3d4e
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
....0-fix-plasma-scaling-w-int-scale-factors.patch | 44 ++++++++++++++++++++++
...lasma-5.85.0.ebuild => plasma-5.85.0-r1.ebuild} | 2 +
2 files changed, 46 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch
new file mode 100644
index 00000000000..9c0e9046496
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch
@@ -0,0 +1,44 @@
+From 837bb6975f6a0661d211107823b7587808fc3d4e Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 15 Aug 2021 09:33:10 -0600
+Subject: [PATCH] Fix Plasma (non-Qt) icon scaling with integer scale factors
+
+An embarrassing error in 4edb830f53aac4833ece024df59441029b01fde6
+caused the function which returns an appropriate scale factor for icons
+to both take and return integer values rather than floating point
+values, preventing it from working properly with any scale factor other
+than an integer scale factor (e.g. 200%). This commit fixes that issue.
+---
+ src/declarativeimports/core/units.cpp | 2 +-
+ src/declarativeimports/core/units.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp
+index 6788ed952..fbcc6d888 100644
+--- a/src/declarativeimports/core/units.cpp
++++ b/src/declarativeimports/core/units.cpp
+@@ -174,7 +174,7 @@ int Units::roundToIconSize(int size)
+ }
+ }
+
+-int Units::bestIconScaleForDevicePixelRatio(const int ratio)
++qreal Units::bestIconScaleForDevicePixelRatio(const qreal ratio)
+ {
+ if (ratio < 1.5) {
+ return 1;
+diff --git a/src/declarativeimports/core/units.h b/src/declarativeimports/core/units.h
+index c19cf0dd8..855738e7d 100644
+--- a/src/declarativeimports/core/units.h
++++ b/src/declarativeimports/core/units.h
+@@ -271,7 +271,7 @@ private:
+ * Note that this function is only relevant when using Plasma scaling and
+ * when using Qt scaling, it always returns 1.
+ */
+- static int bestIconScaleForDevicePixelRatio(const int ratio);
++ static qreal bestIconScaleForDevicePixelRatio(const qreal ratio);
+
+ /**
+ * @return The dpi-adjusted size for a given icon size
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.85.0.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
similarity index 96%
rename from kde-frameworks/plasma/plasma-5.85.0.ebuild
rename to kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
index 48d5e24d902..92d12a32c09 100644
--- a/kde-frameworks/plasma/plasma-5.85.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
@@ -61,6 +61,8 @@ DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
+PATCHES=( "${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package !gles2-only OpenGL)
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2021-08-15 18:57 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-08-15 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 3f84f6af2f02d2e5d2f5031e1cf87441a1ff7b35
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 15 18:23:01 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 18:56:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f84f6af
kde-frameworks/plasma: Fix pinned calendar showing wrong no. of dots
Upstream commit 19fe24ef9377178413438d7749630053995af229
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=440627
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-5.85.0-fix-pinned-calendar-dots.patch | 37 ++++++++++++++++++++++
kde-frameworks/plasma/plasma-5.85.0-r1.ebuild | 5 ++-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch
new file mode 100644
index 00000000000..0342024ca89
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch
@@ -0,0 +1,37 @@
+From 19fe24ef9377178413438d7749630053995af229 Mon Sep 17 00:00:00 2001
+From: Eugene Popov <popov895@ukr.net>
+Date: Mon, 9 Aug 2021 15:56:02 +0000
+Subject: [PATCH] [Calendar] Fix pinned calendar displaying the wrong number of
+ dots
+
+Use assignment instead of binding for the rootIndex property of the DelegateModel.
+
+BUG: 440627
+FIXED-IN: 5.86
+---
+ src/declarativeimports/calendar/qml/DayDelegate.qml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/declarativeimports/calendar/qml/DayDelegate.qml b/src/declarativeimports/calendar/qml/DayDelegate.qml
+index af31991db..3f7fc681b 100644
+--- a/src/declarativeimports/calendar/qml/DayDelegate.qml
++++ b/src/declarativeimports/calendar/qml/DayDelegate.qml
+@@ -81,13 +81,14 @@ PlasmaComponents3.AbstractButton {
+ Repeater {
+ model: DelegateModel {
+ model: dayStyle.dayModel
+- rootIndex: modelIndex(index)
+ delegate: Rectangle {
+ width: PlasmaCore.Units.smallSpacing * 1.5
+ height: width
+ radius: width / 2
+ color: model.eventColor ? Kirigami.ColorUtils.linearInterpolation(model.eventColor, PlasmaCore.Theme.textColor, 0.2) : PlasmaCore.Theme.highlightColor
+ }
++
++ Component.onCompleted: rootIndex = modelIndex(index)
+ }
+ }
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
index 92d12a32c09..2051388092d 100644
--- a/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
@@ -61,7 +61,10 @@ DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
-PATCHES=( "${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch
+ "${FILESDIR}"/${P}-fix-pinned-calendar-dots.patch # KDE-bug 440627
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2021-08-26 17:28 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-08-26 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 6444c42226d1abc81ce9ec47d232bdf74a0b08a3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 17:28:20 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 17:28:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6444c422
kde-frameworks/plasma: Fix build with IUSE="gles2-only"
Closes: https://bugs.gentoo.org/809815
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma/files/plasma-5.85.0-fix-cmake.patch | 48 ++++++++++++++++++++++
kde-frameworks/plasma/plasma-5.85.0-r1.ebuild | 1 +
2 files changed, 49 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch
new file mode 100644
index 00000000000..0eab0a772c0
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch
@@ -0,0 +1,48 @@
+From e496ef0440c92e119da0b1088f1ab788cebeae33 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 26 Aug 2021 19:12:00 +0200
+Subject: [PATCH] CMake: do not expand variables beforehand
+
+Fixes build when FindOpenGL is disabled, producing a syntax error:
+"Function invoked with incorrect arguments for function named: ADD_FEATURE_INFO"
+
+See also: https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/267
+
+Downstream report: https://bugs.gentoo.org/809815
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e27ebd914..25abbf921 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,20 +110,20 @@ set_package_properties(EGL PROPERTIES
+ TYPE OPTIONAL
+ )
+
+-add_feature_info(GLX ${OpenGL_GLX_FOUND} "OpenGL GLX libraries.")
++add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.")
+ if(OpenGL_GLX_FOUND AND X11_FOUND AND (Qt5Gui_OPENGL_IMPLEMENTATION STREQUAL "GL"))
+ set(HAVE_GLX 1)
+ else()
+ set(HAVE_GLX 0)
+ endif()
+
+-add_feature_info(EGL ${OpenGL_EGL_FOUND}
++add_feature_info(EGL OpenGL_EGL_FOUND
+ "A platform-agnostic mechanism for creating rendering surfaces for use with other graphics libraries, such as OpenGL|ES and OpenVG.")
+ # OpenGL_EGL_FOUND is defined by FindOpenGL
+ if(TARGET OpenGL::EGL)
+ set(HAVE_EGL ${OpenGL_EGL_FOUND})
+ set(EGL_TARGET OpenGL::EGL)
+-elseif(${EGL_FOUND})
++elseif(EGL_FOUND)
+ set(HAVE_EGL ${EGL_FOUND})
+ set(EGL_TARGET EGL::EGL)
+ message(STATUS "Switch to EGL compatibility target EGL::EGL because OpenGL::EGL is not available")
+--
+2.33.0
+
diff --git a/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
index 4c087e69234..1e392e19061 100644
--- a/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
@@ -64,6 +64,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch
"${FILESDIR}"/${P}-fix-pinned-calendar-dots.patch # KDE-bug 440627
+ "${FILESDIR}"/${P}-fix-cmake.patch # bug 809815
)
src_configure() {
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2021-09-30 17:24 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-09-30 17:24 UTC (permalink / raw
To: gentoo-commits
commit: e51330334ac9a20bc965407fe2e6ad589bde6c97
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 12:45:40 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 17:22:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5133033
kde-frameworks/plasma: Revert "Change busywidget to a gear"
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=442525
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...5.86.0-revert-Change-busywidget-to-a-gear.patch | 206 +++++++++++++++++++++
kde-frameworks/plasma/plasma-5.86.0-r1.ebuild | 75 ++++++++
2 files changed, 281 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch b/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch
new file mode 100644
index 00000000000..f0c8042d50c
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch
@@ -0,0 +1,206 @@
+From 6f8eae0ca24e1ca7e816906042cb8b6b14886698 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Fri, 17 Sep 2021 07:43:48 -0600
+Subject: [PATCH] Revert "Change busywidget to a gear"
+
+This reverts commit aafe6523cc0fe809d03fb6b98c624ac3c0f49973.
+
+This change has not been well-received by users, and exposes a
+conceptual issue with how app launch animations are currently handled in
+Plasma, with the loading spinner simply re-used as an overlay on top of
+the app icon. This constrains possible designs for the spinner because
+the backgrounds it will be displayed on top of differ gratly in these
+usages; what looks good in one context may not look good in the other.
+We will have to find another way.
+
+BUG: 442525
+FIXED-IN: 5.87
+---
+ .../breeze/widgets/busywidget.svg | 80 ++++++++-----------
+ 1 file changed, 35 insertions(+), 45 deletions(-)
+
+diff --git a/src/desktoptheme/breeze/widgets/busywidget.svg b/src/desktoptheme/breeze/widgets/busywidget.svg
+index 2ca09f283..0eaf137a7 100644
+--- a/src/desktoptheme/breeze/widgets/busywidget.svg
++++ b/src/desktoptheme/breeze/widgets/busywidget.svg
+@@ -14,7 +14,7 @@
+ viewBox="0 0 35.983333 35.983334"
+ id="svg2"
+ version="1.1"
+- inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
++ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="busywidget.svgz">
+ <defs
+ id="defs4">
+@@ -75,7 +75,7 @@
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.4632354"
+- inkscape:cx="186.91665"
++ inkscape:cx="219.5896"
+ inkscape:cy="25.042129"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+@@ -84,9 +84,9 @@
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:window-width="1920"
+- inkscape:window-height="1007"
++ inkscape:window-height="1027"
+ inkscape:window-x="0"
+- inkscape:window-y="0"
++ inkscape:window-y="-3"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+@@ -96,73 +96,59 @@
+ type="xygrid"
+ id="grid4160"
+ empspacing="2"
+- originx="0"
+- originy="0"
++ originx="0px"
++ originy="0px"
+ visible="true"
+ enabled="true"
+- snapvisiblegridlinesonly="true"
+- spacingx="1"
+- spacingy="1" />
++ snapvisiblegridlinesonly="true" />
+ <sodipodi:guide
+ position="-5.8455811e-08,35.983344"
+ orientation="136.00001,0"
+- id="guide4155"
+- inkscape:locked="false" />
++ id="guide4155" />
+ <sodipodi:guide
+ position="-5.8455811e-08,6.6152344e-06"
+ orientation="0,136"
+- id="guide4157"
+- inkscape:locked="false" />
++ id="guide4157" />
+ <sodipodi:guide
+ position="35.983333,6.6152344e-06"
+ orientation="-136.00001,0"
+- id="guide4159"
+- inkscape:locked="false" />
++ id="guide4159" />
+ <sodipodi:guide
+ position="35.983333,35.983344"
+ orientation="0,-136"
+- id="guide4161"
+- inkscape:locked="false" />
++ id="guide4161" />
+ <sodipodi:guide
+ position="1.1488343e-09,17.991675"
+ orientation="68.000007,0"
+- id="guide4165"
+- inkscape:locked="false" />
++ id="guide4165" />
+ <sodipodi:guide
+ position="1.1488343e-09,6.6152344e-06"
+ orientation="0,67.999998"
+- id="guide4167"
+- inkscape:locked="false" />
++ id="guide4167" />
+ <sodipodi:guide
+ position="17.991666,6.6152344e-06"
+ orientation="-68.000007,0"
+- id="guide4169"
+- inkscape:locked="false" />
++ id="guide4169" />
+ <sodipodi:guide
+ position="17.991666,17.991675"
+ orientation="0,-67.999998"
+- id="guide4171"
+- inkscape:locked="false" />
++ id="guide4171" />
+ <sodipodi:guide
+ position="1.8520831,34.131232"
+ orientation="122.00003,0"
+- id="guide4199"
+- inkscape:locked="false" />
++ id="guide4199" />
+ <sodipodi:guide
+ position="1.8520831,1.8520574"
+ orientation="0,121.99999"
+- id="guide4201"
+- inkscape:locked="false" />
++ id="guide4201" />
+ <sodipodi:guide
+ position="34.131248,1.8520574"
+ orientation="-122.00003,0"
+- id="guide4203"
+- inkscape:locked="false" />
++ id="guide4203" />
+ <sodipodi:guide
+ position="34.131248,34.131232"
+ orientation="0,-121.99999"
+- id="guide4205"
+- inkscape:locked="false" />
++ id="guide4205" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+@@ -227,7 +213,7 @@
+ y="285.35831" />
+ <g
+ id="busywidget"
+- transform="translate(-36.777084)">
++ transform="translate(-36.777084,0)">
+ <rect
+ style="fill:none;stroke:none"
+ id="rect3016"
+@@ -236,10 +222,11 @@
+ x="36.247917"
+ y="249.37498" />
+ <path
+- class="ColorScheme-ButtonFocus"
+- d="m 54.239579,252.55041 c -1.250543,0.007 -2.495143,0.1722 -3.704169,0.4921 v 1.93529 c -0.8449,0.2527 -1.661835,0.5908 -2.4381,1.00926 l -1.370963,-1.37102 c -2.161292,1.27435 -3.963589,3.07664 -5.237918,5.23796 l 1.370971,1.37095 c -0.41972,0.77609 -0.75908,1.59306 -1.012872,2.4381 h -1.9425 c -0.31598,1.20946 -0.47768,2.45413 -0.48111,3.70419 0.0077,1.25055 0.17227,2.49515 0.49196,3.70412 h 1.935276 c 0.25263,0.8449 0.5908,1.66187 1.009239,2.4381 l -0.40516,0.4053 -0.965839,0.96586 c 1.274322,2.16125 3.076626,3.96361 5.237932,5.23789 l 0.965824,-0.96586 0.40516,-0.4053 c 0.776118,0.4193 1.593053,0.75908 2.4381,1.01283 v 1.9425 c 1.209488,0.3164 2.454088,0.4774 3.704169,0.4809 1.250081,-0.006 2.494681,-0.1652 3.704169,-0.4809 v -1.9425 c 0.845047,-0.2534 1.661982,-0.5929 2.4381,-1.01283 l 1.370964,1.37095 c 2.161309,-1.27428 3.963606,-3.07664 5.237928,-5.23789 l -1.370985,-1.37102 c 0.41846,-0.77623 0.756637,-1.5932 1.009239,-2.4381 h 1.935297 c 0.31969,-1.20897 0.48454
,-2.45357 0.49196,-3.70412 -0.0036,-1.25006 -0.1652,-2.49473 -0.48111,-3.70419 h -1.9425 c -0.25375,-0.84504 -0.59318,-1.66201 -1.012872,-2.4381 l 0.40516,-0.4053 0.965839,-0.96579 c -1.274322,-2.16132 -3.07664,-3.96361 -5.237928,-5.23796 l -1.356502,1.35653 -0.0147,0.014 c -0.776286,-0.4186 -1.593221,-0.75663 -2.438121,-1.00926 v -1.93529 c -1.209026,-0.3199 -2.453626,-0.4844 -3.704169,-0.4921 z m 0,1.85206 c 0.62027,0.001 1.240078,0.049 1.852081,0.1414 v 1.87019 c 1.649396,0.2828 3.213623,0.9345 4.575942,1.90638 l 0.11949,-0.119 1.208284,-1.20827 c 0.995193,0.74207 1.877914,1.62204 2.622581,2.61534 l -1.327739,1.32769 c 0.96845,1.36437 1.616384,2.92978 1.895404,4.57961 h 1.880991 c 0.08946,0.6132 0.1365,1.23074 0.13741,1.85206 -0.002,0.6202 -0.0504,1.24005 -0.14112,1.85206 h -1.870176 c -0.2828,1.64941 -0.934451,3.21363 -1.906331,4.57597 l 0.11928,0.1197 1.208277,1.20827 c -0.74207,0.99526 -1.622068,1.87796 -2.615336,2.62262 l -1.327746,-1.32776 c -1.364447,0.96845 -2.929899,1.616
44 -4.579659,1.89546 v 1.88097 c -0.61313,0.0896 -1.230803,0.1365 -1.852088,0.1372 -0.62125,-9.1e-4 -1.23893,-0.049 -1.852081,-0.1372 v -1.88097 c -1.64976,-0.2793 -3.215219,-0.92701 -4.579575,-1.89553 l -1.327738,1.32776 c -0.993251,-0.74466 -1.873249,-1.62736 -2.615326,-2.62262 l 1.208284,-1.20827 0.11942,-0.119 c -0.97188,-1.3622 -1.623552,-2.92642 -1.906331,-4.57583 h -1.870176 c -0.09037,-0.6118 -0.13888,-1.23179 -0.14112,-1.85213 9.24e-4,-0.6216 0.0483,-1.23893 0.13741,-1.85206 h 1.881012 c 0.27902,-1.64976 0.926947,-3.21524 1.895495,-4.57954 l -1.327739,-1.32776 c 0.744667,-0.99323 1.627388,-1.87327 2.622585,-2.61534 l 1.208283,1.20827 0.11949,0.119 c 1.36234,-0.97188 2.926574,-1.62351 4.575963,-1.90631 v -1.87019 c 0.61201,-0.0903 1.231804,-0.1386 1.852081,-0.1414 z"
+- id="path5"
+ inkscape:connector-curvature="0"
++ class="ColorScheme-ButtonFocus"
++ id="path3018"
++ transform="matrix(0.26458334,0,0,0.26458334,-0.52916714,249.37498)"
++ d="m 207,7 a 60.999998,61.000013 0 0 0 -61,61 60.999998,61.000013 0 0 0 52.5,60.34375 60.999998,61.000013 0 0 0 0.0625,0 60.999998,61.000013 0 0 0 0.125,0.0313 60.999998,61.000013 0 0 0 3.46875,0.40625 60.999998,61.000013 0 0 0 1.34375,0.0937 60.999998,61.000013 0 0 0 0.0313,0 c 0.15685,0.009 0.31182,0.0232 0.46875,0.0313 A 60.999998,61.000013 0 0 0 207,129 c 0.15564,-7.2e-4 0.31314,-0.0292 0.46875,-0.0313 a 60.999998,61.000013 0 0 0 4.1875,-0.21875 c 0.20839,-0.0188 0.41684,-0.0101 0.625,-0.0313 12.83843,-1.3057 25.21151,-7.11778 34.34375,-16.25 10.43684,-10.43683 16.49999,-25.115076 16.5,-39.875 0,-5.534972 -0.85031,-11.052726 -2.46875,-16.34375 A 54.99999,55.000005 0 0 1 262,68 54.99999,55.000005 0 0 1 207,123 54.99999,55.000002 0 0 1 152,68 54.99999,55.000002 0 0 1 154.46875,51.75 54.99999,55.000002 0 0 1 207,13 l 1,0 c 1.10799,0 2,-0.892032 2,-2 l 0,-2 c 0,-1.1079685 -0.89201,-2 -2,-2 l -1,0 z"
+ style="fill:currentColor;fill-opacity:1;stroke:none" />
+ </g>
+ <g
+@@ -252,11 +239,13 @@
+ id="rect3007"
+ style="fill:none;stroke:none" />
+ <path
+- class="ColorScheme-ButtonFocus"
+- d="m 53.84271,280.06665 v 0.43717 c -0.248425,0.0513 -0.484716,0.1497 -0.696085,0.28991 l -0.310057,-0.31005 -0.561206,0.5612 0.310059,0.31005 c -0.139694,0.2115 -0.237569,0.44777 -0.288353,0.6961 h -0.438734 v 0.79374 h 0.437181 c 0.05126,0.24842 0.14967,0.48472 0.289906,0.69608 l -0.310059,0.31005 0.561206,0.56122 0.310057,-0.31005 c 0.211484,0.13965 0.447772,0.23755 0.696085,0.28834 v 0.43874 h 0.793748 v -0.43717 c 0.248425,-0.0513 0.484717,-0.14971 0.696085,-0.28991 l 0.310057,0.31005 0.561206,-0.56122 -0.310059,-0.31005 c 0.139695,-0.21148 0.23757,-0.44775 0.288353,-0.69608 h 0.438734 v -0.79374 h -0.437181 c -0.05126,-0.24844 -0.14967,-0.48473 -0.289906,-0.6961 l 0.310059,-0.31005 -0.561206,-0.5612 -0.310057,0.31005 c -0.211487,-0.13965 -0.447771,-0.23755 -0.696085,-0.28835 v -0.43873 z m 0.396874,0.79375 c 0.429013,0 0.839763,0.17364 1.13869,0.48137 0.28781,0.29628 0.44881,0.69307 0.44881,1.10612 0,0.42903 -0.17364,0.83977 -0.481365,1.1387 -0.296283,0.2878 -0.69307
5,0.44881 -1.106135,0.44881 -0.429013,0 -0.839762,-0.17365 -1.13869,-0.48137 -0.287809,-0.29628 -0.44881,-0.69308 -0.44881,-1.10614 0,-0.42901 0.173641,-0.83975 0.481365,-1.13868 0.296284,-0.28782 0.693076,-0.44881 1.106135,-0.44881 z"
+- id="path5-3"
++ sodipodi:nodetypes="sccccccccccccccccsssss"
+ inkscape:connector-curvature="0"
+- style="fill:currentColor;fill-opacity:1;stroke:none" />
++ id="path3009"
++ transform="matrix(0.26458334,0,0,0.26458334,-0.52916714,249.37498)"
++ d="m 206.90625,115 c -5.68285,0 -9.90626,4.76331 -9.90625,10 0,5.11064 3.86041,9.24196 8.53125,9.90625 0.007,0.001 0.0245,-0.001 0.0313,0 0.1869,0.0265 0.37435,0.0459 0.5625,0.0625 0.0726,0.008 0.11478,-0.004 0.1875,0 l 0.0313,0 c 0.0253,0.002 0.0371,0 0.0625,0 0.16207,0.008 0.3377,0.0313 0.5,0.0313 0.0253,-1.1e-4 0.0373,0 0.0625,0 0.22673,-0.003 0.46154,-0.0123 0.6875,-0.0313 0.0336,-0.003 0.06,0.002 0.0937,0 2.08268,-0.2143 4.08105,-1.19024 5.5625,-2.6875 2.29078,-2.85585 2.42433,-5.2927 1.42433,-9.29269 1.22819,5.24703 -2.45297,9.87167 -7.86188,10.0102 -4.24948,0 -7.87455,-3.58819 -7.87457,-7.99871 0.0682,-4.85133 3.99957,-7.98861 7.93707,-8.00652 l 0.15625,0 c 0.16789,0 0.31534,-0.15426 0.3125,-0.32394 -0.006,-0.3677 -0.0216,-0.97956 -0.0313,-1.32579 C 207.36994,115.1624 207.24222,115 207.0625,115 z"
++ style="fill:currentColor;fill-opacity:1;stroke:none"
++ class="ColorScheme-ButtonFocus" />
+ </g>
+ <g
+ id="16-16-busywidget">
+@@ -268,11 +257,12 @@
+ x="58.472801"
+ y="281.12497" />
+ <path
+- class="ColorScheme-ButtonFocus"
+- d="m 60.280903,281.38956 v 0.34003 c -0.193218,0.0399 -0.377001,0.11643 -0.541398,0.22548 l -0.241156,-0.24115 -0.436493,0.4365 0.241157,0.24115 c -0.108652,0.16448 -0.184777,0.34826 -0.224276,0.5414 H 58.7375 v 0.61735 h 0.34003 c 0.03986,0.19323 0.11641,0.37701 0.225483,0.54141 l -0.241157,0.24115 0.436493,0.43649 0.241156,-0.24115 c 0.164487,0.10862 0.348266,0.18477 0.541398,0.22427 v 0.34124 h 0.617361 v -0.34003 c 0.193218,-0.0399 0.377001,-0.11643 0.541398,-0.22548 l 0.241156,0.24115 0.436493,-0.43649 -0.241157,-0.24115 c 0.108652,-0.16449 0.184777,-0.34827 0.224276,-0.54141 h 0.341237 v -0.61735 h -0.34003 c -0.03987,-0.19322 -0.11641,-0.37701 -0.225483,-0.5414 l 0.241157,-0.24115 -0.436493,-0.4365 -0.241156,0.24115 c -0.164489,-0.10862 -0.348266,-0.18477 -0.541398,-0.22427 v -0.34124 z m 0.30868,0.61737 c 0.333678,0 0.653149,0.13505 0.885649,0.37439 0.223851,0.23044 0.349073,0.53906 0.349073,0.86033 0,0.33367 -0.135053,0.65314 -0.374395,0.88565 -0.230442,0.22385 -0
.539058,0.34906 -0.860327,0.34906 -0.333677,0 -0.653149,-0.13505 -0.885648,-0.37439 -0.223852,-0.23044 -0.349073,-0.53906 -0.349073,-0.86032 0,-0.33368 0.135053,-0.65315 0.374395,-0.88566 0.230442,-0.22384 0.539058,-0.34906 0.860326,-0.34906 z"
+- id="path5-6"
++ style="fill:currentColor;fill-opacity:1;stroke:none"
++ d="m 60.57642,281.3808 c -1.05492,0 -1.838921,0.88423 -1.838919,1.85633 0,0.9487 0.716617,1.71561 1.583674,1.83892 0.0013,1.8e-4 0.0045,-1.8e-4 0.0058,0 0.03469,0.005 0.06949,0.008 0.104418,0.0115 0.01348,9.5e-4 0.02132,-7.1e-4 0.03481,0 l 0.0058,0 c 0.0047,3.7e-4 0.0068,0 0.0116,0 0.03009,9.5e-4 0.06269,0.006 0.09281,0.006 0.0047,-10e-6 0.007,0 0.01161,0 0.04209,-5.5e-4 0.08568,-0.002 0.127622,-0.006 0.0062,-5.5e-4 0.01115,3.7e-4 0.01739,0 0.386612,-0.0397 0.757573,-0.22096 1.032578,-0.49889 0.425244,-0.53014 0.450034,-0.98249 0.264402,-1.72502 0.227992,0.97402 -0.455349,1.8325 -1.459418,1.85821 -0.788838,0 -1.461768,-0.66608 -1.461773,-1.48481 0.01267,-0.90056 0.74245,-1.48294 1.473376,-1.48626 l 0.029,0 c 0.03117,0 0.05855,-0.0288 0.05801,-0.0601 -0.0011,-0.0683 -0.0039,-0.18183 -0.0058,-0.2461 -9.11e-4,-0.0337 -0.02464,-0.0638 -0.058,-0.0638 z"
++ id="path3794"
+ inkscape:connector-curvature="0"
+- style="fill:currentColor;fill-opacity:1;stroke:none" />
++ sodipodi:nodetypes="sccccccccccccccccsssss"
++ class="ColorScheme-ButtonFocus" />
+ </g>
+ </g>
+ </svg>
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild
new file mode 100644
index 00000000000..9019b0099af
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/libglvnd
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=( "${FILESDIR}"/${P}-revert-Change-busywidget-to-a-gear.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2021-10-11 11:01 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-10-11 11:01 UTC (permalink / raw
To: gentoo-commits
commit: c0d81aded718a7afad43a694991e6606a62cf6c2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 11 06:42:55 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 11 11:00:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d81ade
kde-frameworks/plasma: drop 5.86.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
...5.86.0-revert-Change-busywidget-to-a-gear.patch | 206 ---------------------
kde-frameworks/plasma/plasma-5.86.0-r1.ebuild | 75 --------
3 files changed, 282 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index d22462492de..dc3a586ad50 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
DIST plasma-framework-5.85.0.tar.xz 3145156 BLAKE2B 8a9257e3613ecc20051064af8eaa94cd30d07fd9c6349f6dd2aa1169ab661dbede1ff424ac1f96a30230270cf8f957731465c0a655270862c104987576b614ed SHA512 aba7e62ff3d9eff7c28c1736bd1b25e14c19502f021ed7f78025f7129abb728a066de0fff327098f52b84e78f78fbe87743563b78a4c91e2065187fb443eeb77
-DIST plasma-framework-5.86.0.tar.xz 3147804 BLAKE2B 39b58d3613a5e99217b9cef3aaff0c5ef7c0563f3a6014b50ccd8ac1a7b328f6fc2a91af94c66c2bb702435f892b23605cda6a8aee049c6f7c9ea7a455fae57d SHA512 f94d9a0175141705eb8e384877d69d0b6bfbdc76a12f7f3fcc33587186a7ab5ed7cf87eaa9e13102932d7c8fad500bf479da111ea4b61c1e35acea9f216eaef8
DIST plasma-framework-5.87.0.tar.xz 3139456 BLAKE2B bc04461b82084e2f341f6b47bda054fb5ff70f3d23ad05af203218b2d8a6e4a4ec2b898b3901e2845fd58ceb5157077edfdda2ee6378c7ab0418eeef1e19b4e5 SHA512 e74f60a15329fbda1a5c8e978914844dc5bf6486c241a9e44905a2955399dc67605361618ec3b33815a0af85b7711e18ede1d481b81d9909cf87e6b0e32374fb
diff --git a/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch b/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch
deleted file mode 100644
index f0c8042d50c..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From 6f8eae0ca24e1ca7e816906042cb8b6b14886698 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 17 Sep 2021 07:43:48 -0600
-Subject: [PATCH] Revert "Change busywidget to a gear"
-
-This reverts commit aafe6523cc0fe809d03fb6b98c624ac3c0f49973.
-
-This change has not been well-received by users, and exposes a
-conceptual issue with how app launch animations are currently handled in
-Plasma, with the loading spinner simply re-used as an overlay on top of
-the app icon. This constrains possible designs for the spinner because
-the backgrounds it will be displayed on top of differ gratly in these
-usages; what looks good in one context may not look good in the other.
-We will have to find another way.
-
-BUG: 442525
-FIXED-IN: 5.87
----
- .../breeze/widgets/busywidget.svg | 80 ++++++++-----------
- 1 file changed, 35 insertions(+), 45 deletions(-)
-
-diff --git a/src/desktoptheme/breeze/widgets/busywidget.svg b/src/desktoptheme/breeze/widgets/busywidget.svg
-index 2ca09f283..0eaf137a7 100644
---- a/src/desktoptheme/breeze/widgets/busywidget.svg
-+++ b/src/desktoptheme/breeze/widgets/busywidget.svg
-@@ -14,7 +14,7 @@
- viewBox="0 0 35.983333 35.983334"
- id="svg2"
- version="1.1"
-- inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-+ inkscape:version="0.48.5 r10040"
- sodipodi:docname="busywidget.svgz">
- <defs
- id="defs4">
-@@ -75,7 +75,7 @@
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.4632354"
-- inkscape:cx="186.91665"
-+ inkscape:cx="219.5896"
- inkscape:cy="25.042129"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
-@@ -84,9 +84,9 @@
- inkscape:showpageshadow="false"
- borderlayer="true"
- inkscape:window-width="1920"
-- inkscape:window-height="1007"
-+ inkscape:window-height="1027"
- inkscape:window-x="0"
-- inkscape:window-y="0"
-+ inkscape:window-y="-3"
- inkscape:window-maximized="1"
- fit-margin-top="0"
- fit-margin-left="0"
-@@ -96,73 +96,59 @@
- type="xygrid"
- id="grid4160"
- empspacing="2"
-- originx="0"
-- originy="0"
-+ originx="0px"
-+ originy="0px"
- visible="true"
- enabled="true"
-- snapvisiblegridlinesonly="true"
-- spacingx="1"
-- spacingy="1" />
-+ snapvisiblegridlinesonly="true" />
- <sodipodi:guide
- position="-5.8455811e-08,35.983344"
- orientation="136.00001,0"
-- id="guide4155"
-- inkscape:locked="false" />
-+ id="guide4155" />
- <sodipodi:guide
- position="-5.8455811e-08,6.6152344e-06"
- orientation="0,136"
-- id="guide4157"
-- inkscape:locked="false" />
-+ id="guide4157" />
- <sodipodi:guide
- position="35.983333,6.6152344e-06"
- orientation="-136.00001,0"
-- id="guide4159"
-- inkscape:locked="false" />
-+ id="guide4159" />
- <sodipodi:guide
- position="35.983333,35.983344"
- orientation="0,-136"
-- id="guide4161"
-- inkscape:locked="false" />
-+ id="guide4161" />
- <sodipodi:guide
- position="1.1488343e-09,17.991675"
- orientation="68.000007,0"
-- id="guide4165"
-- inkscape:locked="false" />
-+ id="guide4165" />
- <sodipodi:guide
- position="1.1488343e-09,6.6152344e-06"
- orientation="0,67.999998"
-- id="guide4167"
-- inkscape:locked="false" />
-+ id="guide4167" />
- <sodipodi:guide
- position="17.991666,6.6152344e-06"
- orientation="-68.000007,0"
-- id="guide4169"
-- inkscape:locked="false" />
-+ id="guide4169" />
- <sodipodi:guide
- position="17.991666,17.991675"
- orientation="0,-67.999998"
-- id="guide4171"
-- inkscape:locked="false" />
-+ id="guide4171" />
- <sodipodi:guide
- position="1.8520831,34.131232"
- orientation="122.00003,0"
-- id="guide4199"
-- inkscape:locked="false" />
-+ id="guide4199" />
- <sodipodi:guide
- position="1.8520831,1.8520574"
- orientation="0,121.99999"
-- id="guide4201"
-- inkscape:locked="false" />
-+ id="guide4201" />
- <sodipodi:guide
- position="34.131248,1.8520574"
- orientation="-122.00003,0"
-- id="guide4203"
-- inkscape:locked="false" />
-+ id="guide4203" />
- <sodipodi:guide
- position="34.131248,34.131232"
- orientation="0,-121.99999"
-- id="guide4205"
-- inkscape:locked="false" />
-+ id="guide4205" />
- </sodipodi:namedview>
- <metadata
- id="metadata7">
-@@ -227,7 +213,7 @@
- y="285.35831" />
- <g
- id="busywidget"
-- transform="translate(-36.777084)">
-+ transform="translate(-36.777084,0)">
- <rect
- style="fill:none;stroke:none"
- id="rect3016"
-@@ -236,10 +222,11 @@
- x="36.247917"
- y="249.37498" />
- <path
-- class="ColorScheme-ButtonFocus"
-- d="m 54.239579,252.55041 c -1.250543,0.007 -2.495143,0.1722 -3.704169,0.4921 v 1.93529 c -0.8449,0.2527 -1.661835,0.5908 -2.4381,1.00926 l -1.370963,-1.37102 c -2.161292,1.27435 -3.963589,3.07664 -5.237918,5.23796 l 1.370971,1.37095 c -0.41972,0.77609 -0.75908,1.59306 -1.012872,2.4381 h -1.9425 c -0.31598,1.20946 -0.47768,2.45413 -0.48111,3.70419 0.0077,1.25055 0.17227,2.49515 0.49196,3.70412 h 1.935276 c 0.25263,0.8449 0.5908,1.66187 1.009239,2.4381 l -0.40516,0.4053 -0.965839,0.96586 c 1.274322,2.16125 3.076626,3.96361 5.237932,5.23789 l 0.965824,-0.96586 0.40516,-0.4053 c 0.776118,0.4193 1.593053,0.75908 2.4381,1.01283 v 1.9425 c 1.209488,0.3164 2.454088,0.4774 3.704169,0.4809 1.250081,-0.006 2.494681,-0.1652 3.704169,-0.4809 v -1.9425 c 0.845047,-0.2534 1.661982,-0.5929 2.4381,-1.01283 l 1.370964,1.37095 c 2.161309,-1.27428 3.963606,-3.07664 5.237928,-5.23789 l -1.370985,-1.37102 c 0.41846,-0.77623 0.756637,-1.5932 1.009239,-2.4381 h 1.935297 c 0.31969,-1.20897 0.48454
,-2.45357 0.49196,-3.70412 -0.0036,-1.25006 -0.1652,-2.49473 -0.48111,-3.70419 h -1.9425 c -0.25375,-0.84504 -0.59318,-1.66201 -1.012872,-2.4381 l 0.40516,-0.4053 0.965839,-0.96579 c -1.274322,-2.16132 -3.07664,-3.96361 -5.237928,-5.23796 l -1.356502,1.35653 -0.0147,0.014 c -0.776286,-0.4186 -1.593221,-0.75663 -2.438121,-1.00926 v -1.93529 c -1.209026,-0.3199 -2.453626,-0.4844 -3.704169,-0.4921 z m 0,1.85206 c 0.62027,0.001 1.240078,0.049 1.852081,0.1414 v 1.87019 c 1.649396,0.2828 3.213623,0.9345 4.575942,1.90638 l 0.11949,-0.119 1.208284,-1.20827 c 0.995193,0.74207 1.877914,1.62204 2.622581,2.61534 l -1.327739,1.32769 c 0.96845,1.36437 1.616384,2.92978 1.895404,4.57961 h 1.880991 c 0.08946,0.6132 0.1365,1.23074 0.13741,1.85206 -0.002,0.6202 -0.0504,1.24005 -0.14112,1.85206 h -1.870176 c -0.2828,1.64941 -0.934451,3.21363 -1.906331,4.57597 l 0.11928,0.1197 1.208277,1.20827 c -0.74207,0.99526 -1.622068,1.87796 -2.615336,2.62262 l -1.327746,-1.32776 c -1.364447,0.96845 -2.929899,1.616
44 -4.579659,1.89546 v 1.88097 c -0.61313,0.0896 -1.230803,0.1365 -1.852088,0.1372 -0.62125,-9.1e-4 -1.23893,-0.049 -1.852081,-0.1372 v -1.88097 c -1.64976,-0.2793 -3.215219,-0.92701 -4.579575,-1.89553 l -1.327738,1.32776 c -0.993251,-0.74466 -1.873249,-1.62736 -2.615326,-2.62262 l 1.208284,-1.20827 0.11942,-0.119 c -0.97188,-1.3622 -1.623552,-2.92642 -1.906331,-4.57583 h -1.870176 c -0.09037,-0.6118 -0.13888,-1.23179 -0.14112,-1.85213 9.24e-4,-0.6216 0.0483,-1.23893 0.13741,-1.85206 h 1.881012 c 0.27902,-1.64976 0.926947,-3.21524 1.895495,-4.57954 l -1.327739,-1.32776 c 0.744667,-0.99323 1.627388,-1.87327 2.622585,-2.61534 l 1.208283,1.20827 0.11949,0.119 c 1.36234,-0.97188 2.926574,-1.62351 4.575963,-1.90631 v -1.87019 c 0.61201,-0.0903 1.231804,-0.1386 1.852081,-0.1414 z"
-- id="path5"
- inkscape:connector-curvature="0"
-+ class="ColorScheme-ButtonFocus"
-+ id="path3018"
-+ transform="matrix(0.26458334,0,0,0.26458334,-0.52916714,249.37498)"
-+ d="m 207,7 a 60.999998,61.000013 0 0 0 -61,61 60.999998,61.000013 0 0 0 52.5,60.34375 60.999998,61.000013 0 0 0 0.0625,0 60.999998,61.000013 0 0 0 0.125,0.0313 60.999998,61.000013 0 0 0 3.46875,0.40625 60.999998,61.000013 0 0 0 1.34375,0.0937 60.999998,61.000013 0 0 0 0.0313,0 c 0.15685,0.009 0.31182,0.0232 0.46875,0.0313 A 60.999998,61.000013 0 0 0 207,129 c 0.15564,-7.2e-4 0.31314,-0.0292 0.46875,-0.0313 a 60.999998,61.000013 0 0 0 4.1875,-0.21875 c 0.20839,-0.0188 0.41684,-0.0101 0.625,-0.0313 12.83843,-1.3057 25.21151,-7.11778 34.34375,-16.25 10.43684,-10.43683 16.49999,-25.115076 16.5,-39.875 0,-5.534972 -0.85031,-11.052726 -2.46875,-16.34375 A 54.99999,55.000005 0 0 1 262,68 54.99999,55.000005 0 0 1 207,123 54.99999,55.000002 0 0 1 152,68 54.99999,55.000002 0 0 1 154.46875,51.75 54.99999,55.000002 0 0 1 207,13 l 1,0 c 1.10799,0 2,-0.892032 2,-2 l 0,-2 c 0,-1.1079685 -0.89201,-2 -2,-2 l -1,0 z"
- style="fill:currentColor;fill-opacity:1;stroke:none" />
- </g>
- <g
-@@ -252,11 +239,13 @@
- id="rect3007"
- style="fill:none;stroke:none" />
- <path
-- class="ColorScheme-ButtonFocus"
-- d="m 53.84271,280.06665 v 0.43717 c -0.248425,0.0513 -0.484716,0.1497 -0.696085,0.28991 l -0.310057,-0.31005 -0.561206,0.5612 0.310059,0.31005 c -0.139694,0.2115 -0.237569,0.44777 -0.288353,0.6961 h -0.438734 v 0.79374 h 0.437181 c 0.05126,0.24842 0.14967,0.48472 0.289906,0.69608 l -0.310059,0.31005 0.561206,0.56122 0.310057,-0.31005 c 0.211484,0.13965 0.447772,0.23755 0.696085,0.28834 v 0.43874 h 0.793748 v -0.43717 c 0.248425,-0.0513 0.484717,-0.14971 0.696085,-0.28991 l 0.310057,0.31005 0.561206,-0.56122 -0.310059,-0.31005 c 0.139695,-0.21148 0.23757,-0.44775 0.288353,-0.69608 h 0.438734 v -0.79374 h -0.437181 c -0.05126,-0.24844 -0.14967,-0.48473 -0.289906,-0.6961 l 0.310059,-0.31005 -0.561206,-0.5612 -0.310057,0.31005 c -0.211487,-0.13965 -0.447771,-0.23755 -0.696085,-0.28835 v -0.43873 z m 0.396874,0.79375 c 0.429013,0 0.839763,0.17364 1.13869,0.48137 0.28781,0.29628 0.44881,0.69307 0.44881,1.10612 0,0.42903 -0.17364,0.83977 -0.481365,1.1387 -0.296283,0.2878 -0.69307
5,0.44881 -1.106135,0.44881 -0.429013,0 -0.839762,-0.17365 -1.13869,-0.48137 -0.287809,-0.29628 -0.44881,-0.69308 -0.44881,-1.10614 0,-0.42901 0.173641,-0.83975 0.481365,-1.13868 0.296284,-0.28782 0.693076,-0.44881 1.106135,-0.44881 z"
-- id="path5-3"
-+ sodipodi:nodetypes="sccccccccccccccccsssss"
- inkscape:connector-curvature="0"
-- style="fill:currentColor;fill-opacity:1;stroke:none" />
-+ id="path3009"
-+ transform="matrix(0.26458334,0,0,0.26458334,-0.52916714,249.37498)"
-+ d="m 206.90625,115 c -5.68285,0 -9.90626,4.76331 -9.90625,10 0,5.11064 3.86041,9.24196 8.53125,9.90625 0.007,0.001 0.0245,-0.001 0.0313,0 0.1869,0.0265 0.37435,0.0459 0.5625,0.0625 0.0726,0.008 0.11478,-0.004 0.1875,0 l 0.0313,0 c 0.0253,0.002 0.0371,0 0.0625,0 0.16207,0.008 0.3377,0.0313 0.5,0.0313 0.0253,-1.1e-4 0.0373,0 0.0625,0 0.22673,-0.003 0.46154,-0.0123 0.6875,-0.0313 0.0336,-0.003 0.06,0.002 0.0937,0 2.08268,-0.2143 4.08105,-1.19024 5.5625,-2.6875 2.29078,-2.85585 2.42433,-5.2927 1.42433,-9.29269 1.22819,5.24703 -2.45297,9.87167 -7.86188,10.0102 -4.24948,0 -7.87455,-3.58819 -7.87457,-7.99871 0.0682,-4.85133 3.99957,-7.98861 7.93707,-8.00652 l 0.15625,0 c 0.16789,0 0.31534,-0.15426 0.3125,-0.32394 -0.006,-0.3677 -0.0216,-0.97956 -0.0313,-1.32579 C 207.36994,115.1624 207.24222,115 207.0625,115 z"
-+ style="fill:currentColor;fill-opacity:1;stroke:none"
-+ class="ColorScheme-ButtonFocus" />
- </g>
- <g
- id="16-16-busywidget">
-@@ -268,11 +257,12 @@
- x="58.472801"
- y="281.12497" />
- <path
-- class="ColorScheme-ButtonFocus"
-- d="m 60.280903,281.38956 v 0.34003 c -0.193218,0.0399 -0.377001,0.11643 -0.541398,0.22548 l -0.241156,-0.24115 -0.436493,0.4365 0.241157,0.24115 c -0.108652,0.16448 -0.184777,0.34826 -0.224276,0.5414 H 58.7375 v 0.61735 h 0.34003 c 0.03986,0.19323 0.11641,0.37701 0.225483,0.54141 l -0.241157,0.24115 0.436493,0.43649 0.241156,-0.24115 c 0.164487,0.10862 0.348266,0.18477 0.541398,0.22427 v 0.34124 h 0.617361 v -0.34003 c 0.193218,-0.0399 0.377001,-0.11643 0.541398,-0.22548 l 0.241156,0.24115 0.436493,-0.43649 -0.241157,-0.24115 c 0.108652,-0.16449 0.184777,-0.34827 0.224276,-0.54141 h 0.341237 v -0.61735 h -0.34003 c -0.03987,-0.19322 -0.11641,-0.37701 -0.225483,-0.5414 l 0.241157,-0.24115 -0.436493,-0.4365 -0.241156,0.24115 c -0.164489,-0.10862 -0.348266,-0.18477 -0.541398,-0.22427 v -0.34124 z m 0.30868,0.61737 c 0.333678,0 0.653149,0.13505 0.885649,0.37439 0.223851,0.23044 0.349073,0.53906 0.349073,0.86033 0,0.33367 -0.135053,0.65314 -0.374395,0.88565 -0.230442,0.22385 -0
.539058,0.34906 -0.860327,0.34906 -0.333677,0 -0.653149,-0.13505 -0.885648,-0.37439 -0.223852,-0.23044 -0.349073,-0.53906 -0.349073,-0.86032 0,-0.33368 0.135053,-0.65315 0.374395,-0.88566 0.230442,-0.22384 0.539058,-0.34906 0.860326,-0.34906 z"
-- id="path5-6"
-+ style="fill:currentColor;fill-opacity:1;stroke:none"
-+ d="m 60.57642,281.3808 c -1.05492,0 -1.838921,0.88423 -1.838919,1.85633 0,0.9487 0.716617,1.71561 1.583674,1.83892 0.0013,1.8e-4 0.0045,-1.8e-4 0.0058,0 0.03469,0.005 0.06949,0.008 0.104418,0.0115 0.01348,9.5e-4 0.02132,-7.1e-4 0.03481,0 l 0.0058,0 c 0.0047,3.7e-4 0.0068,0 0.0116,0 0.03009,9.5e-4 0.06269,0.006 0.09281,0.006 0.0047,-10e-6 0.007,0 0.01161,0 0.04209,-5.5e-4 0.08568,-0.002 0.127622,-0.006 0.0062,-5.5e-4 0.01115,3.7e-4 0.01739,0 0.386612,-0.0397 0.757573,-0.22096 1.032578,-0.49889 0.425244,-0.53014 0.450034,-0.98249 0.264402,-1.72502 0.227992,0.97402 -0.455349,1.8325 -1.459418,1.85821 -0.788838,0 -1.461768,-0.66608 -1.461773,-1.48481 0.01267,-0.90056 0.74245,-1.48294 1.473376,-1.48626 l 0.029,0 c 0.03117,0 0.05855,-0.0288 0.05801,-0.0601 -0.0011,-0.0683 -0.0039,-0.18183 -0.0058,-0.2461 -9.11e-4,-0.0337 -0.02464,-0.0638 -0.058,-0.0638 z"
-+ id="path3794"
- inkscape:connector-curvature="0"
-- style="fill:currentColor;fill-opacity:1;stroke:none" />
-+ sodipodi:nodetypes="sccccccccccccccccsssss"
-+ class="ColorScheme-ButtonFocus" />
- </g>
- </g>
- </svg>
---
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild
deleted file mode 100644
index 9019b0099af..00000000000
--- a/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( media-libs/libglvnd[X?] )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/libglvnd
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=( "${FILESDIR}"/${P}-revert-Change-busywidget-to-a-gear.patch )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package man KF5DocTools)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2021-11-23 14:59 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-11-23 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 6cd2d37aef9a8974b31772a99496f0905e25c64b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 14:38:30 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 14:59:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd2d37a
kde-frameworks/plasma: Visual fixes
Make the OSD an actual wayland OSD
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=428859
Upstream commit 2ba1b0b642d540f74f0e21e7aaa272644ea4eda5
Fixed a visual glitch with Plasma tooltips flickering
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=305247
Upstream commit 6176d8ef8f36290075c5bd8932d623e68468a1cd
Fix centered icons and text in Plasma applet tabs
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=442830
Upstream commit 92ac1038cff333d70a71331b2a5fa0b9d91bc39d
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-5.88.0-fix-centered-text.patch | 121 +++++++++++++++++++++
....88.0-fix-misrenderings-with-transparency.patch | 34 ++++++
...sma-5.88.0-make-OSD-an-actual-wayland-OSD.patch | 34 ++++++
kde-frameworks/plasma/plasma-5.88.0-r1.ebuild | 79 ++++++++++++++
4 files changed, 268 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
new file mode 100644
index 000000000000..8fb393a568d6
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
@@ -0,0 +1,121 @@
+From 92ac1038cff333d70a71331b2a5fa0b9d91bc39d Mon Sep 17 00:00:00 2001
+From: Eugene Popov <popov895@ukr.net>
+Date: Fri, 19 Nov 2021 11:13:03 +0000
+Subject: [PATCH] Fix IconLabel
+
+---
+ .../plasmacomponents3/private/IconLabel.qml | 97 +++++++++++--------
+ 1 file changed, 55 insertions(+), 42 deletions(-)
+
+diff --git a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
+index 467c2f54b..74a8ff3a5 100644
+--- a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
++++ b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
+@@ -24,49 +24,62 @@ T.Control {
+ PlasmaCore.ColorScope.inherit: true
+ implicitWidth: implicitContentWidth + leftPadding + rightPadding
+ implicitHeight: implicitContentHeight + topPadding + bottomPadding
+- contentItem: GridLayout {
+- rowSpacing: root.spacing
+- columnSpacing: root.spacing
+- flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
+- PlasmaCore.IconItem {
+- id: iconItem
+- visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
+- colorGroup: root.PlasmaCore.ColorScope.colorGroup
+- implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
+- implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
+- Layout.fillWidth: true
+- Layout.fillHeight: true
+- Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
+- Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
+- Layout.alignment: if (root.textBesideIcon) {
+- Qt.AlignRight | Qt.AlignVCenter
+- } else if (root.textUnderIcon) {
+- Qt.AlignHCenter | Qt.AlignBottom
+- } else {
+- Qt.AlignCenter
++ contentItem: Item {
++ implicitWidth: gridLayout.implicitWidth
++ implicitHeight: gridLayout.implicitHeight
++ GridLayout {
++ id: gridLayout
++ rowSpacing: root.spacing
++ columnSpacing: root.spacing
++ flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
++ x: {
++ if (root.alignment & Qt.AlignLeft) {
++ return 0;
++ }
++ if (root.alignment & Qt.AlignRight) {
++ return parent.width - width;
++ }
++ return Math.round((parent.width - width) / 2);
+ }
+- }
+- T.Label {
+- id: label
+- visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
+- palette: root.palette
+- font: root.font
+- horizontalAlignment: root.alignment & Qt.AlignHorizontal_Mask || Text.AlignHCenter
+- verticalAlignment: root.alignment & Qt.AlignVertical_Mask || Text.AlignVCenter
+- // Work around Qt bug where NativeRendering breaks for non-integer scale factors
+- // https://bugreports.qt.io/browse/QTBUG-70481
+- renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
+- color: PlasmaCore.ColorScope.textColor
+- linkColor: PlasmaCore.Theme.linkColor
+- elide: Text.ElideRight
+- Layout.fillWidth: root.alignment & Qt.AlignHorizontal_Mask
+- Layout.fillHeight: root.alignment & Qt.AlignVertical_Mask
+- Layout.alignment: if (root.textBesideIcon) {
+- Qt.AlignLeft | Qt.AlignVCenter
+- } else if (root.textUnderIcon) {
+- Qt.AlignHCenter | Qt.AlignTop
+- } else {
+- Qt.AlignCenter
++ y: {
++ if (root.alignment & Qt.AlignTop) {
++ return 0;
++ }
++ if (root.alignment & Qt.AlignBottom) {
++ return parent.height - height;
++ }
++ return Math.round((parent.height - height) / 2);
++ }
++ width: Math.min(parent.width, implicitWidth)
++ height: Math.min(parent.height, implicitHeight)
++ PlasmaCore.IconItem {
++ id: iconItem
++ visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
++ colorGroup: root.PlasmaCore.ColorScope.colorGroup
++ implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
++ implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
++ Layout.alignment: Qt.AlignCenter
++ Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
++ Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
++ }
++ T.Label {
++ id: label
++ visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
++ palette: root.palette
++ font: root.font
++ // Work around Qt bug where NativeRendering breaks for non-integer scale factors
++ // https://bugreports.qt.io/browse/QTBUG-70481
++ renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
++ color: PlasmaCore.ColorScope.textColor
++ linkColor: PlasmaCore.Theme.linkColor
++ elide: Text.ElideRight
++ Layout.alignment: Qt.AlignCenter
++ Layout.fillWidth: {
++ if (!iconItem.visible || parent.flow === GridLayout.TopToBottom) {
++ return implicitWidth > parent.width;
++ }
++ return iconItem.implicitWidth + parent.columnSpacing + implicitWidth > parent.width;
++ }
+ }
+ }
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
new file mode 100644
index 000000000000..d1e6f37d8a2b
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
@@ -0,0 +1,34 @@
+From 6176d8ef8f36290075c5bd8932d623e68468a1cd Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Tue, 16 Nov 2021 11:05:17 +0100
+Subject: [PATCH] Do updateTheme after QQuickWindow::event
+
+doing updatetheme there will ensure that the window size is correct,
+so then when the surface commit will happen, we'll have the blur
+and contrast regions wit hthe proper geometry
+
+BUG:305247
+---
+ src/plasmaquick/dialog.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index eac7d432a..343bfe4c0 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -1243,10 +1243,12 @@ bool Dialog::event(QEvent *event)
+ // sometimes non null regions arrive even for non visible windows
+ // for which surface creation would fail
+ if (!d->shellSurface && isVisible()) {
++ const bool ret = QQuickWindow::event(event);
+ KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
+ d->setupWaylandIntegration();
+ d->updateVisibility(true);
+ d->updateTheme();
++ return ret;
+ }
+ #endif
+ } else if (event->type() == QEvent::PlatformSurface) {
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch b/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
new file mode 100644
index 000000000000..0631155c89bf
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
@@ -0,0 +1,34 @@
+From 2ba1b0b642d540f74f0e21e7aaa272644ea4eda5 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 8 Nov 2021 16:12:38 +0000
+Subject: [PATCH] make the OSD an actual wayland OSD
+
+when the OnScreenDisplay type is set, set it on the plasma shell surface
+so KWin can actually treat it as such
+
+CCBUG:428859
+---
+ src/plasmaquick/dialog.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 4cea3a28e..3254b8320 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -736,6 +736,13 @@ void DialogPrivate::applyType()
+ if (!wmType) {
+ KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
+ }
++#if HAVE_KWAYLAND
++ if (type == Dialog::OnScreenDisplay) {
++ if (shellSurface) {
++ shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::OnScreenDisplay);
++ }
++ }
++#endif
+ } else {
+ q->setFlags(Qt::FramelessWindowHint | q->flags());
+
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.88.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.88.0-r1.ebuild
new file mode 100644
index 000000000000..5a0e6848003e
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.88.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/libglvnd
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-make-OSD-an-actual-wayland-OSD.patch
+ "${FILESDIR}"/${P}-fix-misrenderings-with-transparency.patch # KDE-bug 305247
+ "${FILESDIR}"/${P}-fix-centered-text.patch # KDE-bug 442830
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2021-12-08 15:08 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-12-08 15:08 UTC (permalink / raw
To: gentoo-commits
commit: e1e08d9dff006c37492c3781ffe75dcd27e1df46
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 14:41:13 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 8 15:07:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e08d9d
kde-frameworks/plasma: Reload shared renderers if file changed on disk
Upstream commit fe9e118ff2212d48a0ea5fcc0346d6312978f3ed
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445516
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...eload-shared-renderers-if-changed-on-disk.patch | 269 +++++++++++++++++++++
kde-frameworks/plasma/plasma-5.88.0-r2.ebuild | 80 ++++++
2 files changed, 349 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch b/kde-frameworks/plasma/files/plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch
new file mode 100644
index 000000000000..07d25c836bbf
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch
@@ -0,0 +1,269 @@
+From fe9e118ff2212d48a0ea5fcc0346d6312978f3ed Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 29 Nov 2021 14:40:38 +0000
+Subject: [PATCH] Reload shared renderers when a file changed on disk
+
+When we have to render a new pixmap, compare the file date with the date of the last time the file was cached. if the dates are different (not only older, in order to allow downgrades) then force the svg renderer to be reloaded from the new file, otherwise the renderer with the old file still loaded will save in cache old graphics with the id derived from the date of the new file, causing a wrong cache entry
+
+BUG:445516
+---
+ src/plasma/private/svg_p.h | 15 +++++-
+ src/plasma/svg.cpp | 100 +++++++++++++++++++++++++++----------
+ 2 files changed, 86 insertions(+), 29 deletions(-)
+
+diff --git a/src/plasma/private/svg_p.h b/src/plasma/private/svg_p.h
+index 11b68f21c..d39f274b4 100644
+--- a/src/plasma/private/svg_p.h
++++ b/src/plasma/private/svg_p.h
+@@ -30,8 +30,14 @@ public:
+
+ SharedSvgRenderer(const QByteArray &contents, const QString &styleSheet, QHash<QString, QRectF> &interestingElements, QObject *parent = nullptr);
+
++ void reload();
++
+ private:
+ bool load(const QByteArray &contents, const QString &styleSheet, QHash<QString, QRectF> &interestingElements);
++
++ QString m_filename;
++ QString m_styleSheet;
++ QHash<QString, QRectF> m_interestingElements;
+ };
+
+ class SvgPrivate
+@@ -125,9 +131,8 @@ public:
+ bool findElementRect(SvgPrivate::CacheId cacheId, QRectF &rect);
+ bool findElementRect(uint id, const QString &filePath, QRectF &rect);
+
+- void loadImageFromCache(const QString &path, uint lastModified);
++ bool loadImageFromCache(const QString &path, uint lastModified);
+ void dropImageFromCache(const QString &path);
+- void expireCache(const QString &path);
+
+ void setNaturalSize(const QString &path, qreal scaleFactor, const QSizeF &size);
+ QSizeF naturalSize(const QString &path, qreal scaleFactor);
+@@ -140,10 +145,15 @@ public:
+
+ QStringList cachedKeysForPath(const QString &path) const;
+
++ unsigned int lastModifiedTimeFromCache(const QString &filePath);
++
+ void updateLastModified(const QString &filePath, unsigned int lastModified);
+
+ static const uint s_seed;
+
++Q_SIGNALS:
++ void lastModifiedChanged(const QString &filePath, unsigned int lastModified);
++
+ private:
+ QTimer *m_configSyncTimer = nullptr;
+ QString m_iconThemePath;
+@@ -156,6 +166,7 @@ private:
+ QHash<uint, QRectF> m_localRectCache;
+ QHash<QString, QSet<unsigned int>> m_invalidElements;
+ QHash<QString, QList<QSize>> m_sizeHintsForId;
++ QHash<QString, unsigned int> m_lastModifiedTimes;
+ };
+ }
+
+diff --git a/src/plasma/svg.cpp b/src/plasma/svg.cpp
+index 1749381b7..47cf142e1 100644
+--- a/src/plasma/svg.cpp
++++ b/src/plasma/svg.cpp
+@@ -73,6 +73,9 @@ SharedSvgRenderer::SharedSvgRenderer(const QString &filename, const QString &sty
+ if (!file.open(QIODevice::ReadOnly)) {
+ return;
+ }
++ m_filename = filename;
++ m_styleSheet = styleSheet;
++ m_interestingElements = interestingElements;
+ load(file.readAll(), styleSheet, interestingElements);
+ }
+
+@@ -82,6 +85,16 @@ SharedSvgRenderer::SharedSvgRenderer(const QByteArray &contents, const QString &
+ load(contents, styleSheet, interestingElements);
+ }
+
++void SharedSvgRenderer::reload()
++{
++ KCompressionDevice file(m_filename, KCompressionDevice::GZip);
++ if (!file.open(QIODevice::ReadOnly)) {
++ return;
++ }
++
++ load(file.readAll(), m_styleSheet, m_interestingElements);
++}
++
+ bool SharedSvgRenderer::load(const QByteArray &contents, const QString &styleSheet, QHash<QString, QRectF> &interestingElements)
+ {
+ // Apply the style sheet.
+@@ -161,21 +174,31 @@ void SvgRectsCache::insert(Plasma::SvgPrivate::CacheId cacheId, const QRectF &re
+
+ void SvgRectsCache::insert(uint id, const QString &filePath, const QRectF &rect, unsigned int lastModified)
+ {
+- if (m_localRectCache.contains(id)) {
++ const unsigned int savedTime = lastModifiedTimeFromCache(filePath);
++
++ if (savedTime == lastModified && m_localRectCache.contains(id)) {
+ return;
+ }
+
+ m_localRectCache.insert(id, rect);
+
++
+ KConfigGroup imageGroup(m_svgElementsCache, filePath);
+- imageGroup.writeEntry("LastModified", lastModified);
++
+ if (rect.isValid()) {
+ imageGroup.writeEntry(QString::number(id), rect);
+ } else {
+ m_invalidElements[filePath] << id;
+ imageGroup.writeEntry("Invalidelements", m_invalidElements[filePath].values());
+ }
++
+ QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
++
++ if (savedTime != lastModified) {
++ m_lastModifiedTimes[filePath] = lastModified;
++ imageGroup.writeEntry("LastModified", lastModified);
++ Q_EMIT lastModifiedChanged(filePath, lastModified);
++ }
+ }
+
+ bool SvgRectsCache::findElementRect(Plasma::SvgPrivate::CacheId cacheId, QRectF &rect)
+@@ -201,20 +224,21 @@ bool SvgRectsCache::findElementRect(uint id, const QString &filePath, QRectF &re
+ return true;
+ }
+
+-void SvgRectsCache::loadImageFromCache(const QString &path, uint lastModified)
++bool SvgRectsCache::loadImageFromCache(const QString &path, uint lastModified)
+ {
+ if (path.isEmpty()) {
+- return;
++ return false;
+ }
+
+ KConfigGroup imageGroup(m_svgElementsCache, path);
+
+- unsigned int savedTime = imageGroup.readEntry("LastModified", 0);
++ unsigned int savedTime = lastModifiedTimeFromCache(path);
+
+- if (lastModified > savedTime) {
++ // Reload even if is older, to support downgrades
++ if (lastModified != savedTime) {
+ imageGroup.deleteGroup();
+ QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
+- return;
++ return false;
+ }
+
+ auto &elements = m_invalidElements[path];
+@@ -231,6 +255,7 @@ void SvgRectsCache::loadImageFromCache(const QString &path, uint lastModified)
+ }
+ }
+ }
++ return true;
+ }
+
+ void SvgRectsCache::dropImageFromCache(const QString &path)
+@@ -302,22 +327,6 @@ void SvgRectsCache::setIconThemePath(const QString &path)
+ QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
+ }
+
+-void SvgRectsCache::expireCache(const QString &path)
+-{
+- KConfigGroup imageGroup(m_svgElementsCache, path);
+-
+- unsigned int savedTime = imageGroup.readEntry("LastModified", QDateTime().toSecsSinceEpoch());
+- QFileInfo info(path);
+- if (info.exists()) {
+- unsigned int lastModified = info.lastModified().toSecsSinceEpoch();
+- if (lastModified <= savedTime) {
+- return;
+- }
+- }
+-
+- imageGroup.deleteGroup();
+-}
+-
+ void SvgRectsCache::setNaturalSize(const QString &path, qreal scaleFactor, const QSizeF &size)
+ {
+ KConfigGroup imageGroup(m_svgElementsCache, path);
+@@ -349,11 +358,30 @@ QStringList SvgRectsCache::cachedKeysForPath(const QString &path) const
+ return filtered;
+ }
+
++unsigned int SvgRectsCache::lastModifiedTimeFromCache(const QString &filePath)
++{
++ const auto &i = m_lastModifiedTimes.constFind(filePath);
++ if (i != m_lastModifiedTimes.constEnd()) {
++ return i.value();
++ }
++
++ KConfigGroup imageGroup(m_svgElementsCache, filePath);
++ const unsigned int savedTime = imageGroup.readEntry("LastModified", 0);
++ m_lastModifiedTimes[filePath] = savedTime;
++ return savedTime;
++}
++
+ void SvgRectsCache::updateLastModified(const QString &filePath, unsigned int lastModified)
+ {
+ KConfigGroup imageGroup(m_svgElementsCache, filePath);
+- imageGroup.writeEntry("LastModified", lastModified);
+- QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
++ const unsigned int savedTime = lastModifiedTimeFromCache(filePath);
++
++ if (savedTime != lastModified) {
++ m_lastModifiedTimes[filePath] = lastModified;
++ imageGroup.writeEntry("LastModified", lastModified);
++ QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
++ Q_EMIT lastModifiedChanged(filePath, lastModified);
++ }
+ }
+
+ SvgPrivate::SvgPrivate(Svg *svg)
+@@ -463,7 +491,17 @@ bool SvgPrivate::setImagePath(const QString &imagePath)
+
+ lastModified = lastModifiedDate.toSecsSinceEpoch();
+
+- SvgRectsCache::instance()->loadImageFromCache(path, lastModified);
++ const bool imageWasCached = SvgRectsCache::instance()->loadImageFromCache(path, lastModified);
++
++ if (!imageWasCached) {
++ auto i = s_renderers.constBegin();
++ while (i != s_renderers.constEnd()) {
++ if (i.key().contains(path)) {
++ i.value()->reload();
++ }
++ i++;
++ }
++ }
+
+ // check if svg wants colorscheme applied
+ checkColorHints();
+@@ -552,7 +590,8 @@ QPixmap SvgPrivate::findInCache(const QString &elementId, qreal ratio, const QSi
+ const QString id = cachePath(actualElementId, size);
+
+ QPixmap p;
+- if (cacheRendering && cacheAndColorsTheme()->findInCache(id, p, lastModified)) {
++ if (cacheRendering && lastModified == SvgRectsCache::instance()->lastModifiedTimeFromCache(path)
++ && cacheAndColorsTheme()->findInCache(id, p, lastModified)) {
+ p.setDevicePixelRatio(ratio);
+ // qCDebug(LOG_PLASMA) << "found cached version of " << id << p.size();
+ return p;
+@@ -845,6 +884,13 @@ Svg::Svg(QObject *parent)
+ : QObject(parent)
+ , d(new SvgPrivate(this))
+ {
++ connect(SvgRectsCache::instance(), &SvgRectsCache::lastModifiedChanged,
++ this, [this] (const QString &filePath, unsigned int lastModified) {
++ if (d->lastModified != lastModified && filePath == d->path) {
++ d->lastModified = lastModified;
++ Q_EMIT repaintNeeded();
++ }
++ });
+ }
+
+ Svg::~Svg()
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.88.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.88.0-r2.ebuild
new file mode 100644
index 000000000000..8cf6ee9309bb
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.88.0-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/libglvnd
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-make-OSD-an-actual-wayland-OSD.patch
+ "${FILESDIR}"/${P}-fix-misrenderings-with-transparency.patch # KDE-bug 305247
+ "${FILESDIR}"/${P}-fix-centered-text.patch # KDE-bug 442830
+ "${FILESDIR}"/${P}-reload-shared-renderers-if-changed-on-disk.patch # KDE-bug 445516
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2022-02-10 9:13 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-02-10 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 7989a782d8cd0d383a0f246fe977349555b02e61
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 08:20:52 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 09:11:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7989a782
kde-frameworks/plasma: drop 5.88.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
.../files/plasma-5.88.0-fix-centered-text.patch | 121 ---------
....88.0-fix-misrenderings-with-transparency.patch | 34 ---
...sma-5.88.0-make-OSD-an-actual-wayland-OSD.patch | 34 ---
.../files/plasma-5.88.0-no-double-delete.patch | 28 ---
...eload-shared-renderers-if-changed-on-disk.patch | 269 ---------------------
...-5.88.0-svg-smaller-mask-to-hide-glitches.patch | 42 ----
...asma-5.88.0-update-after-clearing-actions.patch | 29 ---
kde-frameworks/plasma/plasma-5.88.0-r2.ebuild | 82 -------
kde-frameworks/plasma/plasma-5.88.0-r3.ebuild | 83 -------
10 files changed, 723 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 12df8f1df68c..973225ebdf87 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1 @@
-DIST plasma-framework-5.88.0.tar.xz 3142640 BLAKE2B cbd0cc61b6c39e56a1bceed44d7f04f0033c0daaa3073760f04536b22760147b1bb82f5b85d70d48301083e9ae13e3f6bbebafa75e264762157e2fcaf658123d SHA512 b99c8d5722198d7f2096734f62f913f74471810331980a2722f1864602f3facf796c17a494d16fca7dbbe4389fd5db64b9fe82fd34f148f4ff6230ffde0ded93
DIST plasma-framework-5.90.0.tar.xz 3143720 BLAKE2B 497a1808c2f07b985f3b458d2bf6b4b4e0198a8bd92cffdad86cc9470cd51c857c3de66edbe4d6ea543da74f6ba05fe5ce1b6746e2df7830839e45549ca01293 SHA512 0f22e100ad996be39a2cc5afa72d3e769dc512d3854d417e81536908bc4e6c9874788554fcea1ca1ec4798cd78681c78ab7c2242b95d7f5fdb6cfd9eeee9543b
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
deleted file mode 100644
index 8fb393a568d6..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 92ac1038cff333d70a71331b2a5fa0b9d91bc39d Mon Sep 17 00:00:00 2001
-From: Eugene Popov <popov895@ukr.net>
-Date: Fri, 19 Nov 2021 11:13:03 +0000
-Subject: [PATCH] Fix IconLabel
-
----
- .../plasmacomponents3/private/IconLabel.qml | 97 +++++++++++--------
- 1 file changed, 55 insertions(+), 42 deletions(-)
-
-diff --git a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
-index 467c2f54b..74a8ff3a5 100644
---- a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
-+++ b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
-@@ -24,49 +24,62 @@ T.Control {
- PlasmaCore.ColorScope.inherit: true
- implicitWidth: implicitContentWidth + leftPadding + rightPadding
- implicitHeight: implicitContentHeight + topPadding + bottomPadding
-- contentItem: GridLayout {
-- rowSpacing: root.spacing
-- columnSpacing: root.spacing
-- flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
-- PlasmaCore.IconItem {
-- id: iconItem
-- visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
-- colorGroup: root.PlasmaCore.ColorScope.colorGroup
-- implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
-- implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
-- Layout.fillWidth: true
-- Layout.fillHeight: true
-- Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
-- Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
-- Layout.alignment: if (root.textBesideIcon) {
-- Qt.AlignRight | Qt.AlignVCenter
-- } else if (root.textUnderIcon) {
-- Qt.AlignHCenter | Qt.AlignBottom
-- } else {
-- Qt.AlignCenter
-+ contentItem: Item {
-+ implicitWidth: gridLayout.implicitWidth
-+ implicitHeight: gridLayout.implicitHeight
-+ GridLayout {
-+ id: gridLayout
-+ rowSpacing: root.spacing
-+ columnSpacing: root.spacing
-+ flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
-+ x: {
-+ if (root.alignment & Qt.AlignLeft) {
-+ return 0;
-+ }
-+ if (root.alignment & Qt.AlignRight) {
-+ return parent.width - width;
-+ }
-+ return Math.round((parent.width - width) / 2);
- }
-- }
-- T.Label {
-- id: label
-- visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
-- palette: root.palette
-- font: root.font
-- horizontalAlignment: root.alignment & Qt.AlignHorizontal_Mask || Text.AlignHCenter
-- verticalAlignment: root.alignment & Qt.AlignVertical_Mask || Text.AlignVCenter
-- // Work around Qt bug where NativeRendering breaks for non-integer scale factors
-- // https://bugreports.qt.io/browse/QTBUG-70481
-- renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
-- color: PlasmaCore.ColorScope.textColor
-- linkColor: PlasmaCore.Theme.linkColor
-- elide: Text.ElideRight
-- Layout.fillWidth: root.alignment & Qt.AlignHorizontal_Mask
-- Layout.fillHeight: root.alignment & Qt.AlignVertical_Mask
-- Layout.alignment: if (root.textBesideIcon) {
-- Qt.AlignLeft | Qt.AlignVCenter
-- } else if (root.textUnderIcon) {
-- Qt.AlignHCenter | Qt.AlignTop
-- } else {
-- Qt.AlignCenter
-+ y: {
-+ if (root.alignment & Qt.AlignTop) {
-+ return 0;
-+ }
-+ if (root.alignment & Qt.AlignBottom) {
-+ return parent.height - height;
-+ }
-+ return Math.round((parent.height - height) / 2);
-+ }
-+ width: Math.min(parent.width, implicitWidth)
-+ height: Math.min(parent.height, implicitHeight)
-+ PlasmaCore.IconItem {
-+ id: iconItem
-+ visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
-+ colorGroup: root.PlasmaCore.ColorScope.colorGroup
-+ implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
-+ implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
-+ Layout.alignment: Qt.AlignCenter
-+ Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
-+ Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
-+ }
-+ T.Label {
-+ id: label
-+ visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
-+ palette: root.palette
-+ font: root.font
-+ // Work around Qt bug where NativeRendering breaks for non-integer scale factors
-+ // https://bugreports.qt.io/browse/QTBUG-70481
-+ renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
-+ color: PlasmaCore.ColorScope.textColor
-+ linkColor: PlasmaCore.Theme.linkColor
-+ elide: Text.ElideRight
-+ Layout.alignment: Qt.AlignCenter
-+ Layout.fillWidth: {
-+ if (!iconItem.visible || parent.flow === GridLayout.TopToBottom) {
-+ return implicitWidth > parent.width;
-+ }
-+ return iconItem.implicitWidth + parent.columnSpacing + implicitWidth > parent.width;
-+ }
- }
- }
- }
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
deleted file mode 100644
index d1e6f37d8a2b..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6176d8ef8f36290075c5bd8932d623e68468a1cd Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Tue, 16 Nov 2021 11:05:17 +0100
-Subject: [PATCH] Do updateTheme after QQuickWindow::event
-
-doing updatetheme there will ensure that the window size is correct,
-so then when the surface commit will happen, we'll have the blur
-and contrast regions wit hthe proper geometry
-
-BUG:305247
----
- src/plasmaquick/dialog.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index eac7d432a..343bfe4c0 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -1243,10 +1243,12 @@ bool Dialog::event(QEvent *event)
- // sometimes non null regions arrive even for non visible windows
- // for which surface creation would fail
- if (!d->shellSurface && isVisible()) {
-+ const bool ret = QQuickWindow::event(event);
- KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
- d->setupWaylandIntegration();
- d->updateVisibility(true);
- d->updateTheme();
-+ return ret;
- }
- #endif
- } else if (event->type() == QEvent::PlatformSurface) {
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch b/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
deleted file mode 100644
index 0631155c89bf..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2ba1b0b642d540f74f0e21e7aaa272644ea4eda5 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 8 Nov 2021 16:12:38 +0000
-Subject: [PATCH] make the OSD an actual wayland OSD
-
-when the OnScreenDisplay type is set, set it on the plasma shell surface
-so KWin can actually treat it as such
-
-CCBUG:428859
----
- src/plasmaquick/dialog.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index 4cea3a28e..3254b8320 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -736,6 +736,13 @@ void DialogPrivate::applyType()
- if (!wmType) {
- KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
- }
-+#if HAVE_KWAYLAND
-+ if (type == Dialog::OnScreenDisplay) {
-+ if (shellSurface) {
-+ shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::OnScreenDisplay);
-+ }
-+ }
-+#endif
- } else {
- q->setFlags(Qt::FramelessWindowHint | q->flags());
-
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-no-double-delete.patch b/kde-frameworks/plasma/files/plasma-5.88.0-no-double-delete.patch
deleted file mode 100644
index d3a03411b2cf..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-no-double-delete.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9b37459570f75e09f17aadf32f7abfe8b8d4d1e0 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Sat, 4 Dec 2021 17:16:30 +0800
-Subject: [PATCH] wallpaperinterface: Don't double delete action
-
-`removeAction` already deletes the action, it makes no sense to delete
-the action again and will crash plasmashell.
-
-CCBUG: 446195
----
- src/scriptengines/qml/plasmoid/wallpaperinterface.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-index 570cf8e45..65adf838e 100644
---- a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-+++ b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-@@ -229,7 +229,6 @@ void WallpaperInterface::removeAction(const QString &name)
-
- if (action) {
- m_actions->removeAction(action);
-- delete action;
- }
- setProperty("contextualActions", QVariant::fromValue(contextualActions()));
- }
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch b/kde-frameworks/plasma/files/plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch
deleted file mode 100644
index 07d25c836bbf..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-From fe9e118ff2212d48a0ea5fcc0346d6312978f3ed Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 29 Nov 2021 14:40:38 +0000
-Subject: [PATCH] Reload shared renderers when a file changed on disk
-
-When we have to render a new pixmap, compare the file date with the date of the last time the file was cached. if the dates are different (not only older, in order to allow downgrades) then force the svg renderer to be reloaded from the new file, otherwise the renderer with the old file still loaded will save in cache old graphics with the id derived from the date of the new file, causing a wrong cache entry
-
-BUG:445516
----
- src/plasma/private/svg_p.h | 15 +++++-
- src/plasma/svg.cpp | 100 +++++++++++++++++++++++++++----------
- 2 files changed, 86 insertions(+), 29 deletions(-)
-
-diff --git a/src/plasma/private/svg_p.h b/src/plasma/private/svg_p.h
-index 11b68f21c..d39f274b4 100644
---- a/src/plasma/private/svg_p.h
-+++ b/src/plasma/private/svg_p.h
-@@ -30,8 +30,14 @@ public:
-
- SharedSvgRenderer(const QByteArray &contents, const QString &styleSheet, QHash<QString, QRectF> &interestingElements, QObject *parent = nullptr);
-
-+ void reload();
-+
- private:
- bool load(const QByteArray &contents, const QString &styleSheet, QHash<QString, QRectF> &interestingElements);
-+
-+ QString m_filename;
-+ QString m_styleSheet;
-+ QHash<QString, QRectF> m_interestingElements;
- };
-
- class SvgPrivate
-@@ -125,9 +131,8 @@ public:
- bool findElementRect(SvgPrivate::CacheId cacheId, QRectF &rect);
- bool findElementRect(uint id, const QString &filePath, QRectF &rect);
-
-- void loadImageFromCache(const QString &path, uint lastModified);
-+ bool loadImageFromCache(const QString &path, uint lastModified);
- void dropImageFromCache(const QString &path);
-- void expireCache(const QString &path);
-
- void setNaturalSize(const QString &path, qreal scaleFactor, const QSizeF &size);
- QSizeF naturalSize(const QString &path, qreal scaleFactor);
-@@ -140,10 +145,15 @@ public:
-
- QStringList cachedKeysForPath(const QString &path) const;
-
-+ unsigned int lastModifiedTimeFromCache(const QString &filePath);
-+
- void updateLastModified(const QString &filePath, unsigned int lastModified);
-
- static const uint s_seed;
-
-+Q_SIGNALS:
-+ void lastModifiedChanged(const QString &filePath, unsigned int lastModified);
-+
- private:
- QTimer *m_configSyncTimer = nullptr;
- QString m_iconThemePath;
-@@ -156,6 +166,7 @@ private:
- QHash<uint, QRectF> m_localRectCache;
- QHash<QString, QSet<unsigned int>> m_invalidElements;
- QHash<QString, QList<QSize>> m_sizeHintsForId;
-+ QHash<QString, unsigned int> m_lastModifiedTimes;
- };
- }
-
-diff --git a/src/plasma/svg.cpp b/src/plasma/svg.cpp
-index 1749381b7..47cf142e1 100644
---- a/src/plasma/svg.cpp
-+++ b/src/plasma/svg.cpp
-@@ -73,6 +73,9 @@ SharedSvgRenderer::SharedSvgRenderer(const QString &filename, const QString &sty
- if (!file.open(QIODevice::ReadOnly)) {
- return;
- }
-+ m_filename = filename;
-+ m_styleSheet = styleSheet;
-+ m_interestingElements = interestingElements;
- load(file.readAll(), styleSheet, interestingElements);
- }
-
-@@ -82,6 +85,16 @@ SharedSvgRenderer::SharedSvgRenderer(const QByteArray &contents, const QString &
- load(contents, styleSheet, interestingElements);
- }
-
-+void SharedSvgRenderer::reload()
-+{
-+ KCompressionDevice file(m_filename, KCompressionDevice::GZip);
-+ if (!file.open(QIODevice::ReadOnly)) {
-+ return;
-+ }
-+
-+ load(file.readAll(), m_styleSheet, m_interestingElements);
-+}
-+
- bool SharedSvgRenderer::load(const QByteArray &contents, const QString &styleSheet, QHash<QString, QRectF> &interestingElements)
- {
- // Apply the style sheet.
-@@ -161,21 +174,31 @@ void SvgRectsCache::insert(Plasma::SvgPrivate::CacheId cacheId, const QRectF &re
-
- void SvgRectsCache::insert(uint id, const QString &filePath, const QRectF &rect, unsigned int lastModified)
- {
-- if (m_localRectCache.contains(id)) {
-+ const unsigned int savedTime = lastModifiedTimeFromCache(filePath);
-+
-+ if (savedTime == lastModified && m_localRectCache.contains(id)) {
- return;
- }
-
- m_localRectCache.insert(id, rect);
-
-+
- KConfigGroup imageGroup(m_svgElementsCache, filePath);
-- imageGroup.writeEntry("LastModified", lastModified);
-+
- if (rect.isValid()) {
- imageGroup.writeEntry(QString::number(id), rect);
- } else {
- m_invalidElements[filePath] << id;
- imageGroup.writeEntry("Invalidelements", m_invalidElements[filePath].values());
- }
-+
- QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
-+
-+ if (savedTime != lastModified) {
-+ m_lastModifiedTimes[filePath] = lastModified;
-+ imageGroup.writeEntry("LastModified", lastModified);
-+ Q_EMIT lastModifiedChanged(filePath, lastModified);
-+ }
- }
-
- bool SvgRectsCache::findElementRect(Plasma::SvgPrivate::CacheId cacheId, QRectF &rect)
-@@ -201,20 +224,21 @@ bool SvgRectsCache::findElementRect(uint id, const QString &filePath, QRectF &re
- return true;
- }
-
--void SvgRectsCache::loadImageFromCache(const QString &path, uint lastModified)
-+bool SvgRectsCache::loadImageFromCache(const QString &path, uint lastModified)
- {
- if (path.isEmpty()) {
-- return;
-+ return false;
- }
-
- KConfigGroup imageGroup(m_svgElementsCache, path);
-
-- unsigned int savedTime = imageGroup.readEntry("LastModified", 0);
-+ unsigned int savedTime = lastModifiedTimeFromCache(path);
-
-- if (lastModified > savedTime) {
-+ // Reload even if is older, to support downgrades
-+ if (lastModified != savedTime) {
- imageGroup.deleteGroup();
- QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
-- return;
-+ return false;
- }
-
- auto &elements = m_invalidElements[path];
-@@ -231,6 +255,7 @@ void SvgRectsCache::loadImageFromCache(const QString &path, uint lastModified)
- }
- }
- }
-+ return true;
- }
-
- void SvgRectsCache::dropImageFromCache(const QString &path)
-@@ -302,22 +327,6 @@ void SvgRectsCache::setIconThemePath(const QString &path)
- QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
- }
-
--void SvgRectsCache::expireCache(const QString &path)
--{
-- KConfigGroup imageGroup(m_svgElementsCache, path);
--
-- unsigned int savedTime = imageGroup.readEntry("LastModified", QDateTime().toSecsSinceEpoch());
-- QFileInfo info(path);
-- if (info.exists()) {
-- unsigned int lastModified = info.lastModified().toSecsSinceEpoch();
-- if (lastModified <= savedTime) {
-- return;
-- }
-- }
--
-- imageGroup.deleteGroup();
--}
--
- void SvgRectsCache::setNaturalSize(const QString &path, qreal scaleFactor, const QSizeF &size)
- {
- KConfigGroup imageGroup(m_svgElementsCache, path);
-@@ -349,11 +358,30 @@ QStringList SvgRectsCache::cachedKeysForPath(const QString &path) const
- return filtered;
- }
-
-+unsigned int SvgRectsCache::lastModifiedTimeFromCache(const QString &filePath)
-+{
-+ const auto &i = m_lastModifiedTimes.constFind(filePath);
-+ if (i != m_lastModifiedTimes.constEnd()) {
-+ return i.value();
-+ }
-+
-+ KConfigGroup imageGroup(m_svgElementsCache, filePath);
-+ const unsigned int savedTime = imageGroup.readEntry("LastModified", 0);
-+ m_lastModifiedTimes[filePath] = savedTime;
-+ return savedTime;
-+}
-+
- void SvgRectsCache::updateLastModified(const QString &filePath, unsigned int lastModified)
- {
- KConfigGroup imageGroup(m_svgElementsCache, filePath);
-- imageGroup.writeEntry("LastModified", lastModified);
-- QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
-+ const unsigned int savedTime = lastModifiedTimeFromCache(filePath);
-+
-+ if (savedTime != lastModified) {
-+ m_lastModifiedTimes[filePath] = lastModified;
-+ imageGroup.writeEntry("LastModified", lastModified);
-+ QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
-+ Q_EMIT lastModifiedChanged(filePath, lastModified);
-+ }
- }
-
- SvgPrivate::SvgPrivate(Svg *svg)
-@@ -463,7 +491,17 @@ bool SvgPrivate::setImagePath(const QString &imagePath)
-
- lastModified = lastModifiedDate.toSecsSinceEpoch();
-
-- SvgRectsCache::instance()->loadImageFromCache(path, lastModified);
-+ const bool imageWasCached = SvgRectsCache::instance()->loadImageFromCache(path, lastModified);
-+
-+ if (!imageWasCached) {
-+ auto i = s_renderers.constBegin();
-+ while (i != s_renderers.constEnd()) {
-+ if (i.key().contains(path)) {
-+ i.value()->reload();
-+ }
-+ i++;
-+ }
-+ }
-
- // check if svg wants colorscheme applied
- checkColorHints();
-@@ -552,7 +590,8 @@ QPixmap SvgPrivate::findInCache(const QString &elementId, qreal ratio, const QSi
- const QString id = cachePath(actualElementId, size);
-
- QPixmap p;
-- if (cacheRendering && cacheAndColorsTheme()->findInCache(id, p, lastModified)) {
-+ if (cacheRendering && lastModified == SvgRectsCache::instance()->lastModifiedTimeFromCache(path)
-+ && cacheAndColorsTheme()->findInCache(id, p, lastModified)) {
- p.setDevicePixelRatio(ratio);
- // qCDebug(LOG_PLASMA) << "found cached version of " << id << p.size();
- return p;
-@@ -845,6 +884,13 @@ Svg::Svg(QObject *parent)
- : QObject(parent)
- , d(new SvgPrivate(this))
- {
-+ connect(SvgRectsCache::instance(), &SvgRectsCache::lastModifiedChanged,
-+ this, [this] (const QString &filePath, unsigned int lastModified) {
-+ if (d->lastModified != lastModified && filePath == d->path) {
-+ d->lastModified = lastModified;
-+ Q_EMIT repaintNeeded();
-+ }
-+ });
- }
-
- Svg::~Svg()
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch b/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch
deleted file mode 100644
index f735b392667b..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9ba4ed4da72a3d1bbec8920d93a547cf633cfacd Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Wed, 10 Nov 2021 15:50:10 +0100
-Subject: [PATCH] smaller mask to hide glitches
-
-This makes the mask slightly maller than the frame. Since the svg will have antialiasing and the mask not,
-there will be artifacts at the corners, if they go under the svg they're less evident
-
-CCBUG:438644
----
- src/plasmaquick/dialog.cpp | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index 3254b8320..6b3963303 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -237,14 +237,19 @@ void DialogPrivate::updateTheme()
- frameSvgItem->setImagePath(prefix + QStringLiteral("dialogs/background"));
- }
-
-- KWindowEffects::enableBlurBehind(q, theme.blurBehindEnabled(), frameSvgItem->mask());
-+ // This makes the mask slightly maller than the frame. Since the svg will have antialiasing and the mask not,
-+ // there will be artifacts at the corners, if they go under the svg they're less evident
-+ frameSvgItem->frameSvg()->resizeFrame(q->size() - QSize(2,2));
-+ const QRegion mask = frameSvgItem->frameSvg()->mask().translated(1,1);
-+ KWindowEffects::enableBlurBehind(q, theme.blurBehindEnabled(), mask);
-
- KWindowEffects::enableBackgroundContrast(q,
- theme.backgroundContrastEnabled(),
- theme.backgroundContrast(),
- theme.backgroundIntensity(),
- theme.backgroundSaturation(),
-- frameSvgItem->mask());
-+ mask);
-+ frameSvgItem->frameSvg()->resizeFrame(q->size());
-
- if (KWindowSystem::compositingActive()) {
- if (hasMask) {
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-update-after-clearing-actions.patch b/kde-frameworks/plasma/files/plasma-5.88.0-update-after-clearing-actions.patch
deleted file mode 100644
index a30e9b6e5b1d..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-update-after-clearing-actions.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 77fedf1f9919eb2cc07c8ecccdd70ad2a7343161 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Sat, 4 Dec 2021 18:08:43 +0800
-Subject: [PATCH] wallpaperinterface: Update "contextualActions" after clearing
- actions
-
-After clearing the entire action collection, "contextualActions" needs
-to be updated to remove invalid action pointers.
-
-BUG: 446195
----
- src/scriptengines/qml/plasmoid/wallpaperinterface.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-index 65adf838e..49bdb9512 100644
---- a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-+++ b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-@@ -115,6 +115,7 @@ void WallpaperInterface::syncWallpaperPackage()
- }
-
- m_actions->clear();
-+ setProperty("contextualActions", QVariant::fromValue(contextualActions()));
- m_pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/Wallpaper"));
- m_pkg.setPath(m_wallpaperPlugin);
- if (!m_pkg.isValid()) {
---
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.88.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.88.0-r2.ebuild
deleted file mode 100644
index 1954bafc268a..000000000000
--- a/kde-frameworks/plasma/plasma-5.88.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( media-libs/libglvnd[X?] )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/libglvnd
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-make-OSD-an-actual-wayland-OSD.patch
- "${FILESDIR}"/${P}-fix-misrenderings-with-transparency.patch # KDE-bug 305247
- "${FILESDIR}"/${P}-fix-centered-text.patch # KDE-bug 442830
- "${FILESDIR}"/${P}-reload-shared-renderers-if-changed-on-disk.patch # KDE-bug 445516
- "${FILESDIR}"/${P}-no-double-delete.patch # KDE-bug 446195
- "${FILESDIR}"/${P}-update-after-clearing-actions.patch # KDE-bug 446195
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package man KF5DocTools)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.88.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.88.0-r3.ebuild
deleted file mode 100644
index a7454cdc9b4b..000000000000
--- a/kde-frameworks/plasma/plasma-5.88.0-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( media-libs/libglvnd[X?] )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/libglvnd
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-make-OSD-an-actual-wayland-OSD.patch
- "${FILESDIR}"/${P}-fix-misrenderings-with-transparency.patch # KDE-bug 305247
- "${FILESDIR}"/${P}-fix-centered-text.patch # KDE-bug 442830
- "${FILESDIR}"/${P}-reload-shared-renderers-if-changed-on-disk.patch # KDE-bug 445516
- "${FILESDIR}"/${P}-no-double-delete.patch # KDE-bug 446195
- "${FILESDIR}"/${P}-update-after-clearing-actions.patch # KDE-bug 446195
- "${FILESDIR}"/${P}-svg-smaller-mask-to-hide-glitches.patch # KDE-bug 438644
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package man KF5DocTools)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2022-03-30 14:41 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-03-30 14:41 UTC (permalink / raw
To: gentoo-commits
commit: bf1180f1150f7f3fe2da126e07f292afea7c927e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 14:32:09 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 14:38:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1180f1
kde-frameworks/plasma: Visual regression fix
See also:
https://mail.kde.org/pipermail/distributions/2022-March/001212.html
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...lasma-5.92.0-breeze-light-dark-visual-fix.patch | 40 ++++++++++++
kde-frameworks/plasma/plasma-5.92.0-r1.ebuild | 75 ++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch
new file mode 100644
index 000000000000..04992bcb129d
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch
@@ -0,0 +1,40 @@
+From 7352045b388f4b0ef553706bd219457e5018ce4e Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 28 Mar 2022 21:20:16 +0000
+Subject: [PATCH] Don't install the heading SVG in breeze-light and breeze-dark
+ Plasma themes
+
+Installing that file there was an acky workaround that got broken by 2cccf230.
+---
+ src/desktoptheme/breeze-dark/CMakeLists.txt | 5 +----
+ src/desktoptheme/breeze-light/CMakeLists.txt | 4 ----
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/src/desktoptheme/breeze-dark/CMakeLists.txt b/src/desktoptheme/breeze-dark/CMakeLists.txt
+index 8f2078e4d..7f8f99062 100644
+--- a/src/desktoptheme/breeze-dark/CMakeLists.txt
++++ b/src/desktoptheme/breeze-dark/CMakeLists.txt
+@@ -8,7 +8,4 @@ install(
+ FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
+ DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark
+ )
+-install(
+- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
+- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark/widgets
+-)
++
+diff --git a/src/desktoptheme/breeze-light/CMakeLists.txt b/src/desktoptheme/breeze-light/CMakeLists.txt
+index 678033cec..6688a603b 100644
+--- a/src/desktoptheme/breeze-light/CMakeLists.txt
++++ b/src/desktoptheme/breeze-light/CMakeLists.txt
+@@ -8,7 +8,3 @@ install(
+ FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
+ DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light
+ )
+-install(
+- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
+- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light/widgets
+-)
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild
new file mode 100644
index 000000000000..3e5fa1db605e
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/libglvnd
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=( "${FILESDIR}/${P}-breeze-light-dark-visual-fix.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2022-04-15 18:27 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-04-15 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 4ab71f2653b05f6f08d5fee913c5d0c3db2d195c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 18:25:47 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 18:27:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab71f26
kde-frameworks/plasma: Dialog: Do not upd. layout params while hidden
See also: https://mail.kde.org/pipermail/distributions/2022-April/001216.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=452512
Upstream commit b62d83bef7733e4943e6f66787166b41198d1359
Closes: https://bugs.gentoo.org/838661
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 29 ++++++++++++++++++++++
...lasma-5.93.0.ebuild => plasma-5.93.0-r1.ebuild} | 5 +++-
2 files changed, 33 insertions(+), 1 deletion(-)
--git a/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch b/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch
new file mode 100644
index 000000000000..7f95c6531a95
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch
@@ -0,0 +1,29 @@
+From b62d83bef7733e4943e6f66787166b41198d1359 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 13 Apr 2022 16:05:32 +0200
+Subject: [PATCH] Dialog: Do not update layout parameters while hidden
+
+Wait until the dialog it's shown to position the components within.
+Otherwise we do it based on a random size.
+
+BUG: 452512
+---
+ src/plasmaquick/dialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 09937ef0f..9ca2c8a66 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -475,7 +475,7 @@ void DialogPrivate::getSizeHints(QSize &min, QSize &max) const
+
+ void DialogPrivate::updateLayoutParameters()
+ {
+- if (!componentComplete || !mainItem || !mainItemLayout) {
++ if (!componentComplete || !mainItem || !mainItemLayout || q->visibility() == QWindow::Hidden) {
+ return;
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.93.0.ebuild b/kde-frameworks/plasma/plasma-5.93.0-r1.ebuild
similarity index 92%
rename from kde-frameworks/plasma/plasma-5.93.0.ebuild
rename to kde-frameworks/plasma/plasma-5.93.0-r1.ebuild
index 8203773544a2..1548d3671d1d 100644
--- a/kde-frameworks/plasma/plasma-5.93.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.93.0-r1.ebuild
@@ -59,7 +59,10 @@ DEPEND="${RDEPEND}
"
BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-PATCHES=( "${FILESDIR}/${PN}-5.92.0-fix-blurry-buttons.patch" ) # KDE-bug 447977
+PATCHES=(
+ "${FILESDIR}/${PN}-5.92.0-fix-blurry-buttons.patch" # KDE-bug 447977
+ "${FILESDIR}/${P}-fix-widget-popups.patch" # bug 838661, KDE-bug 452512
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2022-04-21 8:56 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-04-21 8:56 UTC (permalink / raw
To: gentoo-commits
commit: caa7e287c1eff5fcadf0b3423af82ac09b35f10c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 08:51:10 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 08:51:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa7e287
kde-frameworks/plasma: Two 5.93 upstream backport requests
See also:
https://mail.kde.org/pipermail/distributions/2022-April/001220.html
https://mail.kde.org/pipermail/distributions/2022-April/001221.html
Upstream commits:
aec00b32980390b93411f140dfb0503a671c2163
734b956c27bd76df7fed6979beb27c2f30cbd3bf
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=452648
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=452555
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-5.93.0-fix-osd-dialog-position.patch | 32 +++++++++
...ma-5.93.0-keep-legacy-highlight-behaviour.patch | 33 +++++++++
kde-frameworks/plasma/plasma-5.93.0-r2.ebuild | 80 ++++++++++++++++++++++
3 files changed, 145 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch b/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch
new file mode 100644
index 000000000000..088230402863
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch
@@ -0,0 +1,32 @@
+From aec00b32980390b93411f140dfb0503a671c2163 Mon Sep 17 00:00:00 2001
+From: Jim Jones <rauchwolke@gmx.net>
+Date: Wed, 20 Apr 2022 16:18:20 +0000
+Subject: [PATCH] Fix osd dialog position
+
+After the upgrade to kde-frameworks-5.93 the osd volume indicator is displayed in the top left corner of the screen instead of being displayed in the center of the screen.
+
+BUG: 452648
+---
+ src/plasmaquick/dialog.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 9ca2c8a66..1e6736dee 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -1237,11 +1237,7 @@ bool Dialog::event(QEvent *event)
+ {
+ if (event->type() == QEvent::Expose) {
+ if (!KWindowSystem::isPlatformWayland() || !isExposed()) {
+- auto ret = QQuickWindow::event(event);
+- if (d->mainItem) {
+- d->syncToMainItemSize();
+- }
+- return ret;
++ return QQuickWindow::event(event);
+ }
+
+ /*
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch b/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch
new file mode 100644
index 000000000000..20935856caa8
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch
@@ -0,0 +1,33 @@
+From 734b956c27bd76df7fed6979beb27c2f30cbd3bf Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 13 Apr 2022 17:25:52 +0200
+Subject: [PATCH] Keep PlasmaComponents.Highlight on its former behaviour
+
+Otherwise some applets like Kickoff Legacy don't get a highlight
+
+BUG: 452555
+---
+ src/declarativeimports/plasmacomponents/qml/Highlight.qml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/declarativeimports/plasmacomponents/qml/Highlight.qml b/src/declarativeimports/plasmacomponents/qml/Highlight.qml
+index 672e57231..3672050b7 100644
+--- a/src/declarativeimports/plasmacomponents/qml/Highlight.qml
++++ b/src/declarativeimports/plasmacomponents/qml/Highlight.qml
+@@ -4,6 +4,7 @@
+ SPDX-License-Identifier: LGPL-2.0-or-later
+ */
+
++import QtQuick 2.15
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+
+ /**
+@@ -15,4 +16,5 @@ PlasmaExtras.Highlight
+ id: root
+ // At some point we had the "hover" property which was replaced with "hovered"
+ property alias hover: root.hovered
++ hovered: true
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild
new file mode 100644
index 000000000000..f5d72b460cb0
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/libglvnd
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.92.0-fix-blurry-buttons.patch" # KDE-bug 447977
+ "${FILESDIR}/${P}-fix-widget-popups.patch" # bug 838661, KDE-bug 452512
+ "${FILESDIR}/${P}-fix-osd-dialog-position.patch" # KDE-bug 452648
+ "${FILESDIR}/${P}-keep-legacy-highlight-behaviour.patch" # KDE-bug 452555
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2022-06-14 12:44 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-06-14 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 6884e1a48df42983f9a2302987c3b61985c744a2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 12:12:23 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 12:43:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6884e1a4
kde-frameworks/plasma: Fix thumbnail breakage on X11
Upstream commit dff1b034c1162062aa2292099d3d01fc53dafdf6
See also:
https://mail.kde.org/pipermail/distributions/2022-June/001231.html
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-5.95.0-revert-QT_FEATURE_foo.patch | 42 ++++++++++++
kde-frameworks/plasma/plasma-5.95.0-r3.ebuild | 75 ++++++++++++++++++++++
2 files changed, 117 insertions(+)
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
new file mode 100644
index 000000000000..300612763336
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch
@@ -0,0 +1,42 @@
+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
+
diff --git a/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild
new file mode 100644
index 000000000000..056fcf5e2152
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5[qml]
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/libglvnd
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=( "${FILESDIR}/${P}-revert-QT_FEATURE_foo.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2022-07-26 12:08 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-07-26 12:08 UTC (permalink / raw
To: gentoo-commits
commit: 818c9a3e72aa16feacd6535c555ba7ec7496e1d5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 11:36:12 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 12:04:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818c9a3e
kde-frameworks/plasma: Fix (wayland session) crash in WindowShadowTile
Upstream commit 50eaece7aef004b588a684c9fadff0f6787f2ef8
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=443706
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-5.96.0-fix-crash-in-WindowShadowTile.patch | 55 ++++++++++++++++
kde-frameworks/plasma/plasma-5.96.0-r1.ebuild | 75 ++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch b/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch
new file mode 100644
index 000000000000..8d37a508b359
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch
@@ -0,0 +1,55 @@
+From 50eaece7aef004b588a684c9fadff0f6787f2ef8 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 14 Jul 2022 22:45:14 +0100
+Subject: [PATCH] Scope DialogShadows lifetime to application
+
+- DialogShadows own KWayland::Client::buffer objects
+ - Buffer cleanup makes wayland calls
+ - wayland calls after QGuiApplication has stoped will fail
+
+Q_GLOBAL_STATIC mangaged objects can outlive the QGuiApplication.
+
+BUG:443706
+---
+ src/plasmaquick/dialogshadows.cpp | 18 ++++++------------
+ 1 file changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/src/plasmaquick/dialogshadows.cpp b/src/plasmaquick/dialogshadows.cpp
+index 17c9a41e2..93b9bcc0f 100644
+--- a/src/plasmaquick/dialogshadows.cpp
++++ b/src/plasmaquick/dialogshadows.cpp
+@@ -37,17 +37,6 @@ public:
+ QVector<KWindowShadowTile::Ptr> m_tiles;
+ };
+
+-class DialogShadowsSingleton
+-{
+-public:
+- DialogShadowsSingleton()
+- {
+- }
+-
+- DialogShadows self;
+-};
+-
+-Q_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf)
+
+ DialogShadows::DialogShadows(QObject *parent, const QString &prefix)
+ : Plasma::Svg(parent)
+@@ -64,7 +53,12 @@ DialogShadows::~DialogShadows()
+
+ DialogShadows *DialogShadows::self()
+ {
+- return &privateDialogShadowsSelf->self;
++ // KF6 port to Q_APPLICATION_STATIC
++ static DialogShadows *s_privateDialogShadowsSelf = nullptr;
++ if (!s_privateDialogShadowsSelf) {
++ s_privateDialogShadowsSelf = new DialogShadows(qApp);
++ }
++ return s_privateDialogShadowsSelf;
+ }
+
+ void DialogShadows::addWindow(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders)
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild
new file mode 100644
index 000000000000..401899a558a0
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5[qml]
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/libglvnd
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-crash-in-WindowShadowTile.patch" ) # KDE-bug 443706
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2022-08-06 7:44 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-08-06 7:44 UTC (permalink / raw
To: gentoo-commits
commit: 5f691dec3ba9a61e6fee433098a838b322eea33b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 6 06:59:31 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 6 07:18:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f691dec
kde-frameworks/plasma: drop 5.92.0-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
...lasma-5.92.0-breeze-light-dark-visual-fix.patch | 40 --------
.../files/plasma-5.92.0-fix-blurry-buttons.patch | 110 ---------------------
kde-frameworks/plasma/plasma-5.92.0-r2.ebuild | 78 ---------------
4 files changed, 229 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index be5373dcd5d0..dff45506cb78 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1 @@
-DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b
diff --git a/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch
deleted file mode 100644
index 04992bcb129d..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7352045b388f4b0ef553706bd219457e5018ce4e Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 28 Mar 2022 21:20:16 +0000
-Subject: [PATCH] Don't install the heading SVG in breeze-light and breeze-dark
- Plasma themes
-
-Installing that file there was an acky workaround that got broken by 2cccf230.
----
- src/desktoptheme/breeze-dark/CMakeLists.txt | 5 +----
- src/desktoptheme/breeze-light/CMakeLists.txt | 4 ----
- 2 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/src/desktoptheme/breeze-dark/CMakeLists.txt b/src/desktoptheme/breeze-dark/CMakeLists.txt
-index 8f2078e4d..7f8f99062 100644
---- a/src/desktoptheme/breeze-dark/CMakeLists.txt
-+++ b/src/desktoptheme/breeze-dark/CMakeLists.txt
-@@ -8,7 +8,4 @@ install(
- FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark
- )
--install(
-- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
-- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark/widgets
--)
-+
-diff --git a/src/desktoptheme/breeze-light/CMakeLists.txt b/src/desktoptheme/breeze-light/CMakeLists.txt
-index 678033cec..6688a603b 100644
---- a/src/desktoptheme/breeze-light/CMakeLists.txt
-+++ b/src/desktoptheme/breeze-light/CMakeLists.txt
-@@ -8,7 +8,3 @@ install(
- FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light
- )
--install(
-- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
-- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light/widgets
--)
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch b/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch
deleted file mode 100644
index 0286039ddb7b..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From bd1ba6e539a326585a24fc21d0e27ef2c59e8731 Mon Sep 17 00:00:00 2001
-From: Noah Davis <noahadvs@gmail.com>
-Date: Wed, 6 Apr 2022 15:08:53 -0400
-Subject: [PATCH] PC3 toggle controls: fix odd heights misaligning indicators
-
-BUG: 447977
----
- src/declarativeimports/plasmacomponents3/CheckBox.qml | 2 +-
- src/declarativeimports/plasmacomponents3/CheckDelegate.qml | 2 +-
- src/declarativeimports/plasmacomponents3/MenuItem.qml | 2 +-
- src/declarativeimports/plasmacomponents3/RadioButton.qml | 2 +-
- src/declarativeimports/plasmacomponents3/RadioDelegate.qml | 2 +-
- src/declarativeimports/plasmacomponents3/Switch.qml | 2 +-
- src/declarativeimports/plasmacomponents3/SwitchDelegate.qml | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/declarativeimports/plasmacomponents3/CheckBox.qml b/src/declarativeimports/plasmacomponents3/CheckBox.qml
-index 1da39da24..fed972566 100644
---- a/src/declarativeimports/plasmacomponents3/CheckBox.qml
-+++ b/src/declarativeimports/plasmacomponents3/CheckBox.qml
-@@ -35,7 +35,7 @@ T.CheckBox {
-
- indicator: CheckIndicator {
- x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
-- y: control.topPadding + (control.availableHeight - height) / 2
-+ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
- control: control
- }
-
-diff --git a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
-index ef965becd..9d241467b 100644
---- a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
-+++ b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
-@@ -47,7 +47,7 @@ T.CheckDelegate {
-
- indicator: CheckIndicator {
- x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
-- y: control.topPadding + (control.availableHeight - height) / 2
-+ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
-
- control: control
- }
-diff --git a/src/declarativeimports/plasmacomponents3/MenuItem.qml b/src/declarativeimports/plasmacomponents3/MenuItem.qml
-index 16f2a5e36..964c5930d 100644
---- a/src/declarativeimports/plasmacomponents3/MenuItem.qml
-+++ b/src/declarativeimports/plasmacomponents3/MenuItem.qml
-@@ -81,7 +81,7 @@ T.MenuItem {
-
- indicator: Loader {
- x: controlRoot.mirrored ? controlRoot.width - width - controlRoot.rightPadding : controlRoot.leftPadding
-- y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
-+ y: controlRoot.topPadding + Math.round((controlRoot.availableHeight - height) / 2)
-
- visible: controlRoot.checkable
- sourceComponent: controlRoot.autoExclusive ? radioComponent : checkComponent
-diff --git a/src/declarativeimports/plasmacomponents3/RadioButton.qml b/src/declarativeimports/plasmacomponents3/RadioButton.qml
-index 7eeee3f9b..0b7a19894 100644
---- a/src/declarativeimports/plasmacomponents3/RadioButton.qml
-+++ b/src/declarativeimports/plasmacomponents3/RadioButton.qml
-@@ -32,7 +32,7 @@ T.RadioButton {
-
- indicator: RadioIndicator {
- x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
-- y: control.topPadding + (control.availableHeight - height) / 2
-+ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
- control: control
- }
-
-diff --git a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
-index e25f28cc3..a915a4eac 100644
---- a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
-+++ b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
-@@ -47,7 +47,7 @@ T.RadioDelegate {
-
- indicator: RadioIndicator {
- x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
-- y: control.topPadding + (control.availableHeight - height) / 2
-+ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
-
- control: control
- }
-diff --git a/src/declarativeimports/plasmacomponents3/Switch.qml b/src/declarativeimports/plasmacomponents3/Switch.qml
-index 32ef1274b..98de41388 100644
---- a/src/declarativeimports/plasmacomponents3/Switch.qml
-+++ b/src/declarativeimports/plasmacomponents3/Switch.qml
-@@ -32,7 +32,7 @@ T.Switch {
-
- indicator: SwitchIndicator {
- x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
-- y: control.topPadding + (control.availableHeight - height) / 2
-+ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
- control: control
- }
-
-diff --git a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
-index e6adf9a6e..0f3db70de 100644
---- a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
-+++ b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
-@@ -45,7 +45,7 @@ T.SwitchDelegate {
-
- indicator: SwitchIndicator {
- x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
-- y: control.topPadding + (control.availableHeight - height) / 2
-+ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
-
- control: control
- }
---
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
deleted file mode 100644
index f048636a97a6..000000000000
--- a/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( media-libs/libglvnd[X?] )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/libglvnd
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=(
- "${FILESDIR}/${P}-breeze-light-dark-visual-fix.patch"
- "${FILESDIR}/${P}-fix-blurry-buttons.patch" # KDE-bug 447977
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package man KF5DocTools)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2022-11-27 11:20 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-11-27 11:20 UTC (permalink / raw
To: gentoo-commits
commit: 9b99b376a474d29fe66880ee155012cbc4b47a60
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 11:13:57 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:20:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b99b376
kde-frameworks/plasma: drop 5.96.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
...asma-5.96.0-fix-crash-in-WindowShadowTile.patch | 55 ----------------
kde-frameworks/plasma/plasma-5.96.0-r1.ebuild | 75 ----------------------
3 files changed, 131 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index e2822206cd81..2fa718fa26f5 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
DIST plasma-framework-5.100.0.tar.xz 3302260 BLAKE2B 7b928023475502184b9c9d804b34584e278402692a2c3a39246598618f2ee4f2780b0ebed769a4c891e6a51d82f3beb359a60814f7a3fc351df22bbfab17669b SHA512 65d52ceb6454cf3b9a1d898eb8bbd65c96d9eabaf4a0213bf72ee4b9decb0a3cf20e251140186ad96d7346e64533320fee1b8b7157d0a3260e4f4ed0aa1abdac
-DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b
DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb
diff --git a/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch b/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch
deleted file mode 100644
index 8d37a508b359..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 50eaece7aef004b588a684c9fadff0f6787f2ef8 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 14 Jul 2022 22:45:14 +0100
-Subject: [PATCH] Scope DialogShadows lifetime to application
-
-- DialogShadows own KWayland::Client::buffer objects
- - Buffer cleanup makes wayland calls
- - wayland calls after QGuiApplication has stoped will fail
-
-Q_GLOBAL_STATIC mangaged objects can outlive the QGuiApplication.
-
-BUG:443706
----
- src/plasmaquick/dialogshadows.cpp | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/src/plasmaquick/dialogshadows.cpp b/src/plasmaquick/dialogshadows.cpp
-index 17c9a41e2..93b9bcc0f 100644
---- a/src/plasmaquick/dialogshadows.cpp
-+++ b/src/plasmaquick/dialogshadows.cpp
-@@ -37,17 +37,6 @@ public:
- QVector<KWindowShadowTile::Ptr> m_tiles;
- };
-
--class DialogShadowsSingleton
--{
--public:
-- DialogShadowsSingleton()
-- {
-- }
--
-- DialogShadows self;
--};
--
--Q_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf)
-
- DialogShadows::DialogShadows(QObject *parent, const QString &prefix)
- : Plasma::Svg(parent)
-@@ -64,7 +53,12 @@ DialogShadows::~DialogShadows()
-
- DialogShadows *DialogShadows::self()
- {
-- return &privateDialogShadowsSelf->self;
-+ // KF6 port to Q_APPLICATION_STATIC
-+ static DialogShadows *s_privateDialogShadowsSelf = nullptr;
-+ if (!s_privateDialogShadowsSelf) {
-+ s_privateDialogShadowsSelf = new DialogShadows(qApp);
-+ }
-+ return s_privateDialogShadowsSelf;
- }
-
- void DialogShadows::addWindow(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders)
---
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild
deleted file mode 100644
index cf6319f87d3b..000000000000
--- a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5[qml]
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( media-libs/libglvnd[X?] )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/libglvnd
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-crash-in-WindowShadowTile.patch" ) # KDE-bug 443706
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package man KF5DocTools)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2023-01-29 0:12 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2023-01-29 0:12 UTC (permalink / raw
To: gentoo-commits
commit: edec91eb45321a028ed914292879eb240edae7e7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 23:59:16 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 00:12:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edec91eb
kde-frameworks/plasma: Adjust fade animation to not flicker as much
Upstream commit 3fcd43a6ed03d0aff188dfc190cc464c34302a1f
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463061
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463685
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...sma-5.102.0-fix-flicker-on-fade-animation.patch | 44 +++++++++++++
kde-frameworks/plasma/plasma-5.102.0-r2.ebuild | 72 ++++++++++++++++++++++
2 files changed, 116 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch b/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch
new file mode 100644
index 000000000000..1c6ddab618aa
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch
@@ -0,0 +1,44 @@
+From 3fcd43a6ed03d0aff188dfc190cc464c34302a1f Mon Sep 17 00:00:00 2001
+From: Arjen Hiemstra <ahiemstra@heimr.nl>
+Date: Tue, 10 Jan 2023 12:46:20 +0100
+Subject: [PATCH] iconitem: Adjust fade animation to not flicker as much
+
+As it turns out, mix(old texture, new texture, animation value) does
+actually result in a different visual from simply blending the two
+textures on top of each other, because the old texture first gets
+blended with the underlying color. This results in some of the
+underlying color bleeding through, which can cause flickering if the two
+textures are almost the same. To avoid this, change the animation
+slightly so that rather than crossfading, we first fade in the new
+texture then fade out the old texture. This doesn't cause a whole lot of
+visual difference for two completely different textures, but removes the
+flickering when they are very similar.
+
+BUG: 463061
+BUG: 463685
+---
+ src/declarativeimports/core/iconitem.cpp | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
+index de1f56c69..a474a72f9 100644
+--- a/src/declarativeimports/core/iconitem.cpp
++++ b/src/declarativeimports/core/iconitem.cpp
+@@ -645,8 +645,12 @@ QSGNode *IconItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *update
+ m_textureChanged = true;
+ }
+
+- updateSubtree(oldNode->firstChild(), 1.0 - m_animValue);
+- updateSubtree(oldNode->lastChild(), m_animValue);
++ // Rather than doing a perfect crossfade, first fade in the new texture
++ // then fade out the old texture. This is done to avoid the underlying
++ // color bleeding through when both textures are at ~0.5 opacity, which
++ // causes flickering if the two textures are very similar.
++ updateSubtree(oldNode->firstChild(), 2.0 - m_animValue * 2.0);
++ updateSubtree(oldNode->lastChild(), m_animValue * 2.0);
+ } else {
+ if (oldNode->childCount() == 0) {
+ oldNode->appendChildNode(createSubtree(1.0));
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild
new file mode 100644
index 000000000000..19a29410133d
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland"
+
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5[qml]
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ !gles2-only? ( media-libs/libglvnd[X] )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/libglvnd
+ )
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-flicker-on-fade-animation.patch" ) # KDE-bug 463061, 463685
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
@ 2023-02-01 19:46 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 19:46 UTC (permalink / raw
To: gentoo-commits
commit: ef23a0fa6a2c0c8ce8f397a395197da751d31a21
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 19:42:54 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 19:46:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef23a0fa
kde-frameworks/plasma: Fix distance calc between dialog/parent applet
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=464201
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=464513
Bug: https://bugs.gentoo.org/891927
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...of-distance-betw-dialog-and-parent-applet.patch | 44 +++++++++++++
kde-frameworks/plasma/plasma-5.102.0-r3.ebuild | 75 ++++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch b/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch
new file mode 100644
index 000000000000..13f7a7e20232
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch
@@ -0,0 +1,44 @@
+From 1e0042c750756d0963d11d125978f47ea830d495 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@venerandi.com>
+Date: Tue, 31 Jan 2023 20:25:06 +0000
+Subject: [PATCH] Dialog: Fix calculation of distance between dialog and parent
+ applet
+
+`ParentRect` is not using the same coordinate system as `dialogPos` and `avail`,
+which could result in incorrect placement of dialogs when you have e.g. multiple
+monitors or a non-maximized panel. This replaces `ParentRect` with `dialogPos` so
+the coordinate systems remain in sync.
+
+BUG:464201
+BUG:464513
+FIXED-IN: 5.103
+
+
+(cherry picked from commit eda6caabcffff484544af8949d0ca0a3ea3ce333)
+---
+ src/plasmaquick/dialog.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 786d7ebe2..bdbdd028b 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -1249,13 +1249,13 @@ QPoint Dialog::popupPosition(QQuickItem *item, const QSize &size)
+ switch (d->location) {
+ case Plasma::Types::TopEdge:
+ case Plasma::Types::BottomEdge:
+- if (qAbs(parentRect.center().x() - avail.center().x() ) < size.width() / 2 - parentRect.width() / 3) {
++ if (qAbs(dialogPos.x() + size.width() / 2 - avail.center().x() ) < size.width() / 2 - parentRect.width() / 3) {
+ dialogPos.setX(avail.center().x() - size.width() / 2);
+ }
+ break;
+ case Plasma::Types::LeftEdge:
+ case Plasma::Types::RightEdge:
+- if (qAbs(parentRect.center().y() - avail.center().y() ) < size.height() / 2 - parentRect.height() / 3) {
++ if (qAbs(dialogPos.y() + size.height() / 2 - avail.center().y() ) < size.height() / 2 - parentRect.height() / 3) {
+ dialogPos.setY(avail.center().y() - size.height() / 2);
+ }
+ break;
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild
new file mode 100644
index 000000000000..b3a2bef794de
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland"
+
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ =kde-frameworks/kactivities-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5[qml]
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ !gles2-only? ( media-libs/libglvnd[X] )
+ wayland? (
+ =kde-frameworks/kwayland-${PVCUT}*:5
+ media-libs/libglvnd
+ )
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-flicker-on-fade-animation.patch" # KDE-bug 463061, 463685
+ "${FILESDIR}/${P}-fix-calc-of-distance-betw-dialog-and-parent-applet.patch" # KDE-bug 464201, 464513
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2-only OpenGL)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
end of thread, other threads:[~2023-02-01 19:46 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-10 9:13 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-02-01 19:46 Andreas Sturmlechner
2023-01-29 0:12 Andreas Sturmlechner
2022-11-27 11:20 Andreas Sturmlechner
2022-08-06 7:44 Andreas Sturmlechner
2022-07-26 12:08 Andreas Sturmlechner
2022-06-14 12:44 Andreas Sturmlechner
2022-04-21 8:56 Andreas Sturmlechner
2022-04-15 18:27 Andreas Sturmlechner
2022-03-30 14:41 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-11-23 14:59 Andreas Sturmlechner
2021-10-11 11:01 Andreas Sturmlechner
2021-09-30 17:24 Andreas Sturmlechner
2021-08-26 17:28 Andreas Sturmlechner
2021-08-15 18:57 Andreas Sturmlechner
2021-08-15 18:57 Andreas Sturmlechner
2021-01-11 12:28 Andreas Sturmlechner
2020-11-16 23:41 Andreas Sturmlechner
2020-10-26 19:06 Andreas Sturmlechner
2020-04-17 20:59 Andreas Sturmlechner
2020-02-13 23:20 Andreas Sturmlechner
2019-03-13 11:05 Andreas Sturmlechner
2017-04-15 20:31 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox