* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2022-06-29 19:53 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-06-29 19:53 UTC (permalink / raw
To: gentoo-commits
commit: cffb8d30918d2a9ee78eb63e0cc2603a0feb06c6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 19:32:46 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 19:53:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cffb8d30
kde-frameworks/plasma: Units: Fix sizeForLabels double-scaling icons
...with Plasma scaling.
Upstream commit 26ae86dff198fbce05ba3824b89786224b3792a9
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=454131
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...a-5.95.0-fix-sizeForLabels-double-scaling.patch | 38 +++++++++++
kde-frameworks/plasma/plasma-5.95.0-r4.ebuild | 78 ++++++++++++++++++++++
2 files changed, 116 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.95.0-fix-sizeForLabels-double-scaling.patch b/kde-frameworks/plasma/files/plasma-5.95.0-fix-sizeForLabels-double-scaling.patch
new file mode 100644
index 000000000000..84022d815b55
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.95.0-fix-sizeForLabels-double-scaling.patch
@@ -0,0 +1,38 @@
+From 26ae86dff198fbce05ba3824b89786224b3792a9 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 23 Jun 2022 12:47:32 -0600
+Subject: [PATCH] Units: Fix sizeForLabels double-scaling icons with Plasma
+ scaling
+
+The sizeForLabels unit internally uses roundToIconSize(), giving it a
+value and feeding that into devicePixelIconSize() to take into account
+required icons size differences when using Plasma scaling. But
+roundToIconSize() internally does that automatically! So as a result,
+the size is double-scaled and looks too big. To fix this, we simply have
+to stop using devicePixelIconSize() for this unit.
+
+BUG: 454131
+FIXED-IN: 5.96
+---
+ src/declarativeimports/core/units.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp
+index 0cdffcbfd..8d655d11f 100644
+--- a/src/declarativeimports/core/units.cpp
++++ b/src/declarativeimports/core/units.cpp
+@@ -115,8 +115,9 @@ void Units::iconLoaderSettingsChanged()
+ m_iconSizes->insert(QStringLiteral("large"), devicePixelIconSize(KIconLoader::SizeLarge));
+ m_iconSizes->insert(QStringLiteral("huge"), devicePixelIconSize(KIconLoader::SizeHuge));
+ m_iconSizes->insert(QStringLiteral("enormous"), devicePixelIconSize(KIconLoader::SizeEnormous));
+- // gridUnit is always the font height here
+- m_iconSizes->insert(QStringLiteral("sizeForLabels"), devicePixelIconSize(roundToIconSize(QFontMetrics(QGuiApplication::font()).height())));
++ // We deliberately don't feed the result into devicePixelIconSize() because
++ // roundToIconSize() already does that internally.
++ m_iconSizes->insert(QStringLiteral("sizeForLabels"), roundToIconSize(QFontMetrics(QGuiApplication::font()).height()));
+
+ m_iconSizeHints->insert(QStringLiteral("panel"), devicePixelIconSize(KIconLoader::global()->currentSize(KIconLoader::Panel)));
+ m_iconSizeHints->insert(QStringLiteral("desktop"), devicePixelIconSize(KIconLoader::global()->currentSize(KIconLoader::Desktop)));
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.95.0-r4.ebuild b/kde-frameworks/plasma/plasma-5.95.0-r4.ebuild
new file mode 100644
index 000000000000..0eede884b46f
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.95.0-r4.ebuild
@@ -0,0 +1,78 @@
+# 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 ~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}-revert-QT_FEATURE_foo.patch"
+ "${FILESDIR}/${P}-fix-sizeForLabels-double-scaling.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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2023-04-22 16:21 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2023-04-22 16:21 UTC (permalink / raw
To: gentoo-commits
commit: cae77541e600d6619cef76697713ac1a83ed7a85
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 16:13:26 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 16:20:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae77541
kde-frameworks/plasma: drop 5.102.0-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
...of-distance-betw-dialog-and-parent-applet.patch | 44 -------------
...sma-5.102.0-fix-flicker-on-fade-animation.patch | 44 -------------
kde-frameworks/plasma/plasma-5.102.0-r3.ebuild | 75 ----------------------
4 files changed, 164 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index a78300807db7..fda2c3c2b390 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-framework-5.102.0.tar.xz 3305096 BLAKE2B 225bb5a2d3cc5e0631defa59bafaeef49e6b1c4cf650d19d4b15cd270ec47ab2a613d4e3689bdea8d6cee19ed26aff78cb5c24a1ef0c8245fac4b80fa2a2147d SHA512 0db243ad6425c1f543149f4d939b7787cc20af526d4e81246debf7910b05a318cf18822ab0518d70dbb2641ad5853359a4e23104138f131c3a4073237c56d4b1
DIST plasma-framework-5.104.0.tar.xz 3308212 BLAKE2B 40dda3c0d67db19c61d56ce7299d4448dab60421cecbff18f8de84aece47d5c9c32e4e22aa896d2b3870836acdef9862d1b7e80aef960e72a0a76e5490636c15 SHA512 0c327d8cb96b75e41a75fa1ff9a68f4d983f27e8c03c1121efba3dc031b286c331b7aad069a7432b51ca3255e246b980e2e44f60c7f769d291fc25665b17e19f
DIST plasma-framework-5.105.0.tar.xz 3307692 BLAKE2B 63c793d2892a874c1f36bec6544c6bb450b3b71bfbee97515b11fe10abf13c2a524c9f881f5cc0ebefb6956c671301d2683500f8784eee96936050708f7f1c02 SHA512 271218b45176366a34bae6a813eb07a9d4f69f65f3665bbd237721537d58c2406a02d322ce32bb2b760bc28f82653b402d0c977cf9c67844181330c1c9d97c5a
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
deleted file mode 100644
index 13f7a7e20232..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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/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
deleted file mode 100644
index 1c6ddab618aa..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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-r3.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild
deleted file mode 100644
index 4980673a1fab..000000000000
--- a/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2022-12-10 10:47 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-12-10 10:47 UTC (permalink / raw
To: gentoo-commits
commit: 23b7955f8a20beefe248cda53e5716bb5ef1c1ee
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 10:45:58 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 10:47:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b7955f
kde-frameworks/plasma: drop 5.100.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
...plasma-5.100.0-fix-svg-fractional-scaling.patch | 27 --------
kde-frameworks/plasma/plasma-5.100.0-r1.ebuild | 74 ----------------------
3 files changed, 102 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 20f34a0fd2d7..1678ce9c92a1 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.101.0.tar.xz 3303508 BLAKE2B e951f30e69cf979cde50fc46dbd197ee92d53875532efc3146bd421d121ba37bfed2f520a2b18afd0cb8a932b5738671049a25a312b762644bc2825a300b9cb9 SHA512 c1bd66810213634d533e7d63d256c57a923f0d26c2bdcca17ab29be46664bc3bfa578b739c89b3cf429bda10cf6a71ec8cc1ec60a554273719e9b6e041dcdad5
DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb
diff --git a/kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch b/kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch
deleted file mode 100644
index 490386b19e9d..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 159f9dbd6f9378c9d1943f83f13fce7c47e3d8b2 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Tue, 15 Nov 2022 13:09:10 +0800
-Subject: [PATCH] svgitem: do not upscale svg when using fractional scaling
-
-BUG: 461682
-FIXED-IN: 5.101
----
- src/declarativeimports/core/svgitem.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/declarativeimports/core/svgitem.cpp b/src/declarativeimports/core/svgitem.cpp
-index b9ef54c09..7fbbe837e 100644
---- a/src/declarativeimports/core/svgitem.cpp
-+++ b/src/declarativeimports/core/svgitem.cpp
-@@ -166,7 +166,7 @@ void SvgItem::updateDevicePixelRatio()
- } else {
- m_svg.data()->setDevicePixelRatio(qMax<qreal>(1.0, std::ceil(qApp->devicePixelRatio())));
- }
-- m_svg.data()->setScaleFactor(qMax<qreal>(1.0, std::ceil(Units::instance().devicePixelRatio())));
-+ m_svg.data()->setScaleFactor(qMax<qreal>(1.0, Units::instance().devicePixelRatio()));
- }
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.100.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.100.0-r1.ebuild
deleted file mode 100644
index c63653933696..000000000000
--- a/kde-frameworks/plasma/plasma-5.100.0-r1.ebuild
+++ /dev/null
@@ -1,74 +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.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 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[X?]
- =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-svg-fractional-scaling.patch" ) # KDE-bug 461682
-
-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)
- -DWITHOUT_X11=$(usex !X)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2022-11-16 19:17 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-11-16 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 21924c5af81a11c29b75e6e9788abe669eba0781
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 19:15:30 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 19:17:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21924c5a
kde-frameworks/plasma: Fix svgitem too big w/ fractional scaling on X11
See also:
https://mail.kde.org/pipermail/release-team/2022-November/012874.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=461682
Upstream commit 159f9dbd6f9378c9d1943f83f13fce7c47e3d8b2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...plasma-5.100.0-fix-svg-fractional-scaling.patch | 27 ++++++++
kde-frameworks/plasma/plasma-5.100.0-r1.ebuild | 74 ++++++++++++++++++++++
2 files changed, 101 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch b/kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch
new file mode 100644
index 000000000000..490386b19e9d
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch
@@ -0,0 +1,27 @@
+From 159f9dbd6f9378c9d1943f83f13fce7c47e3d8b2 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Tue, 15 Nov 2022 13:09:10 +0800
+Subject: [PATCH] svgitem: do not upscale svg when using fractional scaling
+
+BUG: 461682
+FIXED-IN: 5.101
+---
+ src/declarativeimports/core/svgitem.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/declarativeimports/core/svgitem.cpp b/src/declarativeimports/core/svgitem.cpp
+index b9ef54c09..7fbbe837e 100644
+--- a/src/declarativeimports/core/svgitem.cpp
++++ b/src/declarativeimports/core/svgitem.cpp
+@@ -166,7 +166,7 @@ void SvgItem::updateDevicePixelRatio()
+ } else {
+ m_svg.data()->setDevicePixelRatio(qMax<qreal>(1.0, std::ceil(qApp->devicePixelRatio())));
+ }
+- m_svg.data()->setScaleFactor(qMax<qreal>(1.0, std::ceil(Units::instance().devicePixelRatio())));
++ m_svg.data()->setScaleFactor(qMax<qreal>(1.0, Units::instance().devicePixelRatio()));
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.100.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.100.0-r1.ebuild
new file mode 100644
index 000000000000..c63653933696
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.100.0-r1.ebuild
@@ -0,0 +1,74 @@
+# 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.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 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[X?]
+ =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-svg-fractional-scaling.patch" ) # KDE-bug 461682
+
+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)
+ -DWITHOUT_X11=$(usex !X)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2022-10-10 8:15 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-10-10 8:15 UTC (permalink / raw
To: gentoo-commits
commit: a0ef0ba1a77f4cf4ffdf47218a5336c13557843b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 18:06:50 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 08:14:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ef0ba1
kde-frameworks/plasma: drop 5.98.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
.../plasma/files/plasma-5.98.0-without_x11.patch | 140 ---------------------
kde-frameworks/plasma/plasma-5.98.0-r1.ebuild | 74 -----------
3 files changed, 215 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 8735c6e85622..672f1d710eef 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b
-DIST plasma-framework-5.98.0.tar.xz 3148664 BLAKE2B e61b896ed80a6f8b70846b19e2b9d525490ebbe4abb95d35f5663e93afbbc3ec23453e2228b20346c5961f6d6313c38f738150eca98f71d399670af3e07e0a88 SHA512 a016b5376ed620d4650c7581b282601c99aea2e6b7948d87f7a99bb747a3913ae2cc96a168deb7d25797fb9f936f4c76d05682036693a8515e756b7f20dab46d
DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb
diff --git a/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch b/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch
deleted file mode 100644
index 62b393ba9b91..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From d674a99d19efcad866a773fe6c848a7626a61c0a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 2 Aug 2022 10:52:59 +0200
-Subject: [PATCH] Add CMake option to build WITHOUT_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-HAVE_X11 already exists and is set automagically so far, but using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config.
-
-Introducing this option means there is no behavior change by default,
-cmake will just skip finding X11 or adding unwanted features if the
-option is enabled.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 51 ++++++++++---------
- .../core/config-x11.h.cmake | 1 +
- src/plasmaquick/CMakeLists.txt | 8 +--
- src/plasmaquick/dialog.cpp | 1 +
- 4 files changed, 31 insertions(+), 30 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3b6405725..15698543f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -88,28 +88,33 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate doc
- TYPE OPTIONAL
- )
-
--#optional features
--find_package(X11 MODULE)
--set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-- URL "https://www.x.org/"
-- TYPE OPTIONAL
-- )
--find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER)
--set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
-- URL "https://xcb.freedesktop.org/"
-- TYPE OPTIONAL
-- )
--if(X11_FOUND AND XCB_XCB_FOUND)
-- set(HAVE_X11 1)
-- if (QT_MAJOR_VERSION STREQUAL "5")
-- find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE)
-- elseif (QT_MAJOR_VERSION STREQUAL "6")
-- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
-- endif()
-- #X11_Xrender discovery is done by FindX11
-- #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED")
--else()
-- set(HAVE_X11 0)
-+option(WITHOUT_X11 "Build without X11 support (skips finding X11)." OFF)
-+if(NOT WITHOUT_X11)
-+ #optional features
-+ find_package(X11 MODULE)
-+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+ URL "https://www.x.org/"
-+ TYPE OPTIONAL
-+ )
-+ find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER)
-+ set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
-+ URL "https://xcb.freedesktop.org/"
-+ TYPE OPTIONAL
-+ )
-+ if(X11_FOUND AND XCB_XCB_FOUND)
-+ set(HAVE_X11 1)
-+ if (QT_MAJOR_VERSION STREQUAL "5")
-+ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE)
-+ elseif (QT_MAJOR_VERSION STREQUAL "6")
-+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
-+ endif()
-+ #X11_Xrender discovery is done by FindX11
-+ #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED")
-+ set(HAVE_XCB_SHAPE ${XCB_SHAPE_FOUND})
-+ else()
-+ set(HAVE_X11 0)
-+ set(HAVE_XCB_SHAPE 0)
-+ endif()
- endif()
-
- find_package(OpenGL)
-@@ -125,7 +130,7 @@ set_package_properties(EGL PROPERTIES
- )
-
- 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"))
-+if(OpenGL_GLX_FOUND AND HAVE_X11 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/config-x11.h.cmake b/src/declarativeimports/core/config-x11.h.cmake
-index 2f543d547..ad1b45099 100644
---- a/src/declarativeimports/core/config-x11.h.cmake
-+++ b/src/declarativeimports/core/config-x11.h.cmake
-@@ -1,2 +1,3 @@
- #cmakedefine01 HAVE_X11
- #cmakedefine01 HAVE_XCB_COMPOSITE
-+#cmakedefine01 HAVE_XCB_SHAPE
-diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt
-index 37bbc5097..dd2442e70 100644
---- a/src/plasmaquick/CMakeLists.txt
-+++ b/src/plasmaquick/CMakeLists.txt
-@@ -1,9 +1,3 @@
--if(HAVE_X11 AND XCB_XCB_FOUND AND XCB_SHAPE_FOUND)
-- add_definitions(-DHAVE_XCB_SHAPE=1)
--else()
-- add_definitions(-DHAVE_XCB_SHAPE=0)
--endif()
--
- add_library(KF5PlasmaQuick SHARED)
- add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick)
-
-@@ -81,7 +75,7 @@ if(HAVE_X11)
- target_link_libraries(KF5PlasmaQuick PRIVATE Qt6::GuiPrivate)
- endif()
-
-- if(XCB_SHAPE_FOUND)
-+ if(HAVE_XCB_SHAPE)
- target_link_libraries(KF5PlasmaQuick PRIVATE XCB::SHAPE)
- endif()
- endif()
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index 452e36523..2eabd5fb7 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -11,6 +11,7 @@
- #include "../declarativeimports/core/framesvgitem.h"
- #include "appletquickitem.h"
- #include "config-plasma.h"
-+#include "../declarativeimports/core/config-x11.h"
- #include "configview.h"
- #include "dialogshadows_p.h"
- #include "view.h"
---
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild
deleted file mode 100644
index 36811b06c0b8..000000000000
--- a/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild
+++ /dev/null
@@ -1,74 +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.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 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[X?]
- =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}-without_x11.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)
- -DWITHOUT_X11=$(usex !X)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2022-09-24 8:53 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-09-24 8:53 UTC (permalink / raw
To: gentoo-commits
commit: e991c3a01691713332f47d6e397ae8aaa35a3a90
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 08:56:39 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 08:53:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e991c3a0
kde-frameworks/plasma: Fix build with USE -X
Upstream commit d674a99d19efcad866a773fe6c848a7626a61c0a
Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma/files/plasma-5.98.0-without_x11.patch | 140 +++++++++++++++++++++
...lasma-5.98.0.ebuild => plasma-5.98.0-r1.ebuild} | 7 +-
2 files changed, 144 insertions(+), 3 deletions(-)
diff --git a/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch b/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch
new file mode 100644
index 000000000000..62b393ba9b91
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch
@@ -0,0 +1,140 @@
+From d674a99d19efcad866a773fe6c848a7626a61c0a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 2 Aug 2022 10:52:59 +0200
+Subject: [PATCH] Add CMake option to build WITHOUT_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 51 ++++++++++---------
+ .../core/config-x11.h.cmake | 1 +
+ src/plasmaquick/CMakeLists.txt | 8 +--
+ src/plasmaquick/dialog.cpp | 1 +
+ 4 files changed, 31 insertions(+), 30 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b6405725..15698543f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -88,28 +88,33 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate doc
+ TYPE OPTIONAL
+ )
+
+-#optional features
+-find_package(X11 MODULE)
+-set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
+- URL "https://www.x.org/"
+- TYPE OPTIONAL
+- )
+-find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER)
+-set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
+- URL "https://xcb.freedesktop.org/"
+- TYPE OPTIONAL
+- )
+-if(X11_FOUND AND XCB_XCB_FOUND)
+- set(HAVE_X11 1)
+- if (QT_MAJOR_VERSION STREQUAL "5")
+- find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE)
+- elseif (QT_MAJOR_VERSION STREQUAL "6")
+- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
+- endif()
+- #X11_Xrender discovery is done by FindX11
+- #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED")
+-else()
+- set(HAVE_X11 0)
++option(WITHOUT_X11 "Build without X11 support (skips finding X11)." OFF)
++if(NOT WITHOUT_X11)
++ #optional features
++ find_package(X11 MODULE)
++ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++ URL "https://www.x.org/"
++ TYPE OPTIONAL
++ )
++ find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER)
++ set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
++ URL "https://xcb.freedesktop.org/"
++ TYPE OPTIONAL
++ )
++ if(X11_FOUND AND XCB_XCB_FOUND)
++ set(HAVE_X11 1)
++ if (QT_MAJOR_VERSION STREQUAL "5")
++ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE)
++ elseif (QT_MAJOR_VERSION STREQUAL "6")
++ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
++ endif()
++ #X11_Xrender discovery is done by FindX11
++ #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED")
++ set(HAVE_XCB_SHAPE ${XCB_SHAPE_FOUND})
++ else()
++ set(HAVE_X11 0)
++ set(HAVE_XCB_SHAPE 0)
++ endif()
+ endif()
+
+ find_package(OpenGL)
+@@ -125,7 +130,7 @@ set_package_properties(EGL PROPERTIES
+ )
+
+ 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"))
++if(OpenGL_GLX_FOUND AND HAVE_X11 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/config-x11.h.cmake b/src/declarativeimports/core/config-x11.h.cmake
+index 2f543d547..ad1b45099 100644
+--- a/src/declarativeimports/core/config-x11.h.cmake
++++ b/src/declarativeimports/core/config-x11.h.cmake
+@@ -1,2 +1,3 @@
+ #cmakedefine01 HAVE_X11
+ #cmakedefine01 HAVE_XCB_COMPOSITE
++#cmakedefine01 HAVE_XCB_SHAPE
+diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt
+index 37bbc5097..dd2442e70 100644
+--- a/src/plasmaquick/CMakeLists.txt
++++ b/src/plasmaquick/CMakeLists.txt
+@@ -1,9 +1,3 @@
+-if(HAVE_X11 AND XCB_XCB_FOUND AND XCB_SHAPE_FOUND)
+- add_definitions(-DHAVE_XCB_SHAPE=1)
+-else()
+- add_definitions(-DHAVE_XCB_SHAPE=0)
+-endif()
+-
+ add_library(KF5PlasmaQuick SHARED)
+ add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick)
+
+@@ -81,7 +75,7 @@ if(HAVE_X11)
+ target_link_libraries(KF5PlasmaQuick PRIVATE Qt6::GuiPrivate)
+ endif()
+
+- if(XCB_SHAPE_FOUND)
++ if(HAVE_XCB_SHAPE)
+ target_link_libraries(KF5PlasmaQuick PRIVATE XCB::SHAPE)
+ endif()
+ endif()
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 452e36523..2eabd5fb7 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -11,6 +11,7 @@
+ #include "../declarativeimports/core/framesvgitem.h"
+ #include "appletquickitem.h"
+ #include "config-plasma.h"
++#include "../declarativeimports/core/config-x11.h"
+ #include "configview.h"
+ #include "dialogshadows_p.h"
+ #include "view.h"
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.98.0.ebuild b/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild
similarity index 93%
rename from kde-frameworks/plasma/plasma-5.98.0.ebuild
rename to kde-frameworks/plasma/plasma-5.98.0-r1.ebuild
index 376e2545e87e..36811b06c0b8 100644
--- a/kde-frameworks/plasma/plasma-5.98.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
=kde-frameworks/kpackage-${PVCUT}*:5
=kde-frameworks/kservice-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
=kde-frameworks/kxmlgui-${PVCUT}*:5
!gles2-only? ( media-libs/libglvnd[X?] )
wayland? (
@@ -59,14 +59,15 @@ DEPEND="${RDEPEND}
"
BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+PATCHES=( "${FILESDIR}/${P}-without_x11.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)
+ -DWITHOUT_X11=$(usex !X)
)
ecm_src_configure
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2022-05-14 11:33 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-05-14 11:33 UTC (permalink / raw
To: gentoo-commits
commit: 6427e20b5e088ce66bd8144510485167d9e8eca0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 11:18:11 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 14 11:32:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6427e20b
kde-frameworks/plasma: drop 5.93.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
.../plasma-5.93.0-fix-osd-dialog-position.patch | 32 ---------
| 29 --------
...ma-5.93.0-keep-legacy-highlight-behaviour.patch | 33 ---------
kde-frameworks/plasma/plasma-5.93.0-r2.ebuild | 80 ----------------------
5 files changed, 175 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 18041881fd0d..10daabe647c8 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
-DIST plasma-framework-5.93.0.tar.xz 3148720 BLAKE2B 2e11e742279ce33b33bf5a7a7e4051e14bb7e7c2cdecb41e127bf07c5fbe91fd4ab8905cadb27a2a1be95ce4287e4eb8539cdfb9ad36e052f9789abf5d8159c3 SHA512 df876c422d2de82325537bfdce4db016dc649202f334de063403c15f44d554c4b0f6707e02c8890e269bdb71c17fdd31f651fad3ed7506f23a110d725fd8ccf8
DIST plasma-framework-5.94.0.tar.xz 3137928 BLAKE2B c171e434db41d6b03d97db14aa5abb1ba11e5508a9428d0d16a25c223170f5310b30e36c5681bf67ac9b849c1df744c1c70914efbd664c7c8d4b5b9550b7bd7e SHA512 071e0ce261516e4a7ab1105f86304e5dae7c16a9663980222cf60922ae6bf785cd2b0447b7a2f2a57e2a2396c1de15655c8a7c02568d81652da946a6384b9eb7
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
deleted file mode 100644
index 088230402863..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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-fix-widget-popups.patch b/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch
deleted file mode 100644
index 7f95c6531a95..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch b/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch
deleted file mode 100644
index 20935856caa8..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index f5d72b460cb0..000000000000
--- a/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild
+++ /dev/null
@@ -1,80 +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}/${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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2022-05-04 20:50 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-05-04 20:50 UTC (permalink / raw
To: gentoo-commits
commit: d9c514f57cd1426b965765c0062ff38286c05829
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 21:37:01 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 4 20:49:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c514f5
kde-frameworks/plasma: drop 5.90.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/Manifest | 1 -
.../plasma/files/plasma-5.90.0-KDEBUG-426969.patch | 90 ----------------------
.../plasma/files/plasma-5.90.0-KDEBUG-447752.patch | 68 ----------------
.../plasma/files/plasma-5.90.0-KDEBUG-448590.patch | 32 --------
kde-frameworks/plasma/plasma-5.90.0-r1.ebuild | 79 -------------------
5 files changed, 270 deletions(-)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index fd285b2eb967..fdd094a817a2 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-framework-5.90.0.tar.xz 3143720 BLAKE2B 497a1808c2f07b985f3b458d2bf6b4b4e0198a8bd92cffdad86cc9470cd51c857c3de66edbe4d6ea543da74f6ba05fe5ce1b6746e2df7830839e45549ca01293 SHA512 0f22e100ad996be39a2cc5afa72d3e769dc512d3854d417e81536908bc4e6c9874788554fcea1ca1ec4798cd78681c78ab7c2242b95d7f5fdb6cfd9eeee9543b
DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
DIST plasma-framework-5.93.0.tar.xz 3148720 BLAKE2B 2e11e742279ce33b33bf5a7a7e4051e14bb7e7c2cdecb41e127bf07c5fbe91fd4ab8905cadb27a2a1be95ce4287e4eb8539cdfb9ad36e052f9789abf5d8159c3 SHA512 df876c422d2de82325537bfdce4db016dc649202f334de063403c15f44d554c4b0f6707e02c8890e269bdb71c17fdd31f651fad3ed7506f23a110d725fd8ccf8
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch
deleted file mode 100644
index bccc097a3b99..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From d40d36057a0ee9fcb4badc7ff8b56844da79dfc8 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 12 Jan 2022 22:21:34 +0000
-Subject: [PATCH] Always sync the setPanelBehavior to wayland
-
-Currently this code is in the else statement to if (type !=
-Dialog::Normal) {
-
-This doesn't make sense as panel roles apply explicitly to other types,
-like Dialog::Dock. On X11 the equivalent always applies.
-
-BUG: 426969
-
-* asturm 2022-01-22: Merged with below fixup:
-
-From b882b34d7b55975f679133ef86cfd12869e8bba5 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 13 Jan 2022 17:03:38 +0000
-Subject: [PATCH] Always sync the setPanelBehavior to wayland
-
-The previous patch moved some code that reapplied setRole in a way that
-caused issues.
-
-BUG: 448373
-
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -693,14 +693,13 @@
-
- void DialogPrivate::applyType()
- {
-- if (type != Dialog::Normal) {
- /*QXcbWindowFunctions::WmWindowType*/ int wmType = 0;
-
- #if HAVE_X11
- if (KWindowSystem::isPlatformX11()) {
- switch (type) {
- case Dialog::Normal:
-- Q_UNREACHABLE();
-+ q->setFlags(Qt::FramelessWindowHint | q->flags());
- break;
- case Dialog::Dock:
- wmType = QXcbWindowFunctions::WmWindowType::Dock;
-@@ -729,11 +728,15 @@
- }
- #endif
-
-- if (!wmType) {
-+ if (!wmType && type != Dialog::Normal) {
- KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
- }
- #if HAVE_KWAYLAND
- if (shellSurface) {
-+ if (q->flags() & Qt::WindowStaysOnTopHint) {
-+ type = Dialog::Dock;
-+ shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow);
-+ }
- switch (type) {
- case Dialog::Dock:
- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel);
-@@ -750,27 +753,13 @@
- case Dialog::CriticalNotification:
- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::CriticalNotification);
- break;
-+ case Dialog::Normal:
-+ shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal);
- default:
- break;
- }
- }
- #endif
-- } else {
-- q->setFlags(Qt::FramelessWindowHint | q->flags());
--
--#if HAVE_KWAYLAND
-- // Only possible after setup
-- if (shellSurface) {
-- if (q->flags() & Qt::WindowStaysOnTopHint) {
-- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel);
-- shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow);
-- } else {
-- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal);
-- shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::AlwaysVisible);
-- }
-- }
--#endif
-- }
-
- // an OSD can't be a Dialog, as qt xcb would attempt to set a transient parent for it
- // see bug 370433
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch
deleted file mode 100644
index 62cb8a52b6c5..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From ecf0cc36936f69830a07937b97807ec0ba4d3f41 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 10 Jan 2022 09:22:09 +0000
-Subject: [PATCH] Don't crash when a screen gets disabled and enabled again
-
-when a screen gets disabled, the containment loses its view, and when gets enabled again,
-the process of the old orphaned containment getting a new view causes a plasma crash.
-It comes from the wallpaper, which indicates a hierarchy of C++ owned objects
-makes the internal one (wallpaper) to not reset correctly its window and have a stray pointer to it.
-
-BUG:447752
----
- .../qml/plasmoid/containmentinterface.cpp | 21 +++++++++++++++----
- .../qml/plasmoid/containmentinterface.h | 1 +
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
-index d8a89014c..29a7738ca 100644
---- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp
-+++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
-@@ -74,10 +74,6 @@ void ContainmentInterface::init()
- connect(m_activityInfo, &KActivities::Info::nameChanged, this, &ContainmentInterface::activityNameChanged);
- Q_EMIT activityNameChanged();
-
-- if (!m_containment->wallpaper().isEmpty()) {
-- loadWallpaper();
-- }
--
- AppletInterface::init();
-
- // Create the ToolBox
-@@ -1162,4 +1158,21 @@ bool ContainmentInterface::isLoading() const
- return loading;
- }
-
-+void ContainmentInterface::itemChange(ItemChange change, const ItemChangeData &value)
-+{
-+ if (change == QQuickItem::ItemSceneChange) {
-+ // we have a window: create the representations if needed
-+ if (value.window && !m_containment->wallpaper().isEmpty()) {
-+ loadWallpaper();
-+ } else if (m_wallpaperInterface) {
-+ m_wallpaperInterface->deleteLater();
-+ m_wallpaperInterface = nullptr;
-+ Q_EMIT wallpaperInterfaceChanged();
-+ }
-+ }
-+
-+ AppletInterface::itemChange(change, value);
-+}
-+
-+
- #include "moc_containmentinterface.cpp"
-diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.h b/src/scriptengines/qml/plasmoid/containmentinterface.h
-index a91c60c5e..f1276ee80 100644
---- a/src/scriptengines/qml/plasmoid/containmentinterface.h
-+++ b/src/scriptengines/qml/plasmoid/containmentinterface.h
-@@ -169,6 +169,7 @@ protected:
- void addContainmentActions(QMenu *desktopMenu, QEvent *event);
-
- virtual bool isLoading() const override;
-+ void itemChange(ItemChange change, const ItemChangeData &value) override;
-
- Q_SIGNALS:
- /**
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch
deleted file mode 100644
index 4bbb7a8ce1b0..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e9ba0c54f2c01bb530370c16502cf304fc18b3f6 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Mon, 17 Jan 2022 19:58:53 +0100
-Subject: [PATCH] Corona::containmentForScreen: Ignore activities when an empty
- string is used
-
-With the other overloads being deprecated, consumers are forced to put in an empty string
-for the activity. As one can see in the pre-existing code, an empty string indicates
-that the activity should be ignored. Consequently we should skip the activity check, when
-we got an empty string.
-
-BUG: 448590
----
- src/plasma/corona.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp
-index f034d7b2e..8f532d690 100644
---- a/src/plasma/corona.cpp
-+++ b/src/plasma/corona.cpp
-@@ -206,7 +206,7 @@ Containment *Corona::containmentForScreen(int screen, const QString &activity, c
- for (Containment *cont : std::as_const(d->containments)) {
- /* clang-format off */
- if (cont->lastScreen() == screen
-- && (cont->activity().isEmpty() || cont->activity() == activity)
-+ && ((cont->activity().isEmpty() || activity.isEmpty()) || cont->activity() == activity)
- && (cont->containmentType() == Plasma::Types::DesktopContainment
- || cont->containmentType() == Plasma::Types::CustomContainment)) { /* clang-format on */
- containment = cont;
---
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild
deleted file mode 100644
index df38b8e9aa83..000000000000
--- a/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild
+++ /dev/null
@@ -1,79 +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}-KDEBUG-426969.patch"
- "${FILESDIR}/${P}-KDEBUG-447752.patch"
- "${FILESDIR}/${P}-KDEBUG-448590.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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2022-04-09 16:07 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-04-09 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 234192ae8404034c30f4d88632d85190ee8776d2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 15:29:24 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 16:03:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234192ae
kde-frameworks/plasma: PC3 toggle controls: fix blurry buttons
Upstream commit bd1ba6e539a326585a24fc21d0e27ef2c59e8731
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=447977
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-5.92.0-fix-blurry-buttons.patch | 110 +++++++++++++++++++++
kde-frameworks/plasma/plasma-5.92.0-r2.ebuild | 78 +++++++++++++++
2 files changed, 188 insertions(+)
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
new file mode 100644
index 000000000000..0286039ddb7b
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch
@@ -0,0 +1,110 @@
+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
new file mode 100644
index 000000000000..8d660fd871a3
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
@@ -0,0 +1,78 @@
+# 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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2022-01-20 13:26 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-01-20 13:26 UTC (permalink / raw
To: gentoo-commits
commit: a60d9305d2a70497122ceeb0e32dc2c6ac1f9540
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 11:25:24 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 13:24:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60d9305
kde-frameworks/plasma: Always sync the setPanelBehavior to wayland
Upstream commit d40d36057a0ee9fcb4badc7ff8b56844da79dfc8
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=426969
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma/files/plasma-5.90.0-KDEBUG-426969.patch | 90 ++++++++++++++++++++++
kde-frameworks/plasma/plasma-5.90.0-r1.ebuild | 1 +
2 files changed, 91 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch
new file mode 100644
index 000000000000..bccc097a3b99
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch
@@ -0,0 +1,90 @@
+From d40d36057a0ee9fcb4badc7ff8b56844da79dfc8 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 12 Jan 2022 22:21:34 +0000
+Subject: [PATCH] Always sync the setPanelBehavior to wayland
+
+Currently this code is in the else statement to if (type !=
+Dialog::Normal) {
+
+This doesn't make sense as panel roles apply explicitly to other types,
+like Dialog::Dock. On X11 the equivalent always applies.
+
+BUG: 426969
+
+* asturm 2022-01-22: Merged with below fixup:
+
+From b882b34d7b55975f679133ef86cfd12869e8bba5 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 13 Jan 2022 17:03:38 +0000
+Subject: [PATCH] Always sync the setPanelBehavior to wayland
+
+The previous patch moved some code that reapplied setRole in a way that
+caused issues.
+
+BUG: 448373
+
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -693,14 +693,13 @@
+
+ void DialogPrivate::applyType()
+ {
+- if (type != Dialog::Normal) {
+ /*QXcbWindowFunctions::WmWindowType*/ int wmType = 0;
+
+ #if HAVE_X11
+ if (KWindowSystem::isPlatformX11()) {
+ switch (type) {
+ case Dialog::Normal:
+- Q_UNREACHABLE();
++ q->setFlags(Qt::FramelessWindowHint | q->flags());
+ break;
+ case Dialog::Dock:
+ wmType = QXcbWindowFunctions::WmWindowType::Dock;
+@@ -729,11 +728,15 @@
+ }
+ #endif
+
+- if (!wmType) {
++ if (!wmType && type != Dialog::Normal) {
+ KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
+ }
+ #if HAVE_KWAYLAND
+ if (shellSurface) {
++ if (q->flags() & Qt::WindowStaysOnTopHint) {
++ type = Dialog::Dock;
++ shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow);
++ }
+ switch (type) {
+ case Dialog::Dock:
+ shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel);
+@@ -750,27 +753,13 @@
+ case Dialog::CriticalNotification:
+ shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::CriticalNotification);
+ break;
++ case Dialog::Normal:
++ shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal);
+ default:
+ break;
+ }
+ }
+ #endif
+- } else {
+- q->setFlags(Qt::FramelessWindowHint | q->flags());
+-
+-#if HAVE_KWAYLAND
+- // Only possible after setup
+- if (shellSurface) {
+- if (q->flags() & Qt::WindowStaysOnTopHint) {
+- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel);
+- shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow);
+- } else {
+- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal);
+- shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::AlwaysVisible);
+- }
+- }
+-#endif
+- }
+
+ // an OSD can't be a Dialog, as qt xcb would attempt to set a transient parent for it
+ // see bug 370433
diff --git a/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild
index fa06b05e874f..a59a50636a36 100644
--- a/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild
@@ -60,6 +60,7 @@ DEPEND="${RDEPEND}
BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
PATCHES=(
+ "${FILESDIR}/${P}-KDEBUG-426969.patch"
"${FILESDIR}/${P}-KDEBUG-447752.patch"
"${FILESDIR}/${P}-KDEBUG-448590.patch"
)
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2021-12-15 11:28 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-12-15 11:28 UTC (permalink / raw
To: gentoo-commits
commit: a4699d9c6dea1e6df9b37c10127d21460e744166
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 15 10:45:30 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 15 11:28:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4699d9c
kde-frameworks/plasma: Hide svg glitches using a smaller mask
Upstream commit 9ba4ed4da72a3d1bbec8920d93a547cf633cfacd
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=438644
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-5.88.0-svg-smaller-mask-to-hide-glitches.patch | 42 +++++++++++
kde-frameworks/plasma/plasma-5.88.0-r3.ebuild | 83 ++++++++++++++++++++++
2 files changed, 125 insertions(+)
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
new file mode 100644
index 000000000000..f735b392667b
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch
@@ -0,0 +1,42 @@
+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/plasma-5.88.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.88.0-r3.ebuild
new file mode 100644
index 000000000000..987c2970f561
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.88.0-r3.ebuild
@@ -0,0 +1,83 @@
+# 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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2021-12-08 15:08 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-12-08 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 5cd1959b364ae83787f02898c433c895525533a3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 8 12:48:02 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=5cd1959b
kde-frameworks/plasma: Fix plasmashell crashes on wallpaper change
Upstream commits:
9b37459570f75e09f17aadf32f7abfe8b8d4d1e0
77fedf1f9919eb2cc07c8ecccdd70ad2a7343161
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=446195
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-5.88.0-no-double-delete.patch | 28 +++++++++++++++++++++
...asma-5.88.0-update-after-clearing-actions.patch | 29 ++++++++++++++++++++++
kde-frameworks/plasma/plasma-5.88.0-r2.ebuild | 2 ++
3 files changed, 59 insertions(+)
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
new file mode 100644
index 000000000000..d3a03411b2cf
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-no-double-delete.patch
@@ -0,0 +1,28 @@
+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-update-after-clearing-actions.patch b/kde-frameworks/plasma/files/plasma-5.88.0-update-after-clearing-actions.patch
new file mode 100644
index 000000000000..a30e9b6e5b1d
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-update-after-clearing-actions.patch
@@ -0,0 +1,29 @@
+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
index 8cf6ee9309bb..31c7abb64aaa 100644
--- a/kde-frameworks/plasma/plasma-5.88.0-r2.ebuild
+++ b/kde-frameworks/plasma/plasma-5.88.0-r2.ebuild
@@ -64,6 +64,8 @@ PATCHES=(
"${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() {
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2021-09-04 21:01 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-09-04 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 2a33f82ee80caa693a8a22b30667f42c89aaa929
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 11:09:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 4 20:58:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a33f82e
kde-frameworks/plasma: ExpandableListItem: Fix overlapping entries
Upstream commit f393bace87e5fc8c0e68eff9faf0656df64715ed
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=428102
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...5.85.0-fix-ExpandableListItem-overlapping.patch | 41 +++++++++++
kde-frameworks/plasma/plasma-5.85.0-r3.ebuild | 80 ++++++++++++++++++++++
2 files changed, 121 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch
new file mode 100644
index 00000000000..8063039b762
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch
@@ -0,0 +1,41 @@
+From f393bace87e5fc8c0e68eff9faf0656df64715ed Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Wed, 1 Sep 2021 12:30:01 -0600
+Subject: [PATCH] ExpandableListItem: Fix overlapping entries with many
+ expanded items
+
+A previous hack was done wrong, and was not taking into account disabled
+items.
+
+BUG: 428102
+FIXED-IN: 5.86
+---
+ .../plasmaextracomponents/qml/ExpandableListItem.qml | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+index 47b3e3684..851961a4c 100644
+--- a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
++++ b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+@@ -523,7 +523,7 @@ Item {
+
+ // Container for actions list, so that we can add left and right margins to it
+ Item {
+- height: actionsList.contentHeight
++ height: actionsList.height
+ width: mainRowLayout.width
+
+ // TODO: Implement keyboard focus
+@@ -538,7 +538,8 @@ Item {
+ anchors.leftMargin: listItemIcon.width + PlasmaCore.Units.smallSpacing
+ anchors.rightMargin: listItemIcon.width + PlasmaCore.Units.smallSpacing * 2
+
+- height: PlasmaCore.Units.gridUnit * 2 * actionsList.count
++ // Need to take into account disabled/invisible items
++ height: PlasmaCore.Units.gridUnit * 2 * Array.from(contextualActionsModel).filter(item => item.enabled).length
+
+ focus: true
+ clip: true
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
new file mode 100644
index 00000000000..433fe380d17
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 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.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}-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
+ "${FILESDIR}"/${P}-fix-ExpandableListItem-overlapping.patch # KDE-bug 428102
+)
+
+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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2021-09-04 21:01 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-09-04 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 9f7d20409337b1214e7afbb5ca8fa76d8e1c5c9f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 20:40:03 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 4 20:58:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f7d2040
kde-frameworks/plasma: Backport fixes for two longstanding memleaks
See also:
https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/323
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-5.85.0-fix-svgicon-memleak.patch | 37 ++++++++++
.../files/plasma-5.85.0-fix-theme-memleak.patch | 86 ++++++++++++++++++++++
kde-frameworks/plasma/plasma-5.85.0-r3.ebuild | 2 +
3 files changed, 125 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch
new file mode 100644
index 00000000000..89896911d0a
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch
@@ -0,0 +1,37 @@
+From 73782c8b39d1cc41fef003acca8df75ccdf384e4 Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <kde@mattwhitlock.name>
+Date: Mon, 16 Aug 2021 19:37:28 -0400
+Subject: [PATCH] avoid holding onto old Svg object when changing source of an
+ IconItem
+
+A long-lived IconItem instance can have its source changed many times
+over its lifetime. Because SvgSource parents its internal Plasma::Svg
+instance to the IconItem instance, this means that such Plasma::Svg
+instance was not being destroyed when its responsible SvgSource
+instance is destroyed and indeed would not be destroyed until the
+IconItem instance is eventually destroyed, which could be arbitrarily
+much later. This commit adds an explicit call in the SvgSource
+destructor to delete the Plasma::Svg instance so it does not hang
+around in memory until the IconItem instance is destroyed. This fixes
+one of the major memory "leaks" in plasmashell.
+---
+ src/declarativeimports/core/iconitem.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
+index 0db750acd..3f06b8b0e 100644
+--- a/src/declarativeimports/core/iconitem.cpp
++++ b/src/declarativeimports/core/iconitem.cpp
+@@ -196,6 +196,9 @@ public:
+ {
+ if (m_svgIcon) {
+ QObject::disconnect(m_iconItem, nullptr, m_svgIcon, nullptr);
++ // the parent IconItem can outlive this IconItemSource, so delete our Plasma::Svg object
++ // explicitly to avoid leaving unreferenced Plasma::Svg objects parented to the IconItem
++ delete m_svgIcon;
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch
new file mode 100644
index 00000000000..1d7dc596c20
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch
@@ -0,0 +1,86 @@
+From 14b495f933dadace7832fa6cbc809c3abdb7c682 Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <kde@mattwhitlock.name>
+Date: Mon, 28 Jun 2021 18:01:14 -0400
+Subject: [PATCH] don't make duplicate connections to
+ ThemePrivate::onAppExitCleanup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Plasma::Theme::Theme(…) and Plasma::Theme::setThemeName(…) were
+unconditionally connecting the QCoreApplication::aboutToQuit signal to
+the ThemePrivate::onAppExitCleanup slot, even though the ThemePrivate
+instances are cached and shared across multiple Theme instances. In
+long-running applications that make heavy use of the Svg class (such as
+plasmashell), a single ThemePrivate instance can be reused by huge
+numbers of Theme instances. If the reference count of that ThemePrivate
+instance never reaches zero, then the connections just keep piling up,
+contributing to excessive memory usage. This commit moves the relevant
+connect(…) call so that it only happens in the case that a new
+ThemePrivate instance is constructed. Thus, there will only ever be one
+connection from QCoreApplication::aboutToQuit to
+ThemePrivate::onAppExitCleanup per instance of ThemePrivate.
+---
+ src/plasma/theme.cpp | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/plasma/theme.cpp b/src/plasma/theme.cpp
+index fabf98f4e..f403d393b 100644
+--- a/src/plasma/theme.cpp
++++ b/src/plasma/theme.cpp
+@@ -39,13 +39,13 @@ Theme::Theme(QObject *parent)
+ if (!ThemePrivate::globalTheme) {
+ ThemePrivate::globalTheme = new ThemePrivate;
+ ThemePrivate::globalTheme->settingsChanged(false);
++ if (QCoreApplication::instance()) {
++ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, ThemePrivate::globalTheme, &ThemePrivate::onAppExitCleanup);
++ }
+ }
+ ThemePrivate::globalTheme->ref.ref();
+ d = ThemePrivate::globalTheme;
+
+- if (QCoreApplication::instance()) {
+- connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, d, &ThemePrivate::onAppExitCleanup);
+- }
+ connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
+ connect(d, &ThemePrivate::defaultFontChanged, this, &Theme::defaultFontChanged);
+ connect(d, &ThemePrivate::smallestFontChanged, this, &Theme::smallestFontChanged);
+@@ -57,6 +57,9 @@ Theme::Theme(const QString &themeName, QObject *parent)
+ auto &priv = ThemePrivate::themes[themeName];
+ if (!priv) {
+ priv = new ThemePrivate;
++ if (QCoreApplication::instance()) {
++ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, priv, &ThemePrivate::onAppExitCleanup);
++ }
+ }
+
+ priv->ref.ref();
+@@ -68,9 +71,6 @@ Theme::Theme(const QString &themeName, QObject *parent)
+ d->setThemeName(themeName, false, false);
+ d->cacheTheme = useCache;
+ d->fixedName = true;
+- if (QCoreApplication::instance()) {
+- connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, d, &ThemePrivate::onAppExitCleanup);
+- }
+ connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
+ }
+
+@@ -105,12 +105,12 @@ void Theme::setThemeName(const QString &themeName)
+ auto &priv = ThemePrivate::themes[themeName];
+ if (!priv) {
+ priv = new ThemePrivate;
++ if (QCoreApplication::instance()) {
++ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, priv, &ThemePrivate::onAppExitCleanup);
++ }
+ }
+ priv->ref.ref();
+ d = priv;
+- if (QCoreApplication::instance()) {
+- connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, d, &ThemePrivate::onAppExitCleanup);
+- }
+ connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
index 433fe380d17..5fcce852061 100644
--- a/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
@@ -64,6 +64,8 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-pinned-calendar-dots.patch # KDE-bug 440627
"${FILESDIR}"/${P}-fix-cmake.patch # bug 809815
"${FILESDIR}"/${P}-fix-ExpandableListItem-overlapping.patch # KDE-bug 428102
+ "${FILESDIR}"/${P}-fix-theme-memleak.patch # in KF-5.86
+ "${FILESDIR}"/${P}-fix-svgicon-memleak.patch # in KF-5.86
)
src_configure() {
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2020-09-29 12:49 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-09-29 12:49 UTC (permalink / raw
To: gentoo-commits
commit: fb205328f7ecd5b4dea6b635eba82a07f1736399
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 22:26:16 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 12:46:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb205328
kde-frameworks/plasma: Fix PC3/ToolButton icons color set
Upstream commit 3167717797d07a8645391e093fa91526c4645f4
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=426556
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...sma-5.74.0-fix-pc3-button-icons-color-set.patch | 28 ++++++++
kde-frameworks/plasma/plasma-5.74.0-r1.ebuild | 76 ++++++++++++++++++++++
2 files changed, 104 insertions(+)
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
new file mode 100644
index 00000000000..8f938b00b89
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 00000000000..445cbc96d85
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
@@ -0,0 +1,76 @@
+# 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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2020-06-23 13:49 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-06-23 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 716cd557d1c6758781b45469fe0df34f393c0164
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 19:28:52 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 13:48:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=716cd557
kde-frameworks/plasma: systray [1/4]: Fix unreadable text w/ Breeze Dark
See also: https://mail.kde.org/pipermail/distributions/2020-June/000368.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=422684
Upstream commit e1475e090747088288b05279633d19f12ae257aa
"Introduce PlaceholderMessage"
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...lasma-5.71.0-introduce-PlaceholderMessage.patch | 280 +++++++++++++++++++++
kde-frameworks/plasma/plasma-5.71.0-r1.ebuild | 1 +
2 files changed, 281 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch b/kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch
new file mode 100644
index 00000000000..4255d235d1a
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch
@@ -0,0 +1,280 @@
+From e1475e090747088288b05279633d19f12ae257aa Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Fri, 19 Jun 2020 22:45:19 +0000
+Subject: [PATCH] Introduce PlaceholderMessage
+
+This is a clone of the Kirigami component that we can use in Plasma
+applets until we arrive at a solution for styling QQC2 items using the
+Plasma style (https://phabricator.kde.org/T13256).
+
+See dependent patches:
+- plasma-workspace: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/73
+- bluedevil: https://invent.kde.org/plasma/bluedevil/-/merge_requests/1
+- print-manager: https://invent.kde.org/utilities/print-manager/-/merge_requests/1
+- plasma-vault: https://invent.kde.org/plasma/plasma-vault/-/merge_requests/3
+
+Merge request: https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
+---
+ .../qml/PlaceholderMessage.qml | 237 ++++++++++++++++++
+ .../plasmaextracomponents/qml/qmldir | 1 +
+ 2 files changed, 238 insertions(+)
+ create mode 100644 src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
+
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
+new file mode 100644
+index 000000000..958399a8f
+--- /dev/null
++++ b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
+@@ -0,0 +1,237 @@
++/*
++ * Copyright 2020 Nate Graham <nate@kde.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Library General Public License as
++ * published by the Free Software Foundation; either version 2, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Library General Public License for more details
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ */
++
++import QtQuick 2.0
++import QtQuick.Layouts 1.12
++import QtQuick.Controls 2.12 as QQC2
++
++import org.kde.plasma.core 2.0 as PlasmaCore
++import org.kde.plasma.components 3.0 as PlasmaComponents3
++import org.kde.plasma.extras 2.0 as PlasmaExtras
++
++/**
++ * A placeholder message indicating that a list view is empty. The message
++ * comprises a label with lightened text, an optional icon above the text, and
++ * an optional button below the text which can be used to easily show the user
++ * what to do next to add content to the view.
++ *
++ * The top-level component is a ColumnLayout, so additional components items can
++ * simply be added as child items and they will be positioned sanely.
++ *
++ * Example usage:
++ *
++ * @code{.qml}
++ ** Shows how to use PlaceholderMessage to implement a "this view is empty" message
++ * import QtQuick 2.12
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ * ListView {
++ * id: listView
++ * model: [...]
++ * delegate: [...]
++ *
++ * PlasmaExtras.PlaceholderMessage {
++ * anchors.centerIn: parent
++ * width: parent.width - (units.largeSpacing * 4)
++ *
++ * visible: listView.count == 0
++ *
++ * text: "There are no items in this list"
++ * }
++ * }
++ * @endcode
++ * @code{.qml}
++ ** Shows how to use PlaceholderMessage to implement a "here's how to proceed" message
++ * import QtQuick 2.12
++ * import QtQuick.Controls 2.12 as QQC2
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ * ListView {
++ * id: listView
++ * model: [...]
++ * delegate: [...]
++ *
++ * PlasmaExtras.PlaceholderMessage {
++ * anchors.centerIn: parent
++ * width: parent.width - (units.largeSpacing * 4)
++ *
++ * visible: listView.count == 0
++ *
++ * text: "Add an item to proceed"
++ *
++ * helpfulAction: QQC2.Action {
++ * icon.name: "list-add"
++ * text: "Add item..."
++ * onTriggered: {
++ * [...]
++ * }
++ * }
++ * }
++ * [...]
++ * }
++ * @endcode
++ * @code{.qml}
++ ** Shows how to use PlaceholderMessage to implement a "there was a problem here" message
++ * import org.kde.plasma.components 3.0 as PlasmaComponents3
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ * PlasmaComponents3.Page {
++ * id: root
++ * readonly property bool networkConnected: [...]
++ *
++ * PlasmaExtras.PlaceholderMessage {
++ * anchors.centerIn: parent
++ * width: parent.width - (units.largeSpacing * 4)
++ *
++ * visible: root.networkConnected
++ *
++ * icon.name: "network-disconnect"
++ * text: "Network disconnected; unable to load content"
++ * }
++ * }
++ * @endcode
++ * @code{.qml}
++ * import org.kde.plasma.components 3.0 as PlasmaComponents3
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ ** Shows how to use PlaceholderMessage to implement a loading indicator
++ * PlasmaComponents3.Page {
++ * id: root
++ * readonly property bool loading: [...]
++ * readonly property int completionStatus: [...]
++ *
++ * PlasmaExtras.PlaceholderMessage {
++ * anchors.centerIn: parent
++ * width: parent.width - (units.largeSpacing * 4)
++ *
++ * visible: root.loading
++ *
++ * icon.name: "my-awesome-app-icon"
++ * text: "Loading this awesome app"
++ *
++ * PlasmaComponents3.ProgressBar {
++ * Layout.preferredWidth: units.gridUnit * 20
++ * value: root.completionStatus
++ * from: 0
++ * to: 100
++ * }
++ * }
++ * }
++ * @endcode
++ * @code{.qml}
++ * import QtQuick.Controls 2.12 as QQC2
++ * import org.kde.plasma.components 3.0 as PlasmaComponents3
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ ** Shows how to use PlaceholderMessage to implement a "Here's what you do next" button
++ * PlasmaComponents3.Page {
++ * id: root
++ *
++ * PlasmaExtras.PlaceholderMessage {
++ * anchors.centerIn: parent
++ * width: parent.width - (units.largeSpacing * 4)
++ *
++ * visible: root.loading
++ *
++ * helpfulAction: QQC2.Action {
++ * icon.name: "list-add"
++ * text: "Add item..."
++ * onTriggered: {
++ * [...]
++ * }
++ * }
++ * }
++ * }
++ * @endcode
++ * @since 5.72
++ */
++ColumnLayout {
++ id: root
++
++ /**
++ * text: string
++ * The text to show as a placeholder label
++ *
++ * Optional. Not setting any text is useful when you only want to display
++ * an icon, action button, and/or other custom content
++ *
++ * @since 5.72
++ */
++ property alias text: label.text
++
++ /**
++ * iconName: string
++ * The icon to show above the text label.
++ *
++ * Optional
++ * Falls back to `undefined` if the specified icon is not valid or cannot
++ * be loaded.
++ *
++ * @since 5.72
++ * @see Icon::source
++ */
++ property string iconName: string
++
++ /**
++ * helpfulAction: QtQuickControls2 Action
++ * An action that helps the user proceed. Typically used to guide the user
++ * to the next step for adding content or items to an empty view.
++ *
++ * Optional
++ *
++ * @since 5.72
++ */
++ property alias helpfulAction: actionButton.action
++
++ spacing: units.largeSpacing
++
++ PlasmaCore.IconItem {
++ visible: source != undefined
++ opacity: 0.5
++
++ Layout.alignment: Qt.AlignHCenter
++ Layout.preferredWidth: units.iconSizes.huge
++ Layout.preferredHeight: units.iconSizes.huge
++
++ source: root.iconName || null
++ }
++
++ PlasmaExtras.Heading {
++ id: label
++
++ visible: text.length > 0
++ opacity: 0.5
++
++ Layout.fillWidth: true
++ Layout.alignment: Qt.AlignHCenter
++ horizontalAlignment: Qt.AlignHCenter
++
++ level: 2
++
++ wrapMode: Text.WordWrap
++ }
++
++ PlasmaComponents3.Button {
++ id: actionButton
++
++ Layout.alignment: Qt.AlignHCenter
++
++ visible: action && action.enabled
++ }
++}
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/qmldir b/src/declarativeimports/plasmaextracomponents/qml/qmldir
+index 4ba4ed7b7..6eb4af8a9 100644
+--- a/src/declarativeimports/plasmaextracomponents/qml/qmldir
++++ b/src/declarativeimports/plasmaextracomponents/qml/qmldir
+@@ -7,6 +7,7 @@ ExpandableListItem 2.0 ExpandableListItem.qml
+ Heading 2.0 Heading.qml
+ Paragraph 2.0 Paragraph.qml
+ PageRow 2.0 PageRow.qml
++PlaceholderMessage 2.0 PlaceholderMessage.qml
+ ScrollArea 2.0 ScrollArea.qml
+ Title 2.0 Title.qml
+ DescriptiveLabel 2.0 DescriptiveLabel.qml
+--
+2.27.0
+
diff --git a/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild
index 1a711a9450d..a088f837b6b 100644
--- a/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild
@@ -63,6 +63,7 @@ RESTRICT+=" test"
PATCHES=(
"${FILESDIR}"/${P}-access-expandedView.item.patch # KDE-bug #423093
+ "${FILESDIR}"/${P}-introduce-PlaceholderMessage.patch # KDE-bug #422684
)
src_configure() {
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2020-06-23 13:49 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-06-23 13:49 UTC (permalink / raw
To: gentoo-commits
commit: f8c1a09a694200d16d53b18fba8dce1930f50a84
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 19:10:17 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 13:48:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c1a09a
kde-frameworks/plasma: plasma-nm [1/2]: Fix password is asked twice
See also: https://mail.kde.org/pipermail/distributions/2020-June/000367.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=423093
Upstream commit 7f9e189d87c040a952533713ff48d32872e0eadd
"Add property to access the ExpandableListItem loader's item"
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-5.71.0-access-expandedView.item.patch | 29 ++++++++
kde-frameworks/plasma/plasma-5.71.0-r1.ebuild | 78 ++++++++++++++++++++++
2 files changed, 107 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch b/kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch
new file mode 100644
index 00000000000..ba1b35afbde
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch
@@ -0,0 +1,29 @@
+From 7f9e189d87c040a952533713ff48d32872e0eadd Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 7 Jun 2020 08:46:39 -0600
+Subject: [PATCH] Add property to access the ExpandableListItem loader's item
+
+---
+ .../plasmaextracomponents/qml/ExpandableListItem.qml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+index d9d0662ee..ed21ab8e4 100644
+--- a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
++++ b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+@@ -261,6 +261,12 @@ Item {
+ */
+ property var customExpandedViewContent: actionsListComponent
+
++ /*
++ * The actual instance of the custom view content, if loaded
++ * @since 5.72
++ */
++ property alias customExpandedViewContentItem: expandedView.item
++
+ /*
+ * isBusy: bool
+ * Whether or not to display a busy indicator on the list item. Set to true
+--
+2.27.0
+
diff --git a/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild
new file mode 100644
index 00000000000..1a711a9450d
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.71.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.1
+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}-access-expandedView.item.patch # KDE-bug #423093
+)
+
+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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2020-02-13 21:28 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-02-13 21:28 UTC (permalink / raw
To: gentoo-commits
commit: a6e4eefd7653df1140fe0a58cd25447afd3570fb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 19:20:22 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 21:26:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6e4eefd
kde-frameworks/plasma: Fix systemsettings crashes
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=417548
Thanks-to: Julien Delquié <julien.dlq <AT> gmail.com>
Tested-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Closes: https://bugs.gentoo.org/709484
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
....0-construct-nullengine-w-KPluginMetadata.patch | 29 ++++++++
kde-frameworks/plasma/plasma-5.67.0-r1.ebuild | 77 ++++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.67.0-construct-nullengine-w-KPluginMetadata.patch b/kde-frameworks/plasma/files/plasma-5.67.0-construct-nullengine-w-KPluginMetadata.patch
new file mode 100644
index 00000000000..33301093319
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.67.0-construct-nullengine-w-KPluginMetadata.patch
@@ -0,0 +1,29 @@
+From 1dc36bc2cee489e621a52fb4456ff28cf6a64685 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Thu, 13 Feb 2020 15:21:22 +0100
+Subject: Construct NullEngine with KPluginMetaData()
+
+The deprecated constructor taking a KPluginInfo unconditionally calls toMetaData() and then asserts.
+
+BUG: 417548
+
+Differential Revision: https://phabricator.kde.org/D27366
+---
+ src/plasma/private/dataenginemanager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plasma/private/dataenginemanager.cpp b/src/plasma/private/dataenginemanager.cpp
+index 221440c..852c17a 100644
+--- a/src/plasma/private/dataenginemanager.cpp
++++ b/src/plasma/private/dataenginemanager.cpp
+@@ -40,7 +40,7 @@ class NullEngine : public DataEngine
+ {
+ public:
+ explicit NullEngine(QObject *parent = nullptr)
+- : DataEngine(KPluginInfo(), parent)
++ : DataEngine(KPluginMetaData(), parent)
+ {
+ setValid(false);
+
+--
+cgit v1.1
diff --git a/kde-frameworks/plasma/plasma-5.67.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.67.0-r1.ebuild
new file mode 100644
index 00000000000..3c9fff35b10
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.67.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 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" )
+
+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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2019-12-31 20:09 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-12-31 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 13ada4b568106cabbccd59a7fefe7b913b02bf90
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 20:08:14 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 20:08:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ada4b5
kde-frameworks/plasma: Fix crash in calendar plugin
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-5.65.0-calendar-out-of-bounds.patch | 53 +++++++++++++++
kde-frameworks/plasma/plasma-5.65.0-r1.ebuild | 76 ++++++++++++++++++++++
2 files changed, 129 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.65.0-calendar-out-of-bounds.patch b/kde-frameworks/plasma/files/plasma-5.65.0-calendar-out-of-bounds.patch
new file mode 100644
index 00000000000..4c96921abd5
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.65.0-calendar-out-of-bounds.patch
@@ -0,0 +1,53 @@
+From 6756d00fba11ca2af921a67acdb5e3c92e23bb8a Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 18 Dec 2019 12:52:15 +0000
+Subject: [calendar] Check out of bounds array access in QLocale lookup
+
+Summary:
+If we have a broken locale setup we don't have any uiLanugages to look
+up the relevant locale object for.
+
+In that case use the system locale.
+
+Test Plan:
+Had a crash here
+
+#11 0x00007ff982aab0b2 in QList<QString>::at(int) const (this=0x7ffd50b1d928, i=0) at /opt/qt5/include/QtCore/qlist.h:571
+#12 0x00007ff982aaaa4a in Calendar::monthName() const (this=0x5640cce026f0) at /home/david/projects/kde5/src/frameworks/plasma-framework/src/declarativeimports/calendar/calendar.cpp:202
+#13 0x00007ff982aa14e9 in Calendar::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (_o=0x5640cce026f0, _c=QMetaObject::ReadProperty, _id=9, _a=0x7ffd50b1dd40) at src/declarativeimports/calendar/calendarplugin_autogen/EWIEGA46WW/moc_calendar.cpp:340
+
+Reviewers: #plasma, vkrause
+
+Reviewed By: vkrause
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D25960
+---
+ src/declarativeimports/calendar/calendar.cpp | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/declarativeimports/calendar/calendar.cpp b/src/declarativeimports/calendar/calendar.cpp
+index f652c65..c77824d 100644
+--- a/src/declarativeimports/calendar/calendar.cpp
++++ b/src/declarativeimports/calendar/calendar.cpp
+@@ -199,9 +199,12 @@ QString Calendar::monthName() const
+ // locale and take the month name from that.
+ //
+ // See https://bugs.kde.org/show_bug.cgi?id=353715
+- const QString lang = QLocale().uiLanguages().at(0);
+- // If lang is empty, it will create just a system locale
+- QLocale langLocale(lang);
++
++ QLocale langLocale;
++
++ if (QLocale().uiLanguages().length() > 0) {
++ langLocale = QLocale(QLocale().uiLanguages().at(0));
++ }
+ return langLocale.standaloneMonthName(m_displayedDate.month());
+ }
+
+--
+cgit v1.1
diff --git a/kde-frameworks/plasma/plasma-5.65.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.65.0-r1.ebuild
new file mode 100644
index 00000000000..29c9ed58b90
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.65.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 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 ~x86"
+IUSE="gles2 wayland X"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+ >=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+ >=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
+ >=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
+ !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}-calendar-out-of-bounds.patch" )
+
+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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2019-03-13 10:18 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-03-13 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 1df4f7998a84657aeb071bee1f4a6daeda4f0a22
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 10:18:03 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 10:18:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df4f799
kde-frameworks/plasma: Add fix for Plasma crash
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../plasma/files/plasma-5.56.0-crashfix.patch | 40 ++++++++++++
kde-frameworks/plasma/plasma-5.56.0-r1.ebuild | 73 ++++++++++++++++++++++
2 files changed, 113 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch b/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch
new file mode 100644
index 00000000000..844ddf6a234
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 00000000000..fce285228be
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild
@@ -0,0 +1,73 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2017-03-13 21:00 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2017-03-13 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 6264d1f4e26f9f6057f8237d834b848365c91ea8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 20:56:30 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 20:56:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6264d1f4
kde-frameworks/plasma: Fix Plasma folderview regression
KDE BUG https://bugs.kde.org/show_bug.cgi?id=377441
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/plasma-5.32.0-prefix-qstringlist.patch | 43 +++++++++++++
kde-frameworks/plasma/plasma-5.32.0-r1.ebuild | 70 ++++++++++++++++++++++
2 files changed, 113 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.32.0-prefix-qstringlist.patch b/kde-frameworks/plasma/files/plasma-5.32.0-prefix-qstringlist.patch
new file mode 100644
index 00000000000..460d1bd94ed
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.32.0-prefix-qstringlist.patch
@@ -0,0 +1,43 @@
+From 547a34d346695295ce05499ae355203414412993 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 10 Mar 2017 09:49:47 +0000
+Subject: Handle applyPrefixes with an empty string
+
+Summary:
+When setting an empty QStringList as prefix, it can lead to unexpected results, such as the prefix not changing.
+
+BUG: 377441
+
+Reviewers: #plasma
+
+Subscribers: plasma-devel, #frameworks
+
+Tags: #plasma, #frameworks
+
+Differential Revision: https://phabricator.kde.org/D5000
+---
+ src/declarativeimports/core/framesvgitem.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/declarativeimports/core/framesvgitem.cpp b/src/declarativeimports/core/framesvgitem.cpp
+index 81f9e63..8e6225f 100644
+--- a/src/declarativeimports/core/framesvgitem.cpp
++++ b/src/declarativeimports/core/framesvgitem.cpp
+@@ -556,7 +556,13 @@ void FrameSvgItem::updateDevicePixelRatio()
+
+ void FrameSvgItem::applyPrefixes()
+ {
+- if (m_prefixes.isEmpty() || m_frameSvg->imagePath().isEmpty()) {
++
++ if (m_frameSvg->imagePath().isEmpty()) {
++ return;
++ }
++
++ if (m_prefixes.isEmpty()) {
++ m_frameSvg->setElementPrefix(QString());
+ return;
+ }
+
+--
+cgit v0.11.2
+
diff --git a/kde-frameworks/plasma/plasma-5.32.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.32.0-r1.ebuild
new file mode 100644
index 00000000000..ba8af05f8de
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.32.0-r1.ebuild
@@ -0,0 +1,70 @@
+# 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="egl 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)
+ egl? ( media-libs/mesa[egl] )
+ !gles2? ( virtual/opengl )
+ wayland? ( $(add_frameworks_dep kwayland) )
+ 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}-prefix-qstringlist.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package !gles2 OpenGL)
+ $(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] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2016-11-17 11:35 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2016-11-17 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 0897f2e61539f7256c5663c3184950aeaa3b195c
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Nov 15 23:55:22 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 11:35:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0897f2e6
kde-frameworks/plasma: Backport activationTogglesExpanded
New API to fix e.g. Meta key toggle behaviour. plasma-desktop-5.8.3 is
already able to make use of it and fix KDE Bug 367685:
https://bugs.kde.org/show_bug.cgi?id=367685
See also https://git.reviewboard.kde.org/r/129204/
Package-Manager: portage-2.3.0
.../plasma-5.26.0-activationTogglesExpanded.patch | 124 +++++++++++++++++++++
kde-frameworks/plasma/plasma-5.26.0-r1.ebuild | 70 ++++++++++++
kde-frameworks/plasma/plasma-5.27.0-r1.ebuild | 70 ++++++++++++
3 files changed, 264 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.26.0-activationTogglesExpanded.patch b/kde-frameworks/plasma/files/plasma-5.26.0-activationTogglesExpanded.patch
new file mode 100644
index 00000000..f32f2b4
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.26.0-activationTogglesExpanded.patch
@@ -0,0 +1,124 @@
+commit 65706d3878d556c7a1eac18984ec41b1a1d96d56
+Author: Roman Gilg <subdiff@gmail.com>
+Date: Wed Oct 19 18:51:15 2016 +0200
+
+ New bool to use activated signal as toggle of expanded
+
+ The launcher applets couldn't be closed with Meta alone and on Wayland
+ in general by any global shortcut, since we used for that the focusOutEvent
+ triggered only on X and only on global shortcuts (on default Alt+F1).
+
+ This patch introduces the new bool activationTogglesExpanded, which allowes
+ QML applets to decide if they wish to use the activated signal also to end
+ their expanded state.
+
+ The default value is false, in order to not break any legacy applets.
+
+ REVIEW: 129204
+ BUG: 367685
+
+diff --git a/src/plasmaquick/appletquickitem.cpp b/src/plasmaquick/appletquickitem.cpp
+index ce2b82a..e2fd40e 100644
+--- a/src/plasmaquick/appletquickitem.cpp
++++ b/src/plasmaquick/appletquickitem.cpp
+@@ -48,7 +48,8 @@ AppletQuickItemPrivate::AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickIte
+ switchWidth(-1),
+ switchHeight(-1),
+ applet(a),
+- expanded(false)
++ expanded(false),
++ activationTogglesExpanded(false)
+ {
+ }
+
+@@ -727,6 +728,20 @@ void AppletQuickItem::setExpanded(bool expanded)
+ emit expandedChanged(expanded);
+ }
+
++bool AppletQuickItem::isActivationTogglesExpanded() const
++{
++ return d->activationTogglesExpanded;
++}
++
++void AppletQuickItem::setActivationTogglesExpanded(bool activationTogglesExpanded)
++{
++ if (d->activationTogglesExpanded == activationTogglesExpanded) {
++ return;
++ }
++ d->activationTogglesExpanded = activationTogglesExpanded;
++ emit activationTogglesExpandedChanged(activationTogglesExpanded);
++}
++
+ ////////////Internals
+
+ KDeclarative::QmlObject *AppletQuickItem::qmlObject()
+diff --git a/src/plasmaquick/appletquickitem.h b/src/plasmaquick/appletquickitem.h
+index 943e227..7df364d 100644
+--- a/src/plasmaquick/appletquickitem.h
++++ b/src/plasmaquick/appletquickitem.h
+@@ -81,6 +81,12 @@ class PLASMAQUICK_EXPORT AppletQuickItem : public QQuickItem
+ Q_PROPERTY(bool expanded WRITE setExpanded READ isExpanded NOTIFY expandedChanged)
+
+ /**
++ * True when the applet wants the activation signal act in toggle mode, i.e. while being expanded
++ * the signal shrinks the applet to its not exanded state instead of reexpanding it.
++ */
++ Q_PROPERTY(bool activationTogglesExpanded WRITE setActivationTogglesExpanded READ isActivationTogglesExpanded NOTIFY activationTogglesExpandedChanged)
++
++ /**
+ * the applet root QML item: sometimes is the same as fullRepresentationItem
+ * if a fullrepresentation was not declared explicitly
+ */
+@@ -126,6 +132,9 @@ public:
+ bool isExpanded() const;
+ void setExpanded(bool expanded);
+
++ bool isActivationTogglesExpanded() const;
++ void setActivationTogglesExpanded(bool activationTogglesExpanded);
++
+ ////NEEDED BY QML TO CREATE ATTACHED PROPERTIES
+ static AppletQuickItem *qmlAttachedProperties(QObject *object);
+
+@@ -135,6 +144,7 @@ Q_SIGNALS:
+ void switchHeightChanged(int height);
+
+ void expandedChanged(bool expanded);
++ void activationTogglesExpandedChanged(bool activationTogglesExpanded);
+
+ void compactRepresentationChanged(QQmlComponent *compactRepresentation);
+ void fullRepresentationChanged(QQmlComponent *fullRepresentation);
+diff --git a/src/plasmaquick/private/appletquickitem_p.h b/src/plasmaquick/private/appletquickitem_p.h
+index 1436935..ffd2bf2 100644
+--- a/src/plasmaquick/private/appletquickitem_p.h
++++ b/src/plasmaquick/private/appletquickitem_p.h
+@@ -104,6 +104,7 @@ public:
+ Plasma::Package containmentPackage;
+
+ bool expanded : 1;
++ bool activationTogglesExpanded : 1;
+
+ static QHash<QObject *, AppletQuickItem *> s_rootObjects;
+ };
+diff --git a/src/scriptengines/qml/plasmoid/appletinterface.cpp b/src/scriptengines/qml/plasmoid/appletinterface.cpp
+index 1cd6934..f24bc51 100644
+--- a/src/scriptengines/qml/plasmoid/appletinterface.cpp
++++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp
+@@ -142,11 +142,16 @@ void AppletInterface::init()
+ emit busyChanged();
+
+ applet()->updateConstraints(Plasma::Types::UiReadyConstraint);
++
+ connect(applet(), &Plasma::Applet::activated,
+ [ = ]() {
+- setExpanded(true);
++ // in case the applet doesn't want to get shrinked on reactivation,
++ // we always expand it again (only in order to conform with legacy behaviour)
++ bool activate = !( isExpanded() && isActivationTogglesExpanded() );
++
++ setExpanded(activate);
+ if (QQuickItem *i = qobject_cast<QQuickItem *>(fullRepresentationItem())) {
+- i->setFocus(true, Qt::ShortcutFocusReason);
++ i->setFocus(activate, Qt::ShortcutFocusReason);
+ }
+ });
+
diff --git a/kde-frameworks/plasma/plasma-5.26.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.26.0-r1.ebuild
new file mode 100644
index 00000000..7d45721
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.26.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="egl gles2 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)
+ egl? ( media-libs/mesa[egl] )
+ !gles2? ( virtual/opengl )
+ 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
+ !<kde-plasma/kdeplasma-addons-5.4.3-r1:5
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-5.26.0-activationTogglesExpanded.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package !gles2 OpenGL)
+ $(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.27.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.27.0-r1.ebuild
new file mode 100644
index 00000000..7d45721
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.27.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="egl gles2 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)
+ egl? ( media-libs/mesa[egl] )
+ !gles2? ( virtual/opengl )
+ 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
+ !<kde-plasma/kdeplasma-addons-5.4.3-r1:5
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-5.26.0-activationTogglesExpanded.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package !gles2 OpenGL)
+ $(cmake-utils_use_find_package X X11)
+ $(cmake-utils_use_find_package X XCB)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/
@ 2016-02-17 11:13 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2016-02-17 11:13 UTC (permalink / raw
To: gentoo-commits
commit: f640b7c3b14c747f026e5667beddbf7def4d0549
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 11:13:25 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 11:13:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f640b7c3
kde-frameworks/plasma: backport two patches from upstream
Solves a crash when diplaying tooltips in the task manager, and missing icons
in the system tray.
Package-Manager: portage-2.2.27
.../plasma/files/plasma-5.19.0-crash.patch | 27 ++++++++
.../plasma/files/plasma-5.19.0-systrayicons.patch | 34 ++++++++++
kde-frameworks/plasma/plasma-5.19.0-r1.ebuild | 75 ++++++++++++++++++++++
3 files changed, 136 insertions(+)
diff --git a/kde-frameworks/plasma/files/plasma-5.19.0-crash.patch b/kde-frameworks/plasma/files/plasma-5.19.0-crash.patch
new file mode 100644
index 0000000..8c3a60b
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.19.0-crash.patch
@@ -0,0 +1,27 @@
+From 1e196fdfb2a6eaf1664e1155c086616d55c6712b Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep@gmail.com>
+Date: Mon, 15 Feb 2016 19:05:26 +0100
+Subject: [PATCH] WindowThumbnail: Discard glx pixmap in stopRedirecting()
+
+BUG: 357895
+FIXED-IN: 5.20
+REVIEW: 127072
+---
+ src/declarativeimports/core/windowthumbnail.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/declarativeimports/core/windowthumbnail.cpp b/src/declarativeimports/core/windowthumbnail.cpp
+index 21e655e..b838053 100644
+--- a/src/declarativeimports/core/windowthumbnail.cpp
++++ b/src/declarativeimports/core/windowthumbnail.cpp
+@@ -584,6 +584,7 @@ void WindowThumbnail::stopRedirecting()
+ return;
+ }
+ xcb_composite_unredirect_window(c, m_winId, XCB_COMPOSITE_REDIRECT_AUTOMATIC);
++ discardPixmap();
+ if (m_damage == XCB_NONE) {
+ return;
+ }
+--
+2.4.10
+
diff --git a/kde-frameworks/plasma/files/plasma-5.19.0-systrayicons.patch b/kde-frameworks/plasma/files/plasma-5.19.0-systrayicons.patch
new file mode 100644
index 0000000..f8488cf
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.19.0-systrayicons.patch
@@ -0,0 +1,34 @@
+From 525bf2d377c21b41971a72d694a507bf2af0ada6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Tue, 16 Feb 2016 17:59:32 +0100
+Subject: [PATCH] Fix IconItem not loading non-theme icons with name
+
+Commit 5184ac introduced a small regression that caused IconItem
+to no longer load non-theme icons with name set, for instance icons
+coming from sni-qt, causing sni-qt apps to not show in systray.
+
+BUG: 359388
+FIXED-IN: 5.20
+REVIEW: 127091
+---
+ src/declarativeimports/core/iconitem.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
+index 1d7921a..085f284 100644
+--- a/src/declarativeimports/core/iconitem.cpp
++++ b/src/declarativeimports/core/iconitem.cpp
+@@ -148,6 +148,10 @@ void IconItem::setSource(const QVariant &source)
+ //fail, use QIcon
+ } else {
+ m_icon = QIcon::fromTheme(sourceString);
++ if (m_icon.isNull()) {
++ // fallback for non-theme icons
++ m_icon = source.value<QIcon>();
++ }
+ delete m_svgIcon;
+ m_svgIcon = 0;
+ m_imageIcon = QImage();
+--
+2.4.10
+
diff --git a/kde-frameworks/plasma/plasma-5.19.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.19.0-r1.ebuild
new file mode 100644
index 0000000..dae6808
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.19.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="egl gles2 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 qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ egl? ( media-libs/mesa[egl] )
+ !gles2? ( virtual/opengl )
+ 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
+ !<kde-plasma/kdeplasma-addons-5.4.3-r1
+"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-crash.patch"
+ "${FILESDIR}/${P}-systrayicons.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package !gles2 OpenGL)
+ $(cmake-utils_use_find_package X X11)
+ $(cmake-utils_use_find_package X XCB)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2023-04-22 16:21 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-29 19:53 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-04-22 16:21 Andreas Sturmlechner
2022-12-10 10:47 Andreas Sturmlechner
2022-11-16 19:17 Andreas Sturmlechner
2022-10-10 8:15 Andreas Sturmlechner
2022-09-24 8:53 Andreas Sturmlechner
2022-05-14 11:33 Andreas Sturmlechner
2022-05-04 20:50 Andreas Sturmlechner
2022-04-09 16:07 Andreas Sturmlechner
2022-01-20 13:26 Andreas Sturmlechner
2021-12-15 11:28 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-09-04 21:01 Andreas Sturmlechner
2021-09-04 21:01 Andreas Sturmlechner
2020-09-29 12:49 Andreas Sturmlechner
2020-06-23 13:49 Andreas Sturmlechner
2020-06-23 13:49 Andreas Sturmlechner
2020-02-13 21:28 Andreas Sturmlechner
2019-12-31 20:09 Andreas Sturmlechner
2019-03-13 10:18 Andreas Sturmlechner
2017-03-13 21:00 Andreas Sturmlechner
2016-11-17 11:35 Michael Palimaka
2016-02-17 11:13 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox