commit: d2de754039abf3aab52179f066672a101422bbec Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Thu Mar 31 06:02:28 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Apr 3 10:50:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2de7540
dev-libs/kuserfeedback: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/24826 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../kuserfeedback-1.0.0-fix-opengl-crash.patch | 39 ---------------------- 1 file changed, 39 deletions(-) diff --git a/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch b/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch deleted file mode 100644 index 57321355b23a..000000000000 --- a/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 17db7d75643b4f3dccd5b36a6ab175f03ba74297 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleix...@kde.org> -Date: Wed, 2 Feb 2022 20:36:40 +0100 -Subject: [PATCH] opengl source: Do not crash if we could not make our context - current - -BUG: 449505 ---- - src/provider/core/openglinfosource.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/provider/core/openglinfosource.cpp b/src/provider/core/openglinfosource.cpp -index 5117d85..08402c7 100644 ---- a/src/provider/core/openglinfosource.cpp -+++ b/src/provider/core/openglinfosource.cpp -@@ -13,6 +13,7 @@ - #include <QOpenGLFunctions> - #include <QSurfaceFormat> - #include <QWindow> -+#include "logging_p.h" - #endif - - using namespace KUserFeedback; -@@ -37,7 +38,11 @@ QVariant OpenGLInfoSource::data() - QWindow window; - window.setSurfaceType(QSurface::OpenGLSurface); - window.create(); -- context.makeCurrent(&window); -+ if (!context.makeCurrent(&window)) { -+ qCWarning(Log) << "Could not make OpenGL context current"; -+ m.insert(QStringLiteral("type"), QStringLiteral("none")); -+ return m; -+ } - QOpenGLFunctions functions(&context); - m.insert(QStringLiteral("vendor"), OpenGLInfoSourcePrivate::normalizeVendor(reinterpret_cast<const char*>(functions.glGetString(GL_VENDOR)))); - m.insert(QStringLiteral("renderer"), OpenGLInfoSourcePrivate::normalizeRenderer(reinterpret_cast<const char*>(functions.glGetString(GL_RENDERER)))); --- -GitLab -
