zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kinfocenter: refresh 0001-fix-build-in-x11-less-environments.patch

Browse Source 
fixes:
| WARNING: kinfocenter-5.13.2-r0 do_patch:
| Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
| The context lines in the patches can be updated with devtool:
|
|     devtool modify <recipe>
|     devtool finish --force-patch-refresh <recipe> <layer_path>
|
| Then the updated patches and the source tree (in devtool's workspace)
| should be reviewed to make sure the patches apply in the correct place
| and don't introduce duplicate lines (which can, and does happen
| when some of the context is ignored). Further information:
| http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
| https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
| Details:
| Applying patch 0001-fix-build-in-x11-less-environments.patch
| patching file Modules/info/CMakeLists.txt
| patching file Modules/opengl/CMakeLists.txt
| patching file Modules/opengl/opengl.cpp
| Hunk #2 succeeded at 785 (offset 45 lines).
| Hunk #3 succeeded at 902 (offset 46 lines).
| Hunk #4 succeeded at 948 (offset 44 lines).
| Hunk #5 succeeded at 962 (offset 44 lines).
| Hunk #6 succeeded at 991 (offset 44 lines).
| Hunk #7 succeeded at 1008 with fuzz 1 (offset 44 lines).
|
| Now at patch 0001-fix-build-in-x11-less-environments.patch

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-07-05 16:11:38 +02:00
parent 4fb4e92b3c
commit 181c3d45a7
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
recipes-kde/plasma/untier/kinfocenter/files/0001-fix-build-in-x11-less-environments.patch
View File

@@ -63,7 +63,7 @@ index c87cde8..5df02e3 100644
#include <openglconfig.h>
@@ -737,7 +740,8 @@ static QTreeWidgetItem *get_gl_info_glx(Display *dpy, int scrnum, Bool allowDire
@@ -782,7 +785,8 @@ static QTreeWidgetItem *get_gl_info_glx(Display *dpy, int scrnum, Bool allowDire
}
#endif
@@ -73,7 +73,7 @@ index c87cde8..5df02e3 100644
static QTreeWidgetItem *get_gl_info_egl(Display *dpy, int scrnum, QTreeWidgetItem *l1, QTreeWidgetItem *after)
{
Window win;
@@ -852,6 +856,7 @@ static QTreeWidgetItem *get_gl_info_egl(Display *dpy, int scrnum, QTreeWidgetIte
@@ -898,6 +902,7 @@ static QTreeWidgetItem *get_gl_info_egl(Display *dpy, int scrnum, QTreeWidgetIte
return result;
}
@@ -81,7 +81,7 @@ index c87cde8..5df02e3 100644
static QTreeWidgetItem *get_gl_info_egl_qt(QTreeWidgetItem *l1, QTreeWidgetItem *after, QSurfaceFormat::OpenGLContextProfile profile, const QString &title)
{
@@ -899,7 +904,9 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
@@ -943,7 +948,9 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
{
QTreeWidgetItem *l1, *l2 = nullptr;
@@ -91,7 +91,7 @@ index c87cde8..5df02e3 100644
static bool isWayland = QGuiApplication::platformName().contains(QStringLiteral("wayland"));
QTreeWidgetItem *header = new QTreeWidgetItem();
@@ -911,6 +918,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
@@ -955,6 +962,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
l1 = new QTreeWidgetItem(treeWidget);
@@ -99,7 +99,7 @@ index c87cde8..5df02e3 100644
if (isX11) {
char *displayName = nullptr;
Display *dpy;
@@ -939,7 +947,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
@@ -983,7 +991,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
l2 = get_gl_info_glx(dpy, scrnum, true, l1, l2);
if (l2) l2->setExpanded(true);
#endif
@@ -108,14 +108,11 @@ index c87cde8..5df02e3 100644
l2 = get_gl_info_egl(dpy, scrnum, l1, l2);
if (l2)
l2->setExpanded(true);
@@ -956,6 +964,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
@@ -1000,6 +1008,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
#endif
XCloseDisplay(dpy);
}
+#endif
if (isWayland) {
l1->setText(0, i18n("Name of the Display"));
--
1.9.3
IsDirect = true;