summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade to Qt 5.9.0Samuli Piippo2017-08-201-86/+0
| | | | | | | | | | | | | | | | | | | | | | | | * adapt QtWebEngine recipe to use GN instead of GYP * add QtRemoteObjects and QtWebView as a new Qt modules * update available QtBase configure arguments * remove obsolete patches * patch all .pc files to remove build paths * include generated QML cache files in packages * the patch "configure paths for target qmake properly" could not be applied anymore and support must be done differently * QtWebEngine now requires gcc-multilib to be installed on the host system, because the host tools are built to the same bitness as the target (arm -> x86, aarch64 -> x86-64) * refresh the patches to match with b5.9* branches on: https://github.com/meta-qt5/qtbase https://github.com/meta-qt5/qtwebengine and 56-based branch on https://github.com/meta-qt5/qtwebengine-chromium Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh the patchesMartin Jansa2017-08-171-4/+4
| | | | | | | | | | | | * upload the patches to b5.8* branches on: https://github.com/meta-qt5/qtbase * refresh the patches * notice that some patches were in section which is meant to be common for target, native and nativesdk qtbase but were added only in target recipe, I've updated them to be included in all 3, hopefully they can be used in all 3 (I don't use nativesdk at all) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upgrade to Qt 5.8Samuli Piippo2017-01-261-148/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad. Removes qtdeclarative-render2d [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revisions in 5.7 branchMartin Jansa2016-08-051-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * LIC_FILES_CHKSUM were changed because of this small change: commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6 Author: Sze Howe Koh <szehowe.koh@gmail.com> Date: Tue Jun 14 19:12:35 2016 +0800 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" * -no-nis option was removed from qtbase in: commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Author: Ralf Nolden <nolden@kde.org> Date: Fri May 20 22:03:39 2016 +0200 Cleanup NIS support leftover from Qt 3/4 * allow to disable eglfs independently from gles2, because eglfs-egldevice may be autodetected when libdrm was built before qtbase since this upstream commit: commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0 Author: Ralf Nolden <nolden@kde.org> Date: Tue May 17 12:38:44 2016 +0200 Make eglfs-egldevice check work with pkgconfig as well and then it fails to build, because libdrm could be removed from sysroot and drm.h is missing. * recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch was resolved in upstream commit: commit 26229cfa0b729313893af5674d604e8692dbb946 Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Date: Tue Apr 26 15:08:34 2016 +0200 QDeclarativeTextInput: update API to use setBlinkingCursorEnabled Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revisions in 5.7 branchesMartin Jansa2016-05-021-32/+34
| | | | | | | | | | | | | | | | | * these revisions are after v5.7.0-beta1 tags where available * it's highly recommended to read: http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ to find out how you're affected check which files/tools are included in your builds, e.g. for qtwebengine: OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c 11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$ 67 ** $QT_BEGIN_LICENSE:BSD$ 17 ** $QT_BEGIN_LICENSE:FDL$ 61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$ 261 ** $QT_BEGIN_LICENSE:LGPL$ * change in chromium's LICENSE is only copyright year update Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.6 branchMartin Jansa2016-04-211-8/+5
| | | | | | | | | | | | | | * qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch and qtwebkit/0004-Fix-linking-with-libpthread.patch were resolved upstream * all patches were refreshed with: git format-patch --no-numbered --no-signature -NUMBER to remove numbering from Subject (it's good enough in filename) and to remove git version from signature (so it doesn't look differently when generated on different hosts with different git version). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: upgrade SRCREVs a bit moreMartin Jansa2016-02-201-2/+2
| | | | | | * to make sure that qtbase modules report 4.6.1 version Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revisions in 5.6 branch (5.6 RC)Martin Jansa2016-02-201-14/+14
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.6 branch (5.6.0-alpha1+)Martin Jansa2015-11-111-17/+17
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.5 branch (5.5.1+)upstream/jansa/jethrojansa/jethroMartin Jansa2015-10-231-2/+2
| | | | | | | * this is probably last upgrade for jethro branch, master will switch to 5.6 soon Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.5 branchesMartin Jansa2015-09-251-8/+8
| | | | | | * qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh patchesMartin Jansa2015-08-251-8/+8
| | | | | | * based on b5.5.0 branches in https://github.com/meta-qt5/qtbase Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes-git: upgrade to 5.5Martin Jansa2015-08-181-23/+19
| | | | | | | | | | * based on my WIP patch + fixes from John Mullen * I was trying to get rhid of 0003-Add-external-hostbindir-option.patch and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using upstream configure parameter added in some previous version, but I've failed, so now good-old -external-hostbindir parameter is back Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.4 branchesMartin Jansa2015-06-041-3/+3
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: rename <module>-git directories with patches to just <module>Martin Jansa2015-05-281-0/+233
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: drop recipes for 5.4.1 versionMartin Jansa2015-05-281-233/+0
| | | | | | | | * we don't plan to keep 2 versions, one from tarballs and one from git now there is 5.4.2 in git recipes and 5.4.1 tarballs aren't very useful anymore Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: Refresh patches to match git recipesMartin Jansa2015-02-271-7/+7
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase/EXTERNAL_HOST_BINS: split out code only required for native-(sdk)Andreas Müller2015-02-181-75/+0
| | | | | | | | | | * code was moved from 0003-Add-external-hostbindir-option.patch to 0014-Add-external-hostbindir-option-native.patch * only native(-sdk) versions of qtbase apply 0014-Add-external-hostbindir-option-native.patch Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: upgrade from 5.3.2 to 5.4.0Jonathan Liu2014-12-111-25/+25
| | | | | | | | MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM MJ: qtwebkit: move leveldb dependency to .inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Jonathan Liu <net147@gmail.com>
* qtbase: fix path to external hostbindir binariesJonathan Liu2014-10-301-4/+3
| | | | | | | This fixes syncqt.pl not being included in qtbase-tools. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt*: refresh the patchesMartin Jansa2014-10-041-16/+16
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix 0003-Add-external-hostbindir-option.patchJonathan Liu2014-07-101-26/+39
| | | | | | | | | | | | | | | The isEmpty function takes a variable name instead of a value. As $$[QT_EXTERNAL_HOST_BINS] is a built-in we need to assign it to a variable to check if it is empty. If QT_EXTERNAL_HOST_BINS is empty (as is the case for generated Qt 5 toolchains), we need to fallback to QT_HOST_BINS when determining the path for tools such as moc otherwise you get the following error when building a Qt project using the generated toolchain: make[1]: /moc: Command not found Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: upgrade from 5.3.0 to 5.3.1Martin Jansa2014-07-061-38/+106
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5Martin Jansa2014-06-101-20/+20
| | | | | | * move more patches to "shared" section Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: Upgrade from 5.2.0 to 5.2.1Martin Jansa2014-02-191-11/+11
| | | | | | | | | * qtwayland: Use default LICENSE and LIC_FILES_CHKSUM * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a * qtdeclarative, qtserialport: Update QT_MODULE_BRANCH * SHA-1 of v5.2.1 tag is only in release branch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.2.0Martin Jansa2014-01-121-0/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: drop 5.0.0 and 5.0.1 versionsMartin Jansa2013-05-281-221/+0
| | | | | | | | | | | | | | | | * maintaining 4 different versions requires a lot more testing of changes in .inc files and we have only one version of modules without release (only one _git.bb) and it's impossible to find SRCREV which would be compatible with all 4 versions. * 0005-AddSynchoronization-qimagereader.patch was already backported to 5.0.2 in upstream * 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was already applied in 5.0.2 * 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in qt5-versions.inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh patches, drop 2 unusedMartin Jansa2013-05-211-5/+7
| | | | | | | | | | | | | * drop Change-Ids, add Upstream-Status * 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't used in recipes * 0004-Disable-mkv8snapshot.patch and 0005-AddSynchoronization-qimagereader.patch are special, because they are applied only to 5.0.0 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh patches and add missing to 5.0.2 and git versionsMartin Jansa2013-04-281-2/+2
|
* qtbase: add patches to fix wrong libdir/include dirs in pkgconfig and ↵Martin Jansa2013-04-281-1/+1
| | | | | | | | | libtool files * qt_module.prf replacements were creating -L/usr/lib in .pc files which is bad for cross-compilation * also use '=' for sysroot in libtool files Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: improve internal build system to support OE way of building qtMartin Jansa2013-04-261-0/+219
* add linux-oe-g++ mkspec directly with patch * add functions to read and eval OE_QMAKE functions from mkspec and also export them with QMakeVar to be available also for config.tests * add external-host-bindir parameter to skip building native tools even when we're in fact cross-compiling (because we have them from qtbase-native build already). * use separated ${B} and ${S} and clean ${B} when reconfiguring stalled qmake cache can be used when configure is reexecuted cleaning ${B} prevents that and provide cleaner separation * OE_QMAKE_AR cqs is added by Makefile, having it here too was causing issues * isEmpty(QT_EXTERNAL_HOST_BINS) doesn't work, so lets use exist() even when it allows to incorrectly set wrong directory and build native tools again (instead of skipping them) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>