Merge remote-tracking branch 'origin/krogoth' into dev

* origin/krogoth:
  AM: update revision
  Add appman versions of Kit and Qt to creator
  fonts: add recipe for GNU FreeFonts
  Add multiscreen automotive demo
  neptune: update to include fix for i18ndemo
  fonts: update URL for lohit font
  Update GammaRay to the same version as used by the QtAS 1.1 host tools
  emulator: correctly append qtsimulator configuration
  Update automotive components
  setup-environment: don't exit the shell on error
  neptune-ui: add runtime dependencies
  update meta-qt5 (merged upstream/master) SHA1 to manifest.xml
  AM: Add appman tools to automotive nativesdk
  configure-qtcreator: suppress unnecessary error
  Update GammaRay to the latest 2.7 branch

Conflicts:
	recipes-qt/automotive/neptune-ui_git.bb
	recipes-qt/automotive/qtapplicationmanager_git.bb
	recipes-qt/qt5/qtlocation_git.bbappend
	scripts/manifest.xml

Change-Id: I96601e7d7a1827a6631fe59d18101d2ad3b70871

4 files changed, 81 insertions, 1 deletions

diff --git a/recipes/fonts/ttf-devanagari_2.94.0.bb b/recipes/fonts/ttf-devanagari_2.94.0.bb
index 1073096..ee0ea06 100644
--- a/recipes/fonts/ttf-devanagari_2.94.0.bb
+++ b/recipes/fonts/ttf-devanagari_2.94.0.bb
@@ -37,7 +37,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 inherit allarch fontcache
 
-SRC_URI = "https://fedorahosted.org/releases/l/o/lohit/lohit-devanagari-ttf-${PV}.tar.gz"
+SRC_URI = "https://releases.pagure.org/lohit/lohit-devanagari-ttf-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "57527ee536a18b443cf786d4b8fd5ec8"
 SRC_URI[sha256sum] = "a6618aeb1d25df46d3c22e528c38ea1d1147654e19904497a1e97f4684c55353"
diff --git a/recipes/fonts/ttf-freefont_20120503.bb b/recipes/fonts/ttf-freefont_20120503.bb
new file mode 100644
index 0000000..abf9562
--- /dev/null
+++ b/recipes/fonts/ttf-freefont_20120503.bb
@@ -0,0 +1,49 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "GNU FreeFont is a free family of scalable outline fonts"
+HOMEPAGE = "http://savannah.gnu.org/projects/freefont"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+require recipes-graphics/ttf-fonts/ttf.inc
+
+inherit allarch fontcache
+
+S = "${WORKDIR}/freefont-${PV}"
+
+SRC_URI = "http://ftp.gnu.org/gnu/freefont/freefont-ttf-${PV}.zip"
+
+SRC_URI[md5sum] = "879b76d2e3c8003d567b555743f39154"
+SRC_URI[sha256sum] = "7c85baf1bf82a1a1845d1322112bc6ca982221b484e3b3925022e25b5cae89af"
+
+PACKAGES = "${PN}-sans ${PN}-mono ${PN}-serif"
+FILES_${PN}-sans = "${datadir}/fonts/truetype/FreeSans*.ttf"
+FILES_${PN}-mono = "${datadir}/fonts/truetype/FreeMono*.ttf"
+FILES_${PN}-serif = "${datadir}/fonts/truetype/FreeSerif*.ttf"
diff --git a/recipes/libyaml/libyaml_%.bbappend b/recipes/libyaml/libyaml_%.bbappend
new file mode 100644
index 0000000..728a546
--- /dev/null
+++ b/recipes/libyaml/libyaml_%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+BBCLASSEXTEND += "nativesdk"
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 066ba29..65f7f5e 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -44,6 +44,7 @@ RDEPENDS_${PN} = "\
         ttf-opensans \
         ttf-dejavu-common \
         ttf-dejavu-sans \
+        ttf-freefont-mono \
         otf-noto \
         dbus-session-init \
         tzdata \