summaryrefslogtreecommitdiffstats
path: root/package/qt5
Commit message (Collapse)AuthorAgeFilesLines
* qt5webkit: select leveldb package and memenvGaël PORTAY2019-03-252-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the build issue reported by autobuilder [0]. /home/naourr/work/instance-2/output/build/qt5webkit-5.9.1/Source/WebCore//.obj/platform/leveldb/LevelDBDatabase.o: In function `WebCore::LevelDBDatabase::openInMemory(WebCore::LevelDBComparator const*)': LevelDBDatabase.cpp.text._ZN7WebCore15LevelDBDatabase12openInMemoryEPKNS_17LevelDBComparatorE+0x34): undefined reference to `leveldb::NewMemEnv(leveldb::Env*)' collect2: error: ld returned 1 exit status make[3]: *** [Makefile.api:97: ../lib/libQt5WebKit.so.5.9.1] Error 1 The issue happens when both packages leveldb and qt5webkit are enabled. QtWebKit builds its own copy of leveldb [1] (as a third-party) if the system does not provided it (i.e. buildroot). It builds it differently and this is the origin of that issue. Instead of using the Makefile provided by leveldb [2], QtWebKit uses qmake to build that library [3]. The missing symbol issue happens because the symbol leveldb::NewMemEnv is bundled in the static library libmemenv.a (aside libleveldb.so). This static library consists of this single symbol which is like an extra that is built but *NOT* shipped by default at installation in the staging directory. Unfortunatly, that symbol is required later by WebCore [4]. The copy built by QtWebKit is an all-in-one library including both libleveldb and libmemenv; thus QtWebKit links against libleveldb only. Also, the linker finds the buildroot's copy first (not the third-party): that explains why it is complaining about a missing symbol. That copy does not have the symbol leveldb::NewMemEnv. Fortunatly, QtWebKit provides a facility to link against the system leveldb package. The qmake flag WEBKIT_CONFIG+=use_system_leveldb tells Qt5WebKit to link against libleveldb *AND* libmemenv [5]. To fix that issue, this commit selects the package leveldb that now installs the libmemenv static library and its header. It ensures that QtWebKit has everything it needs to be built. It also sets the appropriate qmake configure flags to tell QtWebKit to use the leveldb copy built by buildroot instead of the bundled one. [0]: http://autobuild.buildroot.net/results/46033e82adf592c3b92c6d50cfaf45bd58beeaa4 [1]: https://github.com/qt/qtwebkit/tree/5.9/Source/ThirdParty/leveldb [2]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Makefile#L167-L169 [3]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Target.pri#L80 [4]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp#L185 [5]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/WebCore.pri#L254 [6]: https://github.com/google/leveldb/commit/739c25100e46576cdcdfff2d6f43f9f7008103c7 Signed-off-by: Gaël PORTAY <gael.portay@collabora.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (cherry picked from commit 2d7c746ed8c89ad262ef0c6db5460ade1fc35973) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/qt5/qt5base: add BR2_PACKAGE_QT5BASE_OPENSSLFabrice Fontaine2019-03-041-0/+6
| | | | | | | | | | | | | | | | | Commit c110e48cecde6f543da18388322907b05b25e7d2 disabled openssl support on QT 5.6, this has the side-effect of breaking the build of python-pyqt5 because support of openssl is enabled on python-pyqt5 if BR2_PACKAGE_OPENSSL is selected To fix this issue, add a new BR2_PACKAGE_QT5BASE_OPENSSL option in qt5base and use it in python-pyqt5 Fixes: - http://autobuild.buildroot.org/results/e92991308d47649cecc4084e41ab5711ec96831f Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> [Peter: make _OPENSSL a blind option, add libressl logic for 5.6.x] Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/qt5/qt5base: build Qt 5.6 with LibreSSL if presentJames Grant2019-03-042-1/+32
| | | | | | | | | LibreSSL build is successful with shared linkage, but not default dlopen(). Also adds patch for successful compilation by using -fpermissive. Signed-off-by: James Grant <jamesg@zaltys.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/qt5/qt5base: exclude OpenSSL functionality for Qt 5.6.xJames Grant2019-03-011-0/+5
| | | | | | | | | No patch back-porting OpenSSL 1.1.x support to Qt 5.6.x is available. https://development.qt-project.narkive.com/RW4wxYXY/openssl-1-1-x-support-on-qt-5-6-5-9 Signed-off-by: James Grant <james.grant@jci.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/qt5/qt5base: add custom configure options lastJames Grant2019-03-011-2/+3
| | | | | | | | This allows all options set by Buildroot to be overridden. Signed-off-by: James Grant <james.grant@jci.com> [Peter: drop original line as pointed out by Thomas] Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/qt5base: fix double-conversion compile for riscvPeter Seiderer2019-02-241-0/+31
| | | | | | | | | | | | Fixes [1], [2]: ../3rdparty/double-conversion/include/double-conversion/utils.h:83:2: error: #error Target architecture was not detected as supported by Double-Conversion. [1] http://autobuild.buildroot.net/results/8bdb6a2b56f6ea96649184e5fef6ce2c56b9ec2b [2] http://autobuild.buildroot.net/results/63ba267674b424786bb10c97c565f4306147f95a Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5base: handle sse2/sse3/ssse3/sse4.1/sse4.2/avx/avx2 configurationPeter Seiderer2019-02-151-0/+19
| | | | | | | | | | | | The Qt configure auto detection (and announced runtime detection feature) failes (see e.g. [1]), so override the configuration with the buildroot determined settings. [1] http://lists.busybox.net/pipermail/buildroot/2019-January/241862.html Reported-by: David Picard <dplamp@gmx.com> Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt: remove packagePeter Korsgaard2019-02-061-2/+0
| | | | | | | | | | | | | Qt4 has been marked obsolete for close to 1 year, since commit 3538b5fb10 (qt: mark as obsolete) and is no longer supported upstream since December 2015: https://blog.qt.io/blog/2015/05/26/qt-4-8-7-released/ So now finally remove it as the in tree users have been removed. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5/qt5base: do not change QMAKE_COMPILER in g++-base.confPeter Seiderer2018-12-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable QMAKE_COMPILER determines the compiler flavour (e.g. gcc, clang, llvm, msvc etc.) and not a compiler path. Changing it confuses the platform test of the qt5webengine package (mkspecs/features/platform.prf): defineTest(isPlatformSupported) { QT_FOR_CONFIG += gui-private linux { if(!gcc:!clang)|intel_icc { skipBuild("Qt WebEngine on Linux requires clang or GCC.") return(false) } gcc:!clang:!isGCCVersionSupported(): return(false) } } Revert the variable change introduced by commit 'package/qt5/qt5base: use ccache for building host code' ([2]). Fixes raspberrypi3_qt5we_defconfig/qt5webengine build ([1]): Qt WebEngine on Linux requires clang or GCC. QtWebEngine will not be built. [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/131217091 [2] https://git.buildroot.net/buildroot/commit/?id=c2ea056a1b34fd1354100d08e603b9374e225968 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5virtualkeyboard: rewrap Config.in help textThomas Petazzoni2018-12-091-1/+2
| | | | | | | | | | check-package complains with: package/qt5/qt5virtualkeyboard/Config.in:59: help text: <tab><2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) So let's rewrap the Config.in help text. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5virtualkeyboard: add arrow key navigation build optionSébastien Szymanski2018-12-092-0/+9
| | | | | | | | It allows controlling the keyboard using the arrow and return keys. Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5quickcontrols: fix hash file entryPeter Seiderer2018-12-081-1/+1
| | | | | | | | | | Fix accidental hash entry change previous commit ('qt5: bump latest version to 5.11.3' 85ecae213ae5d37c9ddb7390706c18b93035f63b). Reported-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* qt5: bump latest version to 5.11.3Peter Seiderer2018-12-0834-89/+54
| | | | | | | | | qt5base: remove 0005-Export-qt_open64-from-QtCore.patch (taken from upstream [1]) [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/qt5base: fix build when system awk is mawk, not gawkYann E. MORIN2018-12-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit c2ea056a1b (package/qt5/qt5base: use ccache for building host code) introduced a tweak to qt5's mkspec file, to define the compilers (C and C++) to use to build qmake. In doing so, it changed the variables in that file, from this layout: VAR = value to this: VAR=value During its configuration phase, qt5 will parse that file using the system awk. However, the system awk is not necessarily GNU awk; some systems, especially Debian ones, use mawk as the default awk implementation. mawk does not behave the same as GNU awk, and this causes qt5 to extract empty values, and thus leads to build failures. Fix that by replacing the variables with similar layout, keeping the spaces around the equal signs. Fixes: http://autobuild.buildroot.org/results/cb5/cb555a124bb3bdb9c5a3465673c21022d94cf2ca/ Reported-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* Merge branch 'next'Peter Korsgaard2018-12-021-0/+8
|\ | | | | | | Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| * package/qt5/qt5base: use ccache for building host codeThomas Petazzoni2018-11-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt5 currently doesn't use HOSTCC/HOSTCXX, so it doesn't use ccache when building all its host code (especially qmake). This means that even with ccache enabled and a hot cache, it still takes a long time to build qt5base. Before this patch, building qt5base takes: - 446 seconds with a cold ccache - 185 seconds with a hot ccache This is because the ccache is not used for host code. After this patch, building qt5base takes: - 450 seconds with a cold ccache - 15 seconds with a hot ccache 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>
* | qt5declarative: fix debug build with uclibcFabrice Fontaine2018-11-301-0/+45
|/ | | | | | | | | | | | | | | | | | | | | | | Debug build of qsgtexture 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> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/postgresql: needs wcharBernd Kuhls2018-11-011-2/+3
| | | | | | | | | | | | | | Upstream removed support for non-wchar toolchains: https://github.com/postgres/postgres/commit/85feb77aa09cda9ff3e12cf95c757c499dc25343 Propagate the new dependency to other packages. Fixes http://autobuild.buildroot.net/results/b73/b73342a39167ed7f293224d4e3b23dde691b9abf/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [Thomas: also propagate to the php, qt and qt5base packages.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5base: Qt KMS support does not depend on openglJoshua Henderson2018-10-221-2/+9
| | | | | | | | | | | | | | | | | | | | Qt KMS support should not explicitly depend on the availability of opengl. Don't explicitly disable KMS if opengl is not available and fallback to detecting if libdrm is available before disabling kms. The scenario where this is necessary involves using the Qt linuxfb backend "dumb buffer" support via the DRM API. This is new in Qt 5.9 [1] and only requires KMS, but not opengl. Although on Qt 5.6, only eglfs actually uses libdrm/kms, it doesn't hurt to add the dependency and the -kms option there as well, and doing so keeps the logic in the .mk file simple. [1] http://doc.qt.io/qt-5/embedded-linux.html#linuxfb Cc: Peter Seiderer <ps.report@gmx.net> Cc: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* qt5multimedia: add license info for examples fftreal libraryPeter Seiderer2018-10-222-0/+3
| | | | | Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5x11extras: fix license informationPeter Seiderer2018-10-223-5/+12
| | | | | | | | | | | | | | | | | | | | This commit fixes several problems with the license information of qt5x11extras: - With the latest version update the legacy version files LICENSE.GPLv2 LICENSE.GPLv3 and LICENSE.LGPLv3 were removed, use the new ones LICENSE.GPL2 LICENSE.GPL3 and LICENSE.LGPL3 instead. Fixes: http://autobuild.buildroot.net/results/238bb74f23d7a11516eac088da3188d463abac5a - Hashes for some licenses files for the 5.6.3 version were missing. As part of this, we switch to using per-version hash files entirely. Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5wayland: remove legacy compile-without-QtQuick patchPeter Seiderer2018-10-201-69/+0
| | | | | | | | | | | | | | | | | | Patch was taken from upstream [1], removing it fixes [2]: Applying 0001-fix-compilation-without-QtQuick.patch using patch: patching file src/compositor/compositor_api/compositor_api.pri Reversed (or previously applied) patch detected! Skipping patch. 3 out of 3 hunks ignored -- saving rejects to file src/compositor/compositor_api/compositor_api.pri.rej patching file src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h.rej [1] http://code.qt.io/cgit/qt/qtwayland.git/commit/?id=2c48ee65e8c3b894caec214641723d0777fc60b8 [2] http://autobuild.buildroot.net/results/0d31817bb4d416d01f4d1bec3e22ce0e5b2ca1c3 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package: drop unversioned hash filesYann E. MORIN2018-10-206-30/+12
| | | | | | | | | | | | | | | | | | | The download infra now knows to look for per-version hash files, so we can now drop the unversioned hash files. Instead of removing them, add a comment that redirects the developper to update the per-version hash files instead (so they do not re-add a unversioned one in the future). Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gaël Portay <gael.portay@savoirfairelinux.com> Cc: Peter Seiderer <ps.report@gmx.net> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Luca Ceresoli <luca@lucaceresoli.net> Cc: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package: prepare for per-version hash filesYann E. MORIN2018-10-2015-21/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt5 packages may have different licensing terms between the two versions we support, and in some cases, those different terms are expressed in similarly named files, like files named plain 'LICENSE' for example. Similarly, glibc also has different license files, especially since the arc version still has libidn, which got dropped from upstream. This is problematic, because, in a .hash file, we can't store two different hashes for the same file. We've started to handle this case by moving the licenses hashes to the per-version sub directories. However, the hashes for the downloads are still stored inside the non- versioned hash file of the package, which is not totally coherent: if we have a per-version hash file, it should list all the hases for that version, downloads included, and there should be no unversioned hash file. In preparation for this, we duplicate the downloads hashes from the main hash files, and into the versioned ones. Once the download infra learns to look for those hashes in these per-version subdirs, we'll remove the unversioned hash files. Note that, now that we have versioned hash files, the main hash files will not be used to check license files, so we can already drop the hashes for license files from the main hash files. Note also that there are a few other packages for which we support different versions (binutils, gcc, gdb, lua, xserver_xorg-server, uboot), but none of those have different licensing terms due to the version. Qt5 and glibc are alone in this case. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gaël Portay <gael.portay@savoirfairelinux.com> Cc: Peter Seiderer <ps.report@gmx.net> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Luca Ceresoli <luca@lucaceresoli.net> Cc: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5location: copy PositioningQuick.so* for QtQuickAlexander 'z33ky' Hirsch2018-10-171-0/+6
| | | | | | | | The Location module for QtQuick depends on this library, which was not being copied in the build rule. Signed-off-by: Alexander 'z33ky' Hirsch <1zeeky@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5base: fix qt_open64 related compile failurePeter Seiderer2018-10-091-0/+35
| | | | | | | | | | | | | | | | Add upstream patch fixing ([1], [2]): .obj/qlinuxfbscreen.o: In function `QLinuxFbScreen::initialize()': qlinuxfbscreen.cpp:(.text+0xa6c): undefined reference to `qt_open64(char const*, int, unsigned int)' qlinuxfbscreen.cpp:(.text+0x1042): undefined reference to `qt_open64(char const*, int, unsigned int)' qlinuxfbscreen.cpp:(.text+0x10aa): undefined reference to `qt_open64(char const*, int, unsigned int)' qlinuxfbscreen.cpp:(.text+0x1746): undefined reference to `qt_open64(char const*, int, unsigned int)' [1] http://autobuild.buildroot.net/results/66f55a311dcf9d54ca6148b232287973ba226999 [2] http://autobuild.buildroot.net/results/a4759e8cea09a597dbeb82f6c673ddc531d419e8 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5serialport: fix 5.6.3 license file hashesPeter Seiderer2018-10-093-12/+13
| | | | | | | | | | | | | | | | | Fixes [1]: ERROR: LICENSE.FDL has wrong sha256 hash: ERROR: expected: ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d ERROR: got : e1251235ce9853eecfecfa905da9ee29e9b76e4db2a1c9c4a20699f460419b08 [1] http://autobuild.buildroot.net/results/320db38e94d68b2ea4451c3cc0bd7742c125cedb We take this opportunity to split the license file hashes in per-version hash files. Signed-off-by: Peter Seiderer <ps.report@gmx.net> [Thomas: split in per-version hash files.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5serialbus: split 5.11.2 license file hashes into a separate fileThomas Petazzoni2018-10-092-6/+5
| | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5serialbus: fix 5.6.3 license file hashesPeter Seiderer2018-10-091-0/+5
| | | | | | | | | | | | | Fixes [1]: ERROR: LICENSE.FDL has wrong sha256 hash: ERROR: expected: ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d ERROR: got : f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d [1] http://autobuild.buildroot.net/results/f8dba48bc1e71332f3983e78c40989e5f864abf3 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5connectivity: add license files hashesPeter Seiderer2018-10-092-0/+13
| | | | | | | Signed-off-by: Peter Seiderer <ps.report@gmx.net> [Thomas: split in per-version hash files, add missing hash for LGPL_EXCEPTION.txt.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5base: drop remnants patches from previous versionYann E. MORIN2018-10-081-74/+0
| | | | | | | | | | | | | | | When the bump to 5.11.2 was applied, master gained a new patch for 5.11.1 in-between the bump submission and the moment it was applied. That patch still lingers around now. Since that patch has been applied upstream (it is detected as a revert when applied to 5.11.2), we simply drop it. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Peter Seiderer <ps.report@gmx.net> Cc: Peter Korsgaard <peter@korsgaard.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5: bump latest version to 5.11.2Peter Seiderer2018-09-3033-55/+64
| | | | | | | | | | | | - qt5canvas3d: update license info - qt5serialbus: update license hash (LICENSE.FDL editorial change, see [1]) - qt5serialport: update license hash (LICENSE.FDL editorial change, see [2]) [1] https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=226bd2f84c807b5401a82832dafa48d34966052a [2] https://code.qt.io/cgit/qt/qtserialport.git/commit/?id=e0bd3949c30ce9c1988a6d6a3c0850d16a1fb33a Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* Merge branch 'next'Peter Korsgaard2018-09-074-4/+148
|\ | | | | | | Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| * package/qt5/qt5base: fix statx support with glibc >= 2.28Bernd Kuhls2018-08-141-0/+74
| | | | | | | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| * qt5base: fix double-conversion compile for aarch64_bePeter Seiderer2018-08-141-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Fixes [1]: ../3rdparty/double-conversion/include/double-conversion/utils.h:81:2: error: #error Target architecture was not detected as supported by Double-Conversion. #error Target architecture was not detected as supported by Double-Conversion. [1] http://autobuild.buildroot.net/results/1fe2be0f26e5b92db57a5cfb5646dd253b731a5c Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| * qt5wayland: add fix from upstream to compile without QtQuickFloris Bos2018-08-093-4/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling qt5wayland fails if you do not have the QtQuick module: == .obj/qwaylandquickhardwarelayer.o: In function `QWaylandQuickHardwareLayer::classBegin()': qwaylandquickhardwarelayer.cpp:(.text+0x170): undefined reference to `QWaylandQuickItem::staticMetaObject' .obj/qwaylandquickhardwarelayer.o: In function `non-virtual thunk to QWaylandQuickHardwareLayer::classBegin()': qwaylandquickhardwarelayer.cpp:(.text+0x1cc): undefined reference to `QWaylandQuickItem::staticMetaObject' .obj/qwaylandquickhardwarelayer.o: In function `QWaylandQuickHardwareLayer::disableSceneGraphPainting()': qwaylandquickhardwarelayer.cpp:(.text+0x1e0): undefined reference to `QWaylandQuickItem::setPaintEnabled(bool)' .obj/qwaylandquickhardwarelayer.o: In function `QWaylandQuickHardwareLayerPrivate::layerIntegration()': qwaylandquickhardwarelayer.cpp:(.text+0x22c): undefined reference to `QtWayland::HardwareLayerIntegrationFactory::keys(QString const&)' qwaylandquickhardwarelayer.cpp:(.text+0x408): undefined reference to `QtWayland::HardwareLayerIntegrationFactory::create(QString const&, QStringList const&, QString const&)' qwaylandquickhardwarelayer.cpp:(.text+0x890): undefined reference to `QtWayland::HardwareLayerIntegrationFactory::create(QString const&, QStringList const&, QString const&)' collect2: error: ld returned 1 exit status Makefile:375: recipe for target '../../lib/libQt5WaylandCompositor.so.5.11.1' failed make[4]: *** [../../lib/libQt5WaylandCompositor.so.5.11.1] Error 1 == Fix taken from upstream's git: http://code.qt.io/cgit/qt/qtwayland.git/commit/?id=2c48ee65e8c3b894caec214641723d0777fc60b8 No longer depends on declarative after applying either. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5location: fix build failure due to missing qt5base gui dependencyGiulio Benetti2018-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt5location fails to build due to missing Qt5 Gui module. In configure.json features.opengl is referred, but it is available only if qt5base gui submodule is built. Add BR2_PACKAGE_QT5BASE_GUI to qt5location Config.in to assure gui submodule is built before qt5location. Fixes: http://autobuild.buildroot.org/results/1e1/1e12a819750c677c9ef204a324c8bf06212e5135/ http://autobuild.buildroot.org/results/223/223ec6565beba1ca73d4ff488296feec53656b40/ http://autobuild.buildroot.org/results/84f/84fe1c84e3537167ee3791e83c9fe2cc2805ccb5/ http://autobuild.buildroot.org/results/9c9/9c96d2106222e623a379f9995bd059725eb27769/ http://autobuild.buildroot.org/results/fa0/fa01513d28d896ca8819966c5b1ed5c35283e92f/ http://autobuild.buildroot.org/results/5d7/5d7333470c31b83c697218382dc77f74af86c666/ http://autobuild.buildroot.org/results/db7/db7b4c61bb41d32e0f7960c194588cd1559ff3f7/ http://autobuild.buildroot.org/results/2b7/2b71f186b8d67c4805393c9c016d641893d46220/ http://autobuild.buildroot.org/results/1e1/1e12a819750c677c9ef204a324c8bf06212e5135/ Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* | qt5location: fix build failure due to GCC < 5.x bug in implicit castsGiulio Benetti2018-09-061-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC < 5.x has some bug in implicit casts, this leads to build failure. In particular QPointer<QGeoMap> in m_map QDeclarativeGeoMap class, when passed to connect(m_map, ...) should directly cast to m_map.data(). Add reworked patch referred on QTBUG-69512: https://bugreports.qt.io/browse/QTBUG-69512 Fixes: http://autobuild.buildroot.org/results/dc5/dc5c354f3aae54b77dad74ad44aca6d12425a457/ http://autobuild.buildroot.org/results/3ab/3ab6f79a36543fa677555bc9ec3500baa46ab0f8/ http://autobuild.buildroot.org/results/8b5/8b5531e44c4f4258c950902b2cd92d1ac8a8491e/ http://autobuild.buildroot.org/results/089/089d03ab14a7c70e465cce891506a082049f2998/ http://autobuild.buildroot.org/results/da8/da87ca470b22d599bb25998af8f25136921f35a7/ http://autobuild.buildroot.org/results/5fe/5fe91fd762c5d4eda01378947b13f7ffc084a8be/ http://autobuild.buildroot.org/results/a84/a84182145122935c8f10105818dbf0e3aa23fd11/ http://autobuild.buildroot.org/results/5b9/5b9106351a04646f42697215ed497e09c62c12fa/ http://autobuild.buildroot.org/results/397/397acc3f5d4998a8d632749ef7d21533c35d501a/ http://autobuild.buildroot.org/results/b18/b186ec0e297d6857a9e0a6a063e476b5049ccf93/ http://autobuild.buildroot.org/results/bf2/bf241beeb1ce10eec99d247cdd331870c08e0ac8/ Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* | qt5virtualkeyboard: fix target install issue with Qt 5.6Gaël PORTAY2018-09-061-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt5virtualkeyboard 2.0 (shipped with Qt 5.6) installs the QML plugin under the directory Enterprise while the later versions install it without that directory. Differentiate installation to target of the QML plugin according to the Qt major version in use. Also, make sure the /usr/qml/QtQuick directory exists before the copy. Fixes: >>> qt5virtualkeyboard 2.0 Installing to target mkdir -p /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins/platforminputcontexts cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins/platforminputcontexts cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard /home/gportay/src/buildroot/output/target/usr/qml/QtQuick cp: cannot stat '/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard': No such file or directory package/pkg-generic.mk:310: recipe for target '/home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_installed' failed make: *** [/home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_installed] Error 1 Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5virtualkeyboard: add hashes of 3rd-party licensesGaël PORTAY2018-09-052-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing license hashes for those three third-parties: - src/virtualkeyboard/3rdparty/openwnn/NOTICE - src/virtualkeyboard/3rdparty/pinyin/NOTICE - src/virtualkeyboard/3rdparty/tcime/COPYING Fixes: >>> qt5virtualkeyboard 5.11.1 Collecting legal info LICENSE.GPL3: OK (sha256: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903) ERROR: No hash found for src/virtualkeyboard/3rdparty/openwnn/NOTICE ERROR: No hash found for src/virtualkeyboard/3rdparty/pinyin/NOTICE ERROR: No hash found for src/virtualkeyboard/3rdparty/tcime/COPYING src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt: OK (sha256: 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10) In order to make this possible, we use a different hash file for the old version (2.0, used with Qt 5.6) and new (5.11, used with Qt 5.11) versions of qt5virtualkeyboard. Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5virtualkeyboard: fix legal-info with 5.6Gaël PORTAY2018-09-052-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt5virtualkeyboard 2.0 (shipped with Qt 5.6) doesn't contain any "main" license files with the GPLv3 license text. Conditionally remove LICENSE.GPL3 from QT5VIRTUALKEYBOARD_LICENSE_FILES when Qt major version is set to 5.6. Fixes: >>> qt5virtualkeyboard 2.0 Collecting legal info sha256sum: /home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/LICENSE.GPL3: No such file or directory ERROR: LICENSE.GPL3 has wrong sha256 hash: ERROR: expected: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 ERROR: got : ERROR: Incomplete download, or man-in-the-middle (MITM) attack Also, the lipi-toolkit has a different filename between both supported Qt major version (5.6 and latest). Conditionally set the license in QT5VIRTUALKEYBOARD_LICENSE_FILES for lipi-toolkit according to the Qt major version used. Fixes: >>> qt5virtualkeyboard 2.0 Collecting legal info ERROR: No hash found for src/virtualkeyboard/3rdparty/openwnn/NOTICE ERROR: No hash found for src/virtualkeyboard/3rdparty/pinyin/NOTICE ERROR: No hash found for src/virtualkeyboard/3rdparty/tcime/COPYING sha256sum: /home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt: No such file or directory ERROR: src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt has wrong sha256 hash: ERROR: expected: 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 ERROR: got : ERROR: Incomplete download, or man-in-the-middle (MITM) attack Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> [Thomas: add hash for lipi-toolkit license file, tweak commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5virtualkeyboard: fix patch applied to 2.0 versionGaël PORTAY2018-09-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch 0001-remove-weird-install-path-for-example.patch using patch: does not apply properly and needs to be fixed. The patch was backported from 5.7 [1] with path adaptation in commit (cb97d9473b qt5virtualkeyboard: allow to build with qt5.6), but the submitted patch did not reflect that said adaptation. Apply the said patch adaptation (i.e. add missing basic subdirectory) to apply properly the patch. Fixes: >>> qt5virtualkeyboard 2.0 Patching Applying 0001-remove-weird-install-path-for-example.patch using patch: patching file examples/virtualkeyboard/basic/basic.pro Hunk #1 FAILED at 7. 1 out of 1 hunk FAILED -- saving rejects to file examples/virtualkeyboard/basic/basic.pro.rej make: ***[/home/test/autobuild/run/instance-2/output/build/qt5virtualkeyboard-2.0/.stamp_patched] Error 1 [1]: https://github.com/qt/qtvirtualkeyboard/commit/aef55eb7b3470ba6dee4abc67acda1d308c90e97 Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5webengine: use QT5WEBENGINE prefix for CHROMIUM_LICENSE_FILES variableLaurent Hartanerot2018-09-013-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qt5webengine package currently uses the CHROMIUM_LICENSE_FILES variable to hold the list of license files for the chromium source code embedded inside the qt5webengine code. However, using this variable would clash with a hypothetical "chromium" package, and anyway violates our rule that all variables of a package should be prefixed by the package name. This commit fixes that by adding the QT5WEBENGINE to this variable. Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5webengine: fix chromium-latest.inc with the current license filesLaurent Hartanerot2018-09-011-276/+397
| | | | | | | | | | | | | | | | | | | | | | | | | | chromium-latest.inc was not properly updated with the latest version bumps of Qt, and it no longer matches the license files of Qt5Webengine 5.11. This commit fixes this legal-info failure: $ make qt5webengine-legal-info [...] cp: cannot stat '/home/thomas/projets/buildroot/output/build/qt5webengine-5.11.1/src/3rdparty/chromium/buildtools/third_party/libc++abi/trunk/LICENSE.TXT': No such file or directory Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5webengine: rename chromium.inc to chromium-latest.incLaurent Hartanerot2018-09-012-1/+1
| | | | | | | | | | | | | | | | For consistency with chromium-lts.inc, rename chromium.inc to chromium-latest.inc. Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5webengine: add separate file for chromium license files for Qt LTSLaurent Hartanerot2018-09-012-0/+252
| | | | | | | | | | | | | | | | | | | | | | The qtwebengine package used by Qt LTS has a different set of license files for chromium, so this commit introduces a separate chromium-lts.inc with the right contents. This fixes legal-info of qt5webengine with Qt LTS. Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5quickcontrols: update license file names for Qt 5.6 versionLaurent Hartanerot2018-08-291-0/+5
| | | | | | | | | | Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5base: fix double conversion for microblazeel/microblazebePeter Seiderer2018-08-211-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | Fixes [1]: ../3rdparty/double-conversion/include/double-conversion/utils.h:81:2: error: #error Target architecture was not detected as supported by Double-Conversion. #error Target architecture was not detected as supported by Double-Conversion. [1] http://autobuild.buildroot.net/results/489/4891d96f45c64c2e66fe819bd4175cc1d6243a93 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | qt5base: fix double-conversion for or1kPeter Seiderer2018-08-201-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | Fixes [1]: ../3rdparty/double-conversion/include/double-conversion/utils.h:81:2: error: #error Target architecture was not detected as supported by Double-Conversion. #error Target architecture was not detected as supported by Double-Conversion. [1] http://autobuild.buildroot.net/results/a3535cdf5e91df011a59a4b9f60d69195f5efdcb Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* | qt5serialbus: examples need qt5 widgets modulePeter Seiderer2018-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes [1]: make[2]: Entering directory '.../build/qt5serialbus-5.11.1/examples' Some of the required modules (qtHaveModule(widgets)) are not available. Skipped. [...] cp -dpfr .../host/mips64el-buildroot-linux-gnu/sysroot/usr/lib/qt/examples/serialbus .../target/usr/lib/qt/examples/ cp: cannot stat '.../host/mips64el-buildroot-linux-gnu/sysroot/usr/lib/qt/examples/serialbus': No such file or directory [1] http://autobuild.buildroot.net/results/147809b5f8758af935bee48c0fc83fd86a8509e9 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
OpenPOWER on IntegriCloud