From fb71293f257c6fd02ccc06765a96dbf11d4569a0 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 --- recipes-qt/qt5/qtwebengine_git.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'recipes-qt/qt5/qtwebengine_git.bb') 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