aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-native_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-03-19 15:30:56 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-10 12:11:51 +0200
commit6374736f37378501793a5191b48545c1fecc0c48 (patch)
tree06516ff2623180d41dddbdf91af3d3701c261a8c /recipes-qt/qt5/qtbase-native_git.bb
parent9957ec5d0176912e189cf7e243617ed9c3cde57a (diff)
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb23
1 files changed, 20 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 6f11bf3a..bafe37ba 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -1,12 +1,29 @@
require qt5-git.inc
require ${PN}.inc
+SRC_URI = "\
+ git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+"
+
+# common with -native
+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://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+ file://0001-Fix-missing-plugin_types.patch \
+ file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+"
+
+# specific for native version
+SRC_URI += " \
+ file://0008-Always-build-uic.patch \
+"
+
do_install_append() {
# for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
# e.g. qt3d, qtwayland
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 168 commits
-SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"
+SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"