aboutsummaryrefslogtreecommitdiff
path: root/package/qt5
Commit message (Collapse)AuthorAgeFilesLines
* package/qt5virtualkeyboard: fix install for Qt 5.12.xGravatar Peter Seiderer3 days1-3/+3
| | | | | | | | | | | | | | | | | | With Qt 5.12.x only handwriting/lipi-toolkit needs 3rdparty parts installation (with Qt 5.6.x although zn_CZ/pinyin and zh_TW tcime). Fixes: - https://bugs.busybox.net/show_bug.cgi?id=12456 cp: cannot stat '.../host/arm-buildroot-linux-gnueabihf/sysroot/usr/qtvirtualkeyboard': No such file or directory Also fix the way we test the variable: we very seldomly use ifdef, instead we usually test for equality. Reported-by: Sam Petrocelli <sam.petrocelli@gmail.com> Signed-off-by: Peter Seiderer <ps.report@gmx.net> [yann.morin.1998@free.fr: also fix the way we test the variable] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
* package/qt5/qt5base: support ti-sgx-libgbmGravatar Lothar Felten2019-12-301-0/+3
| | | | | | | qt5 configure options: add ti-sgx-libgbm as GBM backend Signed-off-by: Lothar Felten <lothar.felten@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5virtualkeyboard: add an upstream URL to Config.inGravatar Mark Corbin2019-12-221-0/+2
| | | | | | | | | | Add an upstream URL to the help text in Config.in. This addresses the 'Missing' URL status in the package stats web page output. Signed-off-by: Mark Corbin <mark@dibsco.co.uk> Reviewed-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5webengine: fix build error due to bogus use of -isystemGravatar Bartosz Bilas2019-12-211-0/+57
| | | | | | | | | | | | | | | | | | | | | | | This commit adds a patch from upstream chromium[1] that allows passing -I instead of -isystem to CFLAGS. Fixes: In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/6.1.0/include/g++-v6/bits/stl_algo.h:59:0, from /usr/lib/gcc/x86_64-pc-linux-gnu/6.1.0/include/g++-v6/algorithm:62, from /usr/include/qt5/QtCore/qglobal.h:85, from /usr/include/qt5/QtCore/qalgorithms.h:37, from /usr/include/qt5/QtCore/qlist.h:37, from /usr/include/qt5/QtCore/qstringlist.h:34, from /usr/include/qt5/QtCore/QStringList:1, from base/http/requestparser.cpp:32: /usr/lib/gcc/x86_64-pc-linux-gnu/6.1.0/include/g++-v6/cstdlib:75:25: fatal error: stdlib.h: No such file or directory #include_next <stdlib.h> [1] https://chromium.googlesource.com/chromium/src/+/a8c8396fd20d98666d517c45b358c63736e345ef Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com> [Thomas: improved commit log with comments from Giulio.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* Merge branch 'next'Gravatar Peter Korsgaard2019-12-021-0/+6
|\ | | | | | | Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| * package/qt5/qt5base: add support for gcnano-binariesGravatar Jens Kleintje2019-11-151-0/+6
| | | | | | | | | | Signed-off-by: Jens Kleintje <scooby22@web.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | package/qt5wayland: fix installation with Qt 5.6Gravatar Carlos Santos2019-11-111-1/+1
|/ | | | | | | | Install QtWayland only if the latest Qt version is selected. It does not exist in version 5.6. Signed-off-by: Carlos Santos <unixmania@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/*: do not override LICENSE, but append to itGravatar Yann E. MORIN2019-10-2710-14/+14
| | | | | | | | | | | | | | | | Now that the infra takes care of removing extraneous spaces before commas, we can safely append to LICENSE variables. This removes the only case where we had to use immediate assignment to append to a variable. Mechanical change, with: $ sed -r -i -e 's/\<([^[:space:]]+_LICENSE) := \$\(\1\),/\1 += ,/' \ $(git grep -l -E '\<([^[:space:]]+_LICENSE) := \$\(\1\),') Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* packages: host gcc >= 4.8 is now guaranteedGravatar Yann E. MORIN2019-10-275-19/+8
| | | | | | | | | | | ... so we can drop all config options about it and previous versions. Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Peter Korsgaard <peter@korsgaard.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Romain Naour <romain.naour@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/qt5/qt5base: fix icu detection in Qt 5.6.3Gravatar Andrey Skvortsov2019-10-261-0/+74
| | | | | | | | | | | | | | | | | | | icu is required to build Q5tWebkit. When UChar is defined as char16_t in ICU, then qtbase fails to detect ICU. The issue is described https://bugreports.qt.io/browse/QTBUG-49586 Build fails with following error messages: ... ustring.h:473:20: error: ‘UChar’ does not name a type u_strCompare(const UChar *s1, int32_t length1, ^ ^ make[2]: *** [Makefile:195: icu.o] Error 1 ICU disabled. The ICU library support cannot be enabled. Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5tools: enable build of host qdocGravatar Yann E. MORIN2019-10-122-5/+23
| | | | | | | | | | | | | qdoc was previously built as part of qtbase (in the pre-5.6 era), but with qt-5.6 it is now part of qttools. With qt-5.12, it needs libclang to build, so be it... Signed-off-by: Yann E. MORIN <yann.morin@orange.com> Cc: Peter Seiderer <ps.report@gmx.net> Cc: Julien Corjon <corjon.j@ecagroup.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5/qt5webview: install missing pluginsGravatar Bartosz Bilas2019-10-081-0/+1
| | | | | | | | Fixes: No WebView plug-in found! Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5webview: new packageGravatar Bartosz Bilas2019-10-074-0/+83
| | | | | | | | Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com> [Bernd: bump version to 5.12.5] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [Thomas: drop select BR2_PACKAGE_QT5BASE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5: bump latest version to 5.12.5Gravatar Bernd Kuhls2019-10-0733-211/+53
| | | | | | | | | | | | | | | | Removed patches applied upstream: - package/qt5/qt5base/5.12.4/0005-Fix-dependency_libs-entry-of-.la-files.patch https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=8c0787cfa1a906ebe25907515d86050303b127e7 - package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=8c0787cfa1a906ebe25907515d86050303b127e7 - package/qt5/qt5serialbus/5.12.4/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5multimedia: fix build without openglGravatar Fabrice Fontaine2019-08-171-0/+47
| | | | | | | | | Fixes: - http://autobuild.buildroot.org/results/fc7bcc6b3ccf1e075dce43296b36e7e1cac417db Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5serialbus: fix build with kernel >= 5.2Gravatar Fabrice Fontaine2019-08-172-0/+72
| | | | | | | | | | Fixes: - http://autobuild.buildroot.org/results/ddacee1d09f34fc718ef05a6e4f0bbbe26cd56d1 - http://autobuild.buildroot.org/results/34a4ed20705b581add96fb5d97828909cee9015c Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5enginio/Config.in: depends before selectGravatar Arnout Vandecappelle (Essensium/Mind)2019-08-151-1/+1
| | | | | | | | | | | In Config.in, we put 'depends' lines before 'select' lines, as reported by check-package. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/273215267 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5enginio: switch to a depends on for SSL supportGravatar Thomas Petazzoni2019-08-131-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt5enginio requires SSL support in qt5base. However, the SSL support in qt5base is a bit annoying: while it can be provided by either openssl or libressl for Qt latest, it can only be provided by libressl for Qt 5.6. Fabrice Fontaine initially proposed [0] a dependency on BR2_PACKAGE_QT5BASE_OPENSSL, and a long discussion followed. Ultimately, we found the dependency to not be nice, as it required users to know that they need to enable some SSL implementation to be able to enable qt5enginio. The current solution enables BR2_PACKAGE_OPENSSL (the virtual package), which can be either openssl or libressl. This choice was done under the assumption that we anyway don't test Qt 5.6 in the autobuilders. However, this is incorrect: Qt latest needs gcc >= 4.8 on host and target, and we have configurations in the autobuilders that don't meet this requirement, and therefore build Qt 5.6, and face a build issue due to OpenSSL being used instead of LibreSSL. After additional thinking, this commit simply gets back to the original solution proposed by Fabrice: a "depends on". We simply add Config.in comments to help the user in knowing what is missing to enable qt5enginio. An alternate solution would have been to disallow selecting qt5enginio when Qt 5.6 is used. But fixing the qt5enginio build is also needed for the LTS branch, and we can't drop qt5enginio on Qt 5.6 in the LTS branch, as that could bother users. Fixes: http://autobuild.buildroot.net/results/227d4b9e2b48c5b3f2dcf0fad9eefa2816c1eb0c/ [0] https://patchwork.ozlabs.org/patch/1053883/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5base: harfbuzz support needs gcc >= 4.8Gravatar Bernd Kuhls2019-08-111-1/+3
| | | | | | | Due to the harfbuzz bump to version 2.5.2 we need gcc >= 4.8. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5base: fix libtool la file dependency_libs entriesGravatar Peter Seiderer2019-08-031-0/+75
| | | | | | | | | | | | | | | | Fixes [1]: libtool: error: cannot find the library '' or unhandled argument '/.../host/riscv64-buildroot-linux-gnu/sysroot/usr/lib/libQt5Widgets.so' Add upstream suggested patch ([2]) to change la file dependency_libs entries to -L<path> -l<library> version. [1] http://autobuild.buildroot.net/results/79c1e1b7a1bc53c1e9b2ae0c9acb443e6d2e2994 [2] https://codereview.qt-project.org/c/qt/qtbase/+/269146 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5/qt5webengine: re-enable when toolchain has gcc bug 85862Gravatar Giulio Benetti2019-08-031-6/+0
| | | | | | | | | | | On Qt5 Latest package qt5webengine libnss that is affected by gcc bug 85862. However, that bug has now been worked around in libnss, so we can remove the 'depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862', as libnss is now available even if the toolchain is affected by gcc bug 85862. Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5base: build with correct optimizationGravatar Giulio Benetti2019-08-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt5 has predefined optimization flags depending if you're building for size, for debug etc. These flags are defined in mkspecs/common/gcc-base.conf: QMAKE_CFLAGS_OPTIMIZE = -O2 QMAKE_CFLAGS_OPTIMIZE_FULL = -O3 QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os Then, in common/features/default_post.prf, they add those flags to QMAKE_CFLAGS_RELEASE/QMAKE_CXXFLAGS_RELEASE depending on various build options (optimize_size, optimize_full, optimize_debug): optimize_size { !isEmpty(QMAKE_CFLAGS_OPTIMIZE):!isEmpty(QMAKE_CFLAGS_OPTIMIZE_SIZE) { QMAKE_CFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE QMAKE_CXXFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_SIZE QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_SIZE } } else: optimize_full { !isEmpty(QMAKE_CFLAGS_OPTIMIZE):!isEmpty(QMAKE_CFLAGS_OPTIMIZE_FULL) { QMAKE_CFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE QMAKE_CXXFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_FULL QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_FULL } } Since this default_post.prf is included *after* our qmake.conf file, these flags override our optimizations flags, which is not good. However, our qmake.conf file is included *after* gcc-base.conf, so we can simply reset those variables to have the empty value, and our optimization flags will be used. Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> [Thomas: completely change the approach, by simply resetting the QMAKE_CFLAGS_OPTIMIZE_* variables in qmake.conf] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5base: drop wrong optimization flagGravatar Giulio Benetti2019-08-031-1/+0
| | | | | | | | | | In qmake.conf.in has been left 'QMAKE_CXXFLAGS_RELEASE += -O3' but this leads to not use Buildroot CXXFLAGS when building in release mode(without debugging symbols). So let's remove it to let Qt5 to follow Buildroot optimization flags like other packages do. Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5: change upstream locationGravatar Yann E. MORIN2019-07-301-1/+1
| | | | | | | | | | | | | | | Upstream pushes their delivery archives in to places: https://download.qt.io/official_releases/ https://download.qt.io/archive/ After a while, only the latter remains, whith the former being pruned actively to contain only officially supported versions. Switch to using the archive location, as it has everything, even the latest versions. Signed-off-by: "Yann E. MORIN" <yann.morin@orange.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/qt5wayland: examples needs opengl with qt latestGravatar Fabrice Fontaine2019-07-131-0/+8
| | | | | | | | | | | | | | | | | | WIth Qt latest, if opengl is not enabled, qt5wayland examples won't be built: make[3]: Entering directory `/home/dawncrow/buildroot-test/scripts/instance-0/output/build/qt5wayland-5.12.2/examples/wayland' Some of the required modules (qtConfig(opengl)) are not available. Skipped. make[3]: Leaving directory `/home/dawncrow/buildroot-test/scripts/instance-0/output/build/qt5wayland-5.12.2/examples/wayland' And build will fail on: cp: cannot stat '/home/dawncrow/buildroot-test/scripts/instance-0/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/lib/qt/examples/wayland': No such file or directory Fixes: - http://autobuild.buildroot.org/results/902322ca156c14044d4ce53ab2c77f30dd854c98 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5: bump latest version to 5.12.4Gravatar Peter Seiderer2019-07-1131-89/+54
| | | | | | | | | | | | | | | qt5multimedia: - remove 0001-Fix-compile-failure-with-gstreamer-0-10.patch (taken from upstream [1]) qt5webengine: - add one additional license hash (src/3rdparty/chromium/third_party/blink/renderer/build/scripts/license.pyc) [1] https://code.qt.io/cgit/qt/qtmultimedia.git/commit/?id=935967a453b47ae7c8e9ad3d94eef3813eab58db Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5webengine: sort license hash list by pathGravatar Peter Seiderer2019-07-112-598/+598
| | | | | | | | Prepare for reproducable re-generation of hash list for coming up qt5 update. Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5/qt5base: work around gcc bug 90620Gravatar Giulio Benetti2019-06-221-2/+10
| | | | | | | | | | | | | | | | | | | | | On Microblaze, with gcc versions <= 9.x and optimization enabled, the build fails with: internal compiler error: in do_output_reload, at reload1.c:7978 This is due to gcc bug 90620 (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90620). The bug shows up when building qt5base (or other qt5 modules) with optimization but not when building with -O0. To work around this bug, if BR2_TOOLCHAIN_HAS_GCC_BUG_90620=y we force using -O0. Fixes: http://autobuild.buildroot.net/results/4e5/4e563f5fc38ec681a730a576c5f056bc092db74e/ http://autobuild.buildroot.net/results/348/3482bd950c7ab5608666807a7ab7ea857c767333/ http://autobuild.buildroot.net/results/835/8351e3fbd6a39d05da6a6e7a978329d718dfc109/ Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5base: disable predefined -Og optimizationGravatar Giulio Benetti2019-06-221-0/+7
| | | | | | | | | | Starting from Qt5 5.9.0, -optimize-debug is enabled by default for debug builds causing -Og flag to be appended to CFLAGS and consequently override TARGET_CFLAGS. We don't want this so let's pass -no-optimize-debug to QT5BASE_CONFIGURE_OPTS if QT5_VERSION_LATEST=y. Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* Merge branch 'next'Gravatar Peter Korsgaard2019-06-021-0/+7
|\ | | | | | | Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| * package/qt5base: enable journald loggingGravatar David Rosca2019-05-141-0/+7
| | | | | | | | | | | | | | | | Allows Qt applications to log into systemd journal with QT_LOGGING_TO_CONSOLE=0 environment variable. Signed-off-by: David Rosca <nowrep@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | package/qt5/qt5wayland: install compositor QML filesGravatar David Rosca2019-05-261-0/+6
| | | | | | | | | | | | | | Fixes using QtWayland.Compositor QML import. Signed-off-by: David Rosca <nowrep@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | package/qt5webkit-examples: fix build with qt5webkitGravatar Fabrice Fontaine2019-05-261-0/+73
| | | | | | | | | | | | | | | | Fixes: - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* | package/qt5multimedia: fix install with gstreamer 0.10 and QT 5.6Gravatar Fabrice Fontaine2019-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QT 5.6 fails to correctly detect gstreamer support with gstreamer 0.10 as a result libqgsttools_p.so is not built and build fails on: cp: cannot stat '/home/buildroot/autobuild/run/instance-1/output/host/xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libqgsttools*.so.*': No such file or directory Fixes: - http://autobuild.buildroot.org/results/c88afcd365418e29c89f247d9d887b5f786b0ec8 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* | package/qt5multimedia: put back gstreamer 0.10 optional dependencyGravatar Fabrice Fontaine2019-05-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | Commit b2e16ea64a6f89a82098625bb93db020ea5d4db4 tried to remove gstreamer 0.10 support by removing its dependency but this was just masking the issue as we have a build failure with gstreamer 0.10 So put back this dependency. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* | package/qt5multimedia: fix build with gstreamer 0.10Gravatar Fabrice Fontaine2019-05-141-0/+36
| | | | | | | | | | | | | | | | | | | | Fixes: - http://autobuild.buildroot.org/results/de26fd4f5ab130bd87ea9d7709d9568290362758 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> [Arnout: patch applies to 5.12.2 version only] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* | package/qt5enginio: needs sslGravatar Fabrice Fontaine2019-05-101-2/+8
|/ | | | | | | | | | | | | | | | | | | | | | | qt5enginio needs Qt5 with ssl support, a dependency could be added on BR2_PACKAGE_QT5BASE_OPENSSL but this proposal was rejected in the first iteration of this patch. Qt5 has ssl support through libressl on Qt 5.6 or openssl in latest Qt however we can't select libressl without adding a circular dependency as some packages (such as sqlcipher) force openssl through BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL. Any solution at the Kconfig level that tries to select libressl will lead to circular dependencies. Since Qt 5.6 is more or less deprecated anyway, and since it is not tested in the autobuilders, solve this with a comment. The comment is only shown for Qt 5.6, when libressl is not selected. Note that it is also shown when qt5enginio is not selected. Fixes: - http://autobuild.buildroot.org/results/60678cab68ec9aa17184b8417b64b3b79adf428a Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5base: fix qmake parallel buildGravatar Giulio Benetti2019-04-221-1/+1
| | | | | | | | | | | | | | | | | | When configuring qt5base, qmake is built, but it's not built in parallel mode. This is due to MAKEFLAGS having 2 dashes on its tail, so this: MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" expands in this(i.e. 5 njobs): MAKEFLAGS="--no-print-directory -- -j5" and -j5 gets ignored due to "--" preceeding -j5. Double dashes are part of $(MAKEFLAGS) only when evaluated by shell. Swap $(MAKEFLAGS) and -j$(PARALLEL_JOBS) to avoid having "--" before -j$(PARALLEL_JOBS), this way -j$(PARALLEL_JOBS) won't be ignored by ./configure. Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Tested-by: Michael Trimarchi <michael@amarulasolutions.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5: Remove *.la/*.prl fixup scriptGravatar Andreas Naumann2019-04-1723-37/+0
| | | | | | | | | | | | After fixing Prefix in our custom qt.conf, Qt computes and embeds the correct sysroot prefixed pathes in all *.la and *.prl files. So remove fixup of - *.la files because they are generically fixed anyway - *.prl files because occurences of absolute /usr/lib were no longer observed Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* qt5base: Fix inconsistencies when overriding qmake propertiesGravatar Andreas Naumann2019-04-171-14/+2
| | | | | | | | | | | | | | | | | | | | | | | When querying the qmake properties with our custom qt.conf present, I noticed that they were different from the built-in ones (without qt.conf). Most notably QT_INSTALL_PREFIX was a concatenated string of two absolute paths (hostdir + sysroot). This is due to Prefix being set to our HOST_DIR and HostPrefix not being set at all. Supposedly this was also the root cause of the initial problem with qt.conf.in, because once Prefix and HostPrefix are set to their correct values, re-setting all the other paths to their defaults is no longer necessary. (However, since our paths for Headers, Plugins and Examples are non-default, they still have to be explicitely set.) There is one exception to this: omitting 'Settings' leads to the CONFIGURATION path being plain /usr, whereas the default without qt.conf is /usr/etc/xdg. But even if storing configs directly under /usr seems a bit strange we keep it that way, because our qt.conf did set it to /usr before and we don't want to break existing users. Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5/qt5virtualkeyboard: fix legal-info failureGravatar Giulio Benetti2019-04-132-5/+17
| | | | | | | | | | | | | After version bump, all sha256 were updated, but not the changed license files paths for version 5.12.2. Update license files paths for 5.12.2. Fixes: http://autobuild.buildroot.net/results/3812f4a6313fab57766c7b98defa723c58a8fa76/ Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5base: fix xkbcommon optionGravatar Peter Seiderer2019-03-241-1/+7
| | | | | | | | | | | | | | | | | - Qt 5.6: according to configure --help the command line option to enable x11 xkbcommon support is '-system-xkbcommon-x11' - Qt 5.12: according to configure --help the command line option to enable xkbcommon support is '-xkbcommon' Fixes [1]: ERROR: Invalid value given for boolean command line option 'xkbcommon'. [1] http://autobuild.buildroot.net/results/87076d03bb92a9940447ca80fc1f202e35ef39da Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/qt5: bump latest version to 5.12.2Gravatar Peter Seiderer2019-03-1830-53/+53
| | | | | Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/sunxi-mali: remove packageGravatar Francois Perrad2019-03-151-1/+1
| | | | | | | The package sunxi-mali-mainline is available for recent kernels. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5virtualkeyboard: install shared libraryGravatar Mark Thompson2019-03-141-0/+7
| | | | | | | | | | | | Between Qt 5.11 and 5.12 the virtual keyboard package gained a new top-level library, libQt5VirtualKeyboard.so, which is then used by all of the plugins it installs. This change makes Buildroot aware of the new library so that we install it to the target filesystem. Signed-off-by: Mark Thompson <mark.thompson@starleaf.com> [Thomas: move the definition of QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS into a separate condition] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* Revert "package/qt5/qt5webengine: fix comment on GL dependencies"Gravatar Thomas Petazzoni2019-03-141-1/+1
| | | | | | | | | This reverts commit 6fb4c14ecb1e8f001449830b65ec2a4606b87682. Indeed, as Peter Seiderer pointed out, the comment is in fact partially correct: with Qt 5.6, QT5DECLARATIVE_QUICK does require OpenGL support. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/qt5/qt5webengine: fix comment on GL dependenciesGravatar Martin Kepplinger2019-03-131-1/+1
| | | | | | | | qt5declarative can be built/used without opengl support so fix the dependency comment in qt5webengine. Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* qt5webkit: select leveldb package and memenvGravatar Gaël PORTAY2019-03-072-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>
* Merge branch 'next'Gravatar Peter Korsgaard2019-03-0539-787/+1389
|\ | | | | | | Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| * package/qt5/qt5webengine: add hashes for license filesGravatar Thomas Petazzoni2019-02-233-5/+714
| | | | | | | | | | | | | | | | | | | | This commit adds hashes for all licenses files found in qt5webengine. In order to do this, it moves the hash file into a per-version folder. 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>