Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/kuserfeedback/files/
Date: Sun, 03 Apr 2022 10:50:37
Message-Id: 1648983010.d2de754039abf3aab52179f066672a101422bbec.conikost@gentoo
1 commit: d2de754039abf3aab52179f066672a101422bbec
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Thu Mar 31 06:02:28 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 3 10:50:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2de7540
7
8 dev-libs/kuserfeedback: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/24826
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../kuserfeedback-1.0.0-fix-opengl-crash.patch | 39 ----------------------
16 1 file changed, 39 deletions(-)
17
18 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
19 deleted file mode 100644
20 index 57321355b23a..000000000000
21 --- a/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch
22 +++ /dev/null
23 @@ -1,39 +0,0 @@
24 -From 17db7d75643b4f3dccd5b36a6ab175f03ba74297 Mon Sep 17 00:00:00 2001
25 -From: Aleix Pol <aleixpol@×××.org>
26 -Date: Wed, 2 Feb 2022 20:36:40 +0100
27 -Subject: [PATCH] opengl source: Do not crash if we could not make our context
28 - current
29 -
30 -BUG: 449505
31 ----
32 - src/provider/core/openglinfosource.cpp | 7 ++++++-
33 - 1 file changed, 6 insertions(+), 1 deletion(-)
34 -
35 -diff --git a/src/provider/core/openglinfosource.cpp b/src/provider/core/openglinfosource.cpp
36 -index 5117d85..08402c7 100644
37 ---- a/src/provider/core/openglinfosource.cpp
38 -+++ b/src/provider/core/openglinfosource.cpp
39 -@@ -13,6 +13,7 @@
40 - #include <QOpenGLFunctions>
41 - #include <QSurfaceFormat>
42 - #include <QWindow>
43 -+#include "logging_p.h"
44 - #endif
45 -
46 - using namespace KUserFeedback;
47 -@@ -37,7 +38,11 @@ QVariant OpenGLInfoSource::data()
48 - QWindow window;
49 - window.setSurfaceType(QSurface::OpenGLSurface);
50 - window.create();
51 -- context.makeCurrent(&window);
52 -+ if (!context.makeCurrent(&window)) {
53 -+ qCWarning(Log) << "Could not make OpenGL context current";
54 -+ m.insert(QStringLiteral("type"), QStringLiteral("none"));
55 -+ return m;
56 -+ }
57 - QOpenGLFunctions functions(&context);
58 - m.insert(QStringLiteral("vendor"), OpenGLInfoSourcePrivate::normalizeVendor(reinterpret_cast<const char*>(functions.glGetString(GL_VENDOR))));
59 - m.insert(QStringLiteral("renderer"), OpenGLInfoSourcePrivate::normalizeRenderer(reinterpret_cast<const char*>(functions.glGetString(GL_RENDERER))));
60 ---
61 -GitLab
62 -