diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-qt5/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-qt5/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch')
-rw-r--r-- | external/meta-qt5/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/external/meta-qt5/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch b/external/meta-qt5/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch deleted file mode 100644 index 5ae32d59..00000000 --- a/external/meta-qt5/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3eaf551ec5f68933c636404945e6404e2508160b Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -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::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)' -| /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<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<ppapi::proxy::SerializedTrueTypeFontDesc, std::allocator<ppapi::proxy::SerializedTrueTypeFontDesc> >*)' -| /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 <Martin.Jansa@gmail.com> -Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com> ---- - 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 8f6687ff..994e2799 100644 ---- a/src/core/chromium_overrides.cpp -+++ b/src/core/chromium_overrides.cpp -@@ -159,7 +159,7 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() - return std::move(font_list); - } - --#if BUILDFLAG(ENABLE_PLUGINS) -+#if BUILDFLAG(ENABLE_PLUGINS) && !defined(USE_OZONE) - // content/browser/renderer_host/pepper/pepper_truetype_font_list.h - void GetFontFamilies_SlowBlocking(std::vector<std::string> *font_families) - { |