gentoo resync : 29.12.2022

6 files changed, 49 insertions, 108 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index f66dd8282924..a1f99249f7d8 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,10 +1,8 @@
 AUX plasma-5.92.0-breeze-light-dark-visual-fix.patch 1689 BLAKE2B 8c15834e53bdb2dfe4707a2173bdf19fd1a98652f644256f050ce55cc57e3268f1d33a1d67901d68301749bf7458137092c71e68d50454bd8db88d962c2bcd01 SHA512 d490f815b11bbf6af35266fab33392cfd5562b2011970b433b2c3952e1e9638af56175e10258596dd863c8fff49d448f141c22bfa3d688c9194a31ca0ed2f1ee
 AUX plasma-5.92.0-fix-blurry-buttons.patch 5410 BLAKE2B 689bf20c1848fd5ac299991f6dcc1e6ee81ef2fecd68d87952967dbb2367326aee8d464588824b059f7162a1cc6092c84cce7d254ac20dbbef3da639a5eaa4e0 SHA512 facb4d4ca36f5edaad918253f8d79442d350a12d611d833d0c48684abd2160527813d7186614fc54d3d5f67171400bbaf56f64c0ffb98c2433e062ee024b180d
-AUX plasma-5.93.0-fix-osd-dialog-position.patch 1057 BLAKE2B 2aefb325c4f4c09dac0632e01a0877afc12998ebdd8d7397ea6268e6c4b0602b5d1e385fae821185bcbf276356777bd47ed5e645c86dbdb81e4bf13b504b0f60 SHA512 3a4c349cc8064ecf9513bdab4db44ff329ce9fa5d3af72b695bedc241509dd70f9c62d8de0903d9cc87775b20fcbc729701917686e5ad3fbd66df3242e3bb5a0
-AUX plasma-5.93.0-fix-widget-popups.patch 931 BLAKE2B 32488d998398ff027f3a265c43a89b2f72b10861e4993584d2fc665a3ef6d4ec9219e105f5de09ce53a83ad6f0ad1ab545ac92d0607406fd2c75984da322a5a0 SHA512 06c7d7d6710d176979756070f4492be2d3101d4c86728b8234484ad3fbc4b57d8d59d78d6ff34d9f79c578a1ca4ffe659819f46924d7ba309e76247e8d0e168b
-AUX plasma-5.93.0-keep-legacy-highlight-behaviour.patch 1054 BLAKE2B 95efe2e47a5816139f77c1ca5b7b75cb42ce93555daec773a6d3942f9498d1ddfd04676fe7a51742ea415b295f88440261ab08400a6734c661dba51157504bb1 SHA512 168098d5a6f492dc37272a23eff873938ad7595345d589faef5ea7a486f4fd3f40cec0e0c3b96fde030f99155d6d79a7dc4a81ece4d3d242d25757d456584971
+AUX plasma-5.95.0-revert-QT_FEATURE_foo.patch 1515 BLAKE2B bbaeef7f8c4d7110f27371a2f1417a2ad47e9b562d0250df4c917a5aec71426307aadb6d33e67ec85c6c8a3623483eff5b01bdae38ade37820b4c7861ab2d910 SHA512 87b73e53ed0b36a43fe973e96f05280692531a0d2c445bda11b712bf3987102e8f1522ef5a4026ef55f2434c1b793f5e3d1204be87afacf47d376312b6db1af0
 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.95.0.tar.xz 3139008 BLAKE2B 55d3e32402a424e9362fec0dc06c80ac0d1754faeb0f60b6f0b447e4fef996e3c8f695300440f763ba911e02efe92d1d0a34e8cd5fd4458c4d1fe31000477097 SHA512 f5b109477b437cac9a54903ee2198df8f38bde4499f1a75288cbb299ca6b0d7b02b624bd5d741bd8e62136201811167f5406d4d98ceed2c86fa23842cd7f36af
 EBUILD plasma-5.92.0-r2.ebuild 2070 BLAKE2B 6e234e85ddc2694560bcdd46a9b12df6a9ab7ee1a3fb2f29e2a9c835a0255a981af7d73f12caf4bd4a7ef90320cb7f23d3906b083b2346e289c6e8bd092f1acb SHA512 3d9389f095b09c330f552f52fa2d7c624c968abc658f6c447bbed066e864d205573314878f8b47f207dcdf3e7273beaecf62de39984bc763a494b26e29bceac9
-EBUILD plasma-5.93.0-r2.ebuild 2241 BLAKE2B 239219e02e14d05f54afe61e6eae15cf18df73e35df3b2262049cb64d4a91727a5ebfe0688492e60745eb39e13110dc8d87ee3fbf8a4fd1a03841e5a327fcd1b SHA512 f5e402e962ddc81f381b8635244f7395e13e2b6f491c71ae0fbbf829ac43c1fe9528e8b1089c9a82b541ede1c5fba52b795a1c3daf7a3795bf470da4068814ca
+EBUILD plasma-5.95.0-r3.ebuild 2015 BLAKE2B 3565271a87e90a336c9a82fc46b5d76f9cac006b94ae265f4d8a219768fea40ac842f65f06f1d6da1fbebc8e0f8f0598830a60a20b318334aa3d77216fdfceaf SHA512 42d88333ed0453c84124fffb5279392345f07a53c471080885314ffe33234e9d65dc741741b011eb45353545ec5e40133cbc3afad91355b90cb34b02c0edc8fe
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
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/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch b/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch
new file mode 100644
index 000000000000..300612763336
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch
@@ -0,0 +1,42 @@
+From dff1b034c1162062aa2292099d3d01fc53dafdf6 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Tue, 14 Jun 2022 14:05:32 +0200
+Subject: [PATCH] Revert "Use QT_FEATURE_foo to detect opengl* support, and
+ TARGET for glesv2"
+
+This reverts commit 31884dc195c815054bfa6b15a90753d2d0ae1ea9.
+---
+ CMakeLists.txt                             | 3 ++-
+ src/declarativeimports/core/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6698a2091..63229cdfb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,7 +118,8 @@ set_package_properties(EGL PROPERTIES
+                        TYPE OPTIONAL
+                       )
+ 
+-if(OpenGL_GLX_FOUND AND X11_FOUND AND QT_FEATURE_opengl)
++get_target_property(QtGui_Enabled_Features Qt${QT_MAJOR_VERSION}::Gui QT_ENABLED_PUBLIC_FEATURES)
++if(OpenGL_GLX_FOUND AND X11_FOUND AND (QtGui_Enabled_Features MATCHES "opengl"))
+     add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.")
+     set(HAVE_GLX 1)
+ else()
+diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt
+index d08b4c619..2136bb985 100644
+--- a/src/declarativeimports/core/CMakeLists.txt
++++ b/src/declarativeimports/core/CMakeLists.txt
+@@ -70,7 +70,7 @@ else()
+ 
+ endif()
+ 
+-if(TARGET Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
++if(QtGui_Enabled_Features MATCHES "opengles2")
+     target_link_libraries(corebindingsplugin Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
+ endif()
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild
index f5d72b460cb0..fc4992b6fe0d 100644
--- a/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild
+++ b/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild
@@ -5,14 +5,14 @@ EAPI=8
 
 KDE_ORG_NAME="${PN}-framework"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
+QTMIN=5.15.3
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Plasma framework"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gles2-only man wayland X"
 
 RESTRICT="test"
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	=kde-frameworks/kactivities-${PVCUT}*:5
 	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5[qml]
 	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
 	=kde-frameworks/kcoreaddons-${PVCUT}*:5
 	=kde-frameworks/kdeclarative-${PVCUT}*:5
@@ -59,12 +59,7 @@ DEPEND="${RDEPEND}
 "
 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
-)
+PATCHES=( "${FILESDIR}/${P}-revert-QT_FEATURE_foo.patch" )
 
 src_configure() {
 	local mycmakeargs=(