diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:15:26 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 12:07:34 +0200 |
| commit | 18741e483851e1a6aae79992b130aee34ad48879 (patch) | |
| tree | c6523af371af79a48d726578217d6b3b1570beb0 /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | d2c05c81e8230358dca80cf9df67e49f9f672a29 (diff) | |
recipes-git: upgrade to 5.5
* 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>
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index ce5e97fc..0b3e87df 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -5,9 +5,9 @@ HOMEPAGE = "http://qt-project.org" LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ - file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ + file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " @@ -25,23 +25,20 @@ SRC_URI += "\ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ - file://0007-configure-bump-path-length-from-256-to-512-character.patch \ - file://0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0009-QOpenGLPaintDevice-sub-area-support.patch \ - file://0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch \ + file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ + file://0006-configure-bump-path-length-from-256-to-512-character.patch \ + file://0008-QOpenGLPaintDevice-sub-area-support.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0011-Always-build-uic.patch \ - file://0012-Add-external-hostbindir-option-for-native-sdk.patch \ + file://0009-Always-build-uic.patch \ + file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ " # specific for nativesdk-qtbase SRC_URI += " \ - file://0013-configure-preserve-built-qmake-and-swap-with-native-.patch \ + file://0009-configure-preserve-built-qmake-and-swap-with-native-.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -280,4 +277,4 @@ do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "2cb17c1fb903434274e58692c9f0df619affdab0" +SRCREV = "2fde9f59eeab68ede92324e7613daf8be3eaf498" |