[neon/extras/kuserfeedback/Neon/release] debian/patches: add patch recommended by Nate

Jonathan Esk-Riddell null at kde.org
Fri Feb 4 11:13:39 GMT 2022


Git commit 65f4cee368f067ea94c2db96be6a747322629e02 by Jonathan Esk-Riddell.
Committed on 04/02/2022 at 11:13.
Pushed by jriddell into branch 'Neon/release'.

add patch recommended by Nate

A  +33   -0    debian/patches/opengl-source.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/extras/kuserfeedback/commit/65f4cee368f067ea94c2db96be6a747322629e02

diff --git a/debian/patches/opengl-source.diff b/debian/patches/opengl-source.diff
new file mode 100644
index 0000000..1ba35ca
--- /dev/null
+++ b/debian/patches/opengl-source.diff
@@ -0,0 +1,33 @@
+commit 17db7d75643b4f3dccd5b36a6ab175f03ba74297
+Author: Aleix Pol <aleixpol at kde.org>
+Date:   Wed Feb 2 20:36:40 2022 +0100
+
+    opengl source: Do not crash if we could not make our context current
+    
+    BUG: 449505
+
+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))));
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cba1de2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+opengl-source.diff


More information about the Neon-commits mailing list