diff options
| author | Gaël PORTAY <gael.portay@savoirfairelinux.com> | 2018-06-28 16:29:10 -0400 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-07-01 11:06:08 +0200 |
| commit | 2d685d762d22b5b52b74e73199a19ccb0094cd99 (patch) | |
| tree | 19df935daabad4ffc514e1d3ce765930b46a5ee8 /package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch | |
| parent | a475e0d874c66d5c0e478942cfb9ee84b1e58d2a (diff) | |
| download | buildroot-2d685d762d22b5b52b74e73199a19ccb0094cd99.tar.gz buildroot-2d685d762d22b5b52b74e73199a19ccb0094cd99.zip | |
qt5: bump latest version to 5.11.1
qtwebengine:
Remove 0001-Fix-build-with-GCC-8.1.0.patch (upstream since
[1]).
[1]: https://github.com/qt/qtwebengine/commit/08db7562bf7709122807f151cab710b3fd9d7c19
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch')
| -rw-r--r-- | package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch deleted file mode 100644 index 6876498022..0000000000 --- a/package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c11299086b7718332e2b4fbc37ce6f6ff427c5ba Mon Sep 17 00:00:00 2001 -From: Yuqing Zhu <carol.zhu@nxp.com> -Date: Mon, 27 Mar 2017 15:33:35 +0800 -Subject: [PATCH] qtbase: Fix build error when using EGL -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -A build error was occurring due to missing EGL configuration. - -Fixed by adding the necessary ties to the EGL pkg-config. - -Task-number: QTBUG-61712 -Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc -Upstream-Status: Pending -Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> ---- - mkspecs/features/egl.prf | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf -index 9fa0c9e219..85d5852ba6 100644 ---- a/mkspecs/features/egl.prf -+++ b/mkspecs/features/egl.prf -@@ -1,3 +1,9 @@ -+# egl headers need a definition -+PKG_CONFIG = $$pkgConfigExecutable() -+PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl) -+PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*) -+QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS -+ - INCLUDEPATH += $$QMAKE_INCDIR_EGL - LIBS_PRIVATE += $$QMAKE_LIBS_EGL - QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL --- -2.16.1 - |
