145e157b98
qt5base:
- removed 0002-double-conversion-enable-for-aarch64_be.patch
(superseded by upstream commits [1] and [2])
- removed 0003-double-conversion-enable-for-or1k.patch
(superseded by upstream commits [1] and [2])
- rebased 0004-double-conversion-enable-for-microblaze.patch
qt5location:
- removed 0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch
(superseded by upstream commit [3])
[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6a39e49a6cdeb28a04a3657bb6a22f848d5dfa9d
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4d40f09a45202dff901d4f970a6a7e939797138b
[3] https://code.qt.io/cgit/qt/qtlocation.git/commit/?id=7bafbdc91f83165710ed74639b76b48b4494937a
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Thomas:
- update chromium-latest.inc with the list of license files that
match qt5webengine 5.12.1
- drop patch in qt5location that has been upstreamed and therefore no
longer applies to 5.12.1]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 2a5711651bee9d021733da19126a71aeda45e646 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Thu, 29 Nov 2018 23:33:10 +0100
|
|
Subject: [PATCH] qsgtexture: fix debug build with uclibc
|
|
|
|
Debug build of gsgtexture fails on uclibc since version 5.11 and
|
|
https://github.com/qt/qtdeclarative/commit/7c507eaac3f848f92f2ebdafe8ded4a064d68351:
|
|
|
|
scenegraph/util/qsgtexture.cpp:69:22: fatal error: execinfo.h: No such file or directory
|
|
#include <execinfo.h>
|
|
|
|
Indeed, !defined(__UCLIBC__) has been replaced by defined(__GBLIBC__) to
|
|
fix build on musl but as a result, build fails on uclibc because uclibc
|
|
also defines __GLIBC__ (and it does not have execinfo like musl)
|
|
|
|
This error is raised only when building in debug mode because
|
|
CAN_BACKTRACE_EXECINFO is undefined if QT_NO_DEBUG is set
|
|
|
|
So keep defined(__GLIBC__), but put back !defined(__UCLIBC__)
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/6fce0ce5aea943e097532efbbc8d1e28f41e5866
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/qt/qtdeclarative/pull/4]
|
|
---
|
|
src/quick/scenegraph/util/qsgtexture.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
|
|
index fea92a512..a26191006 100644
|
|
--- a/src/quick/scenegraph/util/qsgtexture.cpp
|
|
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
|
|
@@ -53,7 +53,7 @@
|
|
#endif
|
|
#include <private/qsgmaterialshader_p.h>
|
|
|
|
-#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__)
|
|
+#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__)
|
|
#define CAN_BACKTRACE_EXECINFO
|
|
#endif
|
|
|
|
--
|
|
2.14.1
|
|
|