diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-06-14 14:12:23 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-06-14 14:43:14 +0200 |
| commit | 6884e1a48df42983f9a2302987c3b61985c744a2 (patch) | |
| tree | 146b7d87bd1b607d9f6bd2db97ed49b9b9591299 /kde-frameworks/plasma/files | |
| parent | kde-frameworks/bluez-qt: Use udev_reload (diff) | |
| download | gentoo-6884e1a48df42983f9a2302987c3b61985c744a2.tar.gz gentoo-6884e1a48df42983f9a2302987c3b61985c744a2.tar.bz2 gentoo-6884e1a48df42983f9a2302987c3b61985c744a2.zip | |
kde-frameworks/plasma: Fix thumbnail breakage on X11
Upstream commit dff1b034c1162062aa2292099d3d01fc53dafdf6
See also:
https://mail.kde.org/pipermail/distributions/2022-June/001231.html
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/plasma/files')
| -rw-r--r-- | kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch | 42 |
1 files changed, 42 insertions, 0 deletions
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 + |