From 6374736f37378501793a5191b48545c1fecc0c48 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 19 Mar 2014 15:30:56 +0100 Subject: recipes-git: Upgrade from latest origin/release to latest origin/stable * there wont be 5.2.2 release, so start preparation for 5.3.0 * probably latest 5.3.0-beta1 snapshot was released yesterday, so this should be reasonably close * probably wont be merged before creating new release branch for Yocto 1.6 * qtbase: Fix build with X.h included from egl.h * nativesdk-qt*: Add git recipes 5.2.1 isn't compatible with qtbase-native from git * qtbase: upgrade to latest stable revision * 0006-configure-make-pulseaudio-alsa-freetype-a-configurab.patch was upstreamed in: 0c3301f configure: make pulseaudio and alsa configurable options * 0005-qt_module-Fix-pkgconfig-replacement.patch is hopefully resolved in: eaefbe3 snuff -L/-I with system paths when installing meta files a33afed de-duplicate setup of libdir replacement in prl files aa20e7f reshuffle code for clarity ee86ce8 don't attempt to replace include paths in meta files but this needs to be double checked * recipes-git: Upgrade to latest origin/stable * qt5-git.inc: update LICENSE.LGPL checksum * only year was updated: - The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). * qtbase: add 2 patches to fix build issues * LIC_FILES_CHKSUM: update other git recipes * qtlocation: bump SRCREV and add to qt5-versions * qt5-versions.inc: Add line for qttools and fix it for nativesdk-qttools * qtquick1: fix LIC_FILES_CHKSUM * qttools: update LIC_FILES_CHKSUM and patches * new qtdiag needs to be disabled as well because it depends on gui which isn't enabled in qtbase-native, disable qtpaths as well Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative_git.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5/qtdeclarative_git.bb') diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index e2d6ae58..2d733a3f 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,6 +1,10 @@ require qt5-git.inc require ${PN}.inc -QT_MODULE_BRANCH = "release" -# v5.2.1 + 81 commits -SRCREV = "7ceefa60ab4f79d5f40e7051edf80c1a77ae7734" +SRCREV = "aedcd57c84ac9d6b74816c13bdf3fde31e1132b5" + +# older copyright year than what e.g. qtbase is using now +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" -- cgit v1.2.3