From b4e270f9e2e5c632f0958af1a5131efb45bcd799 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 4 Jun 2014 17:12:58 +0200 Subject: qtbase: Refresh patches to match with stable* branches on github.com/meta-qt5 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'recipes-qt/qt5/qtbase_git.bb') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4f019be9..037a4f66 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -5,21 +5,23 @@ SRC_URI = "\ git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ " -# common with -native -SRC_URI += "\ +# common with -native and -nativesdk +SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ - file://0002-Add-external-hostbindir-option.patch \ - file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ + file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ + file://0003-Add-external-hostbindir-option.patch \ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \ + file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ + file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ + file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ + file://0008-configure-bump-path-length-from-256-to-512-character.patch \ + file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \ " - + # target specific SRC_URI += "\ - file://0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ - file://0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ + file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ " -SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2" +SRCREV = "80b6fbc2d9dfc753d6570e971aa4cf4f3420585c" -- cgit v1.2.3-54-g00ecf