From c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 20 Dec 2018 01:05:55 +0000 Subject: qt5: upgrade to latest revision in 5.12 * WIP * zlib temporarily disabled in qtbase-native, the configure fails too find it even when it is in RSS: docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\* /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939 /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed. * fixes #136 Signed-off-by: Martin Jansa --- .../0003-chromium-Fix-build-with-gcc8.patch | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch (limited to 'recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch') diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch deleted file mode 100644 index 5323a0f1..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ad0dd667c3459538149de4479d18c1793af91d43 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 5 Jun 2018 13:58:16 +0000 -Subject: [PATCH] chromium: Fix build with gcc8 - ---- - chromium/mojo/public/c/system/buffer.h | 2 +- - chromium/mojo/public/c/system/data_pipe.h | 2 +- - chromium/mojo/public/c/system/message_pipe.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h -index 09f6d285f3e..e516a09e498 100644 ---- a/chromium/mojo/public/c/system/buffer.h -+++ b/chromium/mojo/public/c/system/buffer.h -@@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags - ((MojoCreateSharedBufferOptionsFlags)0) - #endif - --MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); -+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); - struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { - uint32_t struct_size; - MojoCreateSharedBufferOptionsFlags flags; -diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h -index 62adbea1ea6..76225858ba8 100644 ---- a/chromium/mojo/public/c/system/data_pipe.h -+++ b/chromium/mojo/public/c/system/data_pipe.h -@@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE = - ((MojoCreateDataPipeOptionsFlags)0) - #endif - --MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); -+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); - struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { - MOJO_ALIGNAS(4) uint32_t struct_size; - MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags; -diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h -index f0f69d1025f..364a02971e2 100644 ---- a/chromium/mojo/public/c/system/message_pipe.h -+++ b/chromium/mojo/public/c/system/message_pipe.h -@@ -44,7 +44,7 @@ const MojoCreateMessagePipeOptionsFlags - ((MojoCreateMessagePipeOptionsFlags)0) - #endif - --MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); -+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); - struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { - uint32_t struct_size; - MojoCreateMessagePipeOptionsFlags flags; -- cgit v1.2.3-54-g00ecf