diff options
Diffstat (limited to 'kde-frameworks/plasma/files')
4 files changed, 42 insertions, 94 deletions
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 + |