From 818cc2d11b02ceb02ac27401fedcaf1e1db91d36 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 7 Mar 2014 01:39:24 +0100 Subject: [PATCH] qtbase: move 0015-Fix-linuxfb-argument-mmsize-parsing.patch to 5.2.1 recipe Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 1 - recipes-qt/qt5/qtbase_5.2.1.bb | 2 ++ recipes-qt/qt5/qtbase_git.bb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index a6fb3b22c4..89736bea19 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -18,7 +18,6 @@ SRC_URI += "\ file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \ file://0016-eglfs-Fix-quad-coordinates.patch \ " diff --git a/recipes-qt/qt5/qtbase_5.2.1.bb b/recipes-qt/qt5/qtbase_5.2.1.bb index c106d2278b..4257367a01 100644 --- a/recipes-qt/qt5/qtbase_5.2.1.bb +++ b/recipes-qt/qt5/qtbase_5.2.1.bb @@ -1,5 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc +SRC_URI += "file://0015-Fix-linuxfb-argument-mmsize-parsing.patch" + SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1083983425..07dd936df3 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -2,5 +2,5 @@ require qt5-git.inc require ${PN}.inc QT_MODULE_BRANCH = "release" -# v5.2.1 + 168 commits -SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f" +# v5.2.1 + 172 commits +SRCREV = "bf0336a02502b3ed4d399c1cf5b4a56b1e858d42"