Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11

* qtyocto/upstream/master:

  40054db qt5: qtbase: Upgrade Double-Conversion
  dd1ce3c README: Rework to start using GitHub for development
  ef5f5d9 qt5: upgrade to 5.11.1
  820f3ef qt5: add common PACKAGECONFIG for QtQuickCompiler
  e199d80 python-pyqt5: update recipe to 5.10.1
  65db89e qtbase: don't pass empty filename to function
  3b27896 nativesdk-qtbase: add quotes to CC and CXX in environment file
  a36cc5f libvcard: add recipe
  1ac92b6 qtbase: Add packageconfigs for renameat2 and getentropy use
  557aabd qttranslations: remove qtquick1 translation package
  00aafa0 qt5-creator: Remove qtquick1 dependency
  731334a qtwebengine: fix build with plugins as well as ozone enabled
  70ce980 qtwebengine: add -fpermissive
  33f58ff qtwebengine: fix build with gcc8, part II
  267a38f qtwebengine: fix build with gcc8
  7193a7f qtquick1: remove recipe and all references
  29445f6 qtwebkit: do not skip build - use cmake as build system
  dde9b55 qt5: refresh the patches and update them on meta-qt5 repositories
  e0a4e23 qt5: Update to Qt 5.11.0
  73f99f2 gstreamer1.0-plugins-{good,bad}: move the qt5 PACKAGECONFIG from bad to good bbappend

Change-Id: Ib58d0e103bda0b58338989c00f1fa80bd699534c

1 files changed, 26 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
new file mode 100644
index 00000000..e84290e3
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -0,0 +1,26 @@
+From bc578326c48554e2123640869199d0d4505fa357 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Jul 2017 15:39:57 -0700
+Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
+
+musl libc does not have sbrk. on musl libc will only work when called with 0 as
+argument, so we just let it out for now
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h  | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
+index edc8cf2db7..a868b50d30 100644
+--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
+@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
+ }
+ 
+ // Don't hook sbrk() in Android, since it doesn't expose __sbrk.
+-#if !defined(__ANDROID__)
++#if !defined(__ANDROID__) && defined(__GLIBC__)
+ // libc's version:
+ extern "C" void* __sbrk(ptrdiff_t increment);
+