From 325ee67a2494bce7eb4feecf8d6af7deffecd605 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 14 Feb 2019 10:26:21 +0000 Subject: qtwebengine: drop 0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch * with 5.12 it looks like it's not needed anymore, it causes following error instead: linking ../../lib/libQt5WebEngineCore.so.5.12.0 ../../../../git/src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc:79: error: undefined reference to 'content::GetFontFamilies_SlowBlocking(std::vector, std::allocator >, std::allocator, std::allocator > > >*)' ../../../../git/src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc:93: error: undefined reference to 'content::GetFontsInFamily_SlowBlocking(std::__cxx11::basic_string, std::allocator > const&, std::vector >*)' collect2: error: ld returned 1 exit status Makefile.core_module:74: recipe for target '../../lib/libQt5WebEngineCore.so.5.12.0' failed Signed-off-by: Martin Jansa --- ...errides.cpp-Fix-build-with-plugins-and-oz.patch | 50 ---------------------- recipes-qt/qt5/qtwebengine_git.bb | 1 - 2 files changed, 51 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch b/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch deleted file mode 100644 index 4319058b..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 76e9084f139341218eccb4c71766bbc3eaa3e61e Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 10 Jun 2018 10:26:17 +0000 -Subject: [PATCH] chromium_overrides.cpp: Fix build with plugins and ozone - enabled - -* otherwise it fails with: - | make[3]: Entering directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core' -| creating linker version script QtWebEngineCore.version -| rm -f libQt5WebEngineCore.so.5.10.1 libQt5WebEngineCore.so libQt5WebEngineCore.so.5 libQt5WebEngineCore.so.5.10 -| linking ../../lib/libQt5WebEngineCore.so.5.10.1 -| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: error: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/content/browser/browser/pepper_truetype_font_list_ozone.o: multiple definition of 'content::GetFontFamilies_SlowBlocking(std::vector, std::allocator >, std::allocator, std::allocator > > >*)' -| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/QtWebEngineCore/chromium_overrides.o: previous definition here -| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: error: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/content/browser/browser/pepper_truetype_font_list_ozone.o: multiple definition of 'content::GetFontsInFamily_SlowBlocking(std::__cxx11::basic_string, std::allocator > const&, std::vector >*)' -| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/QtWebEngineCore/chromium_overrides.o: previous definition here -| collect2: error: ld returned 1 exit status -| Makefile.core_module:74: recipe for target '../../lib/libQt5WebEngineCore.so.5.10.1' failed -| make[3]: *** [../../lib/libQt5WebEngineCore.so.5.10.1] Error 1 -| make[3]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core' -| Makefile:122: recipe for target 'sub-core_module-pro-make_first' failed -| make[2]: *** [sub-core_module-pro-make_first] Error 2 -| make[2]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core' -| Makefile:78: recipe for target 'sub-core-make_first' failed -| make[1]: *** [sub-core-make_first] Error 2 -| make[1]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src' -| Makefile:46: recipe for target 'sub-src-make_first' failed -| make: *** [sub-src-make_first] Error 2 -| ERROR: oe_runmake failed -| WARNING: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/temp/run.do_compile.10122:1 exit 1 from 'exit 1' -| ERROR: Function failed: do_compile (log file is located at /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/temp/log.do_compile.10122) - -Signed-off-by: Martin Jansa -Signed-off-by: Christophe Chapuis ---- - src/core/chromium_overrides.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp -index 841dcf4c..2f2299b4 100644 ---- a/src/core/chromium_overrides.cpp -+++ b/src/core/chromium_overrides.cpp -@@ -140,7 +140,7 @@ std::unique_ptr GetFontList_SlowBlocking() - return std::move(font_list); - } - --#if QT_CONFIG(webengine_pepper_plugins) -+#if QT_CONFIG(webengine_pepper_plugins) && !defined(USE_OZONE) - // content/browser/renderer_host/pepper/pepper_truetype_font_list.h - void GetFontFamilies_SlowBlocking(std::vector *font_families) - { diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index bcddf889..ee87c884 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -139,7 +139,6 @@ QT_MODULE_BRANCH_CHROMIUM = "69-based" SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ - file://0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ file://0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch \ " SRC_URI_append_libc-musl = "\ -- cgit v1.2.3-54-g00ecf